2003-01-03 Andrew Cagney <cagney@redhat.com>

	* alpha-tdep.c: Use deprecated_update_frame_base_hack.
	* avr-tdep.c, cris-tdep.c: Ditto.
	* mcore-tdep.c, mips-tdep.c, mn10200-tdep.c: Ditto.
	* sh-tdep.c, sparc-tdep.c, v850-tdep.c: Ditto.

10 files changed, 62 insertions, 56 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 32d1155..a0fb3f3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-03  Andrew Cagney  <cagney@redhat.com>
+
+	* alpha-tdep.c: Use deprecated_update_frame_base_hack.
+	* avr-tdep.c, cris-tdep.c: Ditto.
+	* mcore-tdep.c, mips-tdep.c, mn10200-tdep.c: Ditto.
+	* sh-tdep.c, sparc-tdep.c, v850-tdep.c: Ditto.
+	
 2003-01-03  Mark Kettenis  <kettenis@gnu.org>
 
 	* configure.in: Remove --enable-netrom option.
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 5dfe00d..1459505 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -1001,17 +1001,17 @@ alpha_init_extra_frame_info (int fromleaf, struct frame_info *frame)
       /* Fetch the frame pointer for a dummy frame from the procedure
          descriptor.  */
       if (PROC_DESC_IS_DUMMY (proc_desc))
-	frame->frame = (CORE_ADDR) PROC_DUMMY_FRAME (proc_desc);
+	deprecated_update_frame_base_hack (frame, (CORE_ADDR) PROC_DUMMY_FRAME (proc_desc));
 
       /* This may not be quite right, if proc has a real frame register.
          Get the value of the frame relative sp, procedure might have been
          interrupted by a signal at it's very start.  */
       else if (get_frame_pc (frame) == PROC_LOW_ADDR (proc_desc)
 	       && !alpha_proc_desc_is_dyn_sigtramp (proc_desc))
-	frame->frame = read_next_frame_reg (frame->next, SP_REGNUM);
+	deprecated_update_frame_base_hack (frame, read_next_frame_reg (frame->next, SP_REGNUM));
       else
