* symfile.c (find_separate_debug_file): Assert that the objfile's

[deliverable/binutils-gdb.git] / gdb / i386-linux-tdep.c

diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index c7bd36a0d56c36073a6c3ac22f891002581a7352..9bf5a16e200f1e8108aeb296596a9e7b9b3e8959 100644 (file)
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -247,16 +247,16 @@ i386_linux_sigcontext_addr (struct frame_info *frame)
 {
   CORE_ADDR pc;
 
-  pc = i386_linux_sigtramp_start (frame->pc);
+  pc = i386_linux_sigtramp_start (get_frame_pc (frame));
   if (pc)
     {
       CORE_ADDR sp;
 
-      if (frame->next)
+      if (get_next_frame (frame))
        /* If this isn't the top frame, the next frame must be for the
           signal handler itself.  The sigcontext structure lives on
           the stack, right after the signum argument.  */
-       return frame->next->frame + 12;
+       return get_frame_base (get_next_frame (frame)) + 12;
 
       /* This is the top frame.  We'll have to find the address of the
         sigcontext structure by looking at the stack pointer.  Keep
@@ -264,20 +264,21 @@ i386_linux_sigcontext_addr (struct frame_info *frame)
         "pop %eax".  If the PC is at this instruction, adjust the
         returned value accordingly.  */
       sp = read_register (SP_REGNUM);
-      if (pc == frame->pc)
+      if (pc == get_frame_pc (frame))
        return sp + 4;
       return sp;
     }
 
-  pc = i386_linux_rt_sigtramp_start (frame->pc);
+  pc = i386_linux_rt_sigtramp_start (get_frame_pc (frame));
   if (pc)
     {
-      if (frame->next)
+      if (get_next_frame (frame))
        /* If this isn't the top frame, the next frame must be for the
           signal handler itself.  The sigcontext structure is part of
           the user context.  A pointer to the user context is passed
           as the third argument to the signal handler.  */
-       return read_memory_integer (frame->next->frame + 16, 4) + 20;
+       return read_memory_integer (get_frame_base (get_next_frame (frame))
+                                   + 16, 4) + 20;
 
       /* This is the top frame.  Again, use the stack pointer to find
         the address of the sigcontext structure.  */