diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-03-31 01:54:47 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-31 01:54:47 -0400 |
| commit | 2b6ca06237301286016acc4b7bbf5338a27fd5fc (patch) | |
| tree | 3979e83b738bc7d5d6133676fa3ad044ae6e62cc | |
| parent | f6862f27a73f08effd88d98c5efdb08abfcf4bb1 (diff) | |
| download | binutils-gdb-2b6ca06237301286016acc4b7bbf5338a27fd5fc.tar.gz | |
sim: m68hc11: fix gcc-5 build error w/restrict keyword
| -rw-r--r-- | sim/m68hc11/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/m68hc11/m68hc11_sim.c | 14 | ||||
| -rw-r--r-- | sim/m68hc11/sim-main.h | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index db462515cc0..b06c3e3fca3 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -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> * interp.c (sim_pc_get): New function. diff --git a/sim/m68hc11/m68hc11_sim.c b/sim/m68hc11/m68hc11_sim.c index f7c4219d436..8a0464871e6 100644 --- a/sim/m68hc11/m68hc11_sim.c +++ b/sim/m68hc11/m68hc11_sim.c @@ -240,7 +240,7 @@ cpu_set_reg (sim_cpu* cpu, uint8 reg, uint16 val) /* Returns the address of a 68HC12 indexed operand. Pre and post modifications are handled on the source register. */ uint16 -cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict) +cpu_get_indexed_operand_addr (sim_cpu* cpu, int restricted) { uint8 reg; uint16 sval; @@ -285,7 +285,7 @@ cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict) /* [n,r] 16-bits offset indexed indirect. */ else if ((code & 0x07) == 3) { - if (restrict) + if (restricted) { return 0; } @@ -297,7 +297,7 @@ cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict) } else if ((code & 0x4) == 0) { - if (restrict) + if (restricted) { return 0; } @@ -345,20 +345,20 @@ cpu_get_indexed_operand_addr (sim_cpu* cpu, int restrict) } uint8 -cpu_get_indexed_operand8 (sim_cpu* cpu, int restrict) +cpu_get_indexed_operand8 (sim_cpu* cpu, int restricted) { uint16 addr; - addr = cpu_get_indexed_operand_addr (cpu, restrict); + addr = cpu_get_indexed_operand_addr (cpu, restricted); return memory_read8 (cpu, addr); } uint16 -cpu_get_indexed_operand16 (sim_cpu* cpu, int restrict) +cpu_get_indexed_operand16 (sim_cpu* cpu, int restricted) { uint16 addr; - addr = cpu_get_indexed_operand_addr (cpu, restrict); + addr = cpu_get_indexed_operand_addr (cpu, restricted); return memory_read16 (cpu, addr); } diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h index 5dfc1bfdf53..39731594918 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -551,7 +551,7 @@ extern int cpu_initialize (SIM_DESC sd, sim_cpu *cpu); /* Returns the address of a 68HC12 indexed operand. 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_set_sp (sim_cpu *cpu, uint16 val); |