OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: mips: convert to sim-cpu 

Make cpu allocation fully dynamic so we can leverage the common
sim-cpu and its APIs.
This commit is contained in:
Mike Frysinger 2015-04-13 02:09:55 -04:00
parent bea3f671c5
commit 7bebb329bb
4 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sim/mips/ChangeLog
View File

@ -1,3 +1,14 @@
2015-04-13 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Add sim-cpu.o.
* interp.c (mips_pc_get, mips_pc_set): New functions.
(sim_open): Declare new local var i. Call sim_cpu_alloc_all.
Call CPU_PC_FETCH & CPU_PC_STORE for all cpus.
(sim_pc_get): Delete.
* sim-main.h (SIM_CPU): Define.
(struct sim_state): Change cpu to an array of pointers.
(STATE_CPU): Drop &.
2015-04-13 Mike Frysinger <vapier@gentoo.org> 2015-04-13 Mike Frysinger <vapier@gentoo.org>
* interp.c (mips_option_handler, open_trace, sim_close, * interp.c (mips_option_handler, open_trace, sim_close,

1
sim/mips/Makefile.in
View File

@ -46,6 +46,7 @@ SIM_OBJS = \
cp1.o \ cp1.o \
mdmx.o \ mdmx.o \
dsp.o \ dsp.o \
sim-cpu.o \
sim-main.o \ sim-main.o \
sim-hload.o \ sim-hload.o \
sim-stop.o \ sim-stop.o \

34
sim/mips/interp.c
View File

@ -336,14 +336,33 @@ static void device_init(SIM_DESC sd) {
/*-- GDB simulator interface ------------------------------------------------*/ /*-- GDB simulator interface ------------------------------------------------*/
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static sim_cia
mips_pc_get (sim_cpu *cpu)
{
return PC;
}
static void
mips_pc_set (sim_cpu *cpu, sim_cia pc)
{
PC = pc;
}
SIM_DESC SIM_DESC
sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv) sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
{ {
int i;
SIM_DESC sd = sim_state_alloc (kind, cb); SIM_DESC sd = sim_state_alloc (kind, cb);
sim_cpu *cpu = STATE_CPU (sd, 0); /* FIXME */ sim_cpu *cpu;
SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
/* 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)
return 0;
cpu = STATE_CPU (sd, 0); /* FIXME */
/* FIXME: watchpoints code shouldn't need this */ /* FIXME: watchpoints code shouldn't need this */
STATE_WATCHPOINTS (sd)->pc = &(PC); STATE_WATCHPOINTS (sd)->pc = &(PC);
STATE_WATCHPOINTS (sd)->sizeof_pc = sizeof (PC); STATE_WATCHPOINTS (sd)->sizeof_pc = sizeof (PC);
@ -790,7 +809,14 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
} }
} }
/* CPU specific initialization. */
for (i = 0; i < MAX_NR_PROCESSORS; ++i)
{
SIM_CPU *cpu = STATE_CPU (sd, i);
CPU_PC_FETCH (cpu) = mips_pc_get;
CPU_PC_STORE (cpu) = mips_pc_set;
}
return sd; return sd;
} }
@ -1066,12 +1092,6 @@ sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length)
return 0; return 0;
} }
sim_cia
sim_pc_get (sim_cpu *cpu)
{
return PC;
}
SIM_RC SIM_RC
sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env) sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env)
{ {

9
sim/mips/sim-main.h
View File

@ -36,6 +36,8 @@ mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ER
typedef address_word sim_cia; typedef address_word sim_cia;
typedef struct _sim_cpu SIM_CPU;
#include "sim-base.h" #include "sim-base.h"
#include "bfd.h" #include "bfd.h"
@ -486,14 +488,13 @@ struct sim_state {
struct swatch watch; struct swatch watch;
sim_cpu cpu[MAX_NR_PROCESSORS]; sim_cpu *cpu[MAX_NR_PROCESSORS];
#if (WITH_SMP) #if (WITH_SMP)
#define STATE_CPU(sd,n) (&(sd)->cpu[n]) #define STATE_CPU(sd,n) ((sd)->cpu[n])
#else #else
#define STATE_CPU(sd,n) (&(sd)->cpu[0]) #define STATE_CPU(sd,n) ((sd)->cpu[0])
#endif #endif
sim_state_base base; sim_state_base base;
}; };