Switch the inferior too in switch_to_program_space_and_thread

[deliverable/binutils-gdb.git] / sim / common / sim-engine.h

diff --git a/sim/common/sim-engine.h b/sim/common/sim-engine.h
index 32924921d49e6e9bee615759b36194ab38ae01bf..d20bdf26dbeaf8619cbdf28808eee09e65c45249 100644 (file)
--- a/sim/common/sim-engine.h
+++ b/sim/common/sim-engine.h
@@ -1,6 +1,5 @@
 /* Generic simulator halt/resume.
-   Copyright (C) 1997, 1998, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1997-2020 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
@@ -70,10 +69,10 @@ extern void sim_engine_halt
 
 #if !defined (SIM_ENGINE_HALT_HOOK)
 #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \
-if ((LAST_CPU) != NULL) CIA_SET (LAST_CPU, CIA)
+if ((LAST_CPU) != NULL) CPU_PC_SET (LAST_CPU, CIA)
 #endif
 
-/* NB: If a port uses the SIM_CPU_EXCEPTION_* hooks, the default 
+/* NB: If a port uses the SIM_CPU_EXCEPTION_* hooks, the default
    SIM_ENGINE_HALT_HOOK and SIM_ENGINE_RESUME_HOOK must not be used.
    They conflict in that the PC set by the HALT_HOOK may overwrite the
    proper one, as intended to be saved by the EXCEPTION_TRIGGER