sim: arm: delete NEED_UI_LOOP_HOOK handling

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 0c685cc163813d573f95e651e4c452f7c967facc..99a5d50e9b313cba9ed8d603fe918ce8125c9053 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index f218633c130008294432df64d77579eb24b91ad0..1b2ed6a3488b624eb68d4b6d632b63b700e59bed 100644 (file)
--- 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 07bfbb6b619a7bea11bb7dc441d63a2620e5210a..09dfeaf3485acef3326458bd9f9843b33f8b747d 100644 (file)
--- 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.  */