* cgen-trace.c (trace_insn_init): New arg first_p.

	All callers updated.
	(trace_insn_fini): New arg last_p.  All callers updated.
	* cgen-trace.h (trace_insn_init,trace_insn_fini): Update.
	(TRACE_INSN_INIT,TRACE_INSN_FINI): Update.
	* genmloop.sh (engine_resume): Update.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 6fe7239..ee51dd9 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,12 @@
+Fri May 15 16:06:05 1998  Doug Evans  <devans@seba.cygnus.com>
+
+       * cgen-trace.c (trace_insn_init): New arg first_p. 
+       All callers updated.
+       (trace_insn_fini): New arg last_p.  All callers updated.
+       * cgen-trace.h (trace_insn_init,trace_insn_fini): Update.
+       (TRACE_INSN_INIT,TRACE_INSN_FINI): Update.
+       * genmloop.sh (engine_resume): Update.
+
 Fri May 15 15:59:00 1998  Joyce Janczyn  <janczyn@cygnus.com>
 
        * Make-common.in (install-common): Run ranlib on installed copy of

diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c
index 1766980..c389014 100644 (file)
--- a/sim/common/cgen-trace.c
+++ b/sim/common/cgen-trace.c
@@ -57,14 +57,14 @@ static char *bufptr;
 static unsigned long last_cycle_count;
 
 void
-trace_insn_init (SIM_CPU *cpu)
+trace_insn_init (SIM_CPU *cpu, int first_p)
 {
   bufptr = trace_buf;
   *bufptr = 0;
 }
 
 void
-trace_insn_fini (SIM_CPU *cpu)
+trace_insn_fini (SIM_CPU *cpu, int last_p)
 {
   if (CPU_PROFILE_FLAGS (cpu) [PROFILE_MODEL_IDX])
     {
@@ -96,6 +96,7 @@ trace_insn (SIM_CPU *cpu, const struct cgen_insn *opcode,
                         SIZE_PC, (unsigned) pc,
                         SIZE_INSTRUCTION,
                         CGEN_INSN_MNEMONIC (opcode));
+      printed_result_p = 0;
       return;
     }
 
@@ -150,7 +151,7 @@ trace_insn (SIM_CPU *cpu, const struct cgen_insn *opcode,
                     SIZE_LOCATION, SIZE_LOCATION, buf,
                     SIZE_INSTRUCTION,
 #if 0
-                    CGEN_INSN_SYNTAX (opcode)->mnemonic
+                    CGEN_INSN_NAME (opcode)
 #else
                     disasm_buf
 #endif

diff --git a/sim/common/genmloop.sh b/sim/common/genmloop.sh
index e2a283c..591eb66 100644 (file)
--- a/sim/common/genmloop.sh
+++ b/sim/common/genmloop.sh
@@ -192,7 +192,7 @@ engine_resume (SIM_DESC sd, int step, int siggnal)
       ++insn_count;
 
       engine->jmpbuf = NULL;
-      TRACE_INSN_FINI ((sim_cpu *) cpu);
+      TRACE_INSN_FINI ((sim_cpu *) cpu, 1);
       PROFILE_EXEC_TIME (CPU_PROFILE_DATA (cpu))
        += sim_elapsed_time_since (start_time);
       PROFILE_TOTAL_INSN_COUNT (CPU_PROFILE_DATA (cpu))
@@ -313,7 +313,7 @@ cat <<EOF
            PROFILE_COUNT_SCACHE_HIT (current_cpu);
            /* Make core access statistics come out right.
               The size is a guess, but it's currently not used either.  */
-           PROFILE_COUNT_CORE (current_cpu, pc, 2, sim_core_execute_map);
+           PROFILE_COUNT_CORE (current_cpu, pc, 2, exec_map);
          }
 
 /* begin full-exec-scache */