(cr16c_elf_final_link_relocate): Remove duplicated return statements and

[deliverable/binutils-gdb.git] / gdb / sentinel-frame.c

diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index e4060d2776741732083608f32b715019fa34d74f..136dad85835b684e260e3744a3dd17925048e873 100644 (file)
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -44,7 +44,7 @@ sentinel_frame_cache (struct regcache *regcache)
 
 /* Here the register value is taken direct from the register cache.  */
 
-void
+static void
 sentinel_frame_prev_register (struct frame_info *next_frame,
                              void **this_prologue_cache,
                              int regnum, int *optimized,
@@ -56,7 +56,7 @@ sentinel_frame_prev_register (struct frame_info *next_frame,
      onto the corresponding hardware register.  */
   *optimized = 0;
   *lvalp = lval_register;
-  *addrp = REGISTER_BYTE (regnum);
+  *addrp = register_offset_hack (current_gdbarch, regnum);
   *realnum = regnum;
 
   /* If needed, find and return the value of the register.  */
@@ -70,7 +70,7 @@ sentinel_frame_prev_register (struct frame_info *next_frame,
     }
 }
 
-void
+static void
 sentinel_frame_this_id (struct frame_info *next_frame,
                        void **this_prologue_cache,
                        struct frame_id *this_id)
@@ -78,13 +78,25 @@ sentinel_frame_this_id (struct frame_info *next_frame,
   /* The sentinel frame is used as a starting point for creating the
      previous (inner most) frame.  That frame's THIS_ID method will be
      called to determine the inner most frame's ID.  Not this one.  */
-  internal_error (__FILE__, __LINE__, "sentinel_frame_this_id called");
+  internal_error (__FILE__, __LINE__, _("sentinel_frame_this_id called"));
+}
+
+static CORE_ADDR
+sentinel_frame_prev_pc (struct frame_info *next_frame,
+                       void **this_prologue_cache)
+{
+  struct gdbarch *gdbarch = get_frame_arch (next_frame);
+  return gdbarch_unwind_pc (gdbarch, next_frame);
 }
 
 const struct frame_unwind sentinel_frame_unwinder =
 {
+  SENTINEL_FRAME,
   sentinel_frame_this_id,
-  sentinel_frame_prev_register
+  sentinel_frame_prev_register,
+  NULL, /* unwind_data */
+  NULL, /* sniffer */
+  sentinel_frame_prev_pc,
 };
 
 const struct frame_unwind *const sentinel_frame_unwind = &sentinel_frame_unwinder;