Commit 64ececb7 authored by Damien George's avatar Damien George

lib/libc/string0: Use uintptr_t instead of uint32_t.

This makes the code portable to non-32-bit architectures.
parent 8c936ede
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define likely(x) __builtin_expect((x), 1) #define likely(x) __builtin_expect((x), 1)
void *memcpy(void *dst, const void *src, size_t n) { void *memcpy(void *dst, const void *src, size_t n) {
if (likely(!(((uint32_t)dst) & 3) && !(((uint32_t)src) & 3))) { if (likely(!(((uintptr_t)dst) & 3) && !(((uintptr_t)src) & 3))) {
// pointers aligned // pointers aligned
uint32_t *d = dst; uint32_t *d = dst;
const uint32_t *s = src; const uint32_t *s = src;
...@@ -80,7 +80,7 @@ void *memmove(void *dest, const void *src, size_t n) { ...@@ -80,7 +80,7 @@ void *memmove(void *dest, const void *src, size_t n) {
} }
void *memset(void *s, int c, size_t n) { void *memset(void *s, int c, size_t n) {
if (c == 0 && ((uint32_t)s & 3) == 0) { if (c == 0 && ((uintptr_t)s & 3) == 0) {
// aligned store of 0 // aligned store of 0
uint32_t *s32 = s; uint32_t *s32 = s;
for (size_t i = n >> 2; i > 0; i--) { for (size_t i = n >> 2; i > 0; i--) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment