2012-05-09 Frank Ch. Eigler <fche@redhat.com>

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

diff --git a/gdb/infcall.c b/gdb/infcall.c
index b8b7ff5d328f2a44a9199c12753a49b27e832a99..fa498f60ee9cb29f5f099d3732c813a738fdbb3a 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)
@@ -642,33 +640,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"));
     }
@@ -785,6 +756,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;
   }