mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-24 02:24:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

sim: moxie: invert sim_cpu storage

Browse Source
This commit is contained in:
Mike Frysinger 2016-08-13 00:37:34 +08:00
parent 1c867d708c
commit 778ef9bcbb
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sim/moxie/interp.c
View File

@ -127,7 +127,7 @@ struct moxie_regset
#define CC_GTU 1<<3
#define CC_LTU 1<<4
/* TODO: This should be moved to sim-main.h:_sim_cpu. */
/* TODO: This should be moved to sim-main.h:moxie_sim_cpu. */
union
{
struct moxie_regset asregs;
@ -1173,13 +1173,13 @@ moxie_reg_fetch (SIM_CPU *scpu, int rn, void *memory, int length)
static sim_cia
moxie_pc_get (sim_cpu *cpu)
{
return cpu->registers[PCIDX];
return MOXIE_SIM_CPU (cpu)->registers[PCIDX];
}
static void
moxie_pc_set (sim_cpu *cpu, sim_cia pc)
{
cpu->registers[PCIDX] = pc;
MOXIE_SIM_CPU (cpu)->registers[PCIDX] = pc;
}
static void
@ -1203,7 +1203,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
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 moxie_sim_cpu))
!= SIM_RC_OK)
{
free_state (sd);
return 0;

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

@ -20,23 +20,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
#define SIM_HAVE_COMMON_SIM_CPU
#include "sim-basics.h"
#include "sim-base.h"
#include "bfd.h"
#define PCIDX 17
struct _sim_cpu {
/* The following are internal simulator state variables: */
/* To keep this default simulator simple, and fast, we use a direct
vector of registers. The internal simulator engine then uses
manifests to access the correct slot. */
struct moxie_sim_cpu {
/* To keep this default simulator simple, and fast, we use a direct
vector of registers. The internal simulator engine then uses
manifests to access the correct slot. */
unsigned_word registers[19];
sim_cpu_base base;
};
#define MOXIE_SIM_CPU(cpu) ((struct moxie_sim_cpu *) CPU_ARCH_DATA (cpu))
#endif