[PATCH 3/4] sim: arm: delete NEED_UI_LOOP_HOOK handling

[PATCH 3/4] sim: arm: delete NEED_UI_LOOP_HOOK handling

[Mike Frysinger]

---
 sim/arm/ChangeLog   |  7 +++++++
 sim/arm/Makefile.in |  2 +-
 sim/arm/armemu.c    | 19 -------------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 0c685cc..99a5d50 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,5 +1,12 @@
 2015-03-30  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_EXTRA_CFLAGS): Delete -DNEED_UI_LOOP_HOOK.
+	* interp.c [NEED_UI_LOOP_HOOK] (UI_LOOP_POLL_INTERVAL,
+	ui_loop_hook_counter, deprecated_ui_loop_hook): Delete.
+	(sim_resume) [NEED_UI_LOOP_HOOK]: Delete ui code.
+
+2015-03-30  Mike Frysinger  <vapier@gentoo.org>
+
 	* armemu.c [MODE32] (handle_v6_insn): Move definition.
 	(ARMul_Emulate26): Initialize do_int after label target.
 	* armemu.h (UNDEF_Test, UNDEF_Shift, UNDEF_MSRPC, UNDEF_MRSPC,
diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index f218633..1b2ed6a 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -17,7 +17,7 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
-SIM_EXTRA_CFLAGS = -DMODET -DNEED_UI_LOOP_HOOK -DSIM_TARGET_SWITCHES \
+SIM_EXTRA_CFLAGS = -DMODET -DSIM_TARGET_SWITCHES \
 	-DSIM_USE_DEPRECATED_RUN_FRONTEND
 
 # Use the deprecated run frontend until we migrate to nrun.o
diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c
index 07bfbb6..09dfeaf 100644
--- a/sim/arm/armemu.c
+++ b/sim/arm/armemu.c
@@ -48,17 +48,6 @@ static void     Handle_Store_Double (ARMul_State *, ARMword);
 #define LDEFAULT  (0)		/* default : do nothing */
 #define LSCC      (1)		/* set condition codes on result */
 
-#ifdef NEED_UI_LOOP_HOOK
-/* How often to run the ui_loop update, when in use.  */
-#define UI_LOOP_POLL_INTERVAL 0x32000
-
-/* Counter for the ui_loop_hook update.  */
-static long ui_loop_hook_counter = UI_LOOP_POLL_INTERVAL;
-
-/* Actual hook to call to run through gdb's gui event loop.  */
-extern int (*deprecated_ui_loop_hook) (int);
-#endif /* NEED_UI_LOOP_HOOK */
-
 extern int stop_simulator;
 
 /* Short-hand macros for LDR/STR.  */
@@ -3882,14 +3871,6 @@ check_PMUintr:
     donext:
 #endif
 
-#ifdef NEED_UI_LOOP_HOOK
-      if (deprecated_ui_loop_hook != NULL && ui_loop_hook_counter-- < 0)
-	{
-	  ui_loop_hook_counter = UI_LOOP_POLL_INTERVAL;
-	  deprecated_ui_loop_hook (0);
-	}
-#endif /* NEED_UI_LOOP_HOOK */
-
       if (state->Emulate == ONCE)
 	state->Emulate = STOP;
       /* If we have changed mode, allow the PC to advance before stopping.  */
-- 
2.3.4

[PATCH 4/4] sim: arm: convert to nrun

[Mike Frysinger]

A lot of cpu state is stored in global variables, as is memory handling.
The sim_size support needs unwinding at some point.  But at least this
is an improvement on the status quo.
---
 sim/arm/ChangeLog   |  20 +++++
 sim/arm/Makefile.in |  17 ++--
 sim/arm/sim-main.h  |  56 +++++++++++++
 sim/arm/wrapper.c   | 220 ++++++++++++++++++----------------------------------
 4 files changed, 160 insertions(+), 153 deletions(-)
 create mode 100644 sim/arm/sim-main.h

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 99a5d50..d12df6c 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,5 +1,25 @@
 2015-03-30  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+	(SIM_EXTRA_CFLAGS): Delete -DSIM_TARGET_SWITCHES and
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_OBJS): Change to $(SIM_NEW_COMMON_OBJS).
+	* sim-main.h: New file.
+	* wrapper.c: Delete armdefs.h, sim-utils.h, and run-sim.h includes.
+	Add sim-main.h and sim-options.h includes.
+	(sim_callback, mem_size, trace): Add TODO comments.
+	(state): Delete static and add TODO comment.
+	(sim_kind, myname, big_endian): Delete.
+	(init): Change big_endian to CURRENT_TARGET_BYTE_ORDER check.
+	(sim_size, sim_trace, sim_info, sim_target_display_usage, sim_load,
+	sim_do_command, sim_set_callbacks, sim_complete_command): Delete.
+	(sim_target_parse_command_line): Mark static.
+	(free_state): New function.
+	(sim_open): Rewrite to use new common logic.
+	(sim_close): Delete body.
+
+2015-03-30  Mike Frysinger  <vapier@gentoo.org>
+
 	* Makefile.in (SIM_EXTRA_CFLAGS): Delete -DNEED_UI_LOOP_HOOK.
 	* interp.c [NEED_UI_LOOP_HOOK] (UI_LOOP_POLL_INTERVAL,
 	ui_loop_hook_counter, deprecated_ui_loop_hook): Delete.
diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index 1b2ed6a..241911b 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -17,14 +17,15 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
-SIM_EXTRA_CFLAGS = -DMODET -DSIM_TARGET_SWITCHES \
-	-DSIM_USE_DEPRECATED_RUN_FRONTEND
-
-# Use the deprecated run frontend until we migrate to nrun.o
-SIM_RUN_OBJS = run.o
-
-SIM_OBJS = armemu26.o armemu32.o arminit.o armos.o armsupp.o \
-	armvirt.o bag.o thumbemu.o wrapper.o sim-load.o \
+SIM_EXTRA_CFLAGS = -DMODET
+
+SIM_OBJS = \
+	$(SIM_NEW_COMMON_OBJS) \
+	sim-cpu.o \
+	sim-engine.o \
+	sim-hload.o \
+	armemu26.o armemu32.o arminit.o armos.o armsupp.o \
+	armvirt.o bag.o thumbemu.o wrapper.o \
 	armcopro.o maverick.o iwmmxt.o
 
 ## COMMON_POST_CONFIG_FRAG
diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
new file mode 100644
index 0000000..d020972
--- /dev/null
+++ b/sim/arm/sim-main.h
@@ -0,0 +1,56 @@
+/* Simulation code for the ARM processor.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+
+   This file is part of simulators.
+
+   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 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef SIM_MAIN_H
+#define SIM_MAIN_H
+
+#include "sim-basics.h"
+
+typedef address_word sim_cia;
+
+typedef struct _sim_cpu SIM_CPU;
+
+#include "sim-base.h"
+#include "bfd.h"
+
+#undef BIT
+#include "armdefs.h"
+
+extern struct ARMul_State *state;
+
+#define CIA_GET(cpu)     PC
+#define CIA_SET(cpu,val) ARMul_SetPC (state, (val))
+
+struct _sim_cpu {
+
+  sim_cpu_base base;
+};
+
+struct sim_state {
+
+  sim_cpu *cpu[MAX_NR_PROCESSORS];
+#if (WITH_SMP)
+#define STATE_CPU(sd,n) ((sd)->cpu[n])
+#else
+#define STATE_CPU(sd,n) ((sd)->cpu[0])
+#endif
+
+  sim_state_base base;
+};
+
+#endif
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index c1b5321..dd3cfe2 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -28,37 +28,31 @@
 #include <signal.h>
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
-#include "armdefs.h"
+#include "sim-main.h"
+#include "sim-options.h"
 #include "armemu.h"
 #include "dbg_rdi.h"
 #include "ansidecl.h"
-#include "sim-utils.h"
-#include "run-sim.h"
 #include "gdb/sim-arm.h"
 #include "gdb/signals.h"
 #include "libiberty.h"
 #include "iwmmxt.h"
 
+/* TODO: This should get pulled from the SIM_DESC.  */
 host_callback *sim_callback;
 
