Replace ../include/wait.h with gdb_wait.h.

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

diff --git a/gdb/valops.c b/gdb/valops.c
index d51b67db64df80bca109004fe33d03985c938daf..3e1a619c3766d57f24ff2811007ae2b855a82447 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -662,8 +662,8 @@ value_assign (toval, fromval)
              > len * HOST_CHAR_BIT)
            /* Getting this right would involve being very careful about
               byte order.  */
-           error ("\
-Can't handle bitfield which doesn't fit in a single register.");
+           error ("Can't assign to bitfields that cross register "
+                  "boundaries.");
 
          read_register_bytes (VALUE_ADDRESS (toval) + VALUE_OFFSET (toval),
                               buffer, len);
@@ -1074,7 +1074,7 @@ value_push (sp, arg)
      value_ptr arg;
 {
   register int len = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (arg));
-  register int container_len;
+  register int container_len = len;
   register int offset;
 
   /* How big is the container we're going to put this value in?  */
@@ -1292,6 +1292,7 @@ hand_function_call (function, nargs, args)
 {
   register CORE_ADDR sp;
   register int i;
+  int rc;
   CORE_ADDR start_sp;
   /* CALL_DUMMY is an array of words (REGISTER_SIZE), but each word
      is in host byte order.  Before calling FIX_CALL_DUMMY, we byteswap it
@@ -1687,9 +1688,28 @@ You must use a pointer to function type variable. Command ignored.", arg_name);
     /* Execute the stack dummy routine, calling FUNCTION.
        When it is done, discard the empty frame
        after storing the contents of all regs into retbuf.  */
-    if (run_stack_dummy (real_pc + CALL_DUMMY_START_OFFSET, retbuf))
+    rc = run_stack_dummy (real_pc + CALL_DUMMY_START_OFFSET, retbuf);
+
+    if (rc == 1)
+      {
+       /* We stopped inside the FUNCTION because of a random signal.
+          Further execution of the FUNCTION is not allowed. */
+
+       /* In this case, we must do the cleanups because we don't
+          want the dummy anymore (the dummy frame has been poped already. */
+       do_cleanups (old_chain);
+
+       /* FIXME: Insert a bunch of wrap_here; name can be very long if it's
+          a C++ name with arguments and stuff.  */
+       error ("\
+The program being debugged stopped while in a function called from GDB.\n\
+Evaluation of the expression containing the function (%s) will be abandoned.",
+              name);
+      }
+
+    if (rc == 2)
       {
-       /* We stopped somewhere besides the call dummy.  */
+       /* We hit a breakpoint inside the FUNCTION. */
 
        /* If we did the cleanups, we would print a spurious error
           message (Unable to restore previously selected frame),
@@ -1714,6 +1734,7 @@ stop (instead of continuing to evaluate the expression containing\n\
 the function call).", name);
       }
 
+    /* If we get here the called FUNCTION run to completion. */
     do_cleanups (old_chain);
 
     /* Figure out the value returned by the function.  */
@@ -2677,6 +2698,14 @@ find_overload_match (arg_types, nargs, name, method, lax, obj, fsym, valp, symp,
       int i = -1;
       func_name = cplus_demangle (SYMBOL_NAME (fsym), DMGL_NO_OPTS);
 
+      /* If the name is NULL this must be a C-style function.
+         Just return the same symbol. */
+      if (!func_name)
+        {
+         *symp = fsym;
+          return 0;
+        }
+
       oload_syms = make_symbol_overload_list (fsym);
       while (oload_syms[++i])
        num_fns++;