sim: rename common/aclocal.m4 to common/acinclude.m4

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

diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index d116a4e7059727d3d4ced1ee395b4c56cd482958..29cc4b06cedcef9cfc4085e3d6ed9b43b3c90925 100644 (file)
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -5,17 +5,16 @@
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or

     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.

- 
+

     You should have received a copy of the GNU General Public License
     You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

  
     */
 
  
     */
 


@@ -25,11 +24,9 @@
 
 #define WITH_CORE
 #define WITH_WATCHPOINTS 1
 
 #define WITH_CORE
 #define WITH_WATCHPOINTS 1

+#define SIM_HANDLES_LMA 1

 
 

-/* FIXME: Need to set up things so that the generated file semantics.c
-   includes the contents of the file op_utils.c */
-#define SIM_MAIN_INLINE 0
-
+#define SIM_ENGINE_HALT_HOOK(SD,LAST_CPU,CIA) 0 /* disable this hook */

 
 #include "sim-basics.h"
 #include "sim-signal.h"
 
 #include "sim-basics.h"
 #include "sim-signal.h"


@@ -44,17 +41,20 @@
 /* These are generated files.  */
 #include "itable.h"
 #include "idecode.h"
 /* 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.  */
 
 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 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"
 #include "sim-base.h"
 
 #include "mn10300_sim.h"


@@ -100,5 +100,6 @@ extern SIM_DESC simulator;
 /* (re) initialize the simulator */
 
 extern void engine_init(SIM_DESC sd);
 /* (re) initialize the simulator */
 
 extern void engine_init(SIM_DESC sd);

+extern SIM_CORE_SIGNAL_FN mn10300_core_signal;

 
 #endif
 
 #endif