From 294dd6dd01281db0c4fd8e6b4124344efcf06bef Mon Sep 17 00:00:00 2001 From: Hoa Nguyen Date: Thu, 28 Mar 2024 21:05:58 +0000 Subject: [PATCH 1/2] util-m5: Add default M5OP_ADDR to arm64 As pointed out here [1], the expected M5OP_ADDR for arm64 arch is 0x10010000. This change reflects that. [1] https://github.com/gem5/gem5/pull/725 Change-Id: I7e72f5ea20d4aacf3115a485ba7cd664d33d037e Signed-off-by: Hoa Nguyen --- util/m5/src/abi/arm64/SConsopts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/m5/src/abi/arm64/SConsopts b/util/m5/src/abi/arm64/SConsopts index ebf40c5fe2..5e5f16e722 100644 --- a/util/m5/src/abi/arm64/SConsopts +++ b/util/m5/src/abi/arm64/SConsopts @@ -32,3 +32,6 @@ get_abi_opt('QEMU_ARCH', 'aarch64') env['CALL_TYPE']['inst'].impl('m5op.S', 'verify_inst.cc', default=True) env['CALL_TYPE']['addr'].impl('m5op_addr.S') env['CALL_TYPE']['semi'].impl('m5op_semi.S', 'verify_semi.cc') + +env.Append(CXXFLAGS='-DM5OP_ADDR=0x10010000') +env.Append(CCFLAGS='-DM5OP_ADDR=0x10010000') From 136c0eff3b501c3828d38a08ef2e3bcf255fdef2 Mon Sep 17 00:00:00 2001 From: Hoa Nguyen Date: Sat, 30 Mar 2024 02:15:24 +0000 Subject: [PATCH 2/2] util-m5: Add a warning when m5op_addr is 0x0 This address, 0x0, is most likely a wrong address to call m5 ops. The warning will catch the problem where m5op_addr is not initialized properly. Change-Id: I442b4806191ae6f5c137bc947f2a269684c599dd Signed-off-by: Hoa Nguyen --- util/m5/src/m5_mmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/m5/src/m5_mmap.c b/util/m5/src/m5_mmap.c index c088e264eb..cda36fe70a 100644 --- a/util/m5/src/m5_mmap.c +++ b/util/m5/src/m5_mmap.c @@ -69,6 +69,10 @@ map_m5_mem() exit(1); } + if (m5op_addr == 0) { + fprintf(stdout, "Warn: m5op_addr is set to 0x0\n"); + } + fd = open(m5_mmap_dev, O_RDWR | O_SYNC); if (fd == -1) { fprintf(stderr, "Can't open %s: %s\n", m5_mmap_dev, strerror(errno));