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

sim: avr/mcore/moxie: fill out sim-cpu pc fetch/store helpers 

This makes the common sim-cpu logic work.
This commit is contained in:
Mike Frysinger 2015-04-16 02:07:33 -04:00
parent 04be4e9eda
commit 4c0cab1e21
7 changed files with 80 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sim/avr/ChangeLog
View File

@ -1,3 +1,9 @@
2015-04-16 Mike Frysinger <vapier@gentoo.org>
* interp.c (avr_pc_get, avr_pc_set): New functions.
(sim_open): Declare new local var i. Call CPU_PC_FETCH &
CPU_PC_STORE for all cpus.
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-cpu.o.

22
sim/avr/interp.c
View File

@ -1663,6 +1663,18 @@ sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length)
return 0;
}
static sim_cia
avr_pc_get (sim_cpu *cpu)
{
return pc;
}
static void
avr_pc_set (sim_cpu *cpu, sim_cia _pc)
{
pc = _pc;
}
static void
free_state (SIM_DESC sd)
{
@ -1675,6 +1687,7 @@ free_state (SIM_DESC sd)
SIM_DESC
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_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
@ -1729,6 +1742,15 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
return 0;
}
/* CPU specific initialization. */
for (i = 0; i < MAX_NR_PROCESSORS; ++i)
{
SIM_CPU *cpu = STATE_CPU (sd, i);
CPU_PC_FETCH (cpu) = avr_pc_get;
CPU_PC_STORE (cpu) = avr_pc_set;
}
/* Clear all the memory. */
memset (sram, 0, sizeof (sram));
memset (flash, 0, sizeof (flash));

5
sim/mcore/ChangeLog
View File

@ -1,3 +1,8 @@
2015-04-16 Mike Frysinger <vapier@gentoo.org>
* interp.c (mcore_pc_get, mcore_pc_set): New functions.
(sim_open): Call CPU_PC_FETCH & CPU_PC_STORE for all cpus.
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-cpu.o.

16
sim/mcore/interp.c
View File

@ -1779,6 +1779,18 @@ sim_info (SIM_DESC sd, int verbose)
#endif
}
static sim_cia
mcore_pc_get (sim_cpu *cpu)
{
return cpu->pc;
}
static void
mcore_pc_set (sim_cpu *cpu, sim_cia pc)
{
cpu->pc = pc;
}
static void
free_state (SIM_DESC sd)
{
@ -1856,6 +1868,10 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
for (i = 0; i < MAX_NR_PROCESSORS; ++i)
{
SIM_CPU *cpu = STATE_CPU (sd, i);
CPU_PC_FETCH (cpu) = mcore_pc_get;
CPU_PC_STORE (cpu) = mcore_pc_set;
set_initial_gprs (cpu); /* Reset the GPR registers. */
}

7
sim/moxie/ChangeLog
View File

@ -1,3 +1,10 @@
2015-04-16 Mike Frysinger <vapier@gentoo.org>
* interp.c (moxie_pc_get, moxie_pc_set): New functions.
(sim_open): Declare new local var i. Call CPU_PC_FETCH &
CPU_PC_STORE for all cpus.
* sim-main.h (SIM_CPU): New typedef.
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-cpu.o.

23
sim/moxie/interp.c
View File

@ -1145,6 +1145,18 @@ sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length)
return 0;
}
static sim_cia
moxie_pc_get (sim_cpu *cpu)
{
return cpu->registers[PCIDX];
}
static void
moxie_pc_set (sim_cpu *cpu, sim_cia pc)
{
cpu->registers[PCIDX] = pc;
}
static void
free_state (SIM_DESC sd)
{
@ -1157,6 +1169,7 @@ free_state (SIM_DESC sd)
SIM_DESC
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_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
@ -1215,7 +1228,15 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
}
/* CPU specific initialization. */
set_initial_gprs ();
for (i = 0; i < MAX_NR_PROCESSORS; ++i)
{
SIM_CPU *cpu = STATE_CPU (sd, i);
CPU_PC_FETCH (cpu) = moxie_pc_get;
CPU_PC_STORE (cpu) = moxie_pc_set;
set_initial_gprs (); /* Reset the GPR registers. */
}
return sd;
}

2
sim/moxie/sim-main.h
View File

@ -24,6 +24,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
typedef address_word sim_cia;
typedef struct _sim_cpu SIM_CPU;
#include "sim-base.h"
#include "bfd.h"