From bf75c8c166846fc8d5bdefe32a61dfa18300adb1 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 20 Apr 2002 03:09:28 +0000 Subject: [PATCH] * sparc-tdep.c (sparc_get_saved_register): Use get_prev_frame instead of ->prev. * z8k-tdep.c (z8k_frame_chain): Do not use ->prev. * s390-tdep.c (s390_frame_chain): Do not use ->prev. * rs6000-tdep.c (frame_get_saved_regs): Use rs6000_frame_chain() instead of ->prev. --- gdb/ChangeLog | 9 +++++++++ gdb/rs6000-tdep.c | 9 ++++++--- gdb/s390-tdep.c | 4 +--- gdb/sparc-tdep.c | 8 ++++---- gdb/z8k-tdep.c | 4 ---- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d747c92..2f692ab 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2002-04-14 Andrew Cagney + + * sparc-tdep.c (sparc_get_saved_register): Use get_prev_frame + instead of ->prev. + * z8k-tdep.c (z8k_frame_chain): Do not use ->prev. + * s390-tdep.c (s390_frame_chain): Do not use ->prev. + * rs6000-tdep.c (frame_get_saved_regs): Use rs6000_frame_chain() + instead of ->prev. + 2002-04-19 Elena Zannoni Fix PR gdb/471. diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 265ecd6..23130b8 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -1388,10 +1388,13 @@ frame_get_saved_regs (struct frame_info *fi, struct rs6000_framedata *fdatap) && fdatap->cr_offset == 0 && fdatap->vr_offset == 0) frame_addr = 0; - else if (fi->prev && fi->prev->frame) - frame_addr = fi->prev->frame; else - frame_addr = read_memory_addr (fi->frame, wordsize); + /* NOTE: cagney/2002-04-14: The ->frame points to the inner-most + address of the current frame. Things might be easier if the + ->frame pointed to the outer-most address of the frame. In the + mean time, the address of the prev frame is used as the base + address of this frame. */ + frame_addr = FRAME_CHAIN (fi); /* if != -1, fdatap->saved_fpr is the smallest number of saved_fpr. All fpr's from saved_fpr to fp31 are saved. */ diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index d888ae3..c69aca6 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1009,9 +1009,7 @@ s390_frame_chain (struct frame_info *thisframe) { CORE_ADDR prev_fp = 0; - if (thisframe->prev && thisframe->prev->frame) - prev_fp = thisframe->prev->frame; - else if (generic_find_dummy_frame (thisframe->pc, thisframe->frame)) + if (generic_find_dummy_frame (thisframe->pc, thisframe->frame)) return generic_read_register_dummy (thisframe->pc, thisframe->frame, S390_SP_REGNUM); else diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index d6c5dcc..88aeb67 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -829,11 +829,11 @@ sparc_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp, addr = frame1->frame + (regnum - G0_REGNUM) * SPARC_INTREG_SIZE - (FP_REGISTER_BYTES + 8 * SPARC_INTREG_SIZE); else if (regnum >= I0_REGNUM && regnum < I0_REGNUM + 8) - addr = (frame1->prev->extra_info->bottom + addr = (get_prev_frame (frame1)->extra_info->bottom + (regnum - I0_REGNUM) * SPARC_INTREG_SIZE + FRAME_SAVED_I0); else if (regnum >= L0_REGNUM && regnum < L0_REGNUM + 8) - addr = (frame1->prev->extra_info->bottom + addr = (get_prev_frame (frame1)->extra_info->bottom + (regnum - L0_REGNUM) * SPARC_INTREG_SIZE + FRAME_SAVED_L0); else if (regnum >= O0_REGNUM && regnum < O0_REGNUM + 8) @@ -875,11 +875,11 @@ sparc_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp, { /* Normal frame. Local and In registers are saved on stack. */ if (regnum >= I0_REGNUM && regnum < I0_REGNUM + 8) - addr = (frame1->prev->extra_info->bottom + addr = (get_prev_frame (frame1)->extra_info->bottom + (regnum - I0_REGNUM) * SPARC_INTREG_SIZE + FRAME_SAVED_I0); else if (regnum >= L0_REGNUM && regnum < L0_REGNUM + 8) - addr = (frame1->prev->extra_info->bottom + addr = (get_prev_frame (frame1)->extra_info->bottom + (regnum - L0_REGNUM) * SPARC_INTREG_SIZE + FRAME_SAVED_L0); else if (regnum >= O0_REGNUM && regnum < O0_REGNUM + 8) diff --git a/gdb/z8k-tdep.c b/gdb/z8k-tdep.c index fa043a2..572a878 100644 --- a/gdb/z8k-tdep.c +++ b/gdb/z8k-tdep.c @@ -160,10 +160,6 @@ read_memory_pointer (CORE_ADDR x) CORE_ADDR z8k_frame_chain (struct frame_info *thisframe) { - if (thisframe->prev == 0) - { - /* This is the top of the stack, let's get the sp for real */ - } if (!inside_entry_file (thisframe->pc)) { return read_memory_pointer (thisframe->frame); -- 2.7.4