gdb/

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

diff --git a/gdb/infcall.c b/gdb/infcall.c
index 6c250e3c0cca39c7bf996b58020ceebbe4874cbc..4ace08b7a7aa4ee1c8937e42bd7f8d04f2c98cf2 100644 (file)
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -88,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)
@@ -608,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;
     }
 
@@ -640,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"));
     }
@@ -1048,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: