aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/h8300/ChangeLog6
-rw-r--r--sim/h8300/compile.c28
2 files changed, 7 insertions, 27 deletions
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 834fcec..7d87d1f 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,5 +1,11 @@
2015-12-30 Mike Frysinger <vapier@gentoo.org>
+ * compile.c (sim_state_initialize): Delete.
+ (sim_open): Replace sim_state_initialize call with SBR_REGNUM
+ assignment.
+
+2015-12-30 Mike Frysinger <vapier@gentoo.org>
+
* compile.c (h8300_reg_store): Delete sd. Change init_pointers to
use CPU_STATE (cpu). Change h8_set_pc to cpu->pc. Return -1 and
drop the printf if the default case. Change all the set func calls
diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c
index 99d28ad..ef6a853 100644
--- a/sim/h8300/compile.c
+++ b/sim/h8300/compile.c
@@ -58,32 +58,6 @@ static void set_simcache_size (SIM_DESC, int);
/* CPU data object: */
-static int
-sim_state_initialize (SIM_DESC sd, sim_cpu *cpu)
-{
- /* FIXME: not really necessary, since sim_cpu_alloc calls zalloc. */
-
- memset (&cpu->regs, 0, sizeof(cpu->regs));
- cpu->regs[SBR_REGNUM] = 0xFFFFFF00;
- cpu->pc = 0;
- cpu->delayed_branch = 0;
- cpu->memory = NULL;
- cpu->eightbit = NULL;
- cpu->mask = 0;
-
- /* Initialize local simulator state. */
- sd->sim_cache = NULL;
- sd->sim_cache_size = 0;
- sd->cache_idx = NULL;
- sd->cache_top = 0;
- sd->memory_size = 0;
- sd->compiles = 0;
-#ifdef ADEBUG
- memset (&cpu->stats, 0, sizeof (cpu->stats));
-#endif
- return 0;
-}
-
static unsigned int
h8_get_pc (SIM_DESC sd)
{
@@ -4869,7 +4843,7 @@ sim_open (SIM_OPEN_KIND kind,
cpu = STATE_CPU (sd, 0);
SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
- sim_state_initialize (sd, cpu);
+ cpu->regs[SBR_REGNUM] = 0xFFFFFF00;
/* sim_cpu object is new, so some initialization is needed. */
init_pointers_needed = 1;