From 31c4d430c4ae6068c12ed5bb965fe7a1641b9bba Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Wed, 28 Nov 2001 03:36:36 +0000 Subject: [PATCH] * s390-tdep.c (s390_frame_chain): Remember that the SP's element of the frame's saved_regs array is special. --- gdb/ChangeLog | 3 +++ gdb/s390-tdep.c | 24 +++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 83a4af9a82..07b13ee24b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2001-11-27 Jim Blandy + * s390-tdep.c (s390_frame_chain): Remember that the SP's element + of the frame's saved_regs array is special. + * s390-tdep.c (register_names): Call the general-purpose registers `r0' -- `r15', and the floating-point registers `f0' -- `f15', to match the assembly language. diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index be50a92246..afefc7f69d 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -974,18 +974,24 @@ s390_frame_chain (struct frame_info *thisframe) { if (thisframe->saved_regs) { - int regno; - regno = - ((prev_fextra_info.frame_pointer_saved_pc - && thisframe-> - saved_regs[S390_FRAME_REGNUM]) ? S390_FRAME_REGNUM : - S390_SP_REGNUM); + if (prev_fextra_info.frame_pointer_saved_pc + && thisframe->saved_regs[S390_FRAME_REGNUM]) + regno = S390_FRAME_REGNUM; + else + regno = S390_SP_REGNUM; + if (thisframe->saved_regs[regno]) - prev_fp = - read_memory_integer (thisframe->saved_regs[regno], - S390_GPR_SIZE); + { + /* The SP's entry of `saved_regs' is special. */ + if (regno == S390_SP_REGNUM) + prev_fp = thisframe->saved_regs[regno]; + else + prev_fp = + read_memory_integer (thisframe->saved_regs[regno], + S390_GPR_SIZE); + } } } }