From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 48096 invoked by alias); 14 Nov 2016 17:43:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 47885 invoked by uid 89); 14 Nov 2016 17:43:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:4018, 0x10000000, 62210, 6767 X-HELO: mail-pg0-f65.google.com Received: from mail-pg0-f65.google.com (HELO mail-pg0-f65.google.com) (74.125.83.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 14 Nov 2016 17:43:11 +0000 Received: by mail-pg0-f65.google.com with SMTP id 3so9473323pgd.0 for ; Mon, 14 Nov 2016 09:43:10 -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=f8HvpOnDjHsj1ws4hPodFDYZdzH4Lklpsm/9mUqc1RQ=; b=dz+XFlBxCzhwBiVV5hUBBBK0QVoTNqiUOkPQGEf8M3+K5oy6mE8IBh6aPmQ3mo5/iD ooYJ1HoJizs/kNxCPCyMQfh/0do2CmZk0hTcN66RBWpUFHLPAhvYVOZuT2hnGqWBhq+Z SqnKhjrAJG7HBaBAwWzuadpe1O34NauDVsJzu3o1oWzNI38oLv4BRLhYPSmECovPSPQe hTtwVCQrvYdZm27HR0JhPDo8sd6KQ5ypnJi7PqvBso2JfDaHuFEcI+V2AGRh7mkOJCkW rt+BJrMbyVhCGdII9LfBXHNJRSQ4D3T032FtBEeyBlUskzqpA8eay5LrUI2DxgKi2+FT jYpQ== X-Gm-Message-State: ABUngvdINPlaaRodt7PIK+J39qT2htsddhO5A9B0wDH5/7Gr6Ibi8XuaO3h2LVVzTZ+Urg== X-Received: by 10.98.141.74 with SMTP id z71mr38055086pfd.53.1479145389319; Mon, 14 Nov 2016 09:43:09 -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.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Nov 2016 09:43:08 -0800 (PST) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 11/13] gdbarch software_single_step frame_info to regcache: tic6x Date: Mon, 14 Nov 2016 17:43:00 -0000 Message-Id: <1479145370-11432-12-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 X-SW-Source: 2016-11/txt/msg00356.txt.bz2 gdb: 2016-11-10 Yao Qi * tic6x-tdep.c (tic6x_condition_true): Replace frame with regcache. Call regcache_raw_get_signed instead of get_frame_register_signed. (tic6x_get_next_pc): Likewise. Caller updated. --- gdb/tic6x-tdep.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c index 399795c..145534a 100644 --- a/gdb/tic6x-tdep.c +++ b/gdb/tic6x-tdep.c @@ -563,7 +563,7 @@ tic6x_fetch_instruction (struct gdbarch *gdbarch, CORE_ADDR pc) return 1 if INST is not a conditional instruction. */ static int -tic6x_condition_true (struct frame_info *frame, unsigned long inst) +tic6x_condition_true (struct regcache *regcache, unsigned long inst) { int register_number; int register_value; @@ -573,7 +573,7 @@ tic6x_condition_true (struct frame_info *frame, unsigned long inst) if (register_number == -1) return 1; - register_value = get_frame_register_signed (frame, register_number); + register_value = regcache_raw_get_signed (regcache, register_number); if ((inst & 0x10000000) != 0) return register_value == 0; return register_value != 0; @@ -604,9 +604,9 @@ tic6x_extract_signed_field (int value, int low_bit, int bits) /* Determine where to set a single step breakpoint. */ static CORE_ADDR -tic6x_get_next_pc (struct frame_info *frame, CORE_ADDR pc) +tic6x_get_next_pc (struct regcache *regcache, CORE_ADDR pc) { - struct gdbarch *gdbarch = get_frame_arch (frame); + struct gdbarch *gdbarch = get_regcache_arch (regcache); unsigned long inst; int register_number; int last = 0; @@ -622,10 +622,10 @@ tic6x_get_next_pc (struct frame_info *frame, CORE_ADDR pc) struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); if (tdep->syscall_next_pc != NULL) - return tdep->syscall_next_pc (frame); + return tdep->syscall_next_pc (get_current_frame ()); } - if (tic6x_condition_true (frame, inst)) + if (tic6x_condition_true (regcache, inst)) { if ((inst & 0x0000007c) == 0x00000010) { @@ -641,7 +641,7 @@ tic6x_get_next_pc (struct frame_info *frame, CORE_ADDR pc) register_number = tic6x_register_number ((inst >> 18) & 0x1f, INST_S_BIT (inst), INST_X_BIT (inst)); - pc = get_frame_register_unsigned (frame, register_number); + pc = regcache_raw_get_unsigned (regcache, register_number); break; } if ((inst & 0x00001ffc) == 0x00001020) @@ -649,7 +649,7 @@ tic6x_get_next_pc (struct frame_info *frame, CORE_ADDR pc) /* BDEC */ register_number = tic6x_register_number ((inst >> 23) & 0x1f, INST_S_BIT (inst), 0); - if (get_frame_register_signed (frame, register_number) >= 0) + if (regcache_raw_get_signed (regcache, register_number) >= 0) { pc &= ~(TIC6X_FETCH_PACKET_SIZE - 1); pc += tic6x_extract_signed_field (inst, 7, 10) << 2; @@ -668,7 +668,7 @@ tic6x_get_next_pc (struct frame_info *frame, CORE_ADDR pc) /* BNOP with register */ register_number = tic6x_register_number ((inst >> 18) & 0x1f, 1, INST_X_BIT (inst)); - pc = get_frame_register_unsigned (frame, register_number); + pc = regcache_raw_get_unsigned (regcache, register_number); break; } if ((inst & 0x00001ffc) == 0x00000020) @@ -676,7 +676,7 @@ tic6x_get_next_pc (struct frame_info *frame, CORE_ADDR pc) /* BPOS */ register_number = tic6x_register_number ((inst >> 23) & 0x1f, INST_S_BIT (inst), 0); - if (get_frame_register_signed (frame, register_number) >= 0) + if (regcache_raw_get_signed (regcache, register_number) >= 0) { pc &= ~(TIC6X_FETCH_PACKET_SIZE - 1); pc += tic6x_extract_signed_field (inst, 13, 10) << 2; @@ -702,7 +702,8 @@ tic6x_get_next_pc (struct frame_info *frame, CORE_ADDR pc) static VEC (CORE_ADDR) * tic6x_software_single_step (struct frame_info *frame) { - CORE_ADDR next_pc = tic6x_get_next_pc (frame, get_frame_pc (frame)); + struct regcache *regcache = get_current_regcache (); + CORE_ADDR next_pc = tic6x_get_next_pc (regcache, regcache_read_pc (regcache)); VEC (CORE_ADDR) *next_pcs = NULL; VEC_safe_push (CORE_ADDR, next_pcs, next_pc); -- 1.9.1