diff mbox

[1/5] sim: cr16: use common configure options

Message ID 1427690802-26761-1-git-send-email-vapier@gentoo.org
State Committed
Headers

Commit Message

Mike Frysinger March 30, 2015, 4:46 a.m. UTC 
  In preparation for converting to nrun, call the common functions that
are needed.  This doesn't produce any new warnings, and the generated
code should be the same.

Committed.
---
 sim/cr16/ChangeLog    |  10 ++
 sim/cr16/Makefile.in  |   8 +-
 sim/cr16/config.in    |  15 ++
 sim/cr16/configure    | 417 +++++++++++++++++++++++++++++++++++++++++++++++++-
 sim/cr16/configure.ac |   5 +
 sim/cr16/interp.c     |   8 +
 6 files changed, 454 insertions(+), 9 deletions(-)
diff mbox

Patch

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 9669379..5a52cba 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,13 @@ 
+2015-03-29  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_EXTRA_CFLAGS): Delete -DSIM_HAVE_ENVIRONMENT.
+	(interp.o, simops.o, endian.o, table.o): Delete rules.
+	* configure.ac: Call SIM_AC_OPTION_ENDIAN, SIM_AC_OPTION_ALIGNMENT,
+	SIM_AC_OPTION_HOSTENDIAN, SIM_AC_OPTION_ENVIRONMENT, and
+	SIM_AC_OPTION_INLINE.
+	* config.in, configure: Regenerate.
+	* interp.c (sim_trace): Define.
+
 2015-03-16  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in
index a5a612a..63b85b9 100644
--- a/sim/cr16/Makefile.in
+++ b/sim/cr16/Makefile.in
@@ -22,8 +22,7 @@  SIM_RUN_OBJS = run.o
 
 SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o
 SIM_EXTRA_CLEAN = clean-extra
-SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT \
-	-DSIM_USE_DEPRECATED_RUN_FRONTEND
+SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_USE_DEPRECATED_RUN_FRONTEND
 
 INCLUDE = cr16_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \
 	$(srcroot)/include/gdb/sim-cr16.h
@@ -50,8 +49,3 @@  gencode: gencode.o cr16-opc.o
 
 clean-extra:
 	rm -f table.c simops.h gencode
-
-interp.o: interp.c table.c $(INCLUDE)
-simops.o: simops.c simops.h $(INCLUDE)
-endian.o: endian.c $(INCLUDE)
-table.o: table.c
diff --git a/sim/cr16/config.in b/sim/cr16/config.in
index 5ded703..6003e58 100644
diff --git a/sim/cr16/configure b/sim/cr16/configure
index c7e82ec..af6e579 100755
diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac
index 0daa1af..96d0ffd 100644
--- a/sim/cr16/configure.ac
+++ b/sim/cr16/configure.ac
@@ -5,6 +5,11 @@  sinclude(../common/acinclude.m4)
 
 SIM_AC_COMMON
 
+SIM_AC_OPTION_ENDIAN
+SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
+SIM_AC_OPTION_HOSTENDIAN
+SIM_AC_OPTION_ENVIRONMENT
+SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
 
 SIM_AC_OUTPUT
diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index 9c85948..b6ded50 100644
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -1401,6 +1401,14 @@  sim_set_callbacks (p)
   cr16_callback = p;
 }
 
+int
+sim_trace (SIM_DESC sd)
+{
+  sim_resume (sd, 0, 0);
+
+  return 1;
+}
+
 void
 sim_stop_reason (sd, reason, sigrc)
      SIM_DESC sd;