From fb090cfa157e35fac1c10c062fd005e38b894ea4 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 22 Nov 2016 14:05:05 +0000 Subject: [PATCH] gdbarch software_single_step frame_info to regcache: tic6x gdb: 2016-11-22 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/ChangeLog | 7 +++++++ gdb/tic6x-tdep.c | 23 ++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c454d7febf4..7b799bd3060 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2016-11-22 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. + 2016-11-22 Yao Qi * rs6000-aix-tdep.c (branch_dest): Replace parameter frame with diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c index 399795c48a0..145534a2671 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); -- 2.30.2