breakpoints/19546: Fix crash after updating breakpoints

[deliverable/binutils-gdb.git] / sim / sh64 / mloop-compact.c

diff --git a/sim/sh64/mloop-compact.c b/sim/sh64/mloop-compact.c
index fb6b55202cf63e528ce0163a8577a70cb06093b5..16d6e6308ac25dbad2c4f4d59c9f4ad018112358 100644 (file)
--- a/sim/sh64/mloop-compact.c
+++ b/sim/sh64/mloop-compact.c
@@ -124,8 +124,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
          if (PROFILE_MODEL_P (current_cpu)
              && ARGBUF_PROFILE_P (abuf))
            sh64_compact_model_insn_before (current_cpu, 1 /*first_p*/);
-         TRACE_INSN_INIT (current_cpu, abuf, 1);
-         TRACE_INSN (current_cpu, idesc->idata,
+         CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1);
+         CGEN_TRACE_INSN (current_cpu, idesc->idata,
                      (const struct argbuf *) abuf, abuf->addr);
        }
 #if WITH_SCACHE
@@ -144,7 +144,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
              cycles = (*idesc->timing->model_fn) (current_cpu, sc);
              sh64_compact_model_insn_after (current_cpu, 1 /*last_p*/, cycles);
            }
-         TRACE_INSN_FINI (current_cpu, abuf, 1);
+         CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1);
        }
 #else
       abort ();
@@ -459,7 +459,7 @@ sh64_compact_pbb_before (SIM_CPU *current_cpu, SCACHE *sc)
            }
        }
 
-      TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/);
+      CGEN_TRACE_INSN_FINI (current_cpu, cur_abuf, 0 /*last_p*/);
     }
 
   /* FIXME: Later make cover macros: PROFILE_INSN_{INIT,FINI}.  */
@@ -467,8 +467,8 @@ sh64_compact_pbb_before (SIM_CPU *current_cpu, SCACHE *sc)
       && ARGBUF_PROFILE_P (cur_abuf))
     sh64_compact_model_insn_before (current_cpu, first_p);
 
-  TRACE_INSN_INIT (current_cpu, cur_abuf, first_p);
-  TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc);
+  CGEN_TRACE_INSN_INIT (current_cpu, cur_abuf, first_p);
+  CGEN_TRACE_INSN (current_cpu, cur_idesc->idata, cur_abuf, pc);
 }
 
 /* x-after handler.
@@ -493,7 +493,7 @@ sh64_compact_pbb_after (SIM_CPU *current_cpu, SCACHE *sc)
       cycles = (*prev_idesc->timing->model_fn) (current_cpu, prev_sem_arg);
       sh64_compact_model_insn_after (current_cpu, 1 /*last_p*/, cycles);
     }
-  TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/);
+  CGEN_TRACE_INSN_FINI (current_cpu, prev_abuf, 1 /*last_p*/);
 }
 
 #define FAST_P 0