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

sim: or1k: fix mixing of code & decl warning

Browse Source 
Use the correct style of declaring variables at top of scope.
This fixes a few compiler warnings in the process.
This commit is contained in:
Mike Frysinger
2021-01-12 04:11:29 -05:00
parent 5e9e2f41eb
commit e998918e98
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sim/or1k/ChangeLog
View File

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

8
sim/or1k/traps.c
View File

@@ -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)
{