yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sim: m32r: move arch-specific settings to internal header

Browse Source 
There's no need for these settings to be in sim-main.h which is shared
with common/ sim code, so move it all out to the existing m32r-sim.h.
Unfortunately, we can't yet drop the m32r-sim.h include from sim-main.h
as many of the generated CGEN files refer only to sim-main.h.  We'll
have to improve the CGEN interface before we can make more progress,
but this is at least a minor improvement.
This commit is contained in:
Mike Frysinger 2022-12-23 00:49:09 -05:00
parent 218366690f
commit f51d9c6a77
7 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sim/m32r/m32r-sim.h
View File

@ -166,5 +166,27 @@ do { \
/* Handle the trap insn. */
USI m32r_trap (SIM_CPU *, PCADDR, int);
struct m32r_sim_cpu {
M32R_MISC_PROFILE m32r_misc_profile;
#define CPU_M32R_MISC_PROFILE(cpu) (& M32R_SIM_CPU (cpu)->m32r_misc_profile)
/* 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
sense that things work. It is a source of bugs though.
One has to of course be careful to not take the size of this
struct and no structure members accessed in non-cpu specific files can
go after here. Oh for a better language. */
#if defined (WANT_CPU_M32RBF)
M32RBF_CPU_DATA cpu_data;
#endif
#if defined (WANT_CPU_M32RXF)
M32RXF_CPU_DATA cpu_data;
#elif defined (WANT_CPU_M32R2F)
M32R2F_CPU_DATA cpu_data;
#endif
};
#define M32R_SIM_CPU(cpu) ((struct m32r_sim_cpu *) CPU_ARCH_DATA (cpu))
#endif /* M32R_SIM_H */

2
sim/m32r/m32r.c
View File

@ -28,6 +28,8 @@
#include "cgen-ops.h"
#include <stdlib.h>
#include "m32r-sim.h"
/* Return the size of REGNO in bytes. */
static int

2
sim/m32r/m32r2.c
View File

@ -27,6 +27,8 @@
#include "cgen-mem.h"
#include "cgen-ops.h"
#include "m32r-sim.h"
/* The contents of BUF are in target byte order. */
int

2
sim/m32r/m32rx.c
View File

@ -27,6 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "cgen-mem.h"
#include "cgen-ops.h"
#include "m32r-sim.h"
/* The contents of BUF are in target byte order. */
int

1
sim/m32r/sim-if.c
View File

@ -30,6 +30,7 @@
#include "libiberty.h"
#include "bfd.h"
#include "m32r-sim.h"
#include "dv-m32r_uart.h"
#define M32R_DEFAULT_MEM_SIZE 0x2000000 /* 32M */

24
sim/m32r/sim-main.h
View File

@ -14,29 +14,9 @@
#include "arch.h"
#include "sim-base.h"
#include "cgen-sim.h"
#include "m32r-sim.h"
struct m32r_sim_cpu {
M32R_MISC_PROFILE m32r_misc_profile;
#define CPU_M32R_MISC_PROFILE(cpu) (& M32R_SIM_CPU (cpu)->m32r_misc_profile)
/* 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
sense that things work. It is a source of bugs though.
One has to of course be careful to not take the size of this
struct and no structure members accessed in non-cpu specific files can
go after here. Oh for a better language. */
#if defined (WANT_CPU_M32RBF)
M32RBF_CPU_DATA cpu_data;
#endif
#if defined (WANT_CPU_M32RXF)
M32RXF_CPU_DATA cpu_data;
#elif defined (WANT_CPU_M32R2F)
M32R2F_CPU_DATA cpu_data;
#endif
};
#define M32R_SIM_CPU(cpu) ((struct m32r_sim_cpu *) CPU_ARCH_DATA (cpu))
/* TODO: Move this to the CGEN generated files instead. */
#include "m32r-sim.h"
/* Misc. */

2
sim/m32r/traps.c
View File

@ -55,6 +55,8 @@
#include <linux/unistd.h>
#endif
#include "m32r-sim.h"
#define TRAP_LINUX_SYSCALL 2
#define TRAP_FLUSH_CACHE 12
/* The semantic code invokes this for invalid (unrecognized) instructions. */