From 146c09dd040150dfd81c1f611b01a2a7fc5e5ddc Mon Sep 17 00:00:00 2001 From: Lizzy Fleckenstein Date: Sun, 10 Dec 2023 23:25:44 +0100 Subject: memory.c fixes --- stage3/memory.c | 5 +++-- stage3/memory.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stage3/memory.c b/stage3/memory.c index fcf5a28..65acd66 100644 --- a/stage3/memory.c +++ b/stage3/memory.c @@ -5,12 +5,13 @@ void *memcpy(void *dst, const void *src, usize bytes) { for (usize i = 0; i < bytes; i++) ((unsigned char *) dst)[i] = ((const unsigned char *) src)[i]; -} + return dst; -int memcpy_r(void *dst, const void *src, usize bytes) +void *memcpy_r(void *dst, const void *src, usize bytes) { for (usize i = bytes; i > 0; i--) ((unsigned char *) dst)[i-1] = ((const unsigned char *) src)[i-1]; + return dst; } int memcmp(const void *s1, const void *s2, usize n) diff --git a/stage3/memory.h b/stage3/memory.h index ba28b8a..ceb412c 100644 --- a/stage3/memory.h +++ b/stage3/memory.h @@ -4,7 +4,7 @@ #include "def.h" void *memcpy(void *dst, const void *src, usize bytes); -int memcpy_r(void *dst, const void *src, usize bytes); +void *memcpy_r(void *dst, const void *src, usize bytes); int memcmp(const void *s1, const void *s2, usize n); u8 memsum(const void *ptr, usize size); void *memset(void *s, int c, usize n); -- cgit v1.2.3