-	frame->frame = read_next_frame_reg (frame->next, PROC_FRAME_REG (proc_desc))
-	  + PROC_FRAME_OFFSET (proc_desc);
+	deprecated_update_frame_base_hack (frame, read_next_frame_reg (frame->next, PROC_FRAME_REG (proc_desc))
+					   + PROC_FRAME_OFFSET (proc_desc));
 
       if (proc_desc == &temp_proc_desc)
 	{
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 7627ee4..16488f5 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -522,7 +522,7 @@ avr_scan_prologue (struct frame_info *fi)
 	      locals |= ((insn & 0xf) | ((insn & 0x0f00) >> 4)) << 8;
 	      if (memcmp (prologue + vpc + 4, img, sizeof (img)) == 0)
 		{
-		  fi->frame = locals;
+		  deprecated_update_frame_base_hack (fi, locals);
 
 		  fi->extra_info->is_main = 1;
 		  return;
@@ -754,18 +754,17 @@ avr_init_extra_frame_info (int fromleaf, struct frame_info *fi)
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = deprecated_read_register_dummy (get_frame_pc (fi), fi->frame,
-						  AVR_PC_REGNUM);
+      deprecated_update_frame_base_hack (fi, deprecated_read_register_dummy (get_frame_pc (fi), fi->frame,
+									     AVR_PC_REGNUM));
     }
   else if (!fi->next)		/* this is the innermost frame? */
-    fi->frame = read_register (fi->extra_info->framereg);
+    deprecated_update_frame_base_hack (fi, read_register (fi->extra_info->framereg));
   else if (fi->extra_info->is_main != 1)	/* not the innermost frame, not `main' */
     /* If we have an next frame,  the callee saved it. */
     {
       struct frame_info *next_fi = fi->next;
       if (fi->extra_info->framereg == AVR_SP_REGNUM)
-	fi->frame =
-	  next_fi->frame + 2 /* ret addr */  + next_fi->extra_info->framesize;
+	deprecated_update_frame_base_hack (fi, next_fi->frame + 2 /* ret addr */ + next_fi->extra_info->framesize);
       /* FIXME: I don't analyse va_args functions  */
       else
 	{
@@ -788,7 +787,7 @@ avr_init_extra_frame_info (int fromleaf, struct frame_info *fi)
 	  fp_high =
 	    (fp1 ? read_memory_unsigned_integer (avr_make_saddr (fp1), 1) :
 	     read_register (AVR_FP_REGNUM + 1)) & 0xff;
-	  fi->frame = fp_low | (fp_high << 8);
+	  deprecated_update_frame_base_hack (fi, fp_low | (fp_high << 8));
 	}
     }
 
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index c370ef7..52f20bb 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -1217,8 +1217,8 @@ cris_init_extra_frame_info (int fromleaf, struct frame_info *fi)
     {    
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = deprecated_read_register_dummy (get_frame_pc (fi), fi->frame,
-						  SP_REGNUM);
+      deprecated_update_frame_base_hack (fi, deprecated_read_register_dummy (get_frame_pc (fi), fi->frame,
+									     SP_REGNUM));
       fi->extra_info->return_pc = 
         deprecated_read_register_dummy (get_frame_pc (fi), fi->frame, PC_REGNUM);
 
diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c
index 890a342..d0cd302 100644
--- a/gdb/mcore-tdep.c
+++ b/gdb/mcore-tdep.c
@@ -298,7 +298,7 @@ analyze_dummy_frame (CORE_ADDR pc, CORE_ADDR frame)
   dummy->next = NULL;
   dummy->prev = NULL;
   deprecated_update_frame_pc_hack (dummy, pc);
-  dummy->frame = frame;
+  deprecated_update_frame_base_hack (dummy, frame);
   dummy->extra_info->status = 0;
   dummy->extra_info->framesize = 0;
   memset (dummy->saved_regs, '\000', SIZEOF_FRAME_SAVED_REGS);
@@ -385,7 +385,7 @@ mcore_analyze_prologue (struct frame_info *fi, CORE_ADDR pc, int skip_prologue)
     {
       mcore_insn_debug (("MCORE: got jmp r15"));
       if (fi->next == NULL)
-	fi->frame = read_sp ();
+	deprecated_update_frame_base_hack (fi, read_sp ());
       return get_frame_pc (fi);
     }
 
@@ -393,7 +393,7 @@ mcore_analyze_prologue (struct frame_info *fi, CORE_ADDR pc, int skip_prologue)
   if (fi != NULL && get_frame_pc (fi) == func_addr)
     {
       if (fi->next == NULL)
-	fi->frame = read_sp ();
+	deprecated_update_frame_base_hack (fi, read_sp ());
       return get_frame_pc (fi);
     }
 
@@ -615,9 +615,9 @@ mcore_analyze_prologue (struct frame_info *fi, CORE_ADDR pc, int skip_prologue)
       if (fi->next == NULL)
 	{
 	  if (fi->extra_info->status & MY_FRAME_IN_SP)
-	    fi->frame = read_sp () + framesize;
+	    deprecated_update_frame_base_hack (fi, read_sp () + framesize);
 	  else
-	    fi->frame = read_register (fp_regnum) + framesize;
+	    deprecated_update_frame_base_hack (fi, read_register (fp_regnum) + framesize);
 	}
 
       /* Note where saved registers are stored. The offsets in REGISTER_OFFSETS
@@ -1052,7 +1052,7 @@ mcore_init_extra_frame_info (int fromleaf, struct frame_info *fi)
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = deprecated_read_register_dummy (get_frame_pc (fi), fi->frame, SP_REGNUM);
+      deprecated_update_frame_base_hack (fi, deprecated_read_register_dummy (get_frame_pc (fi), fi->frame, SP_REGNUM));
     }
   else
     mcore_analyze_prologue (fi, 0, 0);
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index c6bca3a..1aa3696 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -2484,7 +2484,7 @@ mips_init_extra_frame_info (int fromleaf, struct frame_info *fci)
          interrupted by a signal at it's very start.  */
       if (get_frame_pc (fci) == PROC_LOW_ADDR (proc_desc)
 	  && !PROC_DESC_IS_DUMMY (proc_desc))
-	fci->frame = read_next_frame_reg (fci->next, SP_REGNUM);
+	deprecated_update_frame_base_hack (fci, read_next_frame_reg (fci->next, SP_REGNUM));
       else if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (fci), 0, 0))
 	/* Do not ``fix'' fci->frame.  It will have the value of the
            generic dummy frame's top-of-stack (since the draft
@@ -2494,7 +2494,7 @@ mips_init_extra_frame_info (int fromleaf, struct frame_info *fci)
            part of the dummy frames data.  */
 	/* Do nothing.  */;
       else
-	fci->frame = get_frame_pointer (fci->next, proc_desc);
+	deprecated_update_frame_base_hack (fci, get_frame_pointer (fci->next, proc_desc));
 
       if (proc_desc == &temp_proc_desc)
 	{
diff --git a/gdb/mn10200-tdep.c b/gdb/mn10200-tdep.c
index b29befb..3aea842 100644
--- a/gdb/mn10200-tdep.c
+++ b/gdb/mn10200-tdep.c
@@ -153,14 +153,14 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (status != 0)
 	{
 	  if (fi->next == NULL)
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return get_frame_pc (fi);
 	}
 
       if (buf[0] == 0xfe)
 	{
 	  if (fi->next == NULL)
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return get_frame_pc (fi);
 	}
     }
