From 1e23866b9baa366420ebba4769626db5c7c94b7a Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Tue, 14 Apr 1998 00:59:30 +0000
Subject: [PATCH] o	Use new `!<field>' and `=<field>' operators in spec of
 	MOV and CMP instructions. o	Enable basic inlining.  Diable use of
 SIM_MAIN_INLINE.

---
 sim/mn10300/ChangeLog    | 11 +++++++++++
 sim/mn10300/configure.in |  3 ++-
 sim/mn10300/sim-main.h   | 16 ++++++++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 5f555ef1ff..ffb2d5147f 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,14 @@
+Tue Apr 14 10:03:02 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* mn10300.igen (mov, cmp): Use new igen operators `!' and `=' to
+ 	differentiate between MOV/CMP immediate/register instructions.
+
+	* configure.in (SIM_AC_OPTION_INLINE): Add and enable.
+	* configure: Regenerate.
+
+	* sim-main.h: Define SIM_MAIN_INLINE=0 so that generated
+ 	semantics.c does not include the still to be created sim-main.c.
+	
 Sat Apr  4 20:36:25 1998  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* configure: Regenerated to track ../common/aclocal.m4 changes.
diff --git a/sim/mn10300/configure.in b/sim/mn10300/configure.in
index 59423e16f3..d9dfa6b35c 100644
--- a/sim/mn10300/configure.in
+++ b/sim/mn10300/configure.in
@@ -12,10 +12,11 @@ SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_WARNINGS
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
+SIM_AC_OPTION_INLINE()
 # start-sanitize-am30
 SIM_AC_OPTION_HARDWARE(,mn103cpu mn103int)
-# end-sanitize-am30
 
+# end-sanitize-am30
 AC_CHECK_FUNCS(time chmod utime fork execve execv chown)
 AC_CHECK_HEADERS(unistd.h stdlib.h string.h strings.h utime.h time.h)
 
diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index fb8cb3326c..d116a4e705 100644
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -20,12 +20,17 @@
     */
 
 
-#ifndef _SIM_MAIN_H_
-#define _SIM_MAIN_H_
+#ifndef SIM_MAIN_H
+#define SIM_MAIN_H
 
 #define WITH_CORE
 #define WITH_WATCHPOINTS 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
+
+
 #include "sim-basics.h"
 #include "sim-signal.h"
 
@@ -63,8 +68,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 {