* test-build.mk (HOLES): Add "xargs" for gdb.

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

diff --git a/gdb/parse.c b/gdb/parse.c
index 7bbe0a8f8ff8d9227b26cb2e6a086a4ff4b1bf87..e4ff571f1b7cec7fd2a02b47589d84086e6dc043 100644 (file)
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -215,7 +215,7 @@ write_exp_elt_longcst (expelt)
 
 void
 write_exp_elt_dblcst (expelt)
-     double expelt;
+     DOUBLEST expelt;
 {
   union exp_element tmp;
 
@@ -459,13 +459,13 @@ write_dollar_variable (str)
   /* Handle tokens that refer to machine registers:
      $ followed by a register name.  */
   for (i = 0; i < NUM_REGS; i++)
-    if (str.length - 1 == strlen (reg_names[i])
+    if (reg_names[i] && str.length - 1 == strlen (reg_names[i])
        && STREQN (str.ptr + 1, reg_names[i], str.length - 1))
       {
        goto handle_register;
       }
   for (i = 0; i < num_std_regs; i++)
-    if (str.length - 1 == strlen (std_regs[i].name)
+    if (std_regs[i].name && str.length - 1 == strlen (std_regs[i].name)
        && STREQN (str.ptr + 1, std_regs[i].name, str.length - 1))
       {
        i = std_regs[i].regnum;
@@ -599,6 +599,11 @@ length_of_subexp (expr, endpos)
     case OP_LABELED:
     case STRUCTOP_STRUCT:
     case STRUCTOP_PTR:
+/* start-sanitize-gm */
+#ifdef GENERAL_MAGIC
+    case STRUCTOP_FIELD:
+#endif /* GENERAL_MAGIC */
+/* end-sanitize-gm */
       args = 1;
       /* fall through */
     case OP_M2_STRING: