aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sim/sh/ChangeLog16
-rw-r--r--sim/sh/gencode.c4
-rw-r--r--sim/sh/interp.c79
3 files changed, 53 insertions, 46 deletions
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index b10484b..427333d 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,19 @@
+2015-11-21 Mike Frysinger <vapier@gentoo.org>
+
+ * gencode.c (tab): Pass sd into trap calls.
+ * interp.c (prog_argv, callback): Delete.
+ (parse_and_set_memory_size): Add SIM_DESC arg.
+ (trap): Declare callback and prog_argv.
+ (sim_resume): Declare callback.
+ (sim_info): Change callback->printf_filtered calls to sim_io_printf.
+ (sim_open): Delete callback assignment. Pass sd to
+ parse_and_set_memory_size.
+ (parse_and_set_memory_size): Change callback->printf_filtered call
+ to sim_io_printf.
+ (sim_create_inferior): Delete prog_argv assignment.
+ (sim_do_command): Change callback->printf_filtered calls to
+ sim_io_printf. Pass sd to parse_and_set_memory_size.
+
2015-11-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-stop.o.
diff --git a/sim/sh/gencode.c b/sim/sh/gencode.c
index aa26e6c..e3978ea 100644
--- a/sim/sh/gencode.c
+++ b/sim/sh/gencode.c
@@ -1426,7 +1426,7 @@ static op tab[] =
},
{ "", "", "sleep", "0000000000011011",
- "nip += trap (0xc3, &R0, PC, memory, maskl, maskw, endianw);",
+ "nip += trap (sd, 0xc3, &R0, PC, memory, maskl, maskw, endianw);",
},
{ "n", "", "stc <CREG_M>,<REG_N>", "0000nnnnmmmm0010",
@@ -1524,7 +1524,7 @@ static op tab[] =
"long imm = 0xff & i;",
"RAISE_EXCEPTION_IF_IN_DELAY_SLOT ();",
"if (i < 20 || i == 33 || i == 34 || i == 0xc3)",
- " nip += trap (i, &R0, PC, memory, maskl, maskw, endianw);",
+ " nip += trap (sd, i, &R0, PC, memory, maskl, maskw, endianw);",
#if 0
"else {",
/* SH-[12] */
diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index 55a2d64..2092a1a 100644
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -120,7 +120,6 @@ struct loop_bounds { unsigned char *start, *end; };
static int global_endianw, endianb;
static int target_dsp;
#define host_little_endian (CURRENT_HOST_BYTE_ORDER == LITTLE_ENDIAN)
-static char **prog_argv;
static int maskw = 0;
static int maskl = 0;
@@ -376,7 +375,7 @@ int valid[16];
#define UNDEF(x)
#endif
-static void parse_and_set_memory_size (const char *str);
+static void parse_and_set_memory_size (SIM_DESC sd, const char *str);
static int IOMEM (int addr, int write, int value);
static struct loop_bounds get_loop_bounds (int, int, unsigned char *,
unsigned char *, int, int);
@@ -387,10 +386,6 @@ static int process_rlat_addr (int);
static int process_rwat_addr (int);
static int process_rbat_addr (int);
-static host_callback *callback;
-
-
-
/* Floating point registers */
#define DR(n) (get_dr (n))
@@ -886,9 +881,12 @@ strnswap (int str, int len)
return offset by which to adjust pc. */
static int
-trap (int i, int *regs, unsigned char *insn_ptr, unsigned char *memory,
- int maskl, int maskw, int endianw)
+trap (SIM_DESC sd, int i, int *regs, unsigned char *insn_ptr,
+ unsigned char *memory, int maskl, int maskw, int endianw)
{
+ host_callback *callback = STATE_CALLBACK (sd);
+ char **prog_argv = STATE_PROG_ARGV (sd);
+
switch (i)
{
case 1:
@@ -1865,6 +1863,8 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
if (--pollcount < 0)
{
+ host_callback *callback = STATE_CALLBACK (sd);
+
pollcount = POLL_QUIT_INTERVAL;
if ((*callback->poll_quit) != NULL
&& (*callback->poll_quit) (callback))
@@ -2345,31 +2345,28 @@ sim_info (SIM_DESC sd, int verbose)
(double) saved_state.asregs.ticks / (double) now_persec ();
double virttime = saved_state.asregs.cycles / 36.0e6;
- callback->printf_filtered (callback, "\n\n# instructions executed %10d\n",
- saved_state.asregs.insts);
- callback->printf_filtered (callback, "# cycles %10d\n",
- saved_state.asregs.cycles);
- callback->printf_filtered (callback, "# pipeline stalls %10d\n",
- saved_state.asregs.stalls);
- callback->printf_filtered (callback, "# misaligned load/store %10d\n",
- saved_state.asregs.memstalls);
- callback->printf_filtered (callback, "# real time taken %10.4f\n",
- timetaken);
- callback->printf_filtered (callback, "# virtual time taken %10.4f\n",
- virttime);
- callback->printf_filtered (callback, "# profiling size %10d\n",
- sim_profile_size);
- callback->printf_filtered (callback, "# profiling frequency %10d\n",
- saved_state.asregs.profile);
- callback->printf_filtered (callback, "# profile maxpc %10x\n",
- (1 << sim_profile_size) << PROFILE_SHIFT);
+ sim_io_printf (sd, "\n\n# instructions executed %10d\n",
+ saved_state.asregs.insts);
+ sim_io_printf (sd, "# cycles %10d\n",
+ saved_state.asregs.cycles);
+ sim_io_printf (sd, "# pipeline stalls %10d\n",
+ saved_state.asregs.stalls);
+ sim_io_printf (sd, "# misaligned load/store %10d\n",
+ saved_state.asregs.memstalls);
+ sim_io_printf (sd, "# real time taken %10.4f\n", timetaken);
+ sim_io_printf (sd, "# virtual time taken %10.4f\n", virttime);
+ sim_io_printf (sd, "# profiling size %10d\n", sim_profile_size);
+ sim_io_printf (sd, "# profiling frequency %10d\n",
+ saved_state.asregs.profile);
+ sim_io_printf (sd, "# profile maxpc %10x\n",
+ (1 << sim_profile_size) << PROFILE_SHIFT);
if (timetaken != 0)
{
- callback->printf_filtered (callback, "# cycles/second %10d\n",
- (int) (saved_state.asregs.cycles / timetaken));
- callback->printf_filtered (callback, "# simulation ratio %10.4f\n",
- virttime / timetaken);
+ sim_io_printf (sd, "# cycles/second %10d\n",
+ (int) (saved_state.asregs.cycles / timetaken));
+ sim_io_printf (sd, "# simulation ratio %10.4f\n",
+ virttime / timetaken);
}
}
@@ -2410,8 +2407,6 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
SIM_DESC sd = sim_state_alloc (kind, cb);
SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
- callback = cb;
-
/* 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)
{
@@ -2472,7 +2467,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
for (p = argv + 1; *p != NULL; ++p)
{
if (isdigit (**p))
- parse_and_set_memory_size (*p);
+ parse_and_set_memory_size (sd, *p);
}
if (abfd)
@@ -2490,7 +2485,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
}
static void
-parse_and_set_memory_size (const char *str)
+parse_and_set_memory_size (SIM_DESC sd, const char *str)
{
int n;
@@ -2498,7 +2493,7 @@ parse_and_set_memory_size (const char *str)
if (n > 0 && n <= 24)
sim_memory_size = n;
else
- callback->printf_filtered (callback, "Bad memory size %d; must be 1 to 24, inclusive\n", n);
+ sim_io_printf (sd, "Bad memory size %d; must be 1 to 24, inclusive\n", n);
}
SIM_RC
@@ -2519,9 +2514,6 @@ sim_create_inferior (SIM_DESC sd, struct bfd *prog_bfd, char **argv, char **env)
if (prog_bfd != NULL)
init_dsp (prog_bfd);
- /* Record the program's arguments. */
- prog_argv = argv;
-
return SIM_RC_OK;
}
@@ -2540,17 +2532,16 @@ sim_do_command (SIM_DESC sd, const char *cmd)
if (strncmp (cmd, sms_cmd, cmdsize) == 0
&& strchr (" \t", cmd[cmdsize]) != NULL)
{
- parse_and_set_memory_size (cmd + cmdsize + 1);
+ parse_and_set_memory_size (sd, cmd + cmdsize + 1);
}
else if (strcmp (cmd, "help") == 0)
{
- (callback->printf_filtered) (callback,
- "List of SH simulator commands:\n\n");
- (callback->printf_filtered) (callback, "set-memory-size <n> -- Set the number of address bits to use\n");
- (callback->printf_filtered) (callback, "\n");
+ sim_io_printf (sd, "List of SH simulator commands:\n\n");
+ sim_io_printf (sd, "set-memory-size <n> -- Set the number of address bits to use\n");
+ sim_io_printf (sd, "\n");
}
else
{
- (callback->printf_filtered) (callback, "Error: \"%s\" is not a valid SH simulator command.\n", cmd);
+ sim_io_printf (sd, "Error: \"%s\" is not a valid SH simulator command.\n", cmd);
}
}
generated by cgit v1.1 at 2024-11-28 14:14:54 +0000