From patchwork Sat Apr 18 08:40:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 6318 Received: (qmail 11058 invoked by alias); 18 Apr 2015 08:40:58 -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 11044 invoked by uid 89); 18 Apr 2015 08:40:57 -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; Sat, 18 Apr 2015 08:40:56 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 12E5D340B66 for ; Sat, 18 Apr 2015 08:40:53 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: clean up duplicate sim-engine hooks Date: Sat, 18 Apr 2015 04:40:52 -0400 Message-Id: <1429346452-11039-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes Now that we've unified sim-cpu, we can delete the duplicate sim-engine hooks -- these targets defined these only because they didn't fully implement the sim-cpu callbacks. Committed. --- sim/cris/ChangeLog | 4 ++++ sim/cris/sim-main.h | 11 ----------- sim/lm32/ChangeLog | 4 ++++ sim/lm32/sim-main.h | 11 ----------- sim/m32r/ChangeLog | 4 ++++ sim/m32r/sim-main.h | 11 ----------- sim/mips/ChangeLog | 5 +++++ sim/mips/sim-main.h | 4 ---- 8 files changed, 17 insertions(+), 37 deletions(-) diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index f3e0dbd..23c739d 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,5 +1,9 @@ 2015-04-18 Mike Frysinger + * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete. + +2015-04-18 Mike Frysinger + * sim-main.h (USING_SIM_BASE_H): Delete. 2015-04-18 Mike Frysinger diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h index d1a7c1e..4dc04a2 100644 --- a/sim/cris/sim-main.h +++ b/sim/cris/sim-main.h @@ -30,17 +30,6 @@ along with this program. If not, see . */ #include "cris-desc.h" #include "cris-opc.h" #include "arch.h" - -#define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \ -do { \ - if (cpu) /* Null if ctrl-c. */ \ - sim_pc_set ((cpu), (cia)); \ -} while (0) -#define SIM_ENGINE_RESTART_HOOK(sd, cpu, cia) \ -do { \ - sim_pc_set ((cpu), (cia)); \ -} while (0) - #include "sim-base.h" #include "cgen-sim.h" #include "cris-sim.h" diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 77f9b81..4cb55c5 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,5 +1,9 @@ 2015-04-18 Mike Frysinger + * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete. + +2015-04-18 Mike Frysinger + * sim-main.h (USING_SIM_BASE_H): Delete. 2015-04-18 Mike Frysinger diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h index a25c7dd..4894e8d 100644 --- a/sim/lm32/sim-main.h +++ b/sim/lm32/sim-main.h @@ -29,17 +29,6 @@ #include "lm32-desc.h" #include "lm32-opc.h" #include "arch.h" - -#define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \ -do { \ - if (cpu) /* null if ctrl-c */ \ - sim_pc_set ((cpu), (cia)); \ -} while (0) -#define SIM_ENGINE_RESTART_HOOK(sd, cpu, cia) \ -do { \ - sim_pc_set ((cpu), (cia)); \ -} while (0) - #include "sim-base.h" #include "cgen-sim.h" #include "lm32-sim.h" diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 397f3a8..c85b181 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,5 +1,9 @@ 2015-04-18 Mike Frysinger + * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete. + +2015-04-18 Mike Frysinger + * sim-main.h (USING_SIM_BASE_H): Delete. 2015-04-18 Mike Frysinger diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h index 0f539a0..cd39e98 100644 --- a/sim/m32r/sim-main.h +++ b/sim/m32r/sim-main.h @@ -9,17 +9,6 @@ #include "m32r-desc.h" #include "m32r-opc.h" #include "arch.h" - -#define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \ -do { \ - if (cpu) /* null if ctrl-c */ \ - sim_pc_set ((cpu), (cia)); \ -} while (0) -#define SIM_ENGINE_RESTART_HOOK(sd, cpu, cia) \ -do { \ - sim_pc_set ((cpu), (cia)); \ -} while (0) - #include "sim-base.h" #include "cgen-sim.h" #include "m32r-sim.h" diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 51b4b29..1feeb83 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,5 +1,10 @@ 2015-04-18 Mike Frysinger + * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete + comments. + +2015-04-18 Mike Frysinger + * sim-main.h (SIM_CPU): Delete. 2015-04-18 Mike Frysinger diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h index e6bbd51..c87b8e6 100644 --- a/sim/mips/sim-main.h +++ b/sim/mips/sim-main.h @@ -20,10 +20,6 @@ along with this program. If not, see . */ #ifndef SIM_MAIN_H #define SIM_MAIN_H -/* This simulator doesn't cache the Current Instruction Address */ -/* #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) */ -/* #define SIM_ENGINE_RESUME_HOOK(SD, LAST_CPU, CIA) */ - /* hobble some common features for moment */ #define WITH_WATCHPOINTS 1 #define WITH_MODULO_MEMORY 1