aboutsummaryrefslogtreecommitdiff
path: root/debug/memset_chk.c
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-12-04 02:02:25 +0100
committerOndřej Bílka <neleai@seznam.cz>2013-12-04 02:41:12 +0100
commitd674f0ef3898c0d1fd5cec76c1c736d9cd9bc7d1 (patch)
treeb6a4f57e8e469c61fb3b81e7903961d50a4203f3 /debug/memset_chk.c
parent6905a19f7a8443950f105b6716f6b4b1f98c4dbd (diff)
downloadglibc-d674f0ef3898c0d1fd5cec76c1c736d9cd9bc7d1.tar
glibc-d674f0ef3898c0d1fd5cec76c1c736d9cd9bc7d1.tar.gz
glibc-d674f0ef3898c0d1fd5cec76c1c736d9cd9bc7d1.tar.bz2
glibc-d674f0ef3898c0d1fd5cec76c1c736d9cd9bc7d1.zip
Refactor several debug routines.
To simplify additions of debug routines we replace a custom function implementation by a simple call.
Diffstat (limited to 'debug/memset_chk.c')
-rw-r--r--debug/memset_chk.c61
1 files changed, 1 insertions, 60 deletions
diff --git a/debug/memset_chk.c b/debug/memset_chk.c
index bfbc29d294..ef1cadb60f 100644
--- a/debug/memset_chk.c
+++ b/debug/memset_chk.c
@@ -28,64 +28,5 @@ __memset_chk (dstpp, c, len, dstlen)
if (__builtin_expect (dstlen < len, 0))
__chk_fail ();
- long int dstp = (long int) dstpp;
-
- if (len >= 8)
- {
- size_t xlen;
- op_t cccc;
-
- cccc = (unsigned char) c;
- cccc |= cccc << 8;
- cccc |= cccc << 16;
- if (OPSIZ > 4)
- /* Do the shift in two steps to avoid warning if long has 32 bits. */
- cccc |= (cccc << 16) << 16;
-
- /* There are at least some bytes to set.
- No need to test for LEN == 0 in this alignment loop. */
- while (dstp % OPSIZ != 0)
- {
- ((byte *) dstp)[0] = c;
- dstp += 1;
- len -= 1;
- }
-
- /* Write 8 `op_t' per iteration until less than 8 `op_t' remain. */
- xlen = len / (OPSIZ * 8);
- while (xlen > 0)
- {
- ((op_t *) dstp)[0] = cccc;
- ((op_t *) dstp)[1] = cccc;
- ((op_t *) dstp)[2] = cccc;
- ((op_t *) dstp)[3] = cccc;
- ((op_t *) dstp)[4] = cccc;
- ((op_t *) dstp)[5] = cccc;
- ((op_t *) dstp)[6] = cccc;
- ((op_t *) dstp)[7] = cccc;
- dstp += 8 * OPSIZ;
- xlen -= 1;
- }
- len %= OPSIZ * 8;
-
- /* Write 1 `op_t' per iteration until less than OPSIZ bytes remain. */
- xlen = len / OPSIZ;
- while (xlen > 0)
- {
- ((op_t *) dstp)[0] = cccc;
- dstp += OPSIZ;
- xlen -= 1;
- }
- len %= OPSIZ;
- }
-
- /* Write the last few bytes. */
- while (len > 0)
- {
- ((byte *) dstp)[0] = c;
- dstp += 1;
- len -= 1;
- }
-
- return dstpp;
+ return memset (dstpp, c, len);
}