From 2045d9d17f76fa266acd15a0aa4d3ceacdcb9197 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 26 Apr 2021 23:28:04 -0400 Subject: [PATCH] sim: riscv: switch MIN/MAX to common min/max The common sim-basics.h defines min/max already, so use them. --- sim/riscv/ChangeLog | 5 +++++ sim/riscv/sim-main.c | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog index 09939133215..37284a982a9 100644 --- a/sim/riscv/ChangeLog +++ b/sim/riscv/ChangeLog @@ -1,3 +1,8 @@ +2021-04-26 Mike Frysinger + + * sim-main.c (MAX, MIN): Delete. + (execute_a): Change MAX/MIN to max/min. + 2021-04-26 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index ff328a0dc20..a80dc683826 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: -- 2.30.2