sim: or1k: fix mixing of code & decl warning

Use the correct style of declaring variables at top of scope.
This fixes a few compiler warnings in the process.

diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index e25c563b612288f087c1223414d24e627152569a..1079c669ab1d801fe5d9f0601f8d67eee13d3ad4 100644 (file)
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * traps.c (or1k32bf_exception): Move handler_pc decl to top of scope.
+       (or1k32bf_mfspr): Move val decl to top of function body.
+
 2021-01-12  Mike Frysinger  <vapier@gentoo.org>
 
        * Makefile.in (SIM_OBJS): Delete redundant sim-cpu.o, sim-hload.o,

diff --git a/sim/or1k/traps.c b/sim/or1k/traps.c
index 85d87293b59b0db27204778dc952d1669deb4692..0a0f1aa07114e2e4217d50e2fc0db77b5a2c8c8f 100644 (file)
--- a/sim/or1k/traps.c
+++ b/sim/or1k/traps.c
@@ -128,6 +128,7 @@ or1k32bf_exception (sim_cpu *current_cpu, USI pc, USI exnum)
     }
   else
     {
+      IADDR handler_pc;
 
       /* Calculate the exception program counter.  */
       switch (exnum)
@@ -162,8 +163,8 @@ or1k32bf_exception (sim_cpu *current_cpu, USI pc, USI exnum)
       current_cpu->next_delay_slot = 0;
 
       /* Jump program counter into handler.  */
-      IADDR handler_pc =
-       (GET_H_SYS_SR_EPH ()? 0xf0000000 : 0x00000000) + (exnum << 8);
+      handler_pc =
+       (GET_H_SYS_SR_EPH () ? 0xf0000000 : 0x00000000) + (exnum << 8);
 
       sim_engine_restart (sd, current_cpu, NULL, handler_pc);
     }
@@ -191,6 +192,7 @@ USI
 or1k32bf_mfspr (sim_cpu *current_cpu, USI addr)
 {
   SIM_DESC sd = CPU_STATE (current_cpu);
+  SI val;
 
   if (!GET_H_SYS_SR_SM () && !GET_H_SYS_SR_SUMRA ())
     {
@@ -202,7 +204,7 @@ or1k32bf_mfspr (sim_cpu *current_cpu, USI addr)
   if (addr >= NUM_SPR)
     goto bad_address;
 
-  SI val = GET_H_SPR (addr);
+  val = GET_H_SPR (addr);
 
   switch (addr)
     {