From patchwork Mon Mar 30 07:19:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 5905 Received: (qmail 125950 invoked by alias); 30 Mar 2015 07:20:11 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 125897 invoked by uid 89); 30 Mar 2015 07:20:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 30 Mar 2015 07:20:09 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id D326E340992; Mon, 30 Mar 2015 07:20:04 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org, nickc@redhat.com Subject: [PATCH 3/4] sim: arm: delete NEED_UI_LOOP_HOOK handling Date: Mon, 30 Mar 2015 03:19:59 -0400 Message-Id: <1427700000-5903-4-git-send-email-vapier@gentoo.org> In-Reply-To: <1427700000-5903-1-git-send-email-vapier@gentoo.org> References: <1427700000-5903-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes --- 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 + * 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 + * 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. */