This commit was generated by cvs2svn to track changes on a CVS vendor

[deliverable/binutils-gdb.git] / sim / mn10300 / sim-main.h

diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index fb8cb3326cce4c7ff90626f1ba0559b18b8f2ed9..c13619e821533f8812ea6f2a454a8954399fdf8d 100644 (file)
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -20,11 +20,14 @@
     */
 
 
-#ifndef _SIM_MAIN_H_
-#define _SIM_MAIN_H_
+#ifndef SIM_MAIN_H
+#define SIM_MAIN_H
 
 #define WITH_CORE
 #define WITH_WATCHPOINTS 1
+#define SIM_HANDLES_LMA 1
+
+#define SIM_ENGINE_HALT_HOOK(SD,LAST_CPU,CIA) 0 /* disable this hook */
 
 #include "sim-basics.h"
 #include "sim-signal.h"
@@ -39,17 +42,20 @@
 /* These are generated files.  */
 #include "itable.h"
 #include "idecode.h"
-#include "idecode.h"
 
 typedef instruction_address sim_cia;
 static const sim_cia null_cia = {0}; /* Dummy */
 #define NULL_CIA null_cia
 /* FIXME: Perhaps igen should generate access macros for
    `instruction_address' that we could use.  */
-/*#define CIA_ADDR(cia) ((cia).ip) this is from tic80, doesn't work for mn10300*/
+/*#define CIA_ADDR(cia) ((cia).ip) doesn't work for mn10300*/
 
 #define WITH_WATCHPOINTS 1
 
+#define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR)  \
+mn10300_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
+
+
 #include "sim-base.h"
 
 #include "mn10300_sim.h"
@@ -63,8 +69,11 @@ static const sim_cia null_cia = {0}; /* Dummy */
 (sim_core_read_aligned_1(STATE_CPU(sd, 0), EA, exec_map, (EA) + (N)))
 
 
-#define CIA_GET(CPU) ((CPU)->cia)
-#define CIA_SET(CPU,VAL) ((CPU)->cia = (VAL))
+/* FIXME: For moment, save/restore PC value found in struct State.
+   Struct State will one day go away, being placed in the sim_cpu
+   state. */
+#define CIA_GET(CPU) ((PC) + 0)
+#define CIA_SET(CPU,VAL) ((CPU)->cia = (VAL), PC = (VAL))
 
 
 struct _sim_cpu {
@@ -92,5 +101,6 @@ extern SIM_DESC simulator;
 /* (re) initialize the simulator */
 
 extern void engine_init(SIM_DESC sd);
+extern SIM_CORE_SIGNAL_FN mn10300_core_signal;
 
 #endif