FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sim: cris/frv/h8300/iq2000/lm32/m32r/sh64: standardize cpu state

Browse source 
This sets up the sim_state structure and the cpu member to match what we
do in most other sims, and what the common code suggests.  This is a step
to unifying on the sim-cpu.o object.
This commit is contained in:
Mike Frysinger 2015-04-15 01:22:34 -04:00
parent 0ce398f106
commit f95f4ed2c4
15 changed files with 88 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sim/cris/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (struct sim_state): Change cpu to an array of pointers.
(STATE_CPU): Handle WITH_SMP.
2015-04-13 Mike Frysinger <vapier@gentoo.org> 2015-04-13 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate. * configure: Regenerate.

8
sim/cris/sim-main.h
View file

@ -225,8 +225,12 @@ struct _sim_cpu {
/* The sim_state struct. */ /* The sim_state struct. */
struct sim_state { struct sim_state {
sim_cpu *cpu; sim_cpu *cpu[MAX_NR_PROCESSORS];
#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu) #if (WITH_SMP)
#define STATE_CPU(sd,n) ((sd)->cpu[n])
#else
#define STATE_CPU(sd,n) ((sd)->cpu[0])
#endif
CGEN_STATE cgen_state; CGEN_STATE cgen_state;

5
sim/frv/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (struct sim_state): Change cpu to an array of pointers.
(STATE_CPU): Handle WITH_SMP.
2015-04-13 Mike Frysinger <vapier@gentoo.org> 2015-04-13 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate. * configure: Regenerate.

8
sim/frv/sim-main.h
View file

@ -118,8 +118,12 @@ struct _sim_cpu {
/* The sim_state struct. */ /* The sim_state struct. */
struct sim_state { struct sim_state {
sim_cpu *cpu; sim_cpu *cpu[MAX_NR_PROCESSORS];
#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu) #if (WITH_SMP)
#define STATE_CPU(sd,n) ((sd)->cpu[n])
#else
#define STATE_CPU(sd,n) ((sd)->cpu[0])
#endif
CGEN_STATE cgen_state; CGEN_STATE cgen_state;

7
sim/h8300/ChangeLog
View file

@ -1,3 +1,10 @@
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* compile.c: Include sim-options.h.
(sim_open): Call sim_cpu_alloc_all instead of sim_cpu_alloc.
* sim-main.h (struct sim_state): Change cpu to an array of pointers.
(STATE_CPU): Handle WITH_SMP.
2015-04-13 Mike Frysinger <vapier@gentoo.org> 2015-04-13 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate. * configure: Regenerate.

10
sim/h8300/compile.c
View file

@ -34,6 +34,7 @@
#include "gdb/sim-h8300.h" #include "gdb/sim-h8300.h"
#include "sys/stat.h" #include "sys/stat.h"
#include "sys/types.h" #include "sys/types.h"
#include "sim-options.h"
#ifndef SIGTRAP #ifndef SIGTRAP
# define SIGTRAP 5 # define SIGTRAP 5
@ -4886,7 +4887,14 @@ sim_open (SIM_OPEN_KIND kind,
sim_cpu *cpu; sim_cpu *cpu;
sd = sim_state_alloc (kind, callback); sd = sim_state_alloc (kind, callback);
sd->cpu = sim_cpu_alloc (sd, 0);
/* The cpu data is kept in a separately allocated chunk of memory. */
if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
{
free_state (sd);
return 0;
}
cpu = STATE_CPU (sd, 0); cpu = STATE_CPU (sd, 0);
SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
sim_state_initialize (sd, cpu); sim_state_initialize (sd, cpu);

8
sim/h8300/sim-main.h
View file

@ -138,7 +138,7 @@ struct _sim_cpu {
/* The sim_state struct. */ /* The sim_state struct. */
struct sim_state { struct sim_state {
struct _sim_cpu *cpu; sim_cpu *cpu[MAX_NR_PROCESSORS];
unsigned int sim_cache_size; unsigned int sim_cache_size;
decoded_inst *sim_cache; decoded_inst *sim_cache;
unsigned short *cache_idx; unsigned short *cache_idx;
@ -155,7 +155,11 @@ struct sim_state {
#define CIA_GET(CPU) (cpu_get_pc (CPU)) #define CIA_GET(CPU) (cpu_get_pc (CPU))
#define CIA_SET(CPU, VAL) (cpu_set_pc ((CPU), (VAL))) #define CIA_SET(CPU, VAL) (cpu_set_pc ((CPU), (VAL)))
#define STATE_CPU(SD, N) ((SD)->cpu) /* Single Processor. */ #if (WITH_SMP)
#define STATE_CPU(sd,n) ((sd)->cpu[n])
#else
#define STATE_CPU(sd,n) ((sd)->cpu[0])
#endif
#define cpu_set_pc(CPU, VAL) (((CPU)->pc) = (VAL)) #define cpu_set_pc(CPU, VAL) (((CPU)->pc) = (VAL))
#define cpu_get_pc(CPU) (((CPU)->pc)) #define cpu_get_pc(CPU) (((CPU)->pc))

5
sim/iq2000/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (struct sim_state): Change cpu to an array of pointers.
(STATE_CPU): Handle WITH_SMP.
2015-04-13 Mike Frysinger <vapier@gentoo.org> 2015-04-13 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate. * configure: Regenerate.

8
sim/iq2000/sim-main.h
View file

@ -57,8 +57,12 @@ struct _sim_cpu {
/* The sim_state struct. */ /* The sim_state struct. */
struct sim_state { struct sim_state {
sim_cpu *cpu; sim_cpu *cpu[MAX_NR_PROCESSORS];
#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu) #if (WITH_SMP)
#define STATE_CPU(sd,n) ((sd)->cpu[n])
#else
#define STATE_CPU(sd,n) ((sd)->cpu[0])
#endif
CGEN_STATE cgen_state; CGEN_STATE cgen_state;

5
sim/lm32/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (struct sim_state): Change cpu to an array of pointers.
(STATE_CPU): Handle WITH_SMP.
2015-04-13 Mike Frysinger <vapier@gentoo.org> 2015-04-13 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate. * configure: Regenerate.

8
sim/lm32/sim-main.h
View file

@ -83,8 +83,12 @@ struct _sim_cpu
struct sim_state struct sim_state
{ {
sim_cpu *cpu; sim_cpu *cpu[MAX_NR_PROCESSORS];
#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu) #if (WITH_SMP)
#define STATE_CPU(sd,n) ((sd)->cpu[n])
#else
#define STATE_CPU(sd,n) ((sd)->cpu[0])
#endif
CGEN_STATE cgen_state; CGEN_STATE cgen_state;

5
sim/m32r/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (struct sim_state): Change cpu to an array of pointers.
(STATE_CPU): Handle WITH_SMP.
2015-04-13 Mike Frysinger <vapier@gentoo.org> 2015-04-13 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate. * configure: Regenerate.

8
sim/m32r/sim-main.h
View file

@ -68,8 +68,12 @@ struct _sim_cpu {
/* The sim_state struct. */ /* The sim_state struct. */
struct sim_state { struct sim_state {
sim_cpu *cpu; sim_cpu *cpu[MAX_NR_PROCESSORS];
#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu) #if (WITH_SMP)
#define STATE_CPU(sd,n) ((sd)->cpu[n])
#else
#define STATE_CPU(sd,n) ((sd)->cpu[0])
#endif
CGEN_STATE cgen_state; CGEN_STATE cgen_state;

5
sim/sh64/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (struct sim_state): Change cpu to an array of pointers.
(STATE_CPU): Handle WITH_SMP.
2015-04-13 Mike Frysinger <vapier@gentoo.org> 2015-04-13 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate. * configure: Regenerate.

8
sim/sh64/sim-main.h
View file

@ -53,8 +53,12 @@ struct _sim_cpu {
/* The sim_state struct. */ /* The sim_state struct. */
struct sim_state { struct sim_state {
sim_cpu *cpu; sim_cpu *cpu[MAX_NR_PROCESSORS];
#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu) #if (WITH_SMP)
#define STATE_CPU(sd,n) ((sd)->cpu[n])
#else
#define STATE_CPU(sd,n) ((sd)->cpu[0])
#endif
CGEN_STATE cgen_state; CGEN_STATE cgen_state;