From ef13d3e3ed9ec97903b1eb6e48f0dac684a49230 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 16 Jan 1998 20:36:07 +0000 Subject: [PATCH] replaced call to CGEN_INSN_SYNTAX()->mnemonic with CGEN_INSN_MNEMONIC() --- sim/common/ChangeLog | 16 +++++++++++++++- sim/common/cgen-trace.c | 16 ++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 32cffebd94b..acfabaeb9d6 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,17 @@ +Fri Jan 16 12:33:09 1998 Nick Clifton + + * cgen-trace.c (trace_insn): Call CGEN_INSN_MNEMONIC() rather than + CGEN_INSN_SYNTAX(). + +Mon Dec 15 23:17:11 1997 Andrew Cagney + + * configure: Regenerated to track ../common/aclocal.m4 changes. + * config.in: Ditto. + +Mon Dec 15 23:16:03 1997 Andrew Cagney + + * aclocal.m4 (AR): Check for sigaction. + Thu Dec 4 09:21:05 1997 Doug Evans * Make-common.in (sim-core.o): Depend on $(sim_main_headers). @@ -61,7 +75,7 @@ Fri Nov 28 20:10:09 1997 Michael Meissner Fri Nov 28 11:15:05 1997 Doug Evans - * gennltvals.sh: Redo syscall support to allow sanitization. + * gennltvals.sh: Redo syscall support. * nltvals.def: Regenerated. Wed Nov 26 16:49:38 1997 Michael Meissner diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c index c18cdda9339..1766980cb7e 100644 --- a/sim/common/cgen-trace.c +++ b/sim/common/cgen-trace.c @@ -69,13 +69,13 @@ trace_insn_fini (SIM_CPU *cpu) if (CPU_PROFILE_FLAGS (cpu) [PROFILE_MODEL_IDX]) { unsigned long total = PROFILE_TOTAL_CYCLE_COUNT (CPU_PROFILE_DATA (cpu)); - trace_printf (cpu, "%-*ld %-*ld ", + trace_printf (CPU_STATE (cpu), cpu, "%-*ld %-*ld ", SIZE_CYCLE_COUNT, total - last_cycle_count, SIZE_TOTAL_CYCLE_COUNT, total); last_cycle_count = total; } - trace_printf (cpu, "%s\n", trace_buf); + trace_printf (CPU_STATE (cpu), cpu, "%s\n", trace_buf); } /* For communication between trace_insn and trace_result. */ @@ -95,7 +95,7 @@ trace_insn (SIM_CPU *cpu, const struct cgen_insn *opcode, cgen_trace_printf (cpu, "0x%.*x %-*s ", SIZE_PC, (unsigned) pc, SIZE_INSTRUCTION, - CGEN_INSN_SYNTAX (opcode)->mnemonic); + CGEN_INSN_MNEMONIC (opcode)); return; } @@ -143,7 +143,7 @@ trace_insn (SIM_CPU *cpu, const struct cgen_insn *opcode, } } - sim_disassemble_insn (opcode, abuf, pc, disasm_buf); + sim_disassemble_insn (cpu, opcode, abuf, pc, disasm_buf); cgen_trace_printf (cpu, "0x%.*x %-*.*s %-*s ", SIZE_PC, (unsigned) pc, @@ -168,7 +168,7 @@ trace_extract (SIM_CPU *cpu, PCADDR pc, char *name, ...) va_start (args, name); - trace_printf (cpu, "Extract: 0x%.*x: %s ", SIZE_PC, pc, name); + trace_printf (CPU_STATE (cpu), cpu, "Extract: 0x%.*x: %s ", SIZE_PC, pc, name); do { int type,ival; @@ -178,14 +178,14 @@ trace_extract (SIM_CPU *cpu, PCADDR pc, char *name, ...) if (fmt) { if (printed_one_p) - trace_printf (cpu, ", "); + trace_printf (CPU_STATE (cpu), cpu, ", "); printed_one_p = 1; type = va_arg (args, int); switch (type) { case 'x' : ival = va_arg (args, int); - trace_printf (cpu, fmt, ival); + trace_printf (CPU_STATE (cpu), cpu, fmt, ival); break; default : abort (); @@ -194,7 +194,7 @@ trace_extract (SIM_CPU *cpu, PCADDR pc, char *name, ...) } while (fmt); va_end (args); - trace_printf (cpu, "\n"); + trace_printf (CPU_STATE (cpu), cpu, "\n"); } void -- 2.30.2