Help stupid cvs fixing basic conflicts.

1 files changed, 211 insertions, 38 deletions

diff --git a/gnu/usr.bin/binutils/gas/cond.c b/gnu/usr.bin/binutils/gas/cond.c
index e655451e6e4..025ca51b11a 100644
--- a/gnu/usr.bin/binutils/gas/cond.c
+++ b/gnu/usr.bin/binutils/gas/cond.c
@@ -1,5 +1,6 @@
 /* cond.c - conditional assembly pseudo-ops, and .include
-   Copyright (C) 1990, 91, 92, 93, 95, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 95, 96, 97, 98, 99, 2000
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -14,10 +15,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GAS; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with GAS; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
 
 #include "as.h"
+#include "macro.h"
 
 #include "obstack.h"
 
@@ -28,18 +31,28 @@ struct file_line
 {
   char *file;
   unsigned int line;
-};				/* file_line */
+};
+
+/* We push one of these structures for each .if, and pop it at the
+   .endif.  */
 
-/* This is what we push and pop. */
 struct conditional_frame
-  {
-    struct file_line if_file_line;	/* the source file & line number of the "if" */
-    struct file_line else_file_line;	/* the source file & line of the "else" */
-    struct conditional_frame *previous_cframe;
-    int else_seen;		/* have we seen an else yet? */
-    int ignoring;		/* if we are currently ignoring input. */
-    int dead_tree;		/* if a conditional at a higher level is ignoring input. */
-  };				/* conditional_frame */
+{
+  /* The source file & line number of the "if".  */
+  struct file_line if_file_line;
+  /* The source file & line of the "else".  */
+  struct file_line else_file_line;
+  /* The previous conditional.  */
+  struct conditional_frame *previous_cframe;
+  /* Have we seen an else yet?  */
+  int else_seen;
+  /* Whether we are currently ignoring input.  */
+  int ignoring;
+  /* Whether a conditional at a higher level is ignoring input.  */
+  int dead_tree;
+  /* Macro nesting level at which this conditional was created.  */
+  int macro_nest;
+};
 
 static void initialize_cframe PARAMS ((struct conditional_frame *cframe));
 static char *get_mri_string PARAMS ((int, int *));
@@ -51,7 +64,7 @@ s_ifdef (arg)
      int arg;
 {
   register char *name;		/* points to name of symbol */
-  register struct symbol *symbolP;	/* Points to symbol */
+  register symbolS *symbolP;	/* Points to symbol */
   struct conditional_frame cframe;
 
   SKIP_WHITESPACE ();		/* Leading whitespace is part of operand. */
@@ -59,7 +72,7 @@ s_ifdef (arg)
 
   if (!is_name_beginner (*name))
     {
-      as_bad ("invalid identifier for \".ifdef\"");
+      as_bad (_("invalid identifier for \".ifdef\""));
       obstack_1grow (&cond_obstack, 0);
       ignore_rest_of_line ();
     }
@@ -76,6 +89,13 @@ s_ifdef (arg)
       current_cframe = ((struct conditional_frame *)
 			obstack_copy (&cond_obstack, &cframe,
 				      sizeof (cframe)));
+
+      if (LISTING_SKIP_COND ()
+	  && cframe.ignoring
+	  && (cframe.previous_cframe == NULL
+	      || ! cframe.previous_cframe->ignoring))
+	listing_list (2);
+
       demand_empty_rest_of_line ();
     }				/* if a valid identifyer name */
 }				/* s_ifdef() */
@@ -105,7 +125,7 @@ s_if (arg)
     {
       expression (&operand);
       if (operand.X_op != O_constant)
-	as_bad ("non-constant expression in \".if\" statement");
+	as_bad (_("non-constant expression in \".if\" statement"));
     }
 
   switch ((operatorT) arg)
@@ -118,6 +138,7 @@ s_if (arg)
     case O_gt: t = operand.X_add_number > 0; break;
     default:
       abort ();
+      return;
     }
 
   /* If the above error is signaled, this will dispatch
@@ -127,6 +148,12 @@ s_if (arg)
   current_cframe = ((struct conditional_frame *)
 		    obstack_copy (&cond_obstack, &cframe, sizeof (cframe)));
 
+  if (LISTING_SKIP_COND ()
+      && cframe.ignoring
+      && (cframe.previous_cframe == NULL
+	  || ! cframe.previous_cframe->ignoring))
+    listing_list (2);
+
   if (flag_mri)
     mri_comment_end (stop, stopc);
 
@@ -181,15 +208,20 @@ void
 s_ifc (arg)
      int arg;
 {
+  char *stop = NULL;
+  char stopc;
   char *s1, *s2;
   int len1, len2;
   int res;
   struct conditional_frame cframe;
 
+  if (flag_mri)
+    stop = mri_comment_field (&stopc);
+
   s1 = get_mri_string (',', &len1);
 
   if (*input_line_pointer != ',')
-    as_bad ("bad format for ifc or ifnc");
+    as_bad (_("bad format for ifc or ifnc"));
   else
     ++input_line_pointer;
 
@@ -201,20 +233,117 @@ s_ifc (arg)
   cframe.ignoring = cframe.dead_tree || ! (res ^ arg);
   current_cframe = ((struct conditional_frame *)
 		    obstack_copy (&cond_obstack, &cframe, sizeof (cframe)));
+
+  if (LISTING_SKIP_COND ()
+      && cframe.ignoring
+      && (cframe.previous_cframe == NULL
+	  || ! cframe.previous_cframe->ignoring))
+    listing_list (2);
+
+  if (flag_mri)
+    mri_comment_end (stop, stopc);
+
+  demand_empty_rest_of_line ();
 }
 
 void 
-s_endif (arg)
+s_elseif (arg)
      int arg;
 {
+  expressionS operand;
+  int t;
+
+  if (current_cframe == NULL)
+    {
+      as_bad (_("\".elseif\" without matching \".if\" - ignored"));
+
+    }
+  else if (current_cframe->else_seen)
+    {
+      as_bad (_("\".elseif\" after \".else\" - ignored"));
+      as_bad_where (current_cframe->else_file_line.file,
+		    current_cframe->else_file_line.line,
+		    _("here is the previous \"else\""));
+      as_bad_where (current_cframe->if_file_line.file,
+		    current_cframe->if_file_line.line,
+		    _("here is the previous \"if\""));
+    }
+  else
+    {
+      as_where (&current_cframe->else_file_line.file,
+		&current_cframe->else_file_line.line);
+
+      if (!current_cframe->dead_tree)
+	{
+	  current_cframe->ignoring = !current_cframe->ignoring;
+	  if (LISTING_SKIP_COND ())
+	    {
+	      if (! current_cframe->ignoring)
+		listing_list (1);
+	      else
+		listing_list (2);
+	    }
+	}			/* if not a dead tree */
+    }				/* if error else do it */
+
+
+  SKIP_WHITESPACE ();		/* Leading whitespace is part of operand. */
+
+  if (current_cframe != NULL && current_cframe->ignoring)
+    {
+      operand.X_add_number = 0;
+      while (! is_end_of_line[(unsigned char) *input_line_pointer])
+	++input_line_pointer;
+    }
+  else
+    {
+      expression (&operand);
+      if (operand.X_op != O_constant)
+	as_bad (_("non-constant expression in \".elseif\" statement"));
+    }
+  
+  switch ((operatorT) arg)
+    {
+    case O_eq: t = operand.X_add_number == 0; break;
+    case O_ne: t = operand.X_add_number != 0; break;
+    case O_lt: t = operand.X_add_number < 0; break;
+    case O_le: t = operand.X_add_number <= 0; break;
+    case O_ge: t = operand.X_add_number >= 0; break;
+    case O_gt: t = operand.X_add_number > 0; break;
+    default:
+      abort ();
+      return;
+    }
+
+  current_cframe->ignoring = current_cframe->dead_tree || ! t;
+
+  if (LISTING_SKIP_COND ()
+      && current_cframe->ignoring
+      && (current_cframe->previous_cframe == NULL
+	  || ! current_cframe->previous_cframe->ignoring))
+    listing_list (2);
+
+  demand_empty_rest_of_line ();
+}
+
+void 
+s_endif (arg)
+     int arg ATTRIBUTE_UNUSED;
+{
   struct conditional_frame *hold;
 
   if (current_cframe == NULL)
     {
-      as_bad ("\".endif\" without \".if\"");
+      as_bad (_("\".endif\" without \".if\""));
     }
   else
     {
+      if (LISTING_SKIP_COND ()
+	  && current_cframe->ignoring
+	  && (current_cframe->previous_cframe == NULL
+	      || ! current_cframe->previous_cframe->ignoring))
+	listing_list (1);
+
       hold = current_cframe;
       current_cframe = current_cframe->previous_cframe;
       obstack_free (&cond_obstack, hold);
@@ -231,22 +360,22 @@ s_endif (arg)
 
 void 
 s_else (arg)
-     int arg;
+     int arg ATTRIBUTE_UNUSED;
 {
   if (current_cframe == NULL)
     {
-      as_bad (".else without matching .if - ignored");
+      as_bad (_(".else without matching .if - ignored"));
 
     }
   else if (current_cframe->else_seen)
     {
-      as_bad ("duplicate \"else\" - ignored");
+      as_bad (_("duplicate \"else\" - ignored"));
       as_bad_where (current_cframe->else_file_line.file,
 		    current_cframe->else_file_line.line,
-		    "here is the previous \"else\"");
+		    _("here is the previous \"else\""));
       as_bad_where (current_cframe->if_file_line.file,
 		    current_cframe->if_file_line.line,
-		    "here is the previous \"if\"");
+		    _("here is the previous \"if\""));
     }
   else
     {
@@ -256,6 +385,13 @@ s_else (arg)
       if (!current_cframe->dead_tree)
 	{
 	  current_cframe->ignoring = !current_cframe->ignoring;
+	  if (LISTING_SKIP_COND ())
+	    {
+	      if (! current_cframe->ignoring)
+		listing_list (1);
+	      else
+		listing_list (2);
+	    }
 	}			/* if not a dead tree */
 
       current_cframe->else_seen = 1;
@@ -284,7 +420,7 @@ s_ifeqs (arg)
   SKIP_WHITESPACE ();
   if (*input_line_pointer != ',')
     {
-      as_bad (".ifeqs syntax error");
+      as_bad (_(".ifeqs syntax error"));
       ignore_rest_of_line ();
       return;
     }
@@ -300,6 +436,12 @@ s_ifeqs (arg)
   current_cframe = ((struct conditional_frame *)
 		    obstack_copy (&cond_obstack, &cframe, sizeof (cframe)));
 
+  if (LISTING_SKIP_COND ()
+      && cframe.ignoring
+      && (cframe.previous_cframe == NULL
+	  || ! cframe.previous_cframe->ignoring))
+    listing_list (2);
+
   demand_empty_rest_of_line ();
 }				/* s_ifeqs() */
 
@@ -310,11 +452,7 @@ ignore_input ()
 
   s = input_line_pointer;
 
-  if (flag_m68k_mri
-#ifdef NO_PSEUDO_DOT
-      || 1
-#endif
-      )
+  if (NO_PSEUDO_DOT || flag_m68k_mri)
     {
       if (s[-1] != '.')
 	--s;
@@ -350,15 +488,50 @@ initialize_cframe (cframe)
 	    &cframe->if_file_line.line);
   cframe->previous_cframe = current_cframe;
   cframe->dead_tree = current_cframe != NULL && current_cframe->ignoring;
+  cframe->macro_nest = macro_nest;
+}
+
+/* Give an error if a conditional is unterminated inside a macro or
+   the assembly as a whole.  If NEST is non negative, we are being
+   called because of the end of a macro expansion.  If NEST is
+   negative, we are being called at the of the input files.  */
+
+void
+cond_finish_check (nest)
+     int nest;
+{
+  if (current_cframe != NULL && current_cframe->macro_nest >= nest)
+    {
+      if (nest >= 0)
+	as_bad (_("end of macro inside conditional"));
+      else
+	as_bad (_("end of file inside conditional"));
+      as_bad_where (current_cframe->if_file_line.file,
+		    current_cframe->if_file_line.line,
+		    _("here is the start of the unterminated conditional"));
+      if (current_cframe->else_seen)
+	as_bad_where (current_cframe->else_file_line.file,
+		      current_cframe->else_file_line.line,
+		      _("here is the \"else\" of the unterminated conditional"));
+    }
+}
 
-  return;
-}				/* initialize_cframe() */
+/* This function is called when we exit out of a macro.  We assume
+   that any conditionals which began within the macro are correctly
+   nested, and just pop them off the stack.  */
 
-/*
- * Local Variables:
- * fill-column: 131
- * comment-column: 0
- * End:
- */
+void
+cond_exit_macro (nest)
+     int nest;
+{
+  while (current_cframe != NULL && current_cframe->macro_nest >= nest)
+    {
+      struct conditional_frame *hold;
+
+      hold = current_cframe;
+      current_cframe = current_cframe->previous_cframe;
+      obstack_free (&cond_obstack, hold);
+    }
+}
 
 /* end of cond.c */