sim: riscv: fix -Wshadow=local warnings

Inline the one usage of sd in these macros to avoid possible shadowing.

diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c
index 4d20534..b04d12c 100644 (file)
--- a/sim/riscv/sim-main.c
+++ b/sim/riscv/sim-main.c
@@ -48,10 +48,9 @@ static const struct riscv_opcode *riscv_hash[OP_MASK_OP + 1];
   do { \
     if (RISCV_XLEN (cpu) != 32) \
       { \
-       SIM_DESC sd = CPU_STATE (cpu); \
        TRACE_INSN (cpu, "RV32I-only " fmt, ## args); \
-       sim_engine_halt (sd, cpu, NULL, sim_pc_get (cpu), sim_signalled, \
-                        SIM_SIGILL); \
+       sim_engine_halt (CPU_STATE (cpu), cpu, NULL, sim_pc_get (cpu), \
+                        sim_signalled, SIM_SIGILL); \
       } \
   } while (0)
 
@@ -59,10 +58,9 @@ static const struct riscv_opcode *riscv_hash[OP_MASK_OP + 1];
   do { \
     if (RISCV_XLEN (cpu) != 64) \
       { \
-       SIM_DESC sd = CPU_STATE (cpu); \
        TRACE_INSN (cpu, "RV64I-only " fmt, ## args); \
-       sim_engine_halt (sd, cpu, NULL, sim_pc_get (cpu), sim_signalled, \
-                        SIM_SIGILL); \
+       sim_engine_halt (CPU_STATE (cpu), cpu, NULL, sim_pc_get (cpu), \
+                        sim_signalled, SIM_SIGILL); \
       } \
   } while (0)