Skip to content

Commit 46768c1

Browse files
committed
Fix test code for some compilers
1 parent d2324cc commit 46768c1

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

test/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fi
4040

4141
set -x
4242

43-
LD_PRELOAD=$PWD/../libredfat.so gcc -O2 -o test test.c
43+
LD_PRELOAD=$PWD/../libredfat.so gcc -fno-builtin -O2 -o test test.c
4444
LD_PRELOAD=$PWD/../libredfat.so ../redfat.bin -Xreads ./test
4545
LD_PRELOAD=$PWD/../libredfat.so ./test.redfat
4646

test/test.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ static __attribute__((__noinline__)) void use(size_t x)
6666
{
6767
asm ("": : "r"(x): "memory");
6868
}
69+
static __attribute__((__noinline__)) void use2(void *x)
70+
{
71+
asm ("": : "r"(x): "memory");
72+
}
6973
static __attribute__((__noinline__)) size_t unknown(size_t size)
7074
{
7175
return size;
@@ -398,12 +402,12 @@ static void memset8x8(intptr_t ptr, ssize_t offset)
398402
static void memcpy8x8(intptr_t ptr, ssize_t offset)
399403
{
400404
const char mem[8] = "ABCDEFG";
401-
memcpy((void *)(ptr + offset), mem, unknown(sizeof(mem)));
405+
use2(memcpy((void *)(ptr + offset), mem, unknown(sizeof(mem))));
402406
}
403407
static void memcpy8x8f(intptr_t ptr, ssize_t offset)
404408
{
405409
char mem[8];
406-
memcpy(mem, (void *)(ptr + offset), unknown(sizeof(mem)));
410+
use2(memcpy(mem, (void *)(ptr + offset), unknown(sizeof(mem))));
407411
}
408412
static void memcmp8x8(intptr_t ptr, ssize_t offset)
409413
{

0 commit comments

Comments
 (0)