/* cond.c - conditional assembly pseudo-ops, and .include
- Copyright 1990, 1991, 1992, 1993, 1995, 1997, 1998, 2000, 2001, 2002,
- 2003 Free Software Foundation, Inc.
+ Copyright (C) 1990-2020 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
GAS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free Software Foundation; either version 3, or (at your option)
any later version.
GAS is distributed in the hope that it will be useful,
02110-1301, USA. */
#include "as.h"
+#include "sb.h"
#include "macro.h"
#include "obstack.h"
scanned. */
struct obstack cond_obstack;
-struct file_line {
- char *file;
+struct file_line
+{
+ const char *file;
unsigned int line;
};
/* We push one of these structures for each .if, and pop it at the
.endif. */
-struct conditional_frame {
+struct conditional_frame
+{
/* The source file & line number of the "if". */
struct file_line if_file_line;
/* The source file & line of the "else". */
SKIP_WHITESPACE ();
name = input_line_pointer;
- if (!is_name_beginner (*name))
+ if (!is_name_beginner (*name) && *name != '"')
{
as_bad (_("invalid identifier for \".ifdef\""));
obstack_1grow (&cond_obstack, 0);
return;
}
- c = get_symbol_end ();
+ c = get_symbol_name (& name);
symbolP = symbol_find (name);
- *input_line_pointer = c;
+ (void) restore_line_pointer (c);
initialize_cframe (&cframe);
-
+
if (cframe.dead_tree)
cframe.ignoring = 1;
else
considered to be undefined. */
is_defined =
symbolP != NULL
- && S_IS_DEFINED (symbolP)
+ && (S_IS_DEFINED (symbolP) || symbol_equated_p (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)));
+ current_cframe =
+ (struct conditional_frame *) obstack_alloc (&cond_obstack, sizeof cframe);
+ memcpy (current_cframe, &cframe, sizeof cframe);
if (LISTING_SKIP_COND ()
&& cframe.ignoring
struct conditional_frame cframe;
int t;
char *stop = NULL;
- char stopc;
+ char stopc = 0;
if (flag_mri)
stop = mri_comment_field (&stopc);
}
else
{
- expression (&operand);
+ expression_and_evaluate (&operand);
if (operand.X_op != O_constant)
as_bad (_("non-constant expression in \".if\" statement"));
}
using an undefined result. No big deal. */
initialize_cframe (&cframe);
cframe.ignoring = cframe.dead_tree || ! t;
- current_cframe = ((struct conditional_frame *)
- obstack_copy (&cond_obstack, &cframe, sizeof (cframe)));
+ current_cframe =
+ (struct conditional_frame *) obstack_alloc (&cond_obstack, sizeof cframe);
+ memcpy (current_cframe, & cframe, sizeof cframe);
if (LISTING_SKIP_COND ()
&& cframe.ignoring
struct conditional_frame cframe;
initialize_cframe (&cframe);
-
+
if (cframe.dead_tree)
cframe.ignoring = 1;
else
cframe.ignoring = (test_blank == !is_eol);
}
- current_cframe = ((struct conditional_frame *)
- obstack_copy (&cond_obstack, &cframe,
- sizeof (cframe)));
+ current_cframe =
+ (struct conditional_frame *) obstack_alloc (&cond_obstack, sizeof cframe);
+ memcpy (current_cframe, &cframe, sizeof cframe);
if (LISTING_SKIP_COND ()
&& cframe.ignoring
s_ifc (int arg)
{
char *stop = NULL;
- char stopc;
+ char stopc = 0;
char *s1, *s2;
int len1, len2;
int res;
initialize_cframe (&cframe);
cframe.ignoring = cframe.dead_tree || ! (res ^ arg);
- current_cframe = ((struct conditional_frame *)
- obstack_copy (&cond_obstack, &cframe, sizeof (cframe)));
-
- if (LISTING_SKIP_COND ()
+ current_cframe =
+ (struct conditional_frame *) obstack_alloc (&cond_obstack, sizeof cframe);
+ memcpy (current_cframe, &cframe, sizeof cframe);
+
+ if (LISTING_SKIP_COND ()
&& cframe.ignoring
&& (cframe.previous_cframe == NULL
|| ! cframe.previous_cframe->ignoring))
as_bad (_("\".elseif\" after \".else\""));
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
{
- as_where (¤t_cframe->else_file_line.file,
- ¤t_cframe->else_file_line.line);
+ current_cframe->else_file_line.file
+ = as_where (¤t_cframe->else_file_line.line);
current_cframe->dead_tree |= !current_cframe->ignoring;
current_cframe->ignoring = current_cframe->dead_tree;
/* Leading whitespace is part of operand. */
SKIP_WHITESPACE ();
- expression (&operand);
+ expression_and_evaluate (&operand);
if (operand.X_op != O_constant)
as_bad (_("non-constant expression in \".elseif\" statement"));
}
else if (current_cframe->else_seen)
{
- as_bad (_("duplicate \"else\""));
+ as_bad (_("duplicate \".else\""));
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
{
- as_where (¤t_cframe->else_file_line.file,
- ¤t_cframe->else_file_line.line);
+ current_cframe->else_file_line.file
+ = as_where (¤t_cframe->else_file_line.line);
current_cframe->ignoring =
current_cframe->dead_tree | !current_cframe->ignoring;
initialize_cframe (&cframe);
cframe.ignoring = cframe.dead_tree || ! (res ^ arg);
- current_cframe = ((struct conditional_frame *)
- obstack_copy (&cond_obstack, &cframe, sizeof (cframe)));
+ current_cframe =
+ (struct conditional_frame *) obstack_alloc (&cond_obstack, sizeof cframe);
+ memcpy (current_cframe, &cframe, sizeof cframe);
if (LISTING_SKIP_COND ()
&& cframe.ignoring
initialize_cframe (struct conditional_frame *cframe)
{
memset (cframe, 0, sizeof (*cframe));
- as_where (&cframe->if_file_line.file,
- &cframe->if_file_line.line);
+ cframe->if_file_line.file
+ = as_where (&cframe->if_file_line.line);
cframe->previous_cframe = current_cframe;
cframe->dead_tree = current_cframe != NULL && current_cframe->ignoring;
cframe->macro_nest = macro_nest;
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"));