From d5d9a1e155df4a41f54bcdbcc3359628819be697 Mon Sep 17 00:00:00 2001
From: Doug Evans <dje@google.com>
Date: Tue, 18 Nov 1997 23:36:46 +0000
Subject: [PATCH] 	* sim-main.h (CIA_ADDR): Define.

	* Makefile.in (SIM_OBJS): Use $(SIM_NEW_COMMON_OBJS).
---
 sim/tic80/ChangeLog   |  6 ++++++
 sim/tic80/Makefile.in | 17 +++--------------
 sim/tic80/sim-main.h  |  3 +++
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/sim/tic80/ChangeLog b/sim/tic80/ChangeLog
index af5a4fb4b5c..3eae822fa79 100644
--- 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 ac841e47664..c2ddcdb39c9 100644
--- 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 8b4c930491d..228ad9abbf6 100644
--- 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
 
-- 
2.30.2