From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egGHg-0002QA-Rk for qemu-devel@nongnu.org; Mon, 29 Jan 2018 15:44:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egGHf-0001Ck-Oc for qemu-devel@nongnu.org; Mon, 29 Jan 2018 15:44:08 -0500 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:46420) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1egGHf-0001CF-Ip for qemu-devel@nongnu.org; Mon, 29 Jan 2018 15:44:07 -0500 Received: by mail-pg0-x244.google.com with SMTP id s9so5379888pgq.13 for ; Mon, 29 Jan 2018 12:44:07 -0800 (PST) From: Anatol Pomozov Date: Mon, 29 Jan 2018 12:43:43 -0800 Message-Id: <20180129204344.196196-3-anatol.pomozov@gmail.com> In-Reply-To: <20180129204344.196196-1-anatol.pomozov@gmail.com> References: <20180129204344.196196-1-anatol.pomozov@gmail.com> Subject: [Qemu-devel] [PATCH 3/4] multiboot: make tests work with clang List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jack.schwartz@oracle.com, Anatol Pomozov * 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. Signed-off-by: Anatol Pomozov --- 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) +{ + 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 \ -- 2.16.0.rc1.238.g530d649a79-goog