From patchwork Thu Nov 3 09:48:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 17150 Received: (qmail 33087 invoked by alias); 3 Nov 2016 09:48:45 -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 32800 invoked by uid 89); 3 Nov 2016 09:48:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=4166, Respect, him X-HELO: mail-pf0-f193.google.com Received: from mail-pf0-f193.google.com (HELO mail-pf0-f193.google.com) (209.85.192.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 03 Nov 2016 09:48:36 +0000 Received: by mail-pf0-f193.google.com with SMTP id y68so4385358pfb.1 for ; Thu, 03 Nov 2016 02:48:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=CiGek1jSrpT7/F5LbbPk2JgY9TylF91d3PCK6CEzOsU=; b=iTtYVm5k1ElilYr+gQ9DekMIVs9nGCE3FHf+3HUnJLVRxSW0eCGeKIrD3Q9QmzPUx3 9uBUj76lTJu/mziBOVop3ytzDk6scDWcuf1B0uQn+JEiXcK/VRBsaKB9ZL/XudMX5zN9 9wGM/ybW7jV4ej3gAu14Pya0DhPeOXgbh7ydfnogNg2wSfBimI5z/L2PxFJ2VpU0IPhi d+pRrL0Mk9sxusJdYyWkLxLHy07w+Jv6GET9/kf/epRsJ2xDCIFor5NPNBz4SlPZWOgy SCvqrIl0DwJP/cF9Zmibu5Tmocsy461f5s09P/DqxPhpjLJV+rTzMWDNMsuF+Jp/yaBV 9ULQ== X-Gm-Message-State: ABUngveIBGtI0D3hbuHdT+14TaGBrFElDUtfjUSmNzFwCRxdHJq1TIWABs/QdalqNTufng== X-Received: by 10.98.160.29 with SMTP id r29mr15247359pfe.103.1478166514350; Thu, 03 Nov 2016 02:48:34 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id a22sm11215345pfg.7.2016.11.03.02.48.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Nov 2016 02:48:33 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 10/11] Remove arm_override_mode Date: Thu, 3 Nov 2016 09:48:10 +0000 Message-Id: <1478166491-11357-11-git-send-email-yao.qi@linaro.org> In-Reply-To: <1478166491-11357-1-git-send-email-yao.qi@linaro.org> References: <1478166491-11357-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes GDB can determine the kind of single step breakpoint by gdbarch breakpoint_kind_from_current_state, so global variable arm_override_mode is no longer needed. This patch removes it. gdb: 2016-11-02 Yao Qi * arm-tdep.c (arm_override_mode): Remove. (arm_pc_is_thumb): Update. (arm_insert_single_step_breakpoint): Update. --- gdb/arm-tdep.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 28fc20c..4a89227 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -144,13 +144,6 @@ static const char *const arm_mode_strings[] = static const char *arm_fallback_mode_string = "auto"; static const char *arm_force_mode_string = "auto"; -/* Internal override of the execution mode. -1 means no override, - 0 means override to ARM mode, 1 means override to Thumb mode. - The effect is the same as if arm_force_mode has been set by the - user (except the internal override has precedence over a user's - arm_force_mode override). */ -static int arm_override_mode = -1; - /* Number of different reg name sets (options). */ static int num_disassembly_options; @@ -423,10 +416,6 @@ arm_pc_is_thumb (struct gdbarch *gdbarch, CORE_ADDR memaddr) if (IS_THUMB_ADDR (memaddr)) return 1; - /* Respect internal mode override if active. */ - if (arm_override_mode != -1) - return arm_override_mode; - /* If the user wants to override the symbol table, let him. */ if (strcmp (arm_force_mode_string, "arm") == 0) return 0; @@ -4255,9 +4244,6 @@ arm_insert_single_step_breakpoint (struct gdbarch *gdbarch, struct address_space *aspace, CORE_ADDR pc) { - scoped_restore save_override_mode - = make_scoped_restore (&arm_override_mode, - (int) IS_THUMB_ADDR (pc)); pc = gdbarch_addr_bits_remove (gdbarch, pc); insert_single_step_breakpoint (gdbarch, aspace, pc);