diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-11-01 18:49:48 +0545 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-12-21 00:00:01 -0500 |
| commit | 63c56923057bd8d6ef878df5bbd500717a8aed2d (patch) | |
| tree | b19517604bc28935af0456fd39dd777af8f8210f | |
| parent | 06f4b7b6d11c87b6420a1afe495d66c55be46913 (diff) | |
| download | gdb-63c56923057bd8d6ef878df5bbd500717a8aed2d.zip gdb-63c56923057bd8d6ef878df5bbd500717a8aed2d.tar.gz gdb-63c56923057bd8d6ef878df5bbd500717a8aed2d.tar.bz2 | |
sim: lm32: invert sim_cpu storage
The cpu.h change is in generated cgen code, but that has been sent
upstream too, so the next regen should include it automatically.
| -rw-r--r-- | sim/lm32/cpu.h | 2 | ||||
| -rw-r--r-- | sim/lm32/sim-if.c | 3 | ||||
| -rw-r--r-- | sim/lm32/sim-main.h | 14 |
3 files changed, 7 insertions, 12 deletions
diff --git a/sim/lm32/cpu.h b/sim/lm32/cpu.h index d025065..f179cfc 100644 --- a/sim/lm32/cpu.h +++ b/sim/lm32/cpu.h @@ -54,7 +54,7 @@ typedef struct { #define GET_H_CSR(a1) CPU (h_csr)[a1] #define SET_H_CSR(a1, x) (CPU (h_csr)[a1] = (x)) } hardware; -#define CPU_CGEN_HW(cpu) (& (cpu)->cpu_data.hardware) +#define CPU_CGEN_HW(cpu) (& LM32_SIM_CPU (cpu)->cpu_data.hardware) } LM32BF_CPU_DATA; /* Cover fns for register access. */ diff --git a/sim/lm32/sim-if.c b/sim/lm32/sim-if.c index f6ff712..a2a3362 100644 --- a/sim/lm32/sim-if.c +++ b/sim/lm32/sim-if.c @@ -101,7 +101,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, current_target_byte_order = BFD_ENDIAN_BIG; /* The cpu data is kept in a separately allocated chunk of memory. */ - if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK) + if (sim_cpu_alloc_all_extra (sd, 1, sizeof (struct lm32_sim_cpu)) + != SIM_RC_OK) { free_state (sd); return 0; diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h index 14da34c..17c817c 100644 --- a/sim/lm32/sim-main.h +++ b/sim/lm32/sim-main.h @@ -23,6 +23,8 @@ #ifndef SIM_MAIN_H #define SIM_MAIN_H +#define SIM_HAVE_COMMON_SIM_CPU + #define WITH_SCACHE_PBB 1 #include "symcat.h" @@ -36,16 +38,8 @@ #include "lm32-sim.h" #include "opcode/cgen.h" -/* The _sim_cpu struct. */ - -struct _sim_cpu +struct lm32_sim_cpu { - /* sim/common cpu base. */ - sim_cpu_base base; - - /* Static parts of cgen. */ - CGEN_CPU cgen_cpu; - /* CPU specific parts go here. Note that in files that don't need to access these pieces WANT_CPU_FOO won't be defined and thus these parts won't appear. This is ok in the @@ -56,8 +50,8 @@ struct _sim_cpu #if defined (WANT_CPU_LM32BF) LM32BF_CPU_DATA cpu_data; #endif - }; +#define LM32_SIM_CPU(cpu) ((struct lm32_sim_cpu *) CPU_ARCH_DATA (cpu)) /* Misc. */ |