This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch/rfc] Add replacement for deprecated generic_read_register_dummy()


Hello,

The attached patch does two things:

- Deprecated generic_read_register_dummy(), renaming it to deprecated_read_register_dummy().

- Adds the new functions frame_unwind_unsigned_register() and frame_unwind_signed_register(). This function returns the value of the register in the previous frame (which is different to get_saved_register()).

Any call to deprecated_read_register_dummy() such as:

CORE_ADDR saved_pc = generic_read_register_dummy (fi->pc, fi->frame, E_PC_REGNUM);

can be replaced by the equivalent sequence:

ULONGEST tmp;
frame_unwind_unsigned_register (fi, regnum, &tmp);
saved_pc = tmp;

Keep in mind that frame_unwind_*() works with any frame. Consequently a code sequence like:

if (PC_IN_CALL_DUMMY (fi->pc, ...))
return generic_read_register_dummy (fi->pc, fi->next->frame, regnum);
else
... something involving frame_register_unwind ...

can be reduced to:

ULONGEST tmp;
frame_unwind_unsigned_register (fi, regnum, &tmp);
return tmp;

(if you haven't guessed, I need the ..._signed_... function as part of converting the MIPS to generic dummy frames.)

I'll be looking to commit this next week (I'm waiting on an all architectures build to finish).

Comments?
Andrew
2002-09-13  Andrew Cagney  <cagney@redhat.com>

	* blockframe.c (deprecated_read_register_dummy): Rename
	generic_read_register_dummy.
	* frame.c (frame_unwind_signed_register): New function.
	(frame_unwind_unsigned_register): New function.
	* frame.h (frame_unwind_signed_register): Declare.
	(frame_unwind_unsigned_register): Declare.
	(deprecated_read_register_dummy): Rename
	generic_read_register_dummy.

	* xstormy16-tdep.c (xstormy16_frame_saved_pc): Update.
	* rs6000-tdep.c (rs6000_frame_saved_pc): Update.
	* s390-tdep.c (s390_frame_saved_pc_nofix): Update.
	(s390_frame_chain): Update.
	* v850-tdep.c (v850_find_callers_reg): Update.
	(v850_frame_saved_pc): Update.
	* m32r-tdep.c (m32r_init_extra_frame_info): Update.
	(m32r_find_callers_reg): Update.
	(m32r_frame_saved_pc): Update.
	* sh-tdep.c (sh_find_callers_reg): Update.
	(sh64_get_saved_pr): Update.
	(sh_init_extra_frame_info): Update.
	(sh_init_extra_frame_info): Update.
	(sh64_init_extra_frame_info): Update.
	(sh64_init_extra_frame_info): Update.
	* mcore-tdep.c (mcore_find_callers_reg): Update.
	(mcore_frame_saved_pc): Update.
	(mcore_init_extra_frame_info): Update.
	* i386-tdep.c (i386_frame_saved_pc): Update.
	* ia64-tdep.c (ia64_frame_saved_pc): Update.
	(ia64_init_extra_frame_info): Update.
	(ia64_init_extra_frame_info): Update.
	* h8300-tdep.c (h8300_frame_chain): Update.
	(h8300_frame_saved_pc): Update.
	* d10v-tdep.c (d10v_frame_saved_pc): Update.
	* cris-tdep.c (cris_init_extra_frame_info): Update.
	* avr-tdep.c (avr_frame_chain): Update.
	(avr_init_extra_frame_info): Update.
	(avr_frame_saved_pc): Update.
	* arm-tdep.c (arm_find_callers_reg): Update.
	(arm_init_extra_frame_info): Update.
	(arm_frame_saved_pc): Update.

Index: arm-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/arm-tdep.c,v
retrieving revision 1.72
diff -u -r1.72 arm-tdep.c
--- arm-tdep.c	5 Sep 2002 19:05:59 -0000	1.72
+++ arm-tdep.c	13 Sep 2002 21:46:33 -0000
@@ -995,7 +995,7 @@
       if (USE_GENERIC_DUMMY_FRAMES
 	  && PC_IN_CALL_DUMMY (fi->pc, 0, 0))
 	{
-	  return generic_read_register_dummy (fi->pc, fi->frame, regnum);
+	  return deprecated_read_register_dummy (fi->pc, fi->frame, regnum);
 	}
       else if (fi->saved_regs[regnum] != 0)
 	{
@@ -1110,8 +1110,8 @@
 	   && PC_IN_CALL_DUMMY (fi->next->pc, 0, 0))
     /* For generic dummy frames, pull the value direct from the frame.
        Having an unwind function to do this would be nice.  */
