aboutsummaryrefslogtreecommitdiffstats
path: root/rawmemelemmove.c
diff options
context:
space:
mode:
Diffstat (limited to 'rawmemelemmove.c')
-rw-r--r--rawmemelemmove.c165
1 files changed, 106 insertions, 59 deletions
diff --git a/rawmemelemmove.c b/rawmemelemmove.c
index 8903ae8..a145e7e 100644
--- a/rawmemelemmove.c
+++ b/rawmemelemmove.c
@@ -1,24 +1,25 @@
/* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
#ifndef TEST
#define RAWMEMELEMMOVE(TYPE)\
do {\
- TYPE *p;\
+ const TYPE *p;\
+ TYPE *ret;\
size_t n;\
if (d <= s) {\
for (; (*d++ = *s) != elem; s++);\
return d;\
} else {\
- for (p = *(TYPE **)(void *)&s; *p++ != elem;);\
+ for (p = s; *p++ != elem;);\
n = (size_t)(p - s);\
- p = &d[n];\
+ ret = &d[n];\
while (n) {\
n--;\
d[n] = s[n];\
}\
- return p;\
+ return ret;\
}\
} while (0)
@@ -47,7 +48,8 @@ rawmemelemmove64(uint64_t *restrict d, const uint64_t *restrict s, uint64_t elem
static char *
rawmemelemmovex(char *restrict d, const char *restrict s, const char *restrict elem, size_t width)
{
- char *p;
+ const char *p;
+ char *ret;
size_t i, n;
if (d <= s) {
for (;; s += width) {
@@ -62,7 +64,7 @@ rawmemelemmovex(char *restrict d, const char *restrict s, const char *restrict e
d += width;
}
} else {
- for (p = *(char **)(void *)&s;;) {
+ for (p = s;;) {
for (i = 0; i < width; i++)
if (p[i] != elem[i])
goto next_backwards;
@@ -72,12 +74,12 @@ rawmemelemmovex(char *restrict d, const char *restrict s, const char *restrict e
p += width;
}
n = (size_t)(p - s);
- p = &d[n];
+ ret = &d[n];
while (n) {
n--;
d[n] = s[n];
}
- return p;
+ return ret;
}
}
@@ -111,225 +113,270 @@ main(void)
char buf[1024];
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "", 0) == &buf[5]);
assert(!strncmp(buf, "-----hello-", 11));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "", 0) == &buf[3]);
assert(!strncmp(buf, "-----hello-", 11));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[3], "", 0) == &buf[5]);
assert(!strncmp(buf, "-----hello-", 11));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "o", 1) == &buf[5 + 5]);
assert(!strncmp(buf, "-----hello-", 11));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
- stpcpy(&buf[5], "hello")[0] = '-';;
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
+ stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "l", 1) == &buf[5 + 3]);
assert(!strncmp(buf, "-----hello-", 11));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "o", 1) == &buf[3 + 5]);
assert(!strncmp(buf, "---hellolo-", 11));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "l", 1) == &buf[3 + 3]);
assert(!strncmp(buf, "---helello-", 11));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "o", 1) == &buf[8 + 5]);
assert(!strncmp(buf, "-----helhello-", 14));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "hello")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "l", 1) == &buf[8 + 3]);
assert(!strncmp(buf, "-----helhel-", 12));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".h.e.l.l.o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], ".o", 2) == &buf[5 + 5 * 2]);
assert(!strncmp(buf, "-----.h.e.l.l.o-", 16));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
- stpcpy(&buf[5], ".h.e.l.l.o")[0] = '-';;
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
+ stpcpy(&buf[5], ".h.e.l.l.o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], ".l", 2) == &buf[5 + 3 * 2]);
assert(!strncmp(buf, "-----.h.e.l.l.o-", 16));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".h.e.l.l.o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], ".o", 2) == &buf[3 + 5 * 2]);
assert(!strncmp(buf, "---.h.e.l.l.o.o-", 16));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".h.e.l.l.o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], ".l", 2) == &buf[3 + 3 * 2]);
assert(!strncmp(buf, "---.h.e.l.l.l.o-", 16));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".h.e.l.l.o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], ".o", 2) == &buf[8 + 5 * 2]);
assert(!strncmp(buf, "-----.h..h.e.l.l.o-", 19));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".h.e.l.l.o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], ".l", 2) == &buf[8 + 3 * 2]);
assert(!strncmp(buf, "-----.h..h.e.lo-", 16));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "..h..e..l..l..o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "..o", 3) == &buf[5 + 5 * 3]);
assert(!strncmp(buf, "-----..h..e..l..l..o-", 21));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
- stpcpy(&buf[5], "..h..e..l..l..o")[0] = '-';;
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
+ stpcpy(&buf[5], "..h..e..l..l..o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "..l", 3) == &buf[5 + 3 * 3]);
assert(!strncmp(buf, "-----..h..e..l..l..o-", 21));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "..h..e..l..l..o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "..o", 3) == &buf[3 + 5 * 3]);
assert(!strncmp(buf, "---..h..e..l..l..o.o-", 21));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "..h..e..l..l..o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "..l", 3) == &buf[3 + 3 * 3]);
assert(!strncmp(buf, "---..h..e..l.l..l..o-", 21));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "..h..e..l..l..o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "..o", 3) == &buf[8 + 5 * 3]);
assert(!strncmp(buf, "-----..h..h..e..l..l..o-", 24));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "..h..e..l..l..o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "..l", 3) == &buf[8 + 3 * 3]);
assert(!strncmp(buf, "-----..h..h..e..l..o-", 21));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "...h...e...l...l...o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "...o", 4) == &buf[5 + 5 * 4]);
assert(!strncmp(buf, "-----...h...e...l...l...o-", 26));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
- stpcpy(&buf[5], "...h...e...l...l...o")[0] = '-';;
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
+ stpcpy(&buf[5], "...h...e...l...l...o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "...l", 4) == &buf[5 + 3 * 4]);
assert(!strncmp(buf, "-----...h...e...l...l...o-", 26));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "...h...e...l...l...o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "...o", 4) == &buf[3 + 5 * 4]);
assert(!strncmp(buf, "---...h...e...l...l...o.o-", 26));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "...h...e...l...l...o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "...l", 4) == &buf[3 + 3 * 4]);
assert(!strncmp(buf, "---...h...e...l.l...l...o-", 26));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "...h...e...l...l...o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "...o", 4) == &buf[8 + 5 * 4]);
assert(!strncmp(buf, "-----......h...e...l...l...o-", 29));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "...h...e...l...l...o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "...l", 4) == &buf[8 + 3 * 4]);
assert(!strncmp(buf, "-----......h...e...ll...o-", 26));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".......h.......e.......l.......l.......o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], ".......o", 8) == &buf[5 + 5 * 8]);
assert(!strncmp(buf, "-----.......h.......e.......l.......l.......o-", 46));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
- stpcpy(&buf[5], ".......h.......e.......l.......l.......o")[0] = '-';;
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
+ stpcpy(&buf[5], ".......h.......e.......l.......l.......o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], ".......l", 8) == &buf[5 + 3 * 8]);
assert(!strncmp(buf, "-----.......h.......e.......l.......l.......o-", 46));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".......h.......e.......l.......l.......o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], ".......o", 8) == &buf[3 + 5 * 8]);
assert(!strncmp(buf, "---.......h.......e.......l.......l.......o.o-", 46));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".......h.......e.......l.......l.......o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], ".......l", 8) == &buf[3 + 3 * 8]);
assert(!strncmp(buf, "---.......h.......e.......l.l.......l.......o-", 46));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".......h.......e.......l.......l.......o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], ".......o", 8) == &buf[8 + 5 * 8]);
assert(!strncmp(buf, "-----..........h.......e.......l.......l.......o-", 49));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".......h.......e.......l.......l.......o")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], ".......l", 8) == &buf[8 + 3 * 8]);
assert(!strncmp(buf, "-----..........h.......e.......l....l.......o-", 46));
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".a.a.aa..a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "a.", 2) == &buf[5 + 4 * 2]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".a.a.aa..a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "a.", 2) == &buf[3 + 4 * 2]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".a.a.aa..a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "a.", 2) == &buf[8 + 4 * 2]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "..a..a..aa....a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "a..", 3) == &buf[5 + 4 * 3]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "..a..a..aa....a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "a..", 3) == &buf[3 + 4 * 3]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "..a..a..aa....a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "a..", 3) == &buf[8 + 4 * 3]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "...a...a...aa......a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "a...", 4) == &buf[5 + 4 * 4]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "...a...a...aa......a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "a...", 4) == &buf[3 + 4 * 4]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], "...a...a...aa......a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "a...", 4) == &buf[8 + 4 * 4]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".......a.......a.......aa..............a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[5], &buf[5], "a.......", 8) == &buf[5 + 4 * 8]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".......a.......a.......aa..............a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[3], &buf[5], "a.......", 8) == &buf[3 + 4 * 8]);
- memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0';
+ memset(buf, '-', sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
stpcpy(&buf[5], ".......a.......a.......aa..............a")[0] = '-';
assert(libsimple_rawmemelemmove(&buf[8], &buf[5], "a.......", 8) == &buf[8 + 4 * 8]);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-21 10:34:12 +0000