2004-06-07 Randolph Chung <tausq@debian.org>

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

diff --git a/gdb/infcall.c b/gdb/infcall.c
index 4985884ab07f1648bc6444ac734300b8cb1c992f..7f0a118de7c495cf835c92295f3ed624a9773426 100644 (file)
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -205,7 +205,8 @@ find_function_addr (struct value *function, struct type **retval_type)
   else
     error ("Invalid data type for function to be called.");
 
-  *retval_type = value_type;
+  if (retval_type != NULL)
+    *retval_type = value_type;
   return funaddr + FUNCTION_START_OFFSET;
 }
 
@@ -660,7 +661,7 @@ You must use a pointer to function type variable. Command ignored.", arg_name);
     /* When there is no push_dummy_call method, should this code
        simply error out.  That would the implementation of this method
        for all ABIs (which is probably a good thing).  */
-    sp = gdbarch_push_dummy_call (current_gdbarch, funaddr, current_regcache,
+    sp = gdbarch_push_dummy_call (current_gdbarch, function, current_regcache,
                                  bp_addr, nargs, args, sp, struct_return,
                                  struct_addr);
   else  if (DEPRECATED_PUSH_ARGUMENTS_P ())
@@ -721,15 +722,13 @@ You must use a pointer to function type variable. Command ignored.", arg_name);
   if (DEPRECATED_DUMMY_WRITE_SP_P ())
     DEPRECATED_DUMMY_WRITE_SP (sp);
 
-  if (gdbarch_unwind_dummy_id_p (current_gdbarch))
-    {
-      /* Sanity.  The exact same SP value is returned by
-        PUSH_DUMMY_CALL, saved as the dummy-frame TOS, and used by
-        unwind_dummy_id to form the frame ID's stack address.  */
-      generic_save_dummy_frame_tos (sp);
-    }
-  else if (DEPRECATED_SAVE_DUMMY_FRAME_TOS_P ())
+  if (DEPRECATED_SAVE_DUMMY_FRAME_TOS_P ())
     DEPRECATED_SAVE_DUMMY_FRAME_TOS (sp);
+  else
+    /* Sanity.  The exact same SP value is returned by
+       PUSH_DUMMY_CALL, saved as the dummy-frame TOS, and used by
+       unwind_dummy_id to form the frame ID's stack address.  */
+    generic_save_dummy_frame_tos (sp);
 
   /* Now proceed, having reached the desired place.  */
   clear_proceed_status ();