@@ -170,7 +170,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
   if (fi && get_frame_pc (fi) == func_addr)
     {
       if (fi->next == NULL)
-	fi->frame = read_sp ();
+	deprecated_update_frame_base_hack (fi, read_sp ());
       return get_frame_pc (fi);
     }
 
@@ -187,7 +187,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
   if (status != 0)
     {
       if (fi && fi->next == NULL && fi->status & MY_FRAME_IN_SP)
-	fi->frame = read_sp ();
+	deprecated_update_frame_base_hack (fi, read_sp ());
       return addr;
     }
 
@@ -218,7 +218,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
 	  /* We still haven't allocated our local stack.  Handle this
 	     as if we stopped on the first or last insn of a function.   */
 	  if (fi && fi->next == NULL)
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
 
@@ -226,7 +226,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (status != 0)
 	{
 	  if (fi && fi->next == NULL)
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
       if (buf[0] == 0xf2 && buf[1] == 0x7e)
@@ -245,7 +245,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       else
 	{
 	  if (fi && fi->next == NULL)
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
     }
@@ -263,7 +263,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
   if (status != 0)
     {
       if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	fi->frame = read_sp ();
+	deprecated_update_frame_base_hack (fi, read_sp ());
       return addr;
     }
   if (buf[0] == 0xd3)
@@ -275,7 +275,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (addr >= stop)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp () - stack_size;
+	    deprecated_update_frame_base_hack (fi, read_sp () - stack_size);
 	  return addr;
 	}
     }
@@ -285,7 +285,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (status != 0)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
       stack_size = extract_signed_integer (buf, 2);
@@ -295,7 +295,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (addr >= stop)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp () - stack_size;
+	    deprecated_update_frame_base_hack (fi, read_sp () - stack_size);
 	  return addr;
 	}
     }
@@ -305,7 +305,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (status != 0)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
       stack_size = extract_signed_integer (buf, 3);
@@ -315,7 +315,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (addr >= stop)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp () - stack_size;
+	    deprecated_update_frame_base_hack (fi, read_sp () - stack_size);
 	  return addr;
 	}
     }
@@ -334,7 +334,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (status != 0)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
 
@@ -346,7 +346,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (status == 0)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
 
@@ -362,7 +362,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
 	  if (fi && fi->next == NULL)
 	    {
 	      fi->stack_size -= 16;
-	      fi->frame = read_sp () - fi->stack_size;
+	      deprecated_update_frame_base_hack (fi, read_sp () - fi->stack_size);
 	    }
 	  return addr;
 	}
@@ -375,7 +375,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (status != 0)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
 
@@ -387,7 +387,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       if (status == 0)
 	{
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
-	    fi->frame = read_sp ();
+	    deprecated_update_frame_base_hack (fi, read_sp ());
 	  return addr;
 	}
 
@@ -403,7 +403,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
 	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
 	    {
 	      fi->stack_size -= 16;
-	      fi->frame = read_sp () - fi->stack_size;
+	      deprecated_update_frame_base_hack (fi, read_sp () - fi->stack_size);
 	    }
 	  return addr;
 	}
@@ -421,7 +421,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
 
       /* Update fi->frame if necessary.  */
       if (fi && fi->next == NULL)
-	fi->frame = read_sp () - fi->stack_size;
+	deprecated_update_frame_base_hack (fi, read_sp () - fi->stack_size);
 
       /* After the out of line prologue, there may be another
          stack adjustment for the outgoing arguments.
@@ -488,7 +488,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
       /* Now that we know the size of the outgoing arguments, fix
          fi->frame again if this is the innermost frame.  */
       if (fi && fi->next == NULL)
-	fi->frame -= outgoing_args_size;
+	deprecated_update_frame_base_hack (fi, fi->frame - outgoing_args_size);
 
       /* Note the register save information and update the stack
          size for this frame too.  */
@@ -510,7 +510,7 @@ mn10200_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
      need to fix fi->frame so that backtracing, find_frame_saved_regs,
      etc work correctly.  */
   if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP) != 0)
-    fi->frame = read_sp () - fi->stack_size;
+    deprecated_update_frame_base_hack (fi, read_sp () - fi->stack_size);
 
   /* And last we have the register saves.  These are relatively
      simple because they're physically done off the stack pointer,
@@ -639,7 +639,7 @@ mn10200_frame_chain (struct frame_info *fi)
      So we set up a dummy frame and call mn10200_analyze_prologue to
      find stuff for us.  */
   deprecated_update_frame_pc_hack (&dummy_frame, FRAME_SAVED_PC (fi));
