AMOs should always return store faults, not load faults

[riscv-isa-sim.git] / riscv / insns / amomax_w.h

diff --git a/riscv/insns/amomax_w.h b/riscv/insns/amomax_w.h
index ff9c2da7923787f9232914074deca2008fbc36eb..757bdd2ccb7bdab94d6a3fade459acf17f66bd2d 100644 (file)
--- a/riscv/insns/amomax_w.h
+++ b/riscv/insns/amomax_w.h
@@ -1,3 +1,2 @@
-int32_t v = mmu.load_int32(RS1);
-mmu.store_uint32(RS1, std::max(int32_t(RS2),v));
-RD = v;
+require_extension('A');
+WRITE_RD(sext32(MMU.amo_uint32(RS1, [&](int32_t lhs) { return std::max(lhs, int32_t(RS2)); })));