Decouple inferior_ptid/inferior_thread(); dup ptids in thread list (PR 25412)

[deliverable/binutils-gdb.git] / sim / frv / mloop.in

diff --git a/sim/frv/mloop.in b/sim/frv/mloop.in
index 1269322efe16648b1b2ccb33562ed2b19619d858..41d7a0d2a592e4c7dae077b67f16b3b66e31aee2 100644 (file)
--- a/sim/frv/mloop.in
+++ b/sim/frv/mloop.in
@@ -1,5 +1,5 @@
 # Simulator main loop for frv. -*- C -*-
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 Free Software Foundation, Inc.
 # Contributed by Red Hat.
 #
 # This file is part of the GNU Simulators.
@@ -92,8 +92,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
            }
          else
            model_insn = FRV_INSN_NO_MODELING;
-         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
@@ -116,7 +116,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
                cycles = 1;
              @cpu@_model_insn_after (current_cpu, sc->last_insn_p, cycles);
            }
-         TRACE_INSN_FINI (current_cpu, abuf, 1);
+         CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1);
        }
     }