sim: mcore: convert to nrun
A lot of cpu state is stored in global variables, as is memory handling. The sim_size support needs unwinding at some point. But at least this is an improvement on the status quo.
This commit is contained in:
Mike Frysinger
parent
525887679c
commit
ea6b7543b4
@ -1,3 +1,26 @@
|
||||
2015-03-29 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* Makefile.in (SIM_RUN_OBJS, SIM_EXTRA_CFLAGS, SIM_EXTRA_LIBS): Delete.
|
||||
(SIM_OBJS): Change to $(SIM_NEW_COMMON_OBJS).
|
||||
* interp.c: Include sim-main.h, sim-base.h, and sim-options.h.
|
||||
(word, uword): Move to sim-main.h.
|
||||
(callback, sim_kind, myname): Delete.
|
||||
(struct mcore_regset): Move pc to sim_cpu.
|
||||
(memcycles, sim_size): Mark static.
|
||||
(set_initial_gprs): Take a sim_cpu arg. Set pc via CIA_SET.
|
||||
(handle_trap1): Take a SIM_DESC arg. Get callback from it.
|
||||
(process_stub): Take a SIM_DESC arg. Pass it to handle_trap1
|
||||
(util): Take a SIM_DESC arg. Pass it to process_stub.
|
||||
(sim_resume): Get/set pc via CIA_GET/CIA_SET. Pass sd to handle_trap1
|
||||
and util.
|
||||
(sim_trace, sim_stop, sim_load, sim_set_callbacks): Delete.
|
||||
(sim_info): Get callback from SIM_DESC.
|
||||
(free_state): New cleanup function.
|
||||
(sim_open): Rewrite to use new common logic.
|
||||
(sim_create_inferior): Get sim_cpu from sd. Pass to set_initial_gprs
|
||||
and set pc via CIA_SET.
|
||||
* sim-main.h: New file.
|
||||
|
||||
2015-03-29 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* configure.ac: Call SIM_AC_OPTION_ENDIAN, SIM_AC_OPTION_ALIGNMENT,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Makefile template for Configure for the MCore sim library.
|
||||
# Copyright (C) 1990-2015 Free Software Foundation, Inc.
|
||||
# Written by Cygnus Solutions.
|
||||
#
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
@ -17,11 +17,12 @@
|
||||
|
||||
## COMMON_PRE_CONFIG_FRAG
|
||||
|
||||
# Use the deprecated run frontend until we migrate to nrun.o
|
||||
SIM_RUN_OBJS = run.o
|
||||
SIM_EXTRA_CFLAGS = -DSIM_USE_DEPRECATED_RUN_FRONTEND
|
||||
|
||||
SIM_OBJS = interp.o sim-load.o
|
||||
SIM_EXTRA_LIBS = -lm
|
||||
SIM_OBJS = \
|
||||
interp.o \
|
||||
$(SIM_NEW_COMMON_OBJS) \
|
||||
sim-cpu.o \
|
||||
sim-engine.o \
|
||||
sim-hload.o \
|
||||
sim-stop.o
|
||||
|
||||
## COMMON_POST_CONFIG_FRAG
|
||||
|
||||
@ -29,16 +29,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
#include "libiberty.h"
|
||||
#include "gdb/remote-sim.h"
|
||||
|
||||
#include "sim-main.h"
|
||||
#include "sim-base.h"
|
||||
#include "sim-options.h"
|
||||
|
||||
#ifndef NUM_ELEM
|
||||
#define NUM_ELEM(A) (sizeof (A) / sizeof (A)[0])
|
||||
#endif
|
||||
|
||||
|
||||
typedef long int word;
|
||||
typedef unsigned long int uword;
|
||||
|
||||
static int target_big_endian = 0;
|
||||
host_callback * callback;
|
||||
#define target_big_endian (CURRENT_TARGET_BYTE_ORDER == BIG_ENDIAN)
|
||||
|
||||
|
||||
static unsigned long
|
||||
@ -104,6 +103,7 @@ mcore_store_unsigned_integer (unsigned char *addr, int len, unsigned long val)
|
||||
read/write functions. Keeping this data in native order improves
|
||||
the performance of the simulator. Simulation speed is deemed more
|
||||
important. */
|
||||
/* TODO: Should be moved to sim-main.h:sim_cpu. */
|
||||
|
||||
/* The ordering of the mcore_regset structure is matched in the
|
||||
gdb/config/mcore/tm-mcore.h file in the REGISTER_NAMES macro. */
|
||||
@ -112,7 +112,6 @@ struct mcore_regset
|
||||
word gregs [16]; /* primary registers */
|
||||
word alt_gregs [16]; /* alt register file */
|
||||
word cregs [32]; /* control registers */
|
||||
word pc; /* the pc */
|
||||
int ticks;
|
||||
int stalls;
|
||||
int cycles;
|
||||
@ -132,10 +131,7 @@ union
|
||||
#define LAST_VALID_CREG 32 /* only 0..12 implemented */
|
||||
#define NUM_MCORE_REGS (16 + 16 + LAST_VALID_CREG + 1)
|
||||
|
||||
int memcycles = 1;
|
||||
|
||||
static SIM_OPEN_KIND sim_kind;
|
||||
static char * myname;
|
||||
static int memcycles = 1;
|
||||
|
||||
static int issue_messages = 0;
|
||||
|
||||
@ -352,10 +348,11 @@ rhat (word x)
|
||||
|
||||
|
||||
/* Default to a 8 Mbyte (== 2^23) memory space. */
|
||||
/* TODO: Delete all this custom memory logic and move to common sim helpers. */
|
||||
static int sim_memory_size = 23;
|
||||
|
||||
#define MEM_SIZE_FLOOR 64
|
||||
void
|
||||
static void
|
||||
sim_size (int power)
|
||||
{
|
||||
sim_memory_size = power;
|
||||
@ -391,7 +388,7 @@ init_pointers (void)
|
||||
}
|
||||
|
||||
static void
|
||||
set_initial_gprs (void)
|
||||
set_initial_gprs (SIM_CPU *scpu)
|
||||
{
|
||||
int i;
|
||||
long space;
|
||||
@ -400,7 +397,7 @@ set_initial_gprs (void)
|
||||
init_pointers ();
|
||||
|
||||
/* Set up machine just out of reset. */
|
||||
cpu.asregs.pc = 0;
|
||||
CIA_SET (scpu, 0);
|
||||
cpu.sr = 0;
|
||||
|
||||
memsize = cpu.asregs.msize / (1024 * 1024);
|
||||
@ -468,9 +465,10 @@ is_opened (int fd)
|
||||
}
|
||||
|
||||
static void
|
||||
handle_trap1 (void)
|
||||
handle_trap1 (SIM_DESC sd)
|
||||
{
|
||||
unsigned long a[3];
|
||||
host_callback *callback = STATE_CALLBACK (sd);
|
||||
|
||||
switch ((unsigned long) (cpu.gr [TRAPCODE]))
|
||||
{
|
||||
@ -587,7 +585,7 @@ handle_trap1 (void)
|
||||
}
|
||||
|
||||
static void
|
||||
process_stub (int what)
|
||||
process_stub (SIM_DESC sd, int what)
|
||||
{
|
||||
/* These values should match those in libgloss/mcore/syscalls.s. */
|
||||
switch (what)
|
||||
@ -600,7 +598,7 @@ process_stub (int what)
|
||||
case 19: /* _lseek */
|
||||
case 43: /* _times */
|
||||
cpu.gr [TRAPCODE] = what;
|
||||
handle_trap1 ();
|
||||
handle_trap1 (sd);
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -611,7 +609,7 @@ process_stub (int what)
|
||||
}
|
||||
|
||||
static void
|
||||
util (unsigned what)
|
||||
util (SIM_DESC sd, unsigned what)
|
||||
{
|
||||
switch (what)
|
||||
{
|
||||
@ -653,7 +651,7 @@ util (unsigned what)
|
||||
break;
|
||||
|
||||
case 0xFF:
|
||||
process_stub (cpu.gr[1]);
|
||||
process_stub (sd, cpu.gr[1]);
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -705,6 +703,7 @@ static int tracing = 0;
|
||||
void
|
||||
sim_resume (SIM_DESC sd, int step, int siggnal)
|
||||
{
|
||||
SIM_CPU *scpu = STATE_CPU (sd, 0);
|
||||
int needfetch;
|
||||
word ibuf;
|
||||
word pc;
|
||||
@ -717,7 +716,7 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
|
||||
word WLhash;
|
||||
|
||||
cpu.asregs.exception = step ? SIGTRAP: 0;
|
||||
pc = cpu.asregs.pc;
|
||||
pc = CIA_GET (scpu);
|
||||
|
||||
/* Fetch the initial instructions that we'll decode. */
|
||||
ibuf = rlat (pc & 0xFFFFFFFC);
|
||||
@ -895,7 +894,7 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
|
||||
break;
|
||||
|
||||
case 0x9: /* trap 1 */
|
||||
handle_trap1 ();
|
||||
handle_trap1 (sd);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
@ -1492,7 +1491,7 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
|
||||
cpu.asregs.exception = SIGILL;
|
||||
break;
|
||||
case 0x50:
|
||||
util (inst & 0xFF);
|
||||
util (sd, inst & 0xFF);
|
||||
break;
|
||||
case 0x51: case 0x52: case 0x53:
|
||||
case 0x54: case 0x55: case 0x56: case 0x57:
|
||||
@ -1649,7 +1648,7 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
|
||||
while (!cpu.asregs.exception);
|
||||
|
||||
/* Hide away the things we've cached while executing. */
|
||||
cpu.asregs.pc = pc;
|
||||
CIA_SET (scpu, pc);
|
||||
cpu.asregs.insts += insts; /* instructions done ... */
|
||||
cpu.asregs.cycles += insts; /* and each takes a cycle */
|
||||
cpu.asregs.cycles += bonus_cycles; /* and extra cycles for branches */
|
||||
@ -1723,19 +1722,6 @@ sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
sim_trace (SIM_DESC sd)
|
||||
{
|
||||
tracing = 1;
|
||||
|
||||
sim_resume (sd, 0, 0);
|
||||
|
||||
tracing = 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
void
|
||||
sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc)
|
||||
{
|
||||
@ -1751,15 +1737,6 @@ sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
sim_stop (SIM_DESC sd)
|
||||
{
|
||||
cpu.asregs.exception = SIGINT;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
sim_info (SIM_DESC sd, int verbose)
|
||||
{
|
||||
@ -1767,6 +1744,7 @@ sim_info (SIM_DESC sd, int verbose)
|
||||
int w, wcyc;
|
||||
#endif
|
||||
double virttime = cpu.asregs.cycles / 36.0e6;
|
||||
host_callback *callback = STATE_CALLBACK (sd);
|
||||
|
||||
callback->printf_filtered (callback, "\n\n# instructions executed %10d\n",
|
||||
cpu.asregs.insts);
|
||||
@ -1817,12 +1795,71 @@ struct aout
|
||||
#define LONG(x) (((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3])
|
||||
#define SHORT(x) (((x)[0]<<8)|(x)[1])
|
||||
|
||||
static void
|
||||
free_state (SIM_DESC sd)
|
||||
{
|
||||
if (STATE_MODULES (sd) != NULL)
|
||||
sim_module_uninstall (sd);
|
||||
sim_cpu_free_all (sd);
|
||||
sim_state_free (sd);
|
||||
}
|
||||
|
||||
SIM_DESC
|
||||
sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
|
||||
{
|
||||
int osize = sim_memory_size;
|
||||
myname = argv[0];
|
||||
callback = cb;
|
||||
SIM_DESC sd = sim_state_alloc (kind, cb);
|
||||
int i, osize;
|
||||
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)
|
||||
{
|
||||
free_state (sd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (sim_pre_argv_init (sd, argv[0]) != SIM_RC_OK)
|
||||
{
|
||||
free_state (sd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* getopt will print the error message so we just have to exit if this fails.
|
||||
FIXME: Hmmm... in the case of gdb we need getopt to call
|
||||
print_filtered. */
|
||||
if (sim_parse_args (sd, argv) != SIM_RC_OK)
|
||||
{
|
||||
free_state (sd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Check for/establish the a reference program image. */
|
||||
if (sim_analyze_program (sd,
|
||||
(STATE_PROG_ARGV (sd) != NULL
|
||||
? *STATE_PROG_ARGV (sd)
|
||||
: NULL), abfd) != SIM_RC_OK)
|
||||
{
|
||||
free_state (sd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Configure/verify the target byte order and other runtime
|
||||
configuration options. */
|
||||
if (sim_config (sd) != SIM_RC_OK)
|
||||
{
|
||||
sim_module_uninstall (sd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (sim_post_argv_init (sd) != SIM_RC_OK)
|
||||
{
|
||||
/* Uninstall the modules to avoid memory leaks,
|
||||
file descriptor leaks, etc. */
|
||||
sim_module_uninstall (sd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
osize = sim_memory_size;
|
||||
|
||||
if (kind == SIM_OPEN_STANDALONE)
|
||||
issue_messages = 1;
|
||||
@ -1831,10 +1868,14 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
|
||||
sim_size (1); /* small */
|
||||
sim_size (osize); /* and back again */
|
||||
|
||||
set_initial_gprs (); /* Reset the GPR registers. */
|
||||
/* CPU specific initialization. */
|
||||
for (i = 0; i < MAX_NR_PROCESSORS; ++i)
|
||||
{
|
||||
SIM_CPU *cpu = STATE_CPU (sd, i);
|
||||
set_initial_gprs (cpu); /* Reset the GPR registers. */
|
||||
}
|
||||
|
||||
/* Fudge our descriptor for now. */
|
||||
return (SIM_DESC) 1;
|
||||
return sd;
|
||||
}
|
||||
|
||||
void
|
||||
@ -1843,62 +1884,10 @@ sim_close (SIM_DESC sd, int quitting)
|
||||
/* nothing to do */
|
||||
}
|
||||
|
||||
SIM_RC
|
||||
sim_load (SIM_DESC sd, const char *prog, bfd *abfd, int from_tty)
|
||||
{
|
||||
/* Do the right thing for ELF executables; this turns out to be
|
||||
just about the right thing for any object format that:
|
||||
- we crack using BFD routines
|
||||
- follows the traditional UNIX text/data/bss layout
|
||||
- calls the bss section ".bss". */
|
||||
|
||||
extern bfd * sim_load_file (); /* ??? Don't know where this should live. */
|
||||
bfd * prog_bfd;
|
||||
|
||||
{
|
||||
bfd * handle;
|
||||
handle = bfd_openr (prog, 0); /* could be "mcore" */
|
||||
|
||||
if (!handle)
|
||||
{
|
||||
printf("``%s'' could not be opened.\n", prog);
|
||||
return SIM_RC_FAIL;
|
||||
}
|
||||
|
||||
/* Makes sure that we have an object file, also cleans gets the
|
||||
section headers in place. */
|
||||
if (!bfd_check_format (handle, bfd_object))
|
||||
{
|
||||
/* wasn't an object file */
|
||||
bfd_close (handle);
|
||||
printf ("``%s'' is not appropriate object file.\n", prog);
|
||||
return SIM_RC_FAIL;
|
||||
}
|
||||
|
||||
/* Clean up after ourselves. */
|
||||
bfd_close (handle);
|
||||
|
||||
/* XXX: do we need to free the s_bss and handle structures? */
|
||||
}
|
||||
|
||||
/* from sh -- dac */
|
||||
prog_bfd = sim_load_file (sd, myname, callback, prog, abfd,
|
||||
sim_kind == SIM_OPEN_DEBUG,
|
||||
0, sim_write);
|
||||
if (prog_bfd == NULL)
|
||||
return SIM_RC_FAIL;
|
||||
|
||||
target_big_endian = bfd_big_endian (prog_bfd);
|
||||
|
||||
if (abfd == NULL)
|
||||
bfd_close (prog_bfd);
|
||||
|
||||
return SIM_RC_OK;
|
||||
}
|
||||
|
||||
SIM_RC
|
||||
sim_create_inferior (SIM_DESC sd, struct bfd *prog_bfd, char **argv, char **env)
|
||||
{
|
||||
SIM_CPU *scpu = STATE_CPU (sd, 0);
|
||||
char ** avp;
|
||||
int nargs = 0;
|
||||
int nenv = 0;
|
||||
@ -1912,11 +1901,11 @@ sim_create_inferior (SIM_DESC sd, struct bfd *prog_bfd, char **argv, char **env)
|
||||
/* Set the initial register set. */
|
||||
l = issue_messages;
|
||||
issue_messages = 0;
|
||||
set_initial_gprs ();
|
||||
set_initial_gprs (scpu);
|
||||
issue_messages = l;
|
||||
|
||||
hi_stack = cpu.asregs.msize - 4;
|
||||
cpu.asregs.pc = bfd_get_start_address (prog_bfd);
|
||||
CIA_SET (scpu, bfd_get_start_address (prog_bfd));
|
||||
|
||||
/* Calculate the argument and environment strings. */
|
||||
s_length = 0;
|
||||
@ -2085,9 +2074,3 @@ sim_do_command (SIM_DESC sd, const char *cmd)
|
||||
fprintf (stderr, " verbose\n");
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
sim_set_callbacks (host_callback *ptr)
|
||||
{
|
||||
callback = ptr;
|
||||
}
|
||||
|
||||
56
sim/mcore/sim-main.h
Normal file
56
sim/mcore/sim-main.h
Normal file
@ -0,0 +1,56 @@
|
||||
/* Simulator for Motorola's MCore processor
|
||||
Copyright (C) 2009-2015 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GDB, the GNU debugger.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef SIM_MAIN_H
|
||||
#define SIM_MAIN_H
|
||||
|
||||
#include "sim-basics.h"
|
||||
|
||||
typedef address_word sim_cia;
|
||||
typedef long int word;
|
||||
typedef unsigned long int uword;
|
||||
|
||||
typedef struct _sim_cpu SIM_CPU;
|
||||
|
||||
#include "sim-base.h"
|
||||
#include "bfd.h"
|
||||
|
||||
#define CIA_GET(cpu) (cpu)->pc
|
||||
#define CIA_SET(cpu,val) (cpu)->pc = (val)
|
||||
|
||||
struct _sim_cpu {
|
||||
|
||||
word pc;
|
||||
|
||||
sim_cpu_base base;
|
||||
};
|
||||
|
||||
struct sim_state {
|
||||
|
||||
sim_cpu *cpu[MAX_NR_PROCESSORS];
|
||||
#if (WITH_SMP)
|
||||
#define STATE_CPU(sd,n) ((sd)->cpu[n])
|
||||
#else
|
||||
#define STATE_CPU(sd,n) ((sd)->cpu[0])
|
||||
#endif
|
||||
|
||||
sim_state_base base;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user