libiberty/ChangeLog:

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

diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index 2b1616a1f8cacb4fc6758e16cc10aa7751d14c5b..dcc583ec98ed92e8a5906dd143d28430240ae60c 100644 (file)
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -45,18 +45,18 @@ sentinel_frame_cache (struct regcache *regcache)
 /* Here the register value is taken direct from the register cache.  */
 
 void
-sentinel_frame_register_unwind (struct frame_info *frame,
-                               void **unwind_cache,
-                               int regnum, int *optimized,
-                               enum lval_type *lvalp, CORE_ADDR *addrp,
-                               int *realnum, void *bufferp)
+sentinel_frame_prev_register (struct frame_info *next_frame,
+                             void **this_prologue_cache,
+                             int regnum, int *optimized,
+                             enum lval_type *lvalp, CORE_ADDR *addrp,
+                             int *realnum, void *bufferp)
 {
-  struct frame_unwind_cache *cache = *unwind_cache;
+  struct frame_unwind_cache *cache = *this_prologue_cache;
   /* Describe the register's location.  A reg-frame maps all registers
      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.  */
@@ -71,31 +71,22 @@ sentinel_frame_register_unwind (struct frame_info *frame,
 }
 
 void
-sentinel_frame_id_unwind (struct frame_info *frame,
-                         void **cache,
-                         struct frame_id *id)
+sentinel_frame_this_id (struct frame_info *next_frame,
+                       void **this_prologue_cache,
+                       struct frame_id *this_id)
 {
-  /* FIXME: cagney/2003-01-08: This should be using a per-architecture
-     method that doesn't suffer from DECR_PC_AFTER_BREAK problems.
-     Such a method would take unwind_cache, regcache and stop reason
-     parameters.  */
-  id->base = read_fp ();
-  id->pc = read_pc ();
-}
-
-static void
-sentinel_frame_pop (struct frame_info *frame,
-                   void **cache,
-                   struct regcache *regcache)
-{
-  internal_error (__FILE__, __LINE__, "Function sentinal_frame_pop called");
+  /* 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");
 }
 
 const struct frame_unwind sentinel_frame_unwinder =
 {
-  sentinel_frame_pop,
-  sentinel_frame_id_unwind,
-  sentinel_frame_register_unwind
+  /* Should the sentinel frame be given a special type?  */
+  NORMAL_FRAME,
+  sentinel_frame_this_id,
+  sentinel_frame_prev_register
 };
 
 const struct frame_unwind *const sentinel_frame_unwind = &sentinel_frame_unwinder;