aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>1997-09-10 05:40:04 +0000
committerAndrew Cagney <cagney@redhat.com>1997-09-10 05:40:04 +0000
commit02508bb1798a5e592eb0a26089390c5159bc7f91 (patch)
tree257eb8c5a89b4bfe5d65edaa4fe9eb5e11d1827f
parentd6cef44df4a81e47f6fbe88aa5b2c655fe38ecf6 (diff)
downloadfsf-binutils-gdb-02508bb1798a5e592eb0a26089390c5159bc7f91.zip
fsf-binutils-gdb-02508bb1798a5e592eb0a26089390c5159bc7f91.tar.gz
fsf-binutils-gdb-02508bb1798a5e592eb0a26089390c5159bc7f91.tar.bz2
Have trace_input, trace_output use sim-trace for IO.
-rw-r--r--sim/v850/ChangeLog9
-rw-r--r--sim/v850/simops.c104
2 files changed, 66 insertions, 47 deletions
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index a023237..a2c3f1b 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,12 @@
+Wed Sep 10 10:25:40 1997 Andrew Cagney <cagney@b1.cygnus.com>
+
+ * simops.c (trace_input): Use trace_printf instead of
+ sim_io_printf.
+ (trace_output): Ditto.
+ (trace_input): Only trace when TRACE_ALU_P. Delete code
+ disasembling instruction.
+ (trace_output): Only trace when TRACE_ALU_P.
+
Tue Sep 9 01:29:50 1997 Andrew Cagney <cagney@b1.cygnus.com>
* simops.c (trace_input, trace_output): Use sim_io_printf.
diff --git a/sim/v850/simops.c b/sim/v850/simops.c
index 463e4a3..05b3fda 100644
--- a/sim/v850/simops.c
+++ b/sim/v850/simops.c
@@ -121,12 +121,11 @@ trace_input (name, type, size)
char *p;
uint32 values[3];
int num_values, i;
- char *cond;
const char *filename;
const char *functionname;
unsigned int linenumber;
- if (!TRACE_INSN_P (STATE_CPU (simulator, 0)))
+ if (!TRACE_ALU_P (STATE_CPU (simulator, 0)))
return;
buf[0] = '\0';
@@ -168,11 +167,13 @@ trace_input (name, type, size)
}
}
- sim_io_printf (simulator, "0x%.8x: %-*.*s %-*s",
- (unsigned)PC,
- SIZE_LOCATION, SIZE_LOCATION, buf,
- SIZE_INSTRUCTION, name);
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ "0x%.8x: %-*.*s %-*s",
+ (unsigned)PC,
+ SIZE_LOCATION, SIZE_LOCATION, buf,
+ SIZE_INSTRUCTION, name);
+#if 0
switch (type)
{
default:
@@ -238,29 +239,31 @@ trace_input (name, type, size)
break;
case OP_EX1:
- switch (OP[0] & 0xf)
- {
- default: cond = "?"; break;
- case 0x0: cond = "v"; break;
- case 0x1: cond = "c"; break;
- case 0x2: cond = "z"; break;
- case 0x3: cond = "nh"; break;
- case 0x4: cond = "s"; break;
- case 0x5: cond = "t"; break;
- case 0x6: cond = "lt"; break;
- case 0x7: cond = "le"; break;
- case 0x8: cond = "nv"; break;
- case 0x9: cond = "nc"; break;
- case 0xa: cond = "nz"; break;
- case 0xb: cond = "h"; break;
- case 0xc: cond = "ns"; break;
- case 0xd: cond = "sa"; break;
- case 0xe: cond = "ge"; break;
- case 0xf: cond = "gt"; break;
- }
-
- sprintf (buf, "%s,r%ld", cond, OP[1]);
- break;
+ {
+ char *cond;
+ switch (OP[0] & 0xf)
+ {
+ default: cond = "?"; break;
+ case 0x0: cond = "v"; break;
+ case 0x1: cond = "c"; break;
+ case 0x2: cond = "z"; break;
+ case 0x3: cond = "nh"; break;
+ case 0x4: cond = "s"; break;
+ case 0x5: cond = "t"; break;
+ case 0x6: cond = "lt"; break;
+ case 0x7: cond = "le"; break;
+ case 0x8: cond = "nv"; break;
+ case 0x9: cond = "nc"; break;
+ case 0xa: cond = "nz"; break;
+ case 0xb: cond = "h"; break;
+ case 0xc: cond = "ns"; break;
+ case 0xd: cond = "sa"; break;
+ case 0xe: cond = "ge"; break;
+ case 0xf: cond = "gt"; break;
+ }
+ sprintf (buf, "%s,r%ld", cond, OP[1]);
+ break;
+ }
case OP_EX2:
strcpy (buf, "EX2");
@@ -299,14 +302,19 @@ trace_input (name, type, size)
sprintf (buf, "r%ld, [r%ld]", OP[1], OP[0] );
break;
}
+#endif
if (!TRACE_ALU_P (STATE_CPU (simulator, 0)))
{
- sim_io_printf (simulator, "%s\n", buf);
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ "%s\n", buf);
}
else
{
- sim_io_printf (simulator, "%-*s", SIZE_OPERANDS, buf);
+#if 0
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ "%-*s", SIZE_OPERANDS, buf);
+#endif
switch (type)
{
default:
@@ -417,10 +425,12 @@ trace_input (name, type, size)
}
for (i = 0; i < num_values; i++)
- sim_io_printf (simulator, "%*s0x%.8lx", SIZE_VALUES - 10, "", values[i]);
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ "%*s0x%.8lx", SIZE_VALUES - 10, "", values[i]);
while (i++ < 3)
- sim_io_printf (simulator, "%*s", SIZE_VALUES, "");
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ "%*s", SIZE_VALUES, "");
}
}
@@ -428,8 +438,7 @@ static void
trace_output (result)
enum op_types result;
{
- if (TRACE_INSN_P (STATE_CPU (simulator, 0))
- && TRACE_ALU_P (STATE_CPU (simulator, 0)))
+ if (TRACE_ALU_P (STATE_CPU (simulator, 0)))
{
switch (result)
{
@@ -449,8 +458,8 @@ trace_output (result)
case OP_LOAD16:
case OP_STSR:
- sim_io_printf (simulator, " :: 0x%.8lx",
- (unsigned long)State.regs[OP[0]]);
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ " :: 0x%.8lx", (unsigned long)State.regs[OP[0]]);
break;
case OP_REG_REG:
@@ -459,29 +468,30 @@ trace_output (result)
case OP_IMM_REG_MOVE:
case OP_LOAD32:
case OP_EX1:
- sim_io_printf (simulator, " :: 0x%.8lx",
- (unsigned long)State.regs[OP[1]]);
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ " :: 0x%.8lx", (unsigned long)State.regs[OP[1]]);
break;
case OP_IMM_REG_REG:
case OP_UIMM_REG_REG:
- sim_io_printf (simulator, " :: 0x%.8lx",
- (unsigned long)State.regs[OP[2]]);
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ " :: 0x%.8lx", (unsigned long)State.regs[OP[2]]);
break;
case OP_JUMP:
if (OP[1] != 0)
- sim_io_printf (simulator, " :: 0x%.8lx",
- (unsigned long)State.regs[OP[1]]);
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ " :: 0x%.8lx", (unsigned long)State.regs[OP[1]]);
break;
case OP_LDSR:
- sim_io_printf (simulator, " :: 0x%.8lx",
- (unsigned long)State.sregs[OP[1]]);
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ " :: 0x%.8lx", (unsigned long)State.sregs[OP[1]]);
break;
}
- sim_io_printf (simulator, "\n");
+ trace_printf (simulator, STATE_CPU (simulator, 0),
+ "\n");
}
}
@@ -489,7 +499,7 @@ trace_output (result)
#define trace_input(NAME, IN1, IN2)
#define trace_output(RESULT)
-//#define trace_input(NAME, IN1, IN2) fprintf (stderr, NAME "\n" );
+/* #define trace_input(NAME, IN1, IN2) fprintf (stderr, NAME "\n" ); */
#endif