From 7747578ebb11dbb7315e59542dba5400e6037aef Mon Sep 17 00:00:00 2001 From: Zihao Yu Date: Sun, 13 Oct 2019 21:17:53 +0800 Subject: [PATCH] qemu-diff,riscv64: do not enter S-mode --- src/isa/riscv64/init.c | 2 +- tools/qemu-diff/src/isa/riscv64/init.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/isa/riscv64/init.c b/src/isa/riscv64/init.c index 2b8925de..d276f23a 100644 --- a/src/isa/riscv64/init.c +++ b/src/isa/riscv64/init.c @@ -16,7 +16,7 @@ void init_clint(void); void init_isa(void) { cpu.gpr[0]._64 = 0; cpu.pc = PC_START; - mstatus->val = 0x000c0100; + //mstatus->val = 0x000c0100; register_pmem(0x80000000u); diff --git a/tools/qemu-diff/src/isa/riscv64/init.c b/tools/qemu-diff/src/isa/riscv64/init.c index bff7e7a7..c30e5d5e 100644 --- a/tools/qemu-diff/src/isa/riscv64/init.c +++ b/tools/qemu-diff/src/isa/riscv64/init.c @@ -36,6 +36,7 @@ static uint32_t initcode[] = { void init_isa(void) { + return; // put initcode to QEMU to setup a PMP to permit access to all of memory in S mode bool ok = gdb_memcpy_to_qemu(0x80000000, initcode, sizeof(initcode)); -- GitLab