> compile NEMU

221220000 张三 Linux zzy 5.15.146.1-microsoft-standard-WSL2 #1 SMP Thu Jan 11 04:09:03 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux 23:51:57 up 4 days, 18:57, 1 user, load average: 0.32, 0.60, 0.79
2024-09-21 23:51:58 +08:00
parent cb016cd204
commit 9a6b6a03df
2 changed files with 1 additions and 1 deletions
--- a/abstract-machine/am/src/riscv/nemu/trap.S
+++ b/abstract-machine/am/src/riscv/nemu/trap.S
@ -63,6 +63,7 @@ __am_asm_trap:
  LOAD t1, OFFSET_STATUS(sp)
  LOAD t2, OFFSET_EPC(sp)
  csrw mstatus, t1
+  addi t2, t2, 4
  csrw mepc, t2

  MAP(REGS, POP)
--- a/nanos-lite/src/irq.c
+++ b/nanos-lite/src/irq.c
@ -6,7 +6,6 @@ static Context* do_event(Event e, Context* c) {
    default: panic("Unhandled event ID = %d", e.event);
  }

-  c->mepc += 4;
  return c;
 }