* sim-main.h (CIA_ADDR): Define.

	* Makefile.in (SIM_OBJS): Use $(SIM_NEW_COMMON_OBJS).

diff --git a/sim/tic80/ChangeLog b/sim/tic80/ChangeLog
index af5a4fb4b5c58bce1b0f4fd393f3f6bf0618ca51..3eae822fa79cb8f2ca1773ef874af2e4ee27e8a0 100644 (file)
--- a/sim/tic80/ChangeLog
+++ b/sim/tic80/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 18 15:33:48 1997  Doug Evans  <devans@canuck.cygnus.com>
+
+       * sim-main.h (CIA_ADDR): Define.
+
+       * Makefile.in (SIM_OBJS): Use $(SIM_NEW_COMMON_OBJS).
+
 Tue Oct 28 11:06:47 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * v850.igen: Add model filter field to records.

diff --git a/sim/tic80/Makefile.in b/sim/tic80/Makefile.in
index ac841e47664f35b750b234db91e6c50ca3e5fb0c..c2ddcdb39c93628217c5adc79722893d5770b7e5 100644 (file)
--- a/sim/tic80/Makefile.in
+++ b/sim/tic80/Makefile.in
@@ -10,28 +10,17 @@
 # Not all of these need to be mentioned, only the necessary ones.
 
 # List of object files, less common parts.
-SIM_OBJS = sim-endian.o sim-bits.o sim-config.o \
+SIM_OBJS = \
+       $(SIM_NEW_COMMON_OBJS) \
        support.o idecode.o semantics.o itable.o misc.o \
        sim-calls.o \
-       sim-events.o \
-       sim-core.o \
        sim-hload.o \
        sim-hrw.o \
-       sim-io.o \
-       sim-utils.o \
-       sim-load.o \
-       sim-memopt.o \
-       sim-module.o \
-       sim-options.o \
-       sim-trace.o \
-       sim-profile.o \
-       sim-fpu.o \
        sim-engine.o \
        sim-run.o \
        sim-resume.o \
        sim-stop.o \
-       sim-reason.o \
-       sim-watch.o
+       sim-reason.o
 
 # List of extra dependencies.
 # Generally this consists of simulator specific files included by sim-main.h.

diff --git a/sim/tic80/sim-main.h b/sim/tic80/sim-main.h
index 8b4c930491d469fcb568047889ead8cb3077e793..228ad9abbf605963bfb4860744078397600ec3c2 100644 (file)
--- a/sim/tic80/sim-main.h
+++ b/sim/tic80/sim-main.h
@@ -40,6 +40,9 @@
 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)
 
 #define WITH_WATCHPOINTS 1