From: Luke Kenneth Casson Leighton Date: Fri, 12 Oct 2018 15:21:11 +0000 (+0100) Subject: changed style, can revert changes to amomin/max X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=584319003a1dd757e2a71803eec76acce341207e;p=riscv-isa-sim.git changed style, can revert changes to amomin/max --- diff --git a/riscv/insns/amomaxu_d.h b/riscv/insns/amomaxu_d.h index e5ae07f..12b1733 100644 --- a/riscv/insns/amomaxu_d.h +++ b/riscv/insns/amomaxu_d.h @@ -1,3 +1,3 @@ require_extension('A'); require_rv64; -WRITE_RD(MMU.amo_uint64(RS1, [&](uint64_t lhs) { return (lhs > RS2) ? lhs : RS2; })); +WRITE_RD(MMU.amo_uint64(RS1, [&](uint64_t lhs) { return std::max(lhs, RS2); })); diff --git a/riscv/insns/amominu_d.h b/riscv/insns/amominu_d.h index a03a1d6..15b6c0a 100644 --- a/riscv/insns/amominu_d.h +++ b/riscv/insns/amominu_d.h @@ -1,3 +1,3 @@ require_extension('A'); require_rv64; -WRITE_RD(MMU.amo_uint64(RS1, [&](uint64_t lhs) { return (lhs < RS2) ? lhs : RS2; })); +WRITE_RD(MMU.amo_uint64(RS1, [&](uint64_t lhs) { return std::min(lhs, RS2); }));