From patchwork Wed Aug 31 15:05:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 15122 Received: (qmail 95438 invoked by alias); 31 Aug 2016 15:06:25 -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 95225 invoked by uid 89); 31 Aug 2016 15:06:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=Essential X-HELO: mail-pf0-f196.google.com Received: from mail-pf0-f196.google.com (HELO mail-pf0-f196.google.com) (209.85.192.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Aug 2016 15:06:14 +0000 Received: by mail-pf0-f196.google.com with SMTP id i6so2903735pfe.0 for ; Wed, 31 Aug 2016 08:06:14 -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=wRjGXNcQQrHqmt0gby5eTAJhb3wlOpCg/cXMCbiIA9E=; b=RA7N+K/gKdzcqwfaz6zvrBG2OQbCTL04SR32fX+N1gKO1Tjk3w735or/AEIwgwVewt YyyLkzTYFEC6t+Us6692wy91Lswl8ZsqFDBq14IcYsMiJ6fF5fsmayH5BcEAGp9WYZK5 Clsgt1K4vlprFzByswu8s4Hld6457jSz3E7OkFhVCxU6Y9VWh0eyG0dWSyyC4YkO3cib mgHIzK60QGGAY1huYhsZRJ1XjPxJItiUNlEo0JFji7hPfMCS4D7Te79CLOYi3djQRs3z ZdWJOk/DyDHVOIeNnRJErkWE+Tfup21XKpriuKpPuLjqttwy/iHZCCIG7NDyg/Yo72Pb kPaA== X-Gm-Message-State: AE9vXwMf1jml+szZHqb3M9Ki0zKvOwtLcm29YAgEP9h5zz675xbcdfRSTVGTyQt19pTyjQ== X-Received: by 10.98.35.145 with SMTP id q17mr17716939pfj.42.1472655972485; Wed, 31 Aug 2016 08:06:12 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc115.osuosl.org. [140.211.9.73]) by smtp.gmail.com with ESMTPSA id c125sm464809pfc.40.2016.08.31.08.06.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Aug 2016 08:06:12 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 02/13] Rename 'arch' by 'gdbarch' in m32c_gdbarch_init Date: Wed, 31 Aug 2016 16:05:54 +0100 Message-Id: <1472655965-12212-3-git-send-email-yao.qi@linaro.org> In-Reply-To: <1472655965-12212-1-git-send-email-yao.qi@linaro.org> References: <1472655965-12212-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes This patch renames local 'arch' by 'gdbarch' in m32c_gdbarch_init, so that I can use macros in the following patch. gdb: 2016-08-30 Yao Qi * m32c-tdep.c (m32c_gdbarch_init): Rename local 'arch' by 'gdbarch'. --- gdb/m32c-tdep.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c index 1e98f73..8737880 100644 --- a/gdb/m32c-tdep.c +++ b/gdb/m32c-tdep.c @@ -2630,7 +2630,7 @@ m32c_virtual_frame_pointer (struct gdbarch *gdbarch, CORE_ADDR pc, static struct gdbarch * m32c_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { - struct gdbarch *arch; + struct gdbarch *gdbarch; struct gdbarch_tdep *tdep; unsigned long mach = info.bfd_arch_info->mach; @@ -2642,51 +2642,51 @@ m32c_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) return arches->gdbarch; tdep = XCNEW (struct gdbarch_tdep); - arch = gdbarch_alloc (&info, tdep); + gdbarch = gdbarch_alloc (&info, tdep); /* Essential types. */ - make_types (arch); + make_types (gdbarch); /* Address/pointer conversions. */ if (mach == bfd_mach_m16c) { - set_gdbarch_address_to_pointer (arch, m32c_m16c_address_to_pointer); - set_gdbarch_pointer_to_address (arch, m32c_m16c_pointer_to_address); + set_gdbarch_address_to_pointer (gdbarch, m32c_m16c_address_to_pointer); + set_gdbarch_pointer_to_address (gdbarch, m32c_m16c_pointer_to_address); } /* Register set. */ - make_regs (arch); + make_regs (gdbarch); /* Disassembly. */ - set_gdbarch_print_insn (arch, print_insn_m32c); + set_gdbarch_print_insn (gdbarch, print_insn_m32c); /* Breakpoints. */ - set_gdbarch_breakpoint_from_pc (arch, m32c_breakpoint_from_pc); + set_gdbarch_breakpoint_from_pc (gdbarch, m32c_breakpoint_from_pc); /* Prologue analysis and unwinding. */ - set_gdbarch_inner_than (arch, core_addr_lessthan); - set_gdbarch_skip_prologue (arch, m32c_skip_prologue); - set_gdbarch_unwind_pc (arch, m32c_unwind_pc); - set_gdbarch_unwind_sp (arch, m32c_unwind_sp); + set_gdbarch_inner_than (gdbarch, core_addr_lessthan); + set_gdbarch_skip_prologue (gdbarch, m32c_skip_prologue); + set_gdbarch_unwind_pc (gdbarch, m32c_unwind_pc); + set_gdbarch_unwind_sp (gdbarch, m32c_unwind_sp); #if 0 /* I'm dropping the dwarf2 sniffer because it has a few problems. They may be in the dwarf2 cfi code in GDB, or they may be in the debug info emitted by the upstream toolchain. I don't know which, but I do know that the prologue analyzer works better. MVS 04/13/06 */ - dwarf2_append_sniffers (arch); + dwarf2_append_sniffers (gdbarch); #endif - frame_unwind_append_unwinder (arch, &m32c_unwind); + frame_unwind_append_unwinder (gdbarch, &m32c_unwind); /* Inferior calls. */ - set_gdbarch_push_dummy_call (arch, m32c_push_dummy_call); - set_gdbarch_return_value (arch, m32c_return_value); - set_gdbarch_dummy_id (arch, m32c_dummy_id); + set_gdbarch_push_dummy_call (gdbarch, m32c_push_dummy_call); + set_gdbarch_return_value (gdbarch, m32c_return_value); + set_gdbarch_dummy_id (gdbarch, m32c_dummy_id); /* Trampolines. */ - set_gdbarch_skip_trampoline_code (arch, m32c_skip_trampoline_code); + set_gdbarch_skip_trampoline_code (gdbarch, m32c_skip_trampoline_code); - set_gdbarch_virtual_frame_pointer (arch, m32c_virtual_frame_pointer); + set_gdbarch_virtual_frame_pointer (gdbarch, m32c_virtual_frame_pointer); /* m32c function boundary addresses are not necessarily even. Therefore, the `vbit', which indicates a pointer to a virtual @@ -2696,9 +2696,9 @@ m32c_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) In order to verify this, see the definition of TARGET_PTRMEMFUNC_VBIT_LOCATION in gcc/defaults.h along with the definition of FUNCTION_BOUNDARY in gcc/config/m32c/m32c.h. */ - set_gdbarch_vbit_in_delta (arch, 1); + set_gdbarch_vbit_in_delta (gdbarch, 1); - return arch; + return gdbarch; } /* Provide a prototype to silence -Wmissing-prototypes. */