-  dummy_frame.frame = fi->frame;
+  deprecated_update_frame_base_hack (&dummy_frame, fi->frame);
   memset (dummy_frame.fsr.regs, '\000', sizeof dummy_frame.fsr.regs);
   dummy_frame.status = 0;
   dummy_frame.stack_size = 0;
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 6aaa15f..3b715a8 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -1730,8 +1730,8 @@ sh_init_extra_frame_info (int fromleaf, struct frame_info *fi)
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = deprecated_read_register_dummy (get_frame_pc (fi), fi->frame,
-						  SP_REGNUM);
+      deprecated_update_frame_base_hack (fi, deprecated_read_register_dummy (get_frame_pc (fi), fi->frame,
+									     SP_REGNUM));
       fi->extra_info->return_pc = deprecated_read_register_dummy (get_frame_pc (fi),
 								  fi->frame,
 								  PC_REGNUM);
@@ -1762,8 +1762,8 @@ sh64_init_extra_frame_info (int fromleaf, struct frame_info *fi)
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = deprecated_read_register_dummy (get_frame_pc (fi), fi->frame,
-						  SP_REGNUM);
+      deprecated_update_frame_base_hack (fi, deprecated_read_register_dummy (get_frame_pc (fi), fi->frame,
+									     SP_REGNUM));
       fi->extra_info->return_pc = 
 	deprecated_read_register_dummy (get_frame_pc (fi), fi->frame, PC_REGNUM);
       fi->extra_info->f_offset = -(CALL_DUMMY_LENGTH + 4);
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 66e8997..8f5097e 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -320,17 +320,17 @@ sparc_init_extra_frame_info (int fromleaf, struct frame_info *fi)
 	{
 	  /* A frameless function interrupted by a signal did not change
 	     the frame pointer, fix up frame pointer accordingly.  */
-	  fi->frame = get_frame_base (fi->next);
+	  deprecated_update_frame_base_hack (fi, get_frame_base (fi->next));
 	  fi->extra_info->bottom = fi->next->extra_info->bottom;
 	}
       else
 	{
 	  /* Should we adjust for stack bias here? */
 	  get_saved_register (buf, 0, 0, fi, FP_REGNUM, 0);
-	  fi->frame = extract_address (buf, REGISTER_RAW_SIZE (FP_REGNUM));
+	  deprecated_update_frame_base_hack (fi, extract_address (buf, REGISTER_RAW_SIZE (FP_REGNUM)));
 
 	  if (GDB_TARGET_IS_SPARC64 && (fi->frame & 1))
-	    fi->frame += 2047;
+	    deprecated_update_frame_base_hack (fi, fi->frame + 2047);
 	}
     }
 
@@ -368,10 +368,10 @@ sparc_init_extra_frame_info (int fromleaf, struct frame_info *fi)
 
 	      /* Overwrite the frame's address with the value in %i7.  */
 	      get_saved_register (buf, 0, 0, fi, I7_REGNUM, 0);
-	      fi->frame = extract_address (buf, REGISTER_RAW_SIZE (I7_REGNUM));
+	      deprecated_update_frame_base_hack (fi, extract_address (buf, REGISTER_RAW_SIZE (I7_REGNUM)));
 
 	      if (GDB_TARGET_IS_SPARC64 && (fi->frame & 1))
-		fi->frame += 2047;
+		deprecated_update_frame_base_hack (fi, fi->frame + 2047);
 
 	      /* Record where the fp got saved.  */
 	      fi->extra_info->fp_addr = 
@@ -413,7 +413,7 @@ sparc_init_extra_frame_info (int fromleaf, struct frame_info *fi)
 	      if (addr >= get_frame_pc (fi))
 		{
 		  fi->extra_info->in_prologue = 1;
-		  fi->frame = read_register (SP_REGNUM);
+		  deprecated_update_frame_base_hack (fi, read_register (SP_REGNUM));
 		}
 	    }
 	}
@@ -421,7 +421,7 @@ sparc_init_extra_frame_info (int fromleaf, struct frame_info *fi)
   if (fi->next && fi->frame == 0)
     {
       /* Kludge to cause init_prev_frame_info to destroy the new frame.  */
-      fi->frame = fi->next->frame;
+      deprecated_update_frame_base_hack (fi, fi->next->frame);
       deprecated_update_frame_pc_hack (fi, get_frame_pc (fi->next));
     }
 }
diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index 72a4ba09..13952d5 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -1123,7 +1123,7 @@ v850_frame_init_saved_regs (struct frame_info *fi)
 	  v850_scan_prologue (get_frame_pc (fi), &pi);
 
 	  if (!fi->next && pi.framereg == E_SP_REGNUM)
-	    fi->frame = read_register (pi.framereg) - pi.frameoffset;
+	    deprecated_update_frame_base_hack (fi, read_register (pi.framereg) - pi.frameoffset);
 
 	  for (pifsr = pifsrs; pifsr->framereg; pifsr++)
 	    {