gdb/

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

diff --git a/gdb/infcall.c b/gdb/infcall.c
index 3f9c8713cf2a2ebf771c230be4ed9a5fb6e0509b..4ace08b7a7aa4ee1c8937e42bd7f8d04f2c98cf2 100644 (file)
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -1,8 +1,6 @@
 /* Perform an inferior function call, for GDB, the GNU debugger.
 
-   Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-   2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1986-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -90,7 +88,7 @@ show_coerce_float_to_double_p (struct ui_file *file, int from_tty,
 
    The default is to stop in the frame where the signal was received.  */
 
-int unwind_on_signal_p = 0;
+static int unwind_on_signal_p = 0;
 static void
 show_unwind_on_signal_p (struct ui_file *file, int from_tty,
                         struct cmd_list_element *c, const char *value)
@@ -387,10 +385,8 @@ static struct gdb_exception
 run_inferior_call (struct thread_info *call_thread, CORE_ADDR real_pc)
 {
   volatile struct gdb_exception e;
-  int saved_async = 0;
   int saved_in_infcall = call_thread->control.in_infcall;
   ptid_t call_thread_ptid = call_thread->ptid;
-  char *saved_target_shortname = xstrdup (target_shortname);
 
   call_thread->control.in_infcall = 1;
 
@@ -401,22 +397,24 @@ run_inferior_call (struct thread_info *call_thread, CORE_ADDR real_pc)
   /* We want stop_registers, please...  */
   call_thread->control.proceed_to_finish = 1;
 
-  if (target_can_async_p ())
-    saved_async = target_async_mask (0);
-
   TRY_CATCH (e, RETURN_MASK_ALL)
-    proceed (real_pc, TARGET_SIGNAL_0, 0);
+    {
+      proceed (real_pc, TARGET_SIGNAL_0, 0);
+
+      /* Inferior function calls are always synchronous, even if the
+        target supports asynchronous execution.  Do here what
+        `proceed' itself does in sync mode.  */
+      if (target_can_async_p () && is_running (inferior_ptid))
+       {
+         wait_for_inferior ();
+         normal_stop ();
+       }
+    }
 
   /* At this point the current thread may have changed.  Refresh
      CALL_THREAD as it could be invalid if its thread has exited.  */
   call_thread = find_thread_ptid (call_thread_ptid);
 
-  /* Don't restore the async mask if the target has changed,
-     saved_async is for the original target.  */
-  if (saved_async
-      && strcmp (saved_target_shortname, target_shortname) == 0)
-    target_async_mask (saved_async);
-
   enable_watchpoints_after_interactive_call_stop ();
 
   /* Call breakpoint_auto_delete on the current contents of the bpstat
@@ -433,8 +431,6 @@ run_inferior_call (struct thread_info *call_thread, CORE_ADDR real_pc)
   if (call_thread != NULL)
     call_thread->control.in_infcall = saved_in_infcall;
 
-  xfree (saved_target_shortname);
-
   return e;
 }
 
@@ -495,6 +491,9 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
   if (get_traceframe_number () >= 0)
     error (_("May not call functions while looking at trace frames."));
 
+  if (execution_direction == EXEC_REVERSE)
+    error (_("Cannot call functions in reverse mode."));
+
   frame = get_current_frame ();
   gdbarch = get_frame_arch (frame);
 
@@ -609,8 +608,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
     }
   else
     {
-      struct_return = using_struct_return (gdbarch,
-                                          value_type (function), values_type);
+      struct_return = using_struct_return (gdbarch, function, values_type);
       target_values_type = values_type;
     }
 
@@ -641,33 +639,6 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
        bp_addr = dummy_addr;
        break;
       }
-    case AT_SYMBOL:
-      /* Some executables define a symbol __CALL_DUMMY_ADDRESS whose
-        address is the location where the breakpoint should be
-        placed.  Once all targets are using the overhauled frame code
-        this can be deleted - ON_STACK is a better option.  */
-      {
-       struct minimal_symbol *sym;
-       CORE_ADDR dummy_addr;
-
-       sym = lookup_minimal_symbol ("__CALL_DUMMY_ADDRESS", NULL, NULL);
-       real_pc = funaddr;
-       if (sym)
-         {
-           dummy_addr = SYMBOL_VALUE_ADDRESS (sym);
-           /* Make certain that the address points at real code, and not
-              a function descriptor.  */
-           dummy_addr = gdbarch_convert_from_func_ptr_addr (gdbarch,
-                                                            dummy_addr,
-                                                            &current_target);
-         }
-       else
-         dummy_addr = entry_point_address ();
-       /* A call dummy always consists of just a single breakpoint,
-          so it's address is the same as the address of the dummy.  */
-       bp_addr = dummy_addr;
-       break;
-      }
     default:
       internal_error (__FILE__, __LINE__, _("bad switch"));
     }
@@ -784,6 +755,10 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
        PUSH_DUMMY_CALL, saved as the dummy-frame TOS, and used by
        dummy_id to form the frame ID's stack address.  */
     bpt = set_momentary_breakpoint (gdbarch, sal, dummy_id, bp_call_dummy);
+
+    /* set_momentary_breakpoint invalidates FRAME.  */
+    frame = NULL;
+
     bpt->disposition = disp_del;
   }
 
@@ -1045,13 +1020,13 @@ When the function is done executing, GDB will silently stop."),
       {
        /* If the function returns void, don't bother fetching the
           return value.  */
-       switch (gdbarch_return_value (gdbarch, value_type (function),
-                                     target_values_type, NULL, NULL, NULL))
+       switch (gdbarch_return_value (gdbarch, function, target_values_type,
+                                     NULL, NULL, NULL))
          {
          case RETURN_VALUE_REGISTER_CONVENTION:
          case RETURN_VALUE_ABI_RETURNS_ADDRESS:
          case RETURN_VALUE_ABI_PRESERVES_ADDRESS:
-           gdbarch_return_value (gdbarch, value_type (function), values_type,
+           gdbarch_return_value (gdbarch, function, values_type,
                                  retbuf, value_contents_raw (retval), NULL);
            break;
          case RETURN_VALUE_STRUCT_CONVENTION: