sim: mn10300: tweak engine halt hook

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

diff --git a/sim/common/sim-engine.h b/sim/common/sim-engine.h
index cb5a3ad7fc07c127e5beecb80c1dea9f35396be8..3ebf8acbaccc38550f92527d5bc0a72d1f35dc29 100644 (file)
--- a/sim/common/sim-engine.h
+++ b/sim/common/sim-engine.h
@@ -1,5 +1,5 @@
 /* Generic simulator halt/resume.
-   Copyright (C) 1997-1998, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-2021 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
@@ -62,14 +62,14 @@ extern void sim_engine_halt
  sim_cpu *next_cpu, /* NULL -> succ (last_cpu) or event-mgr */
  sim_cia cia,
  enum sim_stop reason,
- int sigrc) __attribute__ ((noreturn));
+ int sigrc) ATTRIBUTE_NORETURN;
 
 /* Halt hook - allow target specific operation when halting a
    simulator */
 
 #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
@@ -115,14 +115,14 @@ extern void sim_engine_abort
  sim_cpu *cpu,
  sim_cia cia,
  const char *fmt,
- ...) __attribute__ ((format (printf, 4, 5))) __attribute__ ((noreturn));
+ ...) ATTRIBUTE_PRINTF (4, 5) ATTRIBUTE_NORETURN;
 
 extern void sim_engine_vabort
 (SIM_DESC sd,
  sim_cpu *cpu,
  sim_cia cia,
  const char *fmt,
- va_list ap) __attribute__ ((noreturn));
+ va_list ap) ATTRIBUTE_PRINTF (4, 0) ATTRIBUTE_NORETURN;
 
 /* No abort hook - when possible this function exits using the
    engine_halt function (and SIM_ENGINE_HALT_HOOK). */