From: Yao Qi <qiyaoltc@gmail.com>
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 [thread overview]
Message-ID: <1479145370-11432-12-git-send-email-yao.qi@linaro.org> (raw)
In-Reply-To: <1479145370-11432-1-git-send-email-yao.qi@linaro.org>
gdb:
2016-11-10 Yao Qi <yao.qi@linaro.org>
* 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
next prev parent reply other threads:[~2016-11-14 17:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-14 17:43 [PATCH 00/13] Change gdbarch software_single_step frame_info to regcache Yao Qi
2016-11-14 17:43 ` [PATCH 04/13] gdbarch software_single_step frame_info to regcache: cris Yao Qi
2016-11-14 17:43 ` [PATCH 10/13] gdbarch software_single_step frame_info to regcache: rs6000 Yao Qi
2016-11-14 17:43 ` [PATCH 02/13] gdbarch software_single_step frame_info to regcache: aarch64 Yao Qi
2016-11-14 17:43 ` [PATCH 03/13] gdbarch software_single_step frame_info to regcache: alpha Yao Qi
2016-11-14 17:43 ` [PATCH 08/13] gdbarch software_single_step frame_info to regcache: sparc Yao Qi
2016-11-14 17:43 ` [PATCH 05/13] gdbarch software_single_step frame_info to regcache: mips Yao Qi
2016-11-14 17:43 ` [PATCH 12/13] gdbarch software_single_step frame_info to regcache: spu Yao Qi
2016-11-14 17:43 ` [PATCH 13/13] Change gdbarch software_single_step frame_info to regcache Yao Qi
2016-11-16 16:17 ` Luis Machado
2016-11-14 17:43 ` [PATCH 09/13] gdbarch software_single_step frame_info to regcache: s390 Yao Qi
2016-11-14 17:43 ` [PATCH 01/13] New regcache_raw_get_signed Yao Qi
2016-11-16 15:09 ` Luis Machado
2016-11-22 9:28 ` Yao Qi
[not found] ` <36110d4e-9c80-23cb-ee40-849fb155af53@codesourcery.com>
2016-11-22 14:33 ` Yao Qi
2016-11-14 17:43 ` Yao Qi [this message]
2016-11-14 17:43 ` [PATCH 07/13] gdbarch software_single_step frame_info to regcache: nios2 Yao Qi
2016-11-14 17:43 ` [PATCH 06/13] gdbarch software_single_step frame_info to regcache: moxie Yao Qi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479145370-11432-12-git-send-email-yao.qi@linaro.org \
--to=qiyaoltc@gmail.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox