ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/tcg: only read/write 64 bit words on 64 bit systems 

While the compilers will generally happily synthesise a 64 bit value
for you on 32 bit systems it doesn't exercise anything on QEMU. It
also makes it hard to accurately compare the accesses to test_data
when instrumenting.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240916085400.1046925-12-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2024-09-16 09:53:53 +01:00
parent 34f29c6c5b
commit aa5584b579
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/tcg/multiarch/system/memory.c
View File

@ -163,6 +163,7 @@ static void init_test_data_u32(int offset)
ml_printf("done %d @ %p\n", i, ptr); ml_printf("done %d @ %p\n", i, ptr);
} }
#if __SIZEOF_POINTER__ >= 8
static void init_test_data_u64(int offset) static void init_test_data_u64(int offset)
{ {
uint8_t count = 0; uint8_t count = 0;
@ -187,6 +188,7 @@ static void init_test_data_u64(int offset)
} }
ml_printf("done %d @ %p\n", i, ptr); ml_printf("done %d @ %p\n", i, ptr);
} }
#endif
static bool read_test_data_u16(int offset) static bool read_test_data_u16(int offset)
{ {
@ -254,6 +256,7 @@ static bool read_test_data_u32(int offset)
return true; return true;
} }
#if __SIZEOF_POINTER__ >= 8
static bool read_test_data_u64(int offset) static bool read_test_data_u64(int offset)
{ {
uint64_t word, *ptr = (uint64_t *)&test_data[offset]; uint64_t word, *ptr = (uint64_t *)&test_data[offset];
@ -307,11 +310,16 @@ static bool read_test_data_u64(int offset)
ml_printf("done %d @ %p\n", i, ptr); ml_printf("done %d @ %p\n", i, ptr);
return true; return true;
} }
#endif
/* Read the test data and verify at various offsets */ /* Read the test data and verify at various offsets */
read_ufn read_ufns[] = { read_test_data_u16, read_ufn read_ufns[] = {
read_test_data_u32, read_test_data_u16,
read_test_data_u64 }; read_test_data_u32,
#if __SIZEOF_POINTER__ >= 8
read_test_data_u64
#endif
};
bool do_unsigned_reads(int start_off) bool do_unsigned_reads(int start_off)
{ {
@ -476,10 +484,14 @@ bool do_signed_reads(bool neg_first)
return ok; return ok;
} }
init_ufn init_ufns[] = { init_test_data_u8, init_ufn init_ufns[] = {
init_test_data_u16, init_test_data_u8,
init_test_data_u32, init_test_data_u16,
init_test_data_u64 }; init_test_data_u32,
#if __SIZEOF_POINTER__ >= 8
init_test_data_u64
#endif
};
int main(void) int main(void)
{ {