sim: unify sim_cia definition

Almost every target defines sim_cia the same way -- either using the address_word type directly, or a type of equivalent size. The only odd one out is sh64 (who has 32bit address_word and 64bit cia), and even that case doesn't seem to make sense. We'll put off clean up though of sh64 and at least set up a sensible default for everyone.
2015-04-18 04:08:56 -04:00 · 2015-04-18 04:08:56 -04:00 · 7e83aa92f2
commit 7e83aa92f2
parent b9a7202de8
47 changed files with 101 additions and 54 deletions
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@ -21,8 +21,6 @@

 #include "sim-basics.h"

-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "sim-base.h"
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/avr/sim-main.h
+++ b/sim/avr/sim-main.h
@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include "sim-basics.h"

-typedef address_word sim_cia;
 extern unsigned int pc;

 typedef struct _sim_cpu SIM_CPU;
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/bfin/sim-main.h
+++ b/sim/bfin/sim-main.h
@ -24,8 +24,6 @@
 #include "sim-basics.h"
 #include "sim-signal.h"

-typedef unsigned32 sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "bfin-sim.h"
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@ -1,3 +1,9 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* cgen-engine.h (CIA_ADDR): Delete.
+	* sim-base.h: Update sim_cia example.
+	[!CIA_ADDR] (sim_cia): New typedef.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* cgen-utils.c (cgen_rtx_error): Change CIA_GET to CPU_PC_GET.
--- a/sim/common/cgen-engine.h
+++ b/sim/common/cgen-engine.h
@ -186,8 +186,6 @@ do { \

 #if WITH_SCACHE

-#define CIA_ADDR(cia) (cia)
-
 #if WITH_SCACHE_PBB

 /* Return the scache pointer of the current insn.  */
@ -280,8 +278,6 @@ do { \

 /* This is the "simple" engine case.  */

-#define CIA_ADDR(cia) (cia)
-
 #define SEM_SEM_ARG(vpc, sc) (sc)

 #define SEM_NEXT_VPC(sem_arg, pc, len) ((pc) + (len))
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@ -28,9 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
   information), include ``sim-base.h'':

     #include "sim-basics.h"
-     typedef address_word sim_cia;
     /-* If `sim_cia' is not an integral value (e.g. a struct), define
         CIA_ADDR to return the integral value.  *-/
+     /-* typedef struct {...} sim_cia; *-/
     /-* #define CIA_ADDR(cia) (...) *-/
     #include "sim-base.h"

@ -66,6 +66,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
   (e.g. for delay slot handling).  */
 #ifndef CIA_ADDR
 #define CIA_ADDR(cia) (cia)
+typedef address_word sim_cia;
 #endif
 #ifndef INVALID_INSTRUCTION_ADDRESS
 #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/cr16/sim-main.h
+++ b/sim/cr16/sim-main.h
@ -21,7 +21,6 @@

 #include "sim-basics.h"

-typedef address_word sim_cia;
 typedef long int           word;
 typedef unsigned long int  uword;

--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* crisv10f.c (deliver_interrupt): Change CIA_GET to CPU_PC_GET.
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@ -36,9 +36,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "cris-opc.h"
 #include "arch.h"

-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
 #define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
 do { \
  if (cpu) /* Null if ctrl-c.  */ \
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/d10v/sim-main.h
+++ b/sim/d10v/sim-main.h
@ -21,7 +21,6 @@

 #include "sim-basics.h"

-typedef address_word sim_cia;
 typedef long int           word;
 typedef unsigned long int  uword;

--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@ -1,3 +1,8 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+	(frv_sim_engine_halt_hook): Move below includes.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@ -40,10 +40,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "frv-opc.h"
 #include "arch.h"

-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
-void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia);
 #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \
  frv_sim_engine_halt_hook ((SD), (LAST_CPU), (CIA))

@ -55,6 +51,8 @@ void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia);
 #include "cache.h"
 #include "registers.h"
 #include "profile.h"
+
+void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia);

 /* The _sim_cpu struct.  */

--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* interp.c (ft32_read_item): Change CIA_GET to CPU_PC_GET.
--- a/sim/ft32/sim-main.h
+++ b/sim/ft32/sim-main.h
@ -22,9 +22,6 @@
 #define SIM_MAIN_H

 #include "sim-basics.h"
-
-typedef address_word sim_cia;
-
 #include "sim-base.h"
 #include "bfd.h"

--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@ -88,9 +88,6 @@ enum h8_typecodes {

 #include "sim-basics.h"

-/* Define sim_cia.  */
-typedef unsigned32 sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "sim-base.h"
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/iq2000/sim-main.h
+++ b/sim/iq2000/sim-main.h
@ -23,9 +23,6 @@ typedef struct _sim_cpu SIM_CPU;
 /* Pull in IQ2000_{DATA,INSN}_{MASK,VALUE}.  */
 #include "elf/iq2000.h"

-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
 #include "sim-base.h"
 #include "cgen-sim.h"
 #include "iq2000-sim.h"
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* dv-lm32cpu.c (deliver_lm32cpu_interrupt): Change CIA_GET to
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@ -35,9 +35,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "lm32-opc.h"
 #include "arch.h"

-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
 #define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
 do { \
  if (cpu) /* null if ctrl-c */ \
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@ -15,9 +15,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "m32r-opc.h"
 #include "arch.h"

-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
 #define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
 do { \
  if (cpu) /* null if ctrl-c */ \
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include "sim-basics.h"

-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "sim-signal.h"
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* interp.c (set_initial_gprs): Change CIA_SET to CPU_PC_SET.
--- a/sim/mcore/sim-main.h
+++ b/sim/mcore/sim-main.h
@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include "sim-basics.h"

-typedef address_word sim_cia;
 typedef long int           word;
 typedef unsigned long int  uword;

--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* interp.c (issue_messages, wbat, wlat, what, rbat, rlat, rhat,
--- a/sim/microblaze/sim-main.h
+++ b/sim/microblaze/sim-main.h
@ -21,8 +21,6 @@
 #include "microblaze.h"
 #include "sim-basics.h"

-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "sim-base.h"
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* dv-tx3904cpu.c (deliver_tx3904cpu_interrupt): Change CIA_GET to
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@ -34,8 +34,6 @@ mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ER

 #include "sim-basics.h"

-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "sim-base.h"
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@ -1,3 +1,8 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+	(SIM_ADDR): Delete comment.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* dv-mn103cpu.c (deliver_mn103cpu_interrupt): Change CIA_GET to
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@ -42,13 +42,8 @@
 #include "itable.h"
 #include "idecode.h"

-typedef instruction_address sim_cia;
 typedef struct _sim_cpu SIM_CPU;

-/* FIXME: Perhaps igen should generate access macros for
-   `instruction_address' that we could use.  */
-/*#define CIA_ADDR(cia) ((cia).ip) doesn't work for mn10300*/
-
 #define WITH_WATCHPOINTS 1

 #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR)  \
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* interp.c (wbat, wsat, wlat, rsat, rbat, rlat, sim_engine_run):
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include "sim-basics.h"

-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "sim-base.h"
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/msp430/sim-main.h
+++ b/sim/msp430/sim-main.h
@ -24,8 +24,6 @@
 #include "sim-basics.h"
 #include "sim-signal.h"

-typedef unsigned32 sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "msp430-sim.h"
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/sh/sim-main.h
+++ b/sim/sh/sim-main.h
@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include "sim-basics.h"

-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "sim-base.h"
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (CIA_ADDR): Define.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/sh64/sim-main.h
+++ b/sim/sh64/sim-main.h
@ -21,6 +21,7 @@ typedef struct _sim_cpu SIM_CPU;

 /* These must be defined before sim-base.h.  */
 typedef UDI sim_cia;
+#define CIA_ADDR(cia) (cia)

 #include "sim-base.h"
 #include "cgen-sim.h"
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (sim_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_GET, CIA_SET): Delete.
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@ -17,8 +17,6 @@
 #include "sim-signal.h"
 #include "sim-fpu.h"

-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;

 #include "sim-base.h"