From ad76968956f30bed6d120e0dfd247034e0855fea 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: s390 gdb: 2016-11-22 Yao Qi * s390-linux-tdep.c (s390_software_single_step): Call get_regcache_arch instead of get_frame_arch. Call regcache_read_pc instead of get_frame_pc. --- gdb/ChangeLog | 6 ++++++ gdb/s390-linux-tdep.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b3931c3b32..9898c8fffe 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-11-22 Yao Qi + + * s390-linux-tdep.c (s390_software_single_step): Call + get_regcache_arch instead of get_frame_arch. Call + regcache_read_pc instead of get_frame_pc. + 2016-11-22 Yao Qi * sparc-tdep.c (sparc_analyze_control_transfer): Replace parameter diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c index 885aadd153..dc5c674bc2 100644 --- a/gdb/s390-linux-tdep.c +++ b/gdb/s390-linux-tdep.c @@ -725,9 +725,9 @@ s390_is_partial_instruction (struct gdbarch *gdbarch, CORE_ADDR loc, int *len) static VEC (CORE_ADDR) * s390_software_single_step (struct frame_info *frame) { - struct gdbarch *gdbarch = get_frame_arch (frame); - struct address_space *aspace = get_frame_address_space (frame); - CORE_ADDR loc = get_frame_pc (frame); + struct regcache *regcache = get_current_regcache (); + struct gdbarch *gdbarch = get_regcache_arch (regcache); + CORE_ADDR loc = regcache_read_pc (regcache); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int len; uint16_t insn; -- 2.34.1