Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

sim: riscv: switch MIN/MAX to common min/max

Browse Source 
The common sim-basics.h defines min/max already, so use them.
This commit is contained in:
Mike Frysinger
2021-04-26 23:28:04 -04:00
parent bd0918c910
commit 2045d9d17f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sim/riscv/sim-main.c
View File

@@ -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: