2003-07-31 Michael Snyder <msnyder@redhat.com>

[deliverable/binutils-gdb.git] / gdb / infcall.c

diff --git a/gdb/infcall.c b/gdb/infcall.c
index 0a10c31b287b3aca478092b56c78daca9e141c90..4fd97ae5652d97822f2aaa144063c3b3cb184ae6 100644 (file)
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -274,8 +274,8 @@ legacy_push_dummy_code (struct gdbarch *gdbarch,
      with the values.  Instead a DEPRECATED_FIX_CALL_DUMMY replacement
      (PUSH_DUMMY_BREAKPOINT?) should just do everything.  */
 #ifdef GDB_TARGET_IS_HPPA
-  real_pc = DEPRECATED_FIX_CALL_DUMMY (dummy1, start_sp, funaddr, nargs, args,
-                                      value_type, using_gcc);
+  (*real_pc) = DEPRECATED_FIX_CALL_DUMMY (dummy1, start_sp, funaddr, nargs,
+                                         args, value_type, using_gcc);
 #else
   if (DEPRECATED_FIX_CALL_DUMMY_P ())
     {
@@ -421,13 +421,13 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
       vector.  Hence this direct call.
 
       A follow-on change is to modify this interface so that it takes
-      thread OR frame OR tpid as a parameter, and returns a dummy
+      thread OR frame OR ptid as a parameter, and returns a dummy
       frame handle.  The handle can then be used further down as a
-      parameter SAVE_DUMMY_FRAME_TOS.  Hmm, thinking about it, since
-      everything is ment to be using generic dummy frames, why not
-      even use some of the dummy frame code to here - do a regcache
-      dup and then pass the duped regcache, along with all the other
-      stuff, at one single point.
+      parameter to generic_save_dummy_frame_tos().  Hmm, thinking
+      about it, since everything is ment to be using generic dummy
+      frames, why not even use some of the dummy frame code to here -
+      do a regcache dup and then pass the duped regcache, along with
+      all the other stuff, at one single point.
 
       In fact, you can even save the structure's return address in the
       dummy frame and fix one of those nasty lost struct return edge
@@ -445,7 +445,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
           On a RISC architecture, a void parameterless generic dummy
           frame (i.e., no parameters, no result) typically does not
           need to push anything the stack and hence can leave SP and
-          FP.  Similarly, a framelss (possibly leaf) function does
+          FP.  Similarly, a frameless (possibly leaf) function does
           not push anything on the stack and, hence, that too can
           leave FP and SP unchanged.  As a consequence, a sequence of
           void parameterless generic dummy frame calls to frameless
@@ -474,15 +474,14 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
                    || (INNER_THAN (2, 1) && sp >= old_sp));
       }
     else
-      /* FIXME: cagney/2002-09-18: Hey, you loose!  Who knows how
-        badly aligned the SP is!  Further, per comment above, if the
-        generic dummy frame ends up empty (because nothing is pushed)
-        GDB won't be able to correctly perform back traces.  If a
-        target is having trouble with backtraces, first thing to do
-        is add FRAME_ALIGN() to its architecture vector.  After that,
-        try adding SAVE_DUMMY_FRAME_TOS() and modifying
-        DEPRECATED_FRAME_CHAIN so that when the next outer frame is a
-        generic dummy, it returns the current frame's base.  */
+      /* FIXME: cagney/2002-09-18: Hey, you loose!
+
+        Who knows how badly aligned the SP is!  Further, per comment
+        above, if the generic dummy frame ends up empty (because
+        nothing is pushed) GDB won't be able to correctly perform
+        back traces.  If a target is having trouble with backtraces,
+        first thing to do is add FRAME_ALIGN() to the architecture
+        vector. If that fails, try unwind_dummy_id().  */
       sp = old_sp;
   }
 
@@ -831,8 +830,8 @@ You must use a pointer to function type variable. Command ignored.", arg_name);
       gdb_assert (DEPRECATED_USE_GENERIC_DUMMY_FRAMES);
       generic_save_dummy_frame_tos (sp);
     }
-  else if (SAVE_DUMMY_FRAME_TOS_P ())
-    SAVE_DUMMY_FRAME_TOS (sp);
+  else if (DEPRECATED_SAVE_DUMMY_FRAME_TOS_P ())
+    DEPRECATED_SAVE_DUMMY_FRAME_TOS (sp);
 
   /* Now proceed, having reached the desired place.  */
   clear_proceed_status ();