-static struct ARMul_State *state;
-
-/* Who is using the simulator.  */
-static SIM_OPEN_KIND sim_kind;
-
-/* argv[0] */
-static char *myname;
+/* TODO: This should get merged into sim_cpu.  */
+struct ARMul_State *state;
 
 /* Memory size in bytes.  */
+/* TODO: Memory should be converted to the common memory module.  */
 static int mem_size = (1 << 21);
 
-/* Non-zero to set big endian mode.  */
-static int big_endian;
-
 int stop_simulator;
 
 #include "dis-asm.h"
 
+/* TODO: Tracing should be converted to common tracing module.  */
 int trace = 0;
 int disas = 0;
 int trace_funcs = 0;
@@ -146,7 +140,7 @@ init (void)
     {
       ARMul_EmulateInit ();
       state = ARMul_NewState ();
-      state->bigendSig = (big_endian ? HIGH : LOW);
+      state->bigendSig = (CURRENT_TARGET_BYTE_ORDER == BIG_ENDIAN ? HIGH : LOW);
       ARMul_MemoryInit (state, mem_size);
       ARMul_OSInit (state);
       state->verbose = 0;
@@ -154,16 +148,6 @@ init (void)
     }
 }
 
-/* Set the memory size to SIZE bytes.
-   Must be called before initializing simulator.  */
-/* FIXME: Rename to sim_set_mem_size.  */
-
-void
-sim_size (int size)
-{
-  mem_size = size;
-}
-
 void
 ARMul_ConsolePrint (ARMul_State * state,
 		    const char * format,
@@ -220,14 +204,6 @@ sim_read (SIM_DESC sd ATTRIBUTE_UNUSED,
 }
 
 int
-sim_trace (SIM_DESC sd ATTRIBUTE_UNUSED)
-{
-  trace = 1;
-  sim_resume (sd, 0, 0);
-  return 1;
-}
-
-int
 sim_stop (SIM_DESC sd ATTRIBUTE_UNUSED)
 {
   state->Emulate = STOP;
@@ -437,12 +413,6 @@ sim_create_inferior (SIM_DESC sd ATTRIBUTE_UNUSED,
   return SIM_RC_OK;
 }
 
-void
-sim_info (SIM_DESC sd ATTRIBUTE_UNUSED,
-	  int verbose ATTRIBUTE_UNUSED)
-{
-}
-
 static int
 frommem (struct ARMul_State *state, unsigned char *memory)
 {
@@ -728,7 +698,7 @@ static swi_options options[] =
   };
 
 
-int
+static int
 sim_target_parse_command_line (int argc, char ** argv)
 {
   int i;
@@ -830,88 +800,89 @@ sim_target_parse_arg_array (char ** argv)
   sim_target_parse_command_line (i, argv);
 }
 
-void
-sim_target_display_usage (int help)
+static void
+free_state (SIM_DESC sd)
 {
-  FILE *stream = help ? stdout : stderr;
-
-  fprintf (stream, "%s=<list>  Comma seperated list of SWI protocols to supoport.\n\
-                This list can contain: NONE, DEMON, ANGEL, REDBOOT and/or ALL.\n",
-	   SWI_SWITCH);
-  fprintf (stream, "-d\t\tEnable disassembly of instructions during tracing.\n");
-  fprintf (stream, "-z\t\tTrace entering and leaving functions.\n\n");
+  if (STATE_MODULES (sd) != NULL)
+    sim_module_uninstall (sd);
+  sim_cpu_free_all (sd);
+  sim_state_free (sd);
 }
 
 SIM_DESC
-sim_open (SIM_OPEN_KIND   kind,
-	  host_callback * ptr,
-	  struct bfd *    abfd,
-	  char **         argv)
+sim_open (SIM_OPEN_KIND kind,
+	  host_callback *cb,
+	  struct bfd *abfd,
+	  char **argv)
 {
-  sim_kind = kind;
+  SIM_DESC sd = sim_state_alloc (kind, cb);
+  SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
-  if (myname)
-    free (myname);
-  myname = (char *) xstrdup (argv[0]);
+  /* The cpu data is kept in a separately allocated chunk of memory.  */
+  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+    {
+      free_state (sd);
+      return 0;
+    }
 
-  sim_callback = ptr;
+  if (sim_pre_argv_init (sd, argv[0]) != SIM_RC_OK)
+    {
+      free_state (sd);
+      return 0;
+    }
 
-#ifdef SIM_TARGET_SWITCHES
-  sim_target_parse_arg_array (argv);
-#endif
-  
-  /* Decide upon the endian-ness of the processor.
-     If we can, get the information from the bfd itself.
-     Otherwise look to see if we have been given a command
-     line switch that tells us.  Otherwise default to little endian.  */
-  if (abfd != NULL)
-    big_endian = bfd_big_endian (abfd);
-  else if (argv[1] != NULL)
+  /* getopt will print the error message so we just have to exit if this fails.
+     FIXME: Hmmm...  in the case of gdb we need getopt to call
+     print_filtered.  */
+  if (sim_parse_args (sd, argv) != SIM_RC_OK)
     {
-      int i;
+      free_state (sd);
+      return 0;
+    }
 
-      /* Scan for endian-ness and memory-size switches.  */
-      for (i = 0; (argv[i] != NULL) && (argv[i][0] != 0); i++)
-	if (argv[i][0] == '-' && argv[i][1] == 'E')
-	  {
-	    char c;
+  /* Check for/establish the a reference program image.  */
+  if (sim_analyze_program (sd,
+			   (STATE_PROG_ARGV (sd) != NULL
+			    ? *STATE_PROG_ARGV (sd)
+			    : NULL), abfd) != SIM_RC_OK)
+    {
+      free_state (sd);
+      return 0;
+    }
 
-	    if ((c = argv[i][2]) == 0)
-	      {
-		++i;
-		c = argv[i][0];
-	      }
+  /* Configure/verify the target byte order and other runtime
+     configuration options.  */
+  if (sim_config (sd) != SIM_RC_OK)
+    {
+      sim_module_uninstall (sd);
+      return 0;
+    }
 
-	    switch (c)
-	      {
-	      case 0:
-		sim_callback->printf_filtered
-		  (sim_callback, "No argument to -E option provided\n");
-		break;
+  if (sim_post_argv_init (sd) != SIM_RC_OK)
+    {
+      /* Uninstall the modules to avoid memory leaks,
+	 file descriptor leaks, etc.  */
+      sim_module_uninstall (sd);
+      return 0;
+    }
 
-	      case 'b':
-	      case 'B':
-		big_endian = 1;
-		break;
+  sim_callback = cb;
 
-	      case 'l':
-	      case 'L':
-		big_endian = 0;
-		break;
+  sim_target_parse_arg_array (argv);
 
-	      default:
-		sim_callback->printf_filtered
-		  (sim_callback, "Unrecognised argument to -E option\n");
-		break;
-	      }
-	  }
-	else if (argv[i][0] == '-' && argv[i][1] == 'm')
+  if (argv[1] != NULL)
+    {
+      int i;
+
+      /* Scan for memory-size switches.  */
+      for (i = 0; (argv[i] != NULL) && (argv[i][0] != 0); i++)
+	if (argv[i][0] == '-' && argv[i][1] == 'm')
 	  {
 	    if (argv[i][2] != '\0')
-	      sim_size (atoi (&argv[i][2]));
+	      mem_size = atoi (&argv[i][2]);
 	    else if (argv[i + 1] != NULL)
 	      {
-		sim_size (atoi (argv[i + 1]));
+		mem_size = atoi (argv[i + 1]);
 		i++;
 	      }
 	    else
@@ -924,34 +895,14 @@ sim_open (SIM_OPEN_KIND   kind,
 	  }
     }
 
-  return (SIM_DESC) 1;
+  return sd;
 }
 
 void
 sim_close (SIM_DESC sd ATTRIBUTE_UNUSED,
 	   int quitting ATTRIBUTE_UNUSED)
 {
-  if (myname)
-    free (myname);
-  myname = NULL;
-}
-
-SIM_RC
-sim_load (SIM_DESC sd,
-	  const char *prog,
-	  bfd *abfd,
-	  int from_tty ATTRIBUTE_UNUSED)
-{
-  bfd *prog_bfd;
-
-  prog_bfd = sim_load_file (sd, myname, sim_callback, prog, abfd,
-			    sim_kind == SIM_OPEN_DEBUG, 0, sim_write);
-  if (prog_bfd == NULL)
-    return SIM_RC_FAIL;
-  ARMul_SetPC (state, bfd_get_start_address (prog_bfd));
-  if (abfd == NULL)
-    bfd_close (prog_bfd);
-  return SIM_RC_OK;
+  /* Nothing to do.  */
 }
 
 void
@@ -981,24 +932,3 @@ sim_stop_reason (SIM_DESC sd ATTRIBUTE_UNUSED,
 	*sigrc = 0;
     }
 }
-
-void
-sim_do_command (SIM_DESC sd ATTRIBUTE_UNUSED,
-		const char *cmd ATTRIBUTE_UNUSED)
-{  
-  (*sim_callback->printf_filtered)
-    (sim_callback,
-     "This simulator does not accept any commands.\n");
-}
-
-void
-sim_set_callbacks (host_callback *ptr)
-{
-  sim_callback = ptr;
-}
-
-char **
-sim_complete_command (SIM_DESC sd, const char *text, const char *word)
-{
-  return NULL;
-}
-- 
2.3.4

[PATCH 0/4] sim: arm: convert to nrun

[Mike Frysinger]

Nick: could you give this a look over ?  It passes sim tests still, and
the interface (command line & gdb) look ok ...

Mike Frysinger (4):
  sim: arm: use common configure options
  sim: arm: clean up misc warnings
  sim: arm: delete NEED_UI_LOOP_HOOK handling
  sim: arm: convert to nrun

 sim/arm/ChangeLog    |  53 ++++++
 sim/arm/Makefile.in  |  17 +-
 sim/arm/armemu.c     |  24 +--
 sim/arm/armemu.h     |  51 ++---
 sim/arm/armsupp.c    |   5 +-
 sim/arm/bag.c        |   6 +-
 sim/arm/config.in    |  15 ++
 sim/arm/configure    | 528 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 sim/arm/configure.ac |   7 +
 sim/arm/maverick.c   |  49 -----
 sim/arm/sim-main.h   |  56 ++++++
 sim/arm/wrapper.c    | 236 ++++++++---------------
 12 files changed, 776 insertions(+), 271 deletions(-)
 create mode 100644 sim/arm/sim-main.h

-- 
2.3.4

[PATCH 2/4] sim: arm: clean up misc warnings

[Mike Frysinger]

Also delete a few unused funcs.
---
 sim/arm/ChangeLog  | 19 +++++++++++++++++++
 sim/arm/armemu.c   |  5 ++++-
 sim/arm/armemu.h   | 51 ++++++++++++++++++++++++++-------------------------
 sim/arm/armsupp.c  |  5 +----
 sim/arm/bag.c      |  6 +++---
 sim/arm/maverick.c | 49 -------------------------------------------------
 sim/arm/wrapper.c  | 16 +---------------
 7 files changed, 54 insertions(+), 97 deletions(-)

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 6ceed8b..0c685cc 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,5 +1,24 @@
 2015-03-30  Mike Frysinger  <vapier@gentoo.org>
 
+	* armemu.c [MODE32] (handle_v6_insn): Move definition.
+	(ARMul_Emulate26): Initialize do_int after label target.
+	* armemu.h (UNDEF_Test, UNDEF_Shift, UNDEF_MSRPC, UNDEF_MRSPC,
+	UNDEF_MULPCDest, UNDEF_MULDestEQOp1, UNDEF_LSRBPC,
+	UNDEF_LSRBaseEQOffWb, UNDEF_LSRBaseEQDestWb, UNDEF_LSRPCBaseWb,
+	UNDEF_LSRPCOffWb, UNDEF_LSMNoRegs, UNDEF_LSMPCBase,
+	UNDEF_LSMUserBankWb, UNDEF_LSMBaseInListWb, UNDEF_SWPPC,
+	UNDEF_CoProHS, UNDEF_MCRPC, UNDEF_LSCPCBaseWb,
+	UNDEF_UndefNotBounced, UNDEF_ShortInt, UNDEF_IllegalMode,
+	UNDEF_Prog32SigChange, UNDEF_Data32SigChange): Define to while(0).
+	* armsupp.c (ARMul_Align): Convert old style prototype.
+	* bag.c (addtolist, killwholelist): Mark static.
+	(BAG_newbag): Convert old style prototype.
+	* maverick.c (mv_compute_host_endianness): Delete.
+	* wrapper.c (verbosity, sim_set_verbose): Delete.
+	(init): Set state->verbose to 0.
+
+2015-03-30  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac: Call SIM_AC_OPTION_ENDIAN, SIM_AC_OPTION_ALIGNMENT,
 	SIM_AC_OPTION_HOSTENDIAN, SIM_AC_OPTION_ENVIRONMENT,
 	SIM_AC_OPTION_INLINE, and SIM_AC_OPTION_WARNINGS.
diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c
index d535a4e..07bfbb6 100644
--- a/sim/arm/armemu.c
+++ b/sim/arm/armemu.c
@@ -272,6 +272,7 @@ extern int stop_simulator;
 /* Attempt to emulate an ARMv6 instruction.
    Returns non-zero upon success.  */
 
+#ifdef MODE32
 static int
 handle_v6_insn (ARMul_State * state, ARMword instr)
 {
@@ -473,6 +474,7 @@ handle_v6_insn (ARMul_State * state, ARMword instr)
   printf ("Unhandled v6 insn: UNKNOWN: %08x\n", instr);
   return 0;
 }
+#endif
 
 /* EMULATION of ARM6.  */
 
@@ -817,10 +819,11 @@ ARMul_Emulate26 (ARMul_State * state)
 	      else
 		{
 		  ARMword cp14r1;
-		  int do_int = 0;
+		  int do_int;
 
 		  state->CP14R0_CCD = -1;
 check_PMUintr:
+		  do_int = 0;
 		  cp14r0 |= ARMul_CP14_R0_FLAG2;
 		  (void) state->CPWrite[14] (state, 0, cp14r0);
 
diff --git a/sim/arm/armemu.h b/sim/arm/armemu.h
index 419f799..484cc85 100644
--- a/sim/arm/armemu.h
+++ b/sim/arm/armemu.h
@@ -462,31 +462,32 @@ typedef enum
 }
 tdstate;
 
-/* Macros to scrutinize instructions.  */
-#define UNDEF_Test
-#define UNDEF_Shift
-#define UNDEF_MSRPC
-#define UNDEF_MRSPC
-#define UNDEF_MULPCDest
-#define UNDEF_MULDestEQOp1
-#define UNDEF_LSRBPC
-#define UNDEF_LSRBaseEQOffWb
-#define UNDEF_LSRBaseEQDestWb
-#define UNDEF_LSRPCBaseWb
-#define UNDEF_LSRPCOffWb
-#define UNDEF_LSMNoRegs
-#define UNDEF_LSMPCBase
-#define UNDEF_LSMUserBankWb
-#define UNDEF_LSMBaseInListWb
-#define UNDEF_SWPPC
-#define UNDEF_CoProHS
-#define UNDEF_MCRPC
-#define UNDEF_LSCPCBaseWb
-#define UNDEF_UndefNotBounced
-#define UNDEF_ShortInt
-#define UNDEF_IllegalMode
-#define UNDEF_Prog32SigChange
-#define UNDEF_Data32SigChange
+/* Macros to scrutinize instructions.  The dummy do loop is to keep the compiler
+   happy when the statement is used in an otherwise empty else statement.  */
+#define UNDEF_Test		do { ; } while (0)
+#define UNDEF_Shift		do { ; } while (0)
+#define UNDEF_MSRPC		do { ; } while (0)
+#define UNDEF_MRSPC		do { ; } while (0)
+#define UNDEF_MULPCDest		do { ; } while (0)
+#define UNDEF_MULDestEQOp1	do { ; } while (0)
+#define UNDEF_LSRBPC		do { ; } while (0)
+#define UNDEF_LSRBaseEQOffWb	do { ; } while (0)
+#define UNDEF_LSRBaseEQDestWb	do { ; } while (0)
+#define UNDEF_LSRPCBaseWb	do { ; } while (0)
+#define UNDEF_LSRPCOffWb	do { ; } while (0)
+#define UNDEF_LSMNoRegs		do { ; } while (0)
+#define UNDEF_LSMPCBase		do { ; } while (0)
+#define UNDEF_LSMUserBankWb	do { ; } while (0)
+#define UNDEF_LSMBaseInListWb	do { ; } while (0)
+#define UNDEF_SWPPC		do { ; } while (0)
+#define UNDEF_CoProHS		do { ; } while (0)
+#define UNDEF_MCRPC		do { ; } while (0)
+#define UNDEF_LSCPCBaseWb	do { ; } while (0)
+#define UNDEF_UndefNotBounced	do { ; } while (0)
+#define UNDEF_ShortInt		do { ; } while (0)
+#define UNDEF_IllegalMode	do { ; } while (0)
+#define UNDEF_Prog32SigChange	do { ; } while (0)
+#define UNDEF_Data32SigChange	do { ; } while (0)
 
 /* Prototypes for exported functions.  */
 extern unsigned ARMul_NthReg        (ARMword, unsigned);
diff --git a/sim/arm/armsupp.c b/sim/arm/armsupp.c
index e2bac55..113f080 100644
--- a/sim/arm/armsupp.c
+++ b/sim/arm/armsupp.c
@@ -736,10 +736,7 @@ IntPending (ARMul_State * state)
 /* Align a word access to a non word boundary.  */
 
 ARMword
-ARMul_Align (state, address, data)
-     ARMul_State * state ATTRIBUTE_UNUSED;
-     ARMword address;
-     ARMword data;
+ARMul_Align (ARMul_State *state ATTRIBUTE_UNUSED, ARMword address, ARMword data)
 {
   /* This code assumes the address is really unaligned,
      as a shift by 32 is undefined in C.  */
diff --git a/sim/arm/bag.c b/sim/arm/bag.c
index 6cd8a95..35f2953 100644
--- a/sim/arm/bag.c
+++ b/sim/arm/bag.c
@@ -40,7 +40,7 @@ Hashentry;
 Hashentry *lookupbyfirst[HASH_TABLE_SIZE];
 Hashentry *lookupbysecond[HASH_TABLE_SIZE];
 
-void
+static void
 addtolist (Hashentry ** add, long first, long second)
 {
   while (*add)
@@ -52,7 +52,7 @@ addtolist (Hashentry ** add, long first, long second)
   (*add)->second = second;
 }
 
-void
+static void
 killwholelist (Hashentry * p)
 {
   Hashentry *q;
@@ -152,7 +152,7 @@ BAG_killpair_bysecond (long second)
 }
 
 void
-BAG_newbag ()
+BAG_newbag (void)
 {
   int i;
 
diff --git a/sim/arm/maverick.c b/sim/arm/maverick.c
index 8c9ff81..1b0dca9 100644
--- a/sim/arm/maverick.c
+++ b/sim/arm/maverick.c
@@ -1230,52 +1230,3 @@ mv_setReg64int (int regnum, long long val)
   DSPregs[regnum].lower.i = reg_conv.ints[lsw_int_index];
   DSPregs[regnum].upper.i = reg_conv.ints[msw_int_index];
 }
-
-/* Compute LSW in a double and a long long.  */
-
-void
-mv_compute_host_endianness (ARMul_State * state)
-{
-  static union
-  {
-    long long ll;
-    long ints[2];
-    long i;
-    double d;
-    float floats[2];
-    float f;
-  } conv;
-
-  /* Calculate where's the LSW in a 64bit int.  */
-  conv.ll = 45;
-  
-  if (conv.ints[0] == 0)
-    {
-      msw_int_index = 0;
-      lsw_int_index = 1;
-    }
-  else
-    {
-      assert (conv.ints[1] == 0);
-      msw_int_index = 1;
-      lsw_int_index = 0;
-    }
-
-  /* Calculate where's the LSW in a double.  */
-  conv.d = 3.0;
-  
-  if (conv.ints[0] == 0)
-    {
-      msw_float_index = 0;
-      lsw_float_index = 1;
-    }
-  else
-    {
-      assert (conv.ints[1] == 0);
-      msw_float_index = 1;
-      lsw_float_index = 0;
-    }
-
-  printfdbg ("lsw_int_index   %d\n", lsw_int_index);
-  printfdbg ("lsw_float_index %d\n", lsw_float_index);
-}
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 0ccc7fb..c1b5321 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -52,9 +52,6 @@ static char *myname;
 /* Memory size in bytes.  */
 static int mem_size = (1 << 21);
 
-/* Non-zero to display start up banner, and maybe other things.  */
-static int verbosity;
-
 /* Non-zero to set big endian mode.  */
 static int big_endian;
 
@@ -152,22 +149,11 @@ init (void)
       state->bigendSig = (big_endian ? HIGH : LOW);
       ARMul_MemoryInit (state, mem_size);
       ARMul_OSInit (state);
-      state->verbose = verbosity;
+      state->verbose = 0;
       done = 1;
     }
 }
 
-/* Set verbosity level of simulator.
-   This is not intended to produce detailed tracing or debugging information.
-   Just summaries.  */
-/* FIXME: common/run.c doesn't do this yet.  */
-
-void
-sim_set_verbose (int v)
-{
-  verbosity = v;
-}
-
 /* Set the memory size to SIZE bytes.
    Must be called before initializing simulator.  */
 /* FIXME: Rename to sim_set_mem_size.  */
-- 
2.3.4

[PATCH 1/4] sim: arm: use common configure options

[Mike Frysinger]

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.
---
 sim/arm/ChangeLog    |   7 +
 sim/arm/config.in    |  15 ++
 sim/arm/configure    | 528 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 sim/arm/configure.ac |   7 +
 4 files changed, 555 insertions(+), 2 deletions(-)

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 9441a61..6ceed8b 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,5 +1,12 @@
 2015-03-30  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure.ac: Call SIM_AC_OPTION_ENDIAN, SIM_AC_OPTION_ALIGNMENT,
+	SIM_AC_OPTION_HOSTENDIAN, SIM_AC_OPTION_ENVIRONMENT,
+	SIM_AC_OPTION_INLINE, and SIM_AC_OPTION_WARNINGS.
+	* config.in, configure: Regenerate.
+
+2015-03-30  Mike Frysinger  <vapier@gentoo.org>
+
 	* Makefile.in (COPRO): Delete.
 	(SIM_OBJS): Expand COPRO.
 	* configure.ac: Deletd stdint.h check.
diff --git a/sim/arm/config.in b/sim/arm/config.in
index 5ded703..6003e58 100644
diff --git a/sim/arm/configure b/sim/arm/configure
index fa26277..af6e579 100755
diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac
index 799a5df..96d0ffd 100644
--- a/sim/arm/configure.ac
+++ b/sim/arm/configure.ac
@@ -5,4 +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
-- 
2.3.4

Re: [PATCH 0/4] sim: arm: convert to nrun

[Nicholas Clifton]

Hi Mike,

> Nick: could you give this a look over ?  It passes sim tests still, and
> the interface (command line & gdb) look ok ...
>
> Mike Frysinger (4):
>    sim: arm: use common configure options
>    sim: arm: clean up misc warnings
>    sim: arm: delete NEED_UI_LOOP_HOOK handling
>    sim: arm: convert to nrun
>
>   sim/arm/ChangeLog    |  53 ++++++
>   sim/arm/Makefile.in  |  17 +-
>   sim/arm/armemu.c     |  24 +--
>   sim/arm/armemu.h     |  51 ++---
>   sim/arm/armsupp.c    |   5 +-
>   sim/arm/bag.c        |   6 +-
>   sim/arm/config.in    |  15 ++
>   sim/arm/configure    | 528 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>   sim/arm/configure.ac |   7 +
>   sim/arm/maverick.c   |  49 -----
>   sim/arm/sim-main.h   |  56 ++++++
>   sim/arm/wrapper.c    | 236 ++++++++---------------

These all look fine to me.

Cheers
   Nick