From patchwork Mon Mar 30 06:22:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 5899 Received: (qmail 25555 invoked by alias); 30 Mar 2015 06:22:40 -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 25463 invoked by uid 89); 30 Mar 2015 06:22:39 -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 06:22:37 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id F4040340CA5 for ; Mon, 30 Mar 2015 06:22:35 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 3/4] sim: d10v: delete NEED_UI_LOOP_HOOK handling Date: Mon, 30 Mar 2015 02:22:33 -0400 Message-Id: <1427696554-17585-3-git-send-email-vapier@gentoo.org> In-Reply-To: <1427696554-17585-1-git-send-email-vapier@gentoo.org> References: <1427696554-17585-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes This hook is used only when linked into gdb, and d10v doesn't have a gdb port anymore. Punt it. Committed. --- sim/d10v/ChangeLog | 7 +++++++ sim/d10v/Makefile.in | 3 +-- sim/d10v/interp.c | 19 ------------------- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 08a099f..ca4b5d2 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/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 + * Makefile.in (gencode.o, d10v-opc.o): Add $(WARN_CFLAGS). (gencode): Add $(BUILD_LDFLAGS). * endian.c (get_word, get_longword, get_longlong, write_word, diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in index 5ea5b1d..fb2d72d 100644 --- a/sim/d10v/Makefile.in +++ b/sim/d10v/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 = -DSIM_HAVE_ENVIRONMENT -DSIM_USE_DEPRECATED_RUN_FRONTEND INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \ $(srcroot)/include/gdb/sim-d10v.h diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index 57bca39..0b21549 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -56,17 +56,6 @@ extern void sim_set_profile (int n); extern void sim_set_profile_size (int n); static INLINE uint8 *map_memory (unsigned phys_addr); -#ifdef NEED_UI_LOOP_HOOK -/* How often to run the ui_loop update, when in use */ -#define UI_LOOP_POLL_INTERVAL 0x14000 - -/* 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 signo); -#endif /* NEED_UI_LOOP_HOOK */ - #ifndef INLINE #if defined(__GNUC__) && defined(__OPTIMIZE__) #define INLINE __inline__ @@ -1042,14 +1031,6 @@ sim_resume (SIM_DESC sd, int step, int siggnal) /* Writeback all the DATA / PC changes */ SLOT_FLUSH (); - -#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 */ } while ( !State.exception && !stop_simulator);