AMOs should always return store faults, not load faults

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

diff --git a/riscv/insns/amoor_d.h b/riscv/insns/amoor_d.h
index 500803f6876d590bbb7a2150a9e6f681464f9d96..de8762745b3768a66be72da7c2bbcfc9d6d32b3f 100644 (file)
--- a/riscv/insns/amoor_d.h
+++ b/riscv/insns/amoor_d.h
@@ -1,4 +1,3 @@
-require_xpr64;
-reg_t v = MMU.load_uint64(RS1);
-MMU.store_uint64(RS1, RS2 | v);
-WRITE_RD(v);
+require_extension('A');
+require_rv64;
+WRITE_RD(MMU.amo_uint64(RS1, [&](uint64_t lhs) { return lhs | RS2; }));