* breakpoint.c, breakpoint.h (breakpoint_init_inferior): New function

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

diff --git a/gdb/valops.c b/gdb/valops.c
index fa75ea6f4bd3e0f00d2a19f62f01d040f6a6dc1c..82d0f58991f481c64e5c742c1d3d2276b55d7d3a 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -896,8 +896,8 @@ call_function_by_hand (function, nargs, args)
 
 #if CALL_DUMMY_LOCATION == ON_STACK
   write_memory (start_sp, (char *)dummy1, sizeof dummy);
+#endif /* On stack.  */
 
-#else /* Not on stack.  */
 #if CALL_DUMMY_LOCATION == BEFORE_TEXT_END
   /* Convex Unix prohibits executing in the stack segment. */
   /* Hope there is empty room at the top of the text segment. */
@@ -910,21 +910,26 @@ call_function_by_hand (function, nargs, args)
          error ("text segment full -- no place to put call");
     checked = 1;
     sp = old_sp;
-    start_sp = text_end - sizeof dummy;
-    write_memory (start_sp, (char *)dummy1, sizeof dummy);
+    real_pc = text_end - sizeof dummy;
+    write_memory (real_pc, (char *)dummy1, sizeof dummy);
   }
-#else /* After text_end.  */
+#endif /* Before text_end.  */
+
+#if CALL_DUMMY_LOCATION == AFTER_TEXT_END
   {
     extern CORE_ADDR text_end;
     int errcode;
     sp = old_sp;
-    start_sp = text_end;
-    errcode = target_write_memory (start_sp, (char *)dummy1, sizeof dummy);
+    real_pc = text_end;
+    errcode = target_write_memory (real_pc, (char *)dummy1, sizeof dummy);
     if (errcode != 0)
       error ("Cannot write text segment -- call_function failed");
   }
 #endif /* After text_end.  */
-#endif /* Not on stack.  */
+
+#if CALL_DUMMY_LOCATION == AT_ENTRY_POINT
+  real_pc = funaddr;
+#endif /* At entry point.  */
 
 #ifdef lint
   sp = old_sp;         /* It really is used, for some ifdef's... */
@@ -1056,7 +1061,7 @@ call_function_by_hand (function, nargs, args)
        char format[80];
        sprintf (format, "at %s", local_hex_format ());
        name = alloca (80);
-       sprintf (name, format, funaddr);
+       sprintf (name, format, (unsigned long) funaddr);
       }
 
     /* Execute the stack dummy routine, calling FUNCTION.
@@ -1072,7 +1077,7 @@ call_function_by_hand (function, nargs, args)
           wrong things (like set stop_bpstat to the wrong thing).  */
        discard_cleanups (old_chain);
        /* Prevent memory leak.  */
-       bpstat_clear (inf_status.stop_bpstat);
+       bpstat_clear (&inf_status.stop_bpstat);
 
        /* The following error message used to say "The expression
           which contained the function call has been discarded."  It
@@ -1349,7 +1354,8 @@ search_struct_field (name, arg1, offset, type, looking_for_baseclass)
 /* Helper function used by value_struct_elt to recurse through baseclasses.
    Look for a field NAME in ARG1. Adjust the address of ARG1 by OFFSET bytes,
    and search in it assuming it has (class) type TYPE.
-   If found, return value, else return NULL. */
+   If found, return value, else if name matched and args not return (value)-1,
+   else return NULL. */
 
 static value
 search_struct_method (name, arg1p, args, offset, static_memfuncp, type)
@@ -1359,6 +1365,7 @@ search_struct_method (name, arg1p, args, offset, static_memfuncp, type)
      register struct type *type;
 {
   int i;
+  static int name_matched = 0;
 
   check_stub_type (type);
   for (i = TYPE_NFN_FIELDS (type) - 1; i >= 0; i--)
@@ -1368,6 +1375,7 @@ search_struct_method (name, arg1p, args, offset, static_memfuncp, type)
        {
          int j = TYPE_FN_FIELDLIST_LENGTH (type, i) - 1;
          struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
+         name_matched = 1; 
 
          if (j > 0 && args == 0)
            error ("cannot resolve overloaded method `%s'", name);
@@ -1406,14 +1414,19 @@ search_struct_method (name, arg1p, args, offset, static_memfuncp, type)
         }
       v = search_struct_method (name, arg1p, args, base_offset + offset,
                                static_memfuncp, TYPE_BASECLASS (type, i));
-      if (v)
+      if (v == (value) -1)
+       {
+         name_matched = 1;
+       }
+      else if (v)
        {
 /* FIXME-bothner:  Why is this commented out?  Why is it here?  */
 /*       *arg1p = arg1_tmp;*/
          return v;
         }
     }
-  return NULL;
+  if (name_matched) return (value) -1;
+  else return NULL;
 }
 
 /* Given *ARGP, a value of type (pointer to a)* structure/union,
@@ -1511,7 +1524,11 @@ value_struct_elt (argp, args, name, static_memfuncp, err)
   else
     v = search_struct_method (name, argp, args, 0, static_memfuncp, t);
 
-  if (v == 0)
+  if (v == (value) -1)
+    {
+       error("Argument list of %s mismatch with component in the structure.", name);
+    }
+  else if (v == 0)
     {
       /* See if user tried to invoke data as function.  If so,
         hand it back.  If it's not callable (i.e., a pointer to function),
@@ -1520,14 +1537,6 @@ value_struct_elt (argp, args, name, static_memfuncp, err)
     }
 
   if (!v)
-    /* FIXME: This error message is very confusing, since it can also
-       mean that argument matching failed.  But I don't want to say
-       "or argument matching failed" for C programs.  Checking the
-       current language isn't right, because whether we attempt
-       argument matching does not depend on the language.  The right
-       fix is to restructure the above code to be able to distinguish
-       between argument matching failure and the field not being found
-       at all.  */
     error ("Structure has no component named %s.", name);
   return v;
 }