Changeset 609 for branches/GNU/src/binutils/gas/cond.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/gas/cond.c (modified) (4 diffs, 1 prop)

branches/GNU/src/binutils/gas/cond.c

@@ -61 +61 @@
 static struct conditional_frame *current_cframe = NULL;
 
-void
-s_ifdef (arg)
-     int arg;
+/* Performs the .ifdef (test_defined == 1) and
+   the .ifndef (test_defined == 0) pseudo op.  */
+
+void
+s_ifdef (test_defined)
+     int test_defined;
 {
   /* Points to name of symbol.  */
-  register char *name;
+  char *name;
   /* Points to symbol.  */
-  register symbolS *symbolP;
+  symbolS *symbolP;
   struct conditional_frame cframe;
+  char c;
 
   /* Leading whitespace is part of operand.  */
@@ -80 +84 @@
       obstack_1grow (&cond_obstack, 0);
       ignore_rest_of_line ();
-    }
-  else
-    {
-      char c;
-
-      c = get_symbol_end ();
-      symbolP = symbol_find (name);
-      *input_line_pointer = c;
-
-      initialize_cframe (&cframe);
-      cframe.ignoring = cframe.dead_tree || !((symbolP != 0) ^ 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 */
+      return;
+    }
+
+  c = get_symbol_end ();
+  symbolP = symbol_find (name);
+  *input_line_pointer = c;
+
+  initialize_cframe (&cframe);
+  
+  if (cframe.dead_tree)
+    cframe.ignoring = 1;
+  else
+    {
+      int is_defined;
+
+      /* Use the same definition of 'defined' as .equiv so that a symbol
+         which has been referenced but not yet given a value/address is
+         considered to be undefined.  */
+      is_defined =
+        symbolP != NULL
+        && S_IS_DEFINED (symbolP)
+        && S_GET_SEGMENT (symbolP) != reg_section;
+
+      cframe.ignoring = ! (test_defined ^ is_defined);
+    }
+
+  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 ();
 }
 
@@ -258 +276 @@
   if (current_cframe == NULL)
     {
-      as_bad (_("\".elseif\" without matching \".if\" - ignored"));
+      as_bad (_("\".elseif\" without matching \".if\""));
     }
   else if (current_cframe->else_seen)
     {
-      as_bad (_("\".elseif\" after \".else\" - ignored"));
+      as_bad (_("\".elseif\" after \".else\""));
       as_bad_where (current_cframe->else_file_line.file,
                     current_cframe->else_file_line.line,
@@ -366 +384 @@
   if (current_cframe == NULL)
     {
-      as_bad (_(".else without matching .if - ignored"));
+      as_bad (_("\".else\" without matching \".if\""));
     }
   else if (current_cframe->else_seen)
     {
-      as_bad (_("duplicate \"else\" - ignored"));
+      as_bad (_("duplicate \"else\""));
       as_bad_where (current_cframe->else_file_line.file,
                     current_cframe->else_file_line.line,