-    sp = generic_read_register_dummy (fi->next->pc, fi->next->frame,
-				      ARM_SP_REGNUM);
+    sp = deprecated_read_register_dummy (fi->next->pc, fi->next->frame,
+					 ARM_SP_REGNUM);
   else
     sp = (fi->next->frame - fi->next->extra_info->frameoffset
 	  + fi->next->extra_info->framesize);
@@ -1221,7 +1221,7 @@
   /* If a dummy frame, pull the PC out of the frame's register buffer.  */
   if (USE_GENERIC_DUMMY_FRAMES
       && PC_IN_CALL_DUMMY (fi->pc, 0, 0))
-    return generic_read_register_dummy (fi->pc, fi->frame, ARM_PC_REGNUM);
+    return deprecated_read_register_dummy (fi->pc, fi->frame, ARM_PC_REGNUM);
 
   if (PC_IN_CALL_DUMMY (fi->pc, fi->frame - fi->extra_info->frameoffset,
 			fi->frame))
Index: avr-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/avr-tdep.c,v
retrieving revision 1.8
diff -u -r1.8 avr-tdep.c
--- avr-tdep.c	3 Sep 2002 21:42:13 -0000	1.8
+++ avr-tdep.c	13 Sep 2002 21:46:34 -0000
@@ -755,7 +755,11 @@
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = generic_read_register_dummy (fi->pc, fi->frame, fi->frame);
+      /* FIXME: cagney/2002-09-13: This is wrong.  The third parameter
+         to deprecated_read_register_dummy() is REGNUM and not a frame
+         address.  */
+      fi->frame = deprecated_read_register_dummy (fi->pc, fi->frame,
+						  fi->frame);
     }
   else if (!fi->next)		/* this is the innermost frame? */
     fi->frame = read_register (fi->extra_info->framereg);
@@ -867,8 +871,8 @@
 avr_frame_saved_pc (struct frame_info *frame)
 {
   if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
-    return generic_read_register_dummy (frame->pc, frame->frame,
-					AVR_PC_REGNUM);
+    return deprecated_read_register_dummy (frame->pc, frame->frame,
+					   AVR_PC_REGNUM);
   else
     return frame->extra_info->return_pc;
 }
@@ -1033,10 +1037,9 @@
   if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
     {
       /* initialize the return_pc now */
-      frame->extra_info->return_pc = generic_read_register_dummy (frame->pc,
-								  frame->
-								  frame,
-								  AVR_PC_REGNUM);
+      frame->extra_info->return_pc
+	= deprecated_read_register_dummy (frame->pc, frame->frame,
+					  AVR_PC_REGNUM);
       return frame->frame;
     }
   return (frame->extra_info->is_main ? 0
Index: blockframe.c
===================================================================
RCS file: /cvs/src/src/gdb/blockframe.c,v
retrieving revision 1.39
diff -u -r1.39 blockframe.c
--- blockframe.c	6 Sep 2002 20:17:40 -0000	1.39
+++ blockframe.c	13 Sep 2002 21:46:34 -0000
@@ -1208,7 +1208,7 @@
    Find a saved register from before GDB calls a function in the inferior */
 
 CORE_ADDR
-generic_read_register_dummy (CORE_ADDR pc, CORE_ADDR fp, int regno)
+deprecated_read_register_dummy (CORE_ADDR pc, CORE_ADDR fp, int regno)
 {
   struct regcache *dummy_regs = generic_find_dummy_frame (pc, fp);
 
Index: cris-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/cris-tdep.c,v
retrieving revision 1.21
diff -u -r1.21 cris-tdep.c
--- cris-tdep.c	24 Aug 2002 00:21:34 -0000	1.21
+++ cris-tdep.c	13 Sep 2002 21:46:36 -0000
@@ -1214,9 +1214,10 @@
     {    
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = generic_read_register_dummy (fi->pc, fi->frame, SP_REGNUM);
+      fi->frame = deprecated_read_register_dummy (fi->pc, fi->frame,
+						  SP_REGNUM);
       fi->extra_info->return_pc = 
-        generic_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
+        deprecated_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
 
       /* FIXME: Is this necessarily true?  */
       fi->extra_info->leaf_function = 0;
Index: d10v-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/d10v-tdep.c,v
retrieving revision 1.51
diff -u -r1.51 d10v-tdep.c
--- d10v-tdep.c	24 Aug 2002 00:21:34 -0000	1.51
+++ d10v-tdep.c	13 Sep 2002 21:46:36 -0000
@@ -513,9 +513,9 @@
 d10v_frame_saved_pc (struct frame_info *frame)
 {
   if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
-    return d10v_make_iaddr (generic_read_register_dummy (frame->pc, 
-							 frame->frame, 
-							 PC_REGNUM));
+    return d10v_make_iaddr (deprecated_read_register_dummy (frame->pc, 
+							    frame->frame, 
+							    PC_REGNUM));
   else
     return ((frame)->extra_info->return_pc);
 }
Index: frame.c
===================================================================
RCS file: /cvs/src/src/gdb/frame.c,v
retrieving revision 1.15
diff -u -r1.15 frame.c
--- frame.c	21 Aug 2002 03:34:22 -0000	1.15
+++ frame.c	13 Sep 2002 21:46:36 -0000
@@ -159,6 +159,33 @@
 			  optimizedp, lvalp, addrp, realnump, bufferp);
 }
 
+void
+frame_unwind_signed_register (struct frame_info *frame, int regnum,
+			      LONGEST *val)
+{
+  int optimized;
+  CORE_ADDR addr;
+  int realnum;
+  enum lval_type lval;
+  void *buf = alloca (MAX_REGISTER_RAW_SIZE);
+  frame_register_unwind (frame, regnum, &optimized, &lval, &addr,
+			 &realnum, buf);
+  (*val) = extract_signed_integer (buf, REGISTER_VIRTUAL_SIZE (regnum));
+}
+
+void
+frame_unwind_unsigned_register (struct frame_info *frame, int regnum,
+				ULONGEST *val)
+{
+  int optimized;
+  CORE_ADDR addr;
+  int realnum;
+  enum lval_type lval;
+  void *buf = alloca (MAX_REGISTER_RAW_SIZE);
+  frame_register_unwind (frame, regnum, &optimized, &lval, &addr,
+			 &realnum, buf);
+  (*val) = extract_unsigned_integer (buf, REGISTER_VIRTUAL_SIZE (regnum));
+}
 
 void
 generic_unwind_get_saved_register (char *raw_buffer,
Index: frame.h
===================================================================
RCS file: /cvs/src/src/gdb/frame.h,v
retrieving revision 1.22
diff -u -r1.22 frame.h
--- frame.h	2 Jul 2002 19:08:53 -0000	1.22
+++ frame.h	13 Sep 2002 21:46:36 -0000
@@ -304,8 +304,11 @@
 
 extern CORE_ADDR sigtramp_saved_pc (struct frame_info *);
 
-extern CORE_ADDR generic_read_register_dummy (CORE_ADDR pc,
-					      CORE_ADDR fp, int);
+/* NOTE: cagney/2002-09-13: There is no need for this function.
+   Instead either of frame_unwind_signed_register() or
+   frame_unwind_unsigned_register() can be used.  */
+extern CORE_ADDR deprecated_read_register_dummy (CORE_ADDR pc,
+						 CORE_ADDR fp, int);
 extern void generic_push_dummy_frame (void);
 extern void generic_pop_current_frame (void (*)(struct frame_info *));
 extern void generic_pop_dummy_frame (void);
@@ -343,6 +346,15 @@
 				   int *optimizedp, enum lval_type *lvalp,
 				   CORE_ADDR *addrp, int *realnump,
 				   void *valuep);
+
+/* Unwind FRAME so that the value of register REGNUM, in the previous
+   frame is returned.  Simplified versions of frame_register_unwind.  */
+/* NOTE: cagney/2002-09-13: Return void as one day these functions may
+   be changed to return an indication that the read succeeded.  */
+extern void frame_unwind_signed_register (struct frame_info *frame,
+					  int regnum, LONGEST val);
+extern void frame_unwind_unsigned_register (struct frame_info *frame,
+					    int regnum, ULONGEST val);
 
 extern void generic_save_call_dummy_addr (CORE_ADDR lo, CORE_ADDR hi);
 
Index: h8300-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/h8300-tdep.c,v
retrieving revision 1.15
diff -u -r1.15 h8300-tdep.c
--- h8300-tdep.c	20 Aug 2002 22:02:48 -0000	1.15
+++ h8300-tdep.c	13 Sep 2002 21:46:37 -0000
@@ -163,9 +163,9 @@
 {
   if (PC_IN_CALL_DUMMY (thisframe->pc, thisframe->frame, thisframe->frame))
     {				/* initialize the from_pc now */
-      thisframe->from_pc = generic_read_register_dummy (thisframe->pc,
-							thisframe->frame,
-							PC_REGNUM);
+      thisframe->from_pc = deprecated_read_register_dummy (thisframe->pc,
+							   thisframe->frame,
+							   PC_REGNUM);
       return thisframe->frame;
     }
   h8300_frame_find_saved_regs (thisframe, (struct frame_saved_regs *) 0);
@@ -427,7 +427,7 @@
 h8300_frame_saved_pc (struct frame_info *frame)
 {
   if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
-    return generic_read_register_dummy (frame->pc, frame->frame, PC_REGNUM);
+    return deprecated_read_register_dummy (frame->pc, frame->frame, PC_REGNUM);
   else
     return frame->from_pc;
 }
Index: i386-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-tdep.c,v
retrieving revision 1.86
diff -u -r1.86 i386-tdep.c
--- i386-tdep.c	6 Sep 2002 21:28:18 -0000	1.86
+++ i386-tdep.c	13 Sep 2002 21:46:37 -0000
@@ -535,8 +535,8 @@
 i386_frame_saved_pc (struct frame_info *frame)
 {
   if (PC_IN_CALL_DUMMY (frame->pc, 0, 0))
-    return generic_read_register_dummy (frame->pc, frame->frame,
-					PC_REGNUM);
+    return deprecated_read_register_dummy (frame->pc, frame->frame,
+					   PC_REGNUM);
 
   if (frame->signal_handler_caller)
     return i386_sigtramp_saved_pc (frame);
Index: ia64-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/ia64-tdep.c,v
retrieving revision 1.33
diff -u -r1.33 ia64-tdep.c
--- ia64-tdep.c	24 Aug 2002 00:21:34 -0000	1.33
+++ ia64-tdep.c	13 Sep 2002 21:46:38 -0000
@@ -723,7 +723,7 @@
   if (frame->signal_handler_caller)
     return read_sigcontext_register (frame, pc_regnum);
   else if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
-    return generic_read_register_dummy (frame->pc, frame->frame, pc_regnum);
+    return deprecated_read_register_dummy (frame->pc, frame->frame, pc_regnum);
   else
     {
       FRAME_INIT_SAVED_REGS (frame);
@@ -1500,10 +1500,12 @@
     }
   else if (next_frame_is_call_dummy)
     {
-      bsp = generic_read_register_dummy (frame->next->pc, frame->next->frame,
-                                         IA64_BSP_REGNUM);
-      cfm = generic_read_register_dummy (frame->next->pc, frame->next->frame,
-                                         IA64_CFM_REGNUM);
+      bsp = deprecated_read_register_dummy (frame->next->pc,
+					    frame->next->frame,
+					    IA64_BSP_REGNUM);
+      cfm = deprecated_read_register_dummy (frame->next->pc,
+					    frame->next->frame,
+					    IA64_CFM_REGNUM);
     }
   else
     {
@@ -1518,8 +1520,8 @@
       else if (frn->next
                && PC_IN_CALL_DUMMY (frn->next->pc, frn->next->frame,
 	                                           frn->next->frame))
-	cfm = generic_read_register_dummy (frn->next->pc, frn->next->frame,
-	                                   IA64_PFS_REGNUM);
+	cfm = deprecated_read_register_dummy (frn->next->pc, frn->next->frame,
+					      IA64_PFS_REGNUM);
       else
 	cfm = read_register (IA64_PFS_REGNUM);
 
Index: m32r-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/m32r-tdep.c,v
retrieving revision 1.8
diff -u -r1.8 m32r-tdep.c
--- m32r-tdep.c	29 Jul 2002 16:34:06 -0000	1.8
+++ m32r-tdep.c	13 Sep 2002 21:46:38 -0000
@@ -390,7 +390,8 @@
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = generic_read_register_dummy (fi->pc, fi->frame, SP_REGNUM);
+      fi->frame = deprecated_read_register_dummy (fi->pc, fi->frame,
+						  SP_REGNUM);
       fi->framesize = 0;
       return;
     }
@@ -462,7 +463,7 @@
 {
   for (; fi; fi = fi->next)
     if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-      return generic_read_register_dummy (fi->pc, fi->frame, regnum);
+      return deprecated_read_register_dummy (fi->pc, fi->frame, regnum);
     else if (fi->fsr.regs[regnum] != 0)
       return read_memory_integer (fi->fsr.regs[regnum],
 				  REGISTER_RAW_SIZE (regnum));
@@ -554,7 +555,7 @@
 m32r_frame_saved_pc (struct frame_info *fi)
 {
   if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-    return generic_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
+    return deprecated_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
   else
     return m32r_find_callers_reg (fi, RP_REGNUM);
 }
Index: mcore-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mcore-tdep.c,v
retrieving revision 1.19
diff -u -r1.19 mcore-tdep.c
--- mcore-tdep.c	24 Aug 2002 00:21:35 -0000	1.19
+++ mcore-tdep.c	13 Sep 2002 21:46:39 -0000
@@ -756,7 +756,7 @@
   for (; fi != NULL; fi = fi->next)
     {
       if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-	return generic_read_register_dummy (fi->pc, fi->frame, regnum);
+	return deprecated_read_register_dummy (fi->pc, fi->frame, regnum);
       else if (fi->saved_regs[regnum] != 0)
 	return read_memory_integer (fi->saved_regs[regnum],
 				    REGISTER_SIZE);
@@ -772,7 +772,7 @@
 {
 
   if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-    return generic_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
+    return deprecated_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
   else
     return mcore_find_callers_reg (fi, PR_REGNUM);
 }
@@ -1049,7 +1049,7 @@
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = generic_read_register_dummy (fi->pc, fi->frame, SP_REGNUM);
+      fi->frame = deprecated_read_register_dummy (fi->pc, fi->frame, SP_REGNUM);
     }
   else
     mcore_analyze_prologue (fi, 0, 0);
Index: rs6000-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v
retrieving revision 1.81
diff -u -r1.81 rs6000-tdep.c
--- rs6000-tdep.c	26 Aug 2002 23:20:53 -0000	1.81
+++ rs6000-tdep.c	13 Sep 2002 21:46:40 -0000
@@ -1511,7 +1511,7 @@
     return read_memory_addr (fi->frame + SIG_FRAME_PC_OFFSET, wordsize);
 
   if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-    return generic_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
+    return deprecated_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
 
   func_start = get_pc_function_start (fi->pc);
 
Index: s390-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/s390-tdep.c,v
retrieving revision 1.51
diff -u -r1.51 s390-tdep.c
--- s390-tdep.c	24 Aug 2002 00:21:35 -0000	1.51
+++ s390-tdep.c	13 Sep 2002 21:46:40 -0000
@@ -956,7 +956,7 @@
     return fi->extra_info->saved_pc;
 
   if (deprecated_generic_find_dummy_frame (fi->pc, fi->frame))
-    return generic_read_register_dummy (fi->pc, fi->frame, S390_PC_REGNUM);
+    return deprecated_read_register_dummy (fi->pc, fi->frame, S390_PC_REGNUM);
 
   s390_frame_init_saved_regs (fi);
   if (fi->extra_info)
@@ -1010,8 +1010,8 @@
   CORE_ADDR prev_fp = 0;
 
   if (deprecated_generic_find_dummy_frame (thisframe->pc, thisframe->frame))
-    return generic_read_register_dummy (thisframe->pc, thisframe->frame,
-                                        S390_SP_REGNUM);
+    return deprecated_read_register_dummy (thisframe->pc, thisframe->frame,
+					   S390_SP_REGNUM);
   else
     {
       int sigreturn = 0;
Index: sh-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sh-tdep.c,v
retrieving revision 1.70
diff -u -r1.70 sh-tdep.c
--- sh-tdep.c	24 Aug 2002 00:21:35 -0000	1.70
+++ sh-tdep.c	13 Sep 2002 21:46:42 -0000
@@ -986,7 +986,7 @@
     if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
       /* When the caller requests PR from the dummy frame, we return PC because
          that's where the previous routine appears to have done a call from. */
-      return generic_read_register_dummy (fi->pc, fi->frame, regnum);
+      return deprecated_read_register_dummy (fi->pc, fi->frame, regnum);
     else
       {
 	FRAME_INIT_SAVED_REGS (fi);
@@ -1008,7 +1008,7 @@
     if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
       /* When the caller requests PR from the dummy frame, we return PC because
          that's where the previous routine appears to have done a call from. */
-      return generic_read_register_dummy (fi->pc, fi->frame, pr_regnum);
+      return deprecated_read_register_dummy (fi->pc, fi->frame, pr_regnum);
     else
       {
 	FRAME_INIT_SAVED_REGS (fi);
@@ -1722,11 +1722,11 @@
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = generic_read_register_dummy (fi->pc, fi->frame,
-					       SP_REGNUM);
-      fi->extra_info->return_pc = generic_read_register_dummy (fi->pc,
-							       fi->frame,
-							       PC_REGNUM);
+      fi->frame = deprecated_read_register_dummy (fi->pc, fi->frame,
+						  SP_REGNUM);
+      fi->extra_info->return_pc = deprecated_read_register_dummy (fi->pc,
+								  fi->frame,
+								  PC_REGNUM);
       fi->extra_info->f_offset = -(CALL_DUMMY_LENGTH + 4);
       fi->extra_info->leaf_function = 0;
       return;
@@ -1754,10 +1754,10 @@
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      fi->frame = generic_read_register_dummy (fi->pc, fi->frame,
-					       SP_REGNUM);
+      fi->frame = deprecated_read_register_dummy (fi->pc, fi->frame,
+						  SP_REGNUM);
       fi->extra_info->return_pc = 
-	generic_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
+	deprecated_read_register_dummy (fi->pc, fi->frame, PC_REGNUM);
       fi->extra_info->f_offset = -(CALL_DUMMY_LENGTH + 4);
       fi->extra_info->leaf_function = 0;
       return;
Index: v850-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/v850-tdep.c,v
retrieving revision 1.21
diff -u -r1.21 v850-tdep.c
--- v850-tdep.c	24 Aug 2002 00:21:35 -0000	1.21
+++ v850-tdep.c	13 Sep 2002 21:46:43 -0000
@@ -805,7 +805,7 @@
 {
   for (; fi; fi = fi->next)
     if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-      return generic_read_register_dummy (fi->pc, fi->frame, regnum);
+      return deprecated_read_register_dummy (fi->pc, fi->frame, regnum);
     else if (fi->saved_regs[regnum] != 0)
       return read_memory_unsigned_integer (fi->saved_regs[regnum],
 					   v850_register_raw_size (regnum));
@@ -1014,7 +1014,7 @@
 v850_frame_saved_pc (struct frame_info *fi)
 {
   if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-    return generic_read_register_dummy (fi->pc, fi->frame, E_PC_REGNUM);
+    return deprecated_read_register_dummy (fi->pc, fi->frame, E_PC_REGNUM);
   else
     return v850_find_callers_reg (fi, E_RP_REGNUM);
 }
Index: xstormy16-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/xstormy16-tdep.c,v
retrieving revision 1.6
diff -u -r1.6 xstormy16-tdep.c
--- xstormy16-tdep.c	24 Aug 2002 00:21:35 -0000	1.6
+++ xstormy16-tdep.c	13 Sep 2002 21:46:43 -0000
@@ -758,7 +758,8 @@
 
   if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
     {
-      saved_pc = generic_read_register_dummy (fi->pc, fi->frame, E_PC_REGNUM);
+      saved_pc = deprecated_read_register_dummy (fi->pc, fi->frame,
+						 E_PC_REGNUM);
     }
   else
     {

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]