| Message ID | 20171012235439.19457-5-anatol.pomozov@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] multiboot: Change multiboot_info from array of bytes to a C struct | expand |
On 13.10.2017 01:54, Anatol Pomozov wrote: > * clang 3.8 enables SSE even for 32bit code. Generate code for pentium > CPU to make sure no new instructions are used. > * add memset() implementation. Clang implements array zeroing in > print_num() via memset() function call. > --- > tests/multiboot/Makefile | 2 +- > tests/multiboot/libc.c | 9 +++++++++ > tests/multiboot/libc.h | 2 ++ > tests/multiboot/run_test.sh | 1 + > 4 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/tests/multiboot/Makefile b/tests/multiboot/Makefile > index b6a5056347..79dfe85afc 100644 > --- a/tests/multiboot/Makefile > +++ b/tests/multiboot/Makefile > @@ -1,5 +1,5 @@ > CC=gcc > -CCFLAGS=-m32 -Wall -Wextra -Werror -fno-stack-protector -nostdinc -fno-builtin > +CCFLAGS=-m32 -Wall -Wextra -Werror -fno-stack-protector -nostdinc -fno-builtin -march=pentium > ASFLAGS=-m32 > > LD=ld > diff --git a/tests/multiboot/libc.c b/tests/multiboot/libc.c > index 6df9bda96d..512fccd7fa 100644 > --- a/tests/multiboot/libc.c > +++ b/tests/multiboot/libc.c > @@ -33,6 +33,15 @@ void* memcpy(void *dest, const void *src, int n) > > return dest; > } > +void *memset(void *s, int c, size_t n) Add an empty line before the new function? > +{ > + size_t i; > + char *d = s; > + for (i = 0; i < n; i++) { while (n-- > 0) ? ... that way you don't need the i variable. > + *d++ = c; > + } > + return s; > +} Thomas
diff --git a/tests/multiboot/Makefile b/tests/multiboot/Makefile index b6a5056347..79dfe85afc 100644 --- a/tests/multiboot/Makefile +++ b/tests/multiboot/Makefile @@ -1,5 +1,5 @@ CC=gcc -CCFLAGS=-m32 -Wall -Wextra -Werror -fno-stack-protector -nostdinc -fno-builtin +CCFLAGS=-m32 -Wall -Wextra -Werror -fno-stack-protector -nostdinc -fno-builtin -march=pentium ASFLAGS=-m32 LD=ld diff --git a/tests/multiboot/libc.c b/tests/multiboot/libc.c index 6df9bda96d..512fccd7fa 100644 --- a/tests/multiboot/libc.c +++ b/tests/multiboot/libc.c @@ -33,6 +33,15 @@ void* memcpy(void *dest, const void *src, int n) return dest; } +void *memset(void *s, int c, size_t n) +{ + size_t i; + char *d = s; + for (i = 0; i < n; i++) { + *d++ = c; + } + return s; +} static void print_char(char c) { diff --git a/tests/multiboot/libc.h b/tests/multiboot/libc.h index 04c9922c27..bdf7c34287 100644 --- a/tests/multiboot/libc.h +++ b/tests/multiboot/libc.h @@ -36,6 +36,7 @@ typedef signed short int16_t; typedef signed char int8_t; typedef uint32_t uintptr_t; +typedef uint32_t size_t; /* stdarg.h */ @@ -58,5 +59,6 @@ static inline void outb(uint16_t port, uint8_t data) void printf(const char *fmt, ...); void* memcpy(void *dest, const void *src, int n); +void* memset(void *s, int c, size_t n); #endif diff --git a/tests/multiboot/run_test.sh b/tests/multiboot/run_test.sh index f04e35cbf0..38dcfef42c 100755 --- a/tests/multiboot/run_test.sh +++ b/tests/multiboot/run_test.sh @@ -29,6 +29,7 @@ run_qemu() { printf %b "\n\n=== Running test case: $kernel $* ===\n\n" >> test.log $QEMU \ + -cpu pentium \ -kernel $kernel \ -display none \ -device isa-debugcon,chardev=stdio \