From patchwork Mon Nov 14 17:42:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 17468 Received: (qmail 46636 invoked by alias); 14 Nov 2016 17:43:12 -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 46326 invoked by uid 89); 14 Nov 2016 17:43:09 -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_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=moxie, 1.9.1 X-HELO: mail-pg0-f66.google.com Received: from mail-pg0-f66.google.com (HELO mail-pg0-f66.google.com) (74.125.83.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 14 Nov 2016 17:43:05 +0000 Received: by mail-pg0-f66.google.com with SMTP id e9so9127765pgc.1 for ; Mon, 14 Nov 2016 09:43:05 -0800 (PST) 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=5g5RyOnFKkAU3STmH6NXHoa3CNfgY+n7N8bAbQNoEo8=; b=lUInAl3JY4EwW07iLmT7gSOpZDCiPE9WYEKjDP+EKNFm6sMWzEmmmf9ffx3RzC5yYk KN5iE4gNWKipWZTbBrYGA6iLagClPwk3svnq/TAVSVYMHiWtEYpub+7ck/MnOYRJ/gL7 r3GPJyj/lPIwnklV4Kd/cYe+pjMTfdoLPaQ74vrjsbrxnKUAOTXnM+B8daE11rL5NoIR T+uub/xPFr1yAAoxiB4Gybt5nWVeeKHzzoUpv9s+le5Ycg7YrRbO9LII2HrK7LLPx5gg 4ymYwQ6qcaKCu+L5U/vBZNxJwM/RKXleIvP+DI3AIEH3c9vLOcGo0iIInFgk4bVdksx5 jz3A== X-Gm-Message-State: ABUngverHxlcf5SY1J/UhEDFCZGKAy3tumGH3i+LXAXN/0qD2adZ7SwD7b9rxsl5BPK0/g== X-Received: by 10.99.64.133 with SMTP id n127mr13104810pga.104.1479145383890; Mon, 14 Nov 2016 09:43:03 -0800 (PST) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id y29sm36696024pfd.63.2016.11.14.09.43.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Nov 2016 09:43:03 -0800 (PST) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 06/13] gdbarch software_single_step frame_info to regcache: moxie Date: Mon, 14 Nov 2016 17:42:43 +0000 Message-Id: <1479145370-11432-7-git-send-email-yao.qi@linaro.org> In-Reply-To: <1479145370-11432-1-git-send-email-yao.qi@linaro.org> References: <1479145370-11432-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes gdb: 2016-11-10 Yao Qi * moxie-tdep.c (moxie_software_single_step): Call get_regcache_arch instead of get_frame_arch. Call regcache_read_pc instead of get_frame_pc. --- gdb/moxie-tdep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c index b341945..90a6165 100644 --- a/gdb/moxie-tdep.c +++ b/gdb/moxie-tdep.c @@ -302,17 +302,17 @@ moxie_process_readu (CORE_ADDR addr, gdb_byte *buf, static VEC (CORE_ADDR) * moxie_software_single_step (struct frame_info *frame) { - struct gdbarch *gdbarch = get_frame_arch (frame); + struct regcache *regcache = get_current_regcache (); + struct gdbarch *gdbarch = get_regcache_arch (regcache); CORE_ADDR addr; gdb_byte buf[4]; uint16_t inst; uint32_t tmpu32; ULONGEST fp; enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - struct regcache *regcache = get_current_regcache (); VEC (CORE_ADDR) *next_pcs = NULL; - addr = get_frame_pc (frame); + addr = regcache_read_pc (regcache); inst = (uint16_t) moxie_process_readu (addr, buf, 2, byte_order);