diff options
| -rw-r--r-- | sim/riscv/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/riscv/sim-main.c | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog index 0993913..37284a9 100644 --- a/sim/riscv/ChangeLog +++ b/sim/riscv/ChangeLog @@ -1,5 +1,10 @@ 2021-04-26 Mike Frysinger <vapier@gentoo.org> + * sim-main.c (MAX, MIN): Delete. + (execute_a): Change MAX/MIN to max/min. + +2021-04-26 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4, config.in, configure: Regenerate. 2021-04-22 Tom Tromey <tom@tromey.com> diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index ff328a0..a80dc68 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -789,9 +789,6 @@ execute_m (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) return pc; } -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#define MIN(a, b) ((a) < (b) ? (a) : (b)) - static sim_cia execute_a (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) { @@ -881,19 +878,19 @@ execute_a (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) break; case MATCH_AMOMAX_D: case MATCH_AMOMAX_W: - tmp = MAX ((signed_word) cpu->regs[rd], (signed_word) cpu->regs[rs2]); + tmp = max ((signed_word) cpu->regs[rd], (signed_word) cpu->regs[rs2]); break; case MATCH_AMOMAXU_D: case MATCH_AMOMAXU_W: - tmp = MAX ((unsigned_word) cpu->regs[rd], (unsigned_word) cpu->regs[rs2]); + tmp = max ((unsigned_word) cpu->regs[rd], (unsigned_word) cpu->regs[rs2]); break; case MATCH_AMOMIN_D: case MATCH_AMOMIN_W: - tmp = MIN ((signed_word) cpu->regs[rd], (signed_word) cpu->regs[rs2]); + tmp = min ((signed_word) cpu->regs[rd], (signed_word) cpu->regs[rs2]); break; case MATCH_AMOMINU_D: case MATCH_AMOMINU_W: - tmp = MIN ((unsigned_word) cpu->regs[rd], (unsigned_word) cpu->regs[rs2]); + tmp = min ((unsigned_word) cpu->regs[rd], (unsigned_word) cpu->regs[rs2]); break; case MATCH_AMOOR_D: case MATCH_AMOOR_W: |