Skip to content

Ensure that mem*() family function implementations are not shadowed by macros #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FlyGoat merged 1 commit into from
May 19, 2025
Merged

Ensure that mem*() family function implementations are not shadowed by macros #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/libc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#include <stddef.h>
#include <libc.h>

#ifdef memcpy
# undef memcpy
#endif
void *memcpy(void *restrict dest, const void *restrict src, size_t n) {
uint8_t *restrict pdest = (uint8_t *restrict)dest;
const uint8_t *restrict psrc = (const uint8_t *restrict)src;
Expand All @@ -13,6 +16,9 @@ void *memcpy(void *restrict dest, const void *restrict src, size_t n) {
return dest;
}

#ifdef memset
# undef memset
#endif
void *memset(void *s, int c, size_t n) {
uint8_t *p = (uint8_t *)s;

Expand All @@ -23,6 +29,9 @@ void *memset(void *s, int c, size_t n) {
return s;
}

#ifdef memmove
# undef memmove
#endif
void *memmove(void *dest, const void *src, size_t n) {
uint8_t *pdest = (uint8_t *)dest;
const uint8_t *psrc = (const uint8_t *)src;
Expand All @@ -40,6 +49,9 @@ void *memmove(void *dest, const void *src, size_t n) {
return dest;
}

#ifdef memcmp
# undef memcmp
#endif
int memcmp(const void *s1, const void *s2, size_t n) {
const uint8_t *p1 = (const uint8_t *)s1;
const uint8_t *p2 = (const uint8_t *)s2;
Expand Down
7 changes: 4 additions & 3 deletions src/libc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ void *memmove(void *dest, const void *src, size_t n);
int memcmp(const void *s1, const void *s2, size_t n);

/* Access builtin version by default. */
#define memcpy(d,s,l) __builtin_memcpy(d,s,l)
#define memset(d,c,l) __builtin_memset(d,c,l)
#define memcmp __builtin_memcmp
#define memcpy __builtin_memcpy
#define memset __builtin_memset
#define memmove __builtin_memmove
#define memcmp __builtin_memcmp

#endif