This is the mail archive of the 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]

[commit] Revert some of the yanked d10v pc in call dummy checks

Caught between a rock and a hard place, sigh.

Having successfully removed these checks, I'm now putting them back :-/ It seems that a current d10v is needing them. Not sure if I botched the original testing, or ther changes have again made them necessary. Give it a week or two and the tests will again be removed :-/

2003-01-19  Andrew Cagney  <>

	* d10v-tdep.c (d10v_frame_saved_pc, d10v_frame_chain): Restore
	code handling dummy frames.

Index: d10v-tdep.c
RCS file: /cvs/src/src/gdb/d10v-tdep.c,v
retrieving revision 1.71
diff -u -r1.71 d10v-tdep.c
--- d10v-tdep.c	12 Jan 2003 19:25:39 -0000	1.71
+++ d10v-tdep.c	19 Jan 2003 22:20:35 -0000
@@ -521,7 +521,12 @@
 static CORE_ADDR
 d10v_frame_saved_pc (struct frame_info *frame)
-  return (get_frame_extra_info (frame)->return_pc);
+  if (DEPRECATED_PC_IN_CALL_DUMMY (frame->pc, 0, 0))
+    return d10v_make_iaddr (deprecated_read_register_dummy (frame->pc, 
+							    frame->frame, 
+							    PC_REGNUM));
+  else
+    return ((frame)->extra_info->return_pc);
 /* Immediately after a function call, return the saved pc.  We can't
@@ -692,8 +697,10 @@
   CORE_ADDR addr;
   /* A generic call dummy's frame is the same as caller's.  */
-  d10v_frame_init_saved_regs (fi);
+  if (DEPRECATED_PC_IN_CALL_DUMMY (fi->pc, 0, 0))
+    return fi->frame;
+  d10v_frame_init_saved_regs (fi);
   if (get_frame_extra_info (fi)->return_pc == IMEM_START
       || inside_entry_file (get_frame_extra_info (fi)->return_pc))

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