Index: common/ChangeLog

2003-02-26  Andrew Cagney  <cagney@redhat.com>

	* sim-engine.h (sim_engine_abort): Add noreturn attribute.
	(sim_engine_vabort): Ditto.
	(sim_engine_halt, sim_engine_restart): Ditto.

Index: mn10300/ChangeLog
2003-02-26  Andrew Cagney  <cagney@redhat.com>

	* am33.igen: Call sim_engine_abort instead of abort.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 2d5f7b8028bc8d95bdefecae54b40ff4196ee59e..bd1b29b483ac6a447ab4301f138fc10efe8b9529 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-26  Andrew Cagney  <cagney@redhat.com>
+
+       * sim-engine.h (sim_engine_abort): Add noreturn attribute.
+       (sim_engine_vabort): Ditto.
+       (sim_engine_halt, sim_engine_restart): Ditto.
+

 2003-02-20  Andrew Cagney  <ac131313@redhat.com>
 
        * Make-common.in (SIM_NEW_COMMON_OBJS): Remove sim-break.o
 2003-02-20  Andrew Cagney  <ac131313@redhat.com>
 
        * Make-common.in (SIM_NEW_COMMON_OBJS): Remove sim-break.o

diff --git a/sim/common/sim-engine.h b/sim/common/sim-engine.h
index 41aa51f9ed0b7e04928b86abd4c60f5c4ba99b50..18513a64c7960752214cc434e34e816e7b5b96d2 100644 (file)
--- a/sim/common/sim-engine.h
+++ b/sim/common/sim-engine.h
@@ -63,7 +63,7 @@ extern void sim_engine_halt
  sim_cpu *next_cpu, /* NULL -> succ (last_cpu) or event-mgr */
  sim_cia cia,
  enum sim_stop reason,
  sim_cpu *next_cpu, /* NULL -> succ (last_cpu) or event-mgr */
  sim_cia cia,
  enum sim_stop reason,

- int sigrc);
+ int sigrc) __attribute__ ((noreturn));

 
 /* Halt hook - allow target specific operation when halting a
    simulator */
 
 /* Halt hook - allow target specific operation when halting a
    simulator */


@@ -116,14 +116,14 @@ extern void sim_engine_abort
  sim_cpu *cpu,
  sim_cia cia,
  const char *fmt,
  sim_cpu *cpu,
  sim_cia cia,
  const char *fmt,

- ...) __attribute__ ((format (printf, 4, 5)));
+ ...) __attribute__ ((format (printf, 4, 5))) __attribute__ ((noreturn));

 
 extern void sim_engine_vabort
 (SIM_DESC sd,
  sim_cpu *cpu,
  sim_cia cia,
  const char *fmt,
 
 extern void sim_engine_vabort
 (SIM_DESC sd,
  sim_cpu *cpu,
  sim_cia cia,
  const char *fmt,

- va_list ap);
+ va_list ap) __attribute__ ((noreturn));

 
 /* No abort hook - when possible this function exits using the
    engine_halt function (and SIM_ENGINE_HALT_HOOK). */
 
 /* No abort hook - when possible this function exits using the
    engine_halt function (and SIM_ENGINE_HALT_HOOK). */

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index b7ea00d272b68488ba36e959f0094c680c58d310..ce01a53d9310b7bc4d5c2efc7b8af7a41cfb90fd 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-26  Andrew Cagney  <cagney@redhat.com>
+
+       * am33.igen: Call sim_engine_abort instead of abort.
+

 2003-02-26  David Carlton  <carlton@math.stanford.edu>
 
        * dv-mn103tim.c (read_special_timer6_reg): Add break after
 2003-02-26  David Carlton  <carlton@math.stanford.edu>
 
        * dv-mn103tim.c (read_special_timer6_reg): Add break after

diff --git a/sim/mn10300/am33.igen b/sim/mn10300/am33.igen
index a5745e2f9ca51f6bd93c90e5c6f822d21a154d4b..db41889e74715b9abbc6cfae1aa1a8c56bdcc82c 100644 (file)
--- a/sim/mn10300/am33.igen
+++ b/sim/mn10300/am33.igen
@@ -34,7 +34,7 @@
     case 4:
       return REG_MCVF;
     default:
     case 4:
       return REG_MCVF;
     default:

-      abort ();
+      sim_engine_abort (SD, CPU, cia, "%s:%d: bad switch\n", __FILE__, __LINE__);

     }
 }
 
     }
 }