AMOs should always return store faults, not load faults

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

diff --git a/riscv/insns/amomaxu_d.h b/riscv/insns/amomaxu_d.h
index ef003c6e16f0f075b18dc245a92cf236d084a720..12b173313d9e4f1636e13a67fea6785fbae8f8ae 100644 (file)
--- a/riscv/insns/amomaxu_d.h
+++ b/riscv/insns/amomaxu_d.h
@@ -1,4 +1,3 @@
-require_xpr64;
-reg_t v = MMU.load_uint64(RS1);
-MMU.store_uint64(RS1, std::max(RS2,v));
-WRITE_RD(v);
+require_extension('A');
+require_rv64;
+WRITE_RD(MMU.amo_uint64(RS1, [&](uint64_t lhs) { return std::max(lhs, RS2); }));