darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sim: m68hc11: fix gcc-5 build error w/restrict keyword

Browse source
This commit is contained in:
Mike Frysinger 2015-03-31 01:54:47 -04:00
parent f6862f27a7
commit 2b6ca06237
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sim/m68hc11/ChangeLog
View file

@ -1,3 +1,10 @@
2015-03-31 Mike Frysinger <vapier@gentoo.org>
* m68hc11_sim.c (cpu_get_indexed_operand_addr,
cpu_get_indexed_operand8, cpu_get_indexed_operand16): Rename restrict
variable to restricted.
* sim-main.h (cpu_get_indexed_operand_addr): Likewise.
2015-03-24 Mike Frysinger <vapier@gentoo.org> 2015-03-24 Mike Frysinger <vapier@gentoo.org>
* interp.c (sim_pc_get): New function. * interp.c (sim_pc_get): New function.

14
sim/m68hc11/m68hc11_sim.c
View file

@ -240,7 +240,7 @@ cpu_set_reg (sim_cpu* cpu, uint8 reg, uint16 val)
/* Returns the address of a 68HC12 indexed operand. /* Returns the address of a 68HC12 indexed operand.
Pre and post modifications are handled on the source register. */ Pre and post modifications are handled on the source register. */
uint16 uint16
cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict) cpu_get_indexed_operand_addr (sim_cpu* cpu, int restricted)
{ {
uint8 reg; uint8 reg;
uint16 sval; uint16 sval;
@ -285,7 +285,7 @@ cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict)
/* [n,r] 16-bits offset indexed indirect. */ /* [n,r] 16-bits offset indexed indirect. */
else if ((code & 0x07) == 3) else if ((code & 0x07) == 3)
{ {
if (restrict) if (restricted)
{ {
return 0; return 0;
} }
@ -297,7 +297,7 @@ cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict)
} }
else if ((code & 0x4) == 0) else if ((code & 0x4) == 0)
{ {
if (restrict) if (restricted)
{ {
return 0; return 0;
} }
@ -345,20 +345,20 @@ cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict)
} }
uint8 uint8
cpu_get_indexed_operand8 (sim_cpu* cpu, int restrict) cpu_get_indexed_operand8 (sim_cpu* cpu, int restricted)
{ {
uint16 addr; uint16 addr;
addr = cpu_get_indexed_operand_addr (cpu, restrict); addr = cpu_get_indexed_operand_addr (cpu, restricted);
return memory_read8 (cpu, addr); return memory_read8 (cpu, addr);
} }
uint16 uint16
cpu_get_indexed_operand16 (sim_cpu* cpu, int restrict) cpu_get_indexed_operand16 (sim_cpu* cpu, int restricted)
{ {
uint16 addr; uint16 addr;
addr = cpu_get_indexed_operand_addr (cpu, restrict); addr = cpu_get_indexed_operand_addr (cpu, restricted);
return memory_read16 (cpu, addr); return memory_read16 (cpu, addr);
} }

2
sim/m68hc11/sim-main.h
View file

@ -551,7 +551,7 @@ extern int cpu_initialize (SIM_DESC sd, sim_cpu *cpu);
/* Returns the address of a 68HC12 indexed operand. /* Returns the address of a 68HC12 indexed operand.
Pre and post modifications are handled on the source register. */ Pre and post modifications are handled on the source register. */
extern uint16 cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict); extern uint16 cpu_get_indexed_operand_addr (sim_cpu *cpu, int restricted);
extern void cpu_return (sim_cpu *cpu); extern void cpu_return (sim_cpu *cpu);
extern void cpu_set_sp (sim_cpu *cpu, uint16 val); extern void cpu_set_sp (sim_cpu *cpu, uint16 val);