X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fcond.c;h=bcdc4bfcfc3f2ca595266d6a1d2c4873bf9042e4;hb=d476da0ef37ba5ca612a536c69bfe2b859e17c46;hp=b42da901365adb7595afdb16ce5e1b46f34cc5e7;hpb=30a2b4ef8f28ad15ea6bfb17bdf54e164607d8db;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/cond.c b/gas/cond.c index b42da90136..bcdc4bfcfc 100644 --- a/gas/cond.c +++ b/gas/cond.c @@ -1,12 +1,12 @@ /* cond.c - conditional assembly pseudo-ops, and .include - Copyright (C) 1990, 91, 92, 93, 95, 96, 97, 98, 99, 2000 - Free Software Foundation, Inc. + Copyright 1990, 1991, 1992, 1993, 1995, 1997, 1998, 2000, 2001, 2002, + 2003, 2005, 2006, 2007 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, @@ -16,10 +16,11 @@ 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. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ #include "as.h" +#include "sb.h" #include "macro.h" #include "obstack.h" @@ -47,26 +48,31 @@ struct conditional_frame { int else_seen; /* Whether we are currently ignoring input. */ int ignoring; - /* Whether a conditional at a higher level is ignoring input. */ + /* Whether a conditional at a higher level is ignoring input. + Set also when a branch of an "if .. elseif .." tree has matched + to prevent further matches. */ 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 *)); +static void initialize_cframe (struct conditional_frame *cframe); +static char *get_mri_string (int, int *); static struct conditional_frame *current_cframe = NULL; +/* Performs the .ifdef (test_defined == 1) and + the .ifndef (test_defined == 0) pseudo op. */ + void -s_ifdef (arg) - int arg; +s_ifdef (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. */ SKIP_WHITESPACE (); @@ -77,34 +83,47 @@ s_ifdef (arg) as_bad (_("invalid identifier for \".ifdef\"")); obstack_1grow (&cond_obstack, 0); ignore_rest_of_line (); + return; } + + c = get_symbol_end (); + symbolP = symbol_find (name); + *input_line_pointer = c; + + initialize_cframe (&cframe); + + if (cframe.dead_tree) + cframe.ignoring = 1; else { - char c; + int is_defined; - c = get_symbol_end (); - symbolP = symbol_find (name); - *input_line_pointer = c; + /* 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) || symbol_equated_p (symbolP)) + && S_GET_SEGMENT (symbolP) != reg_section; - initialize_cframe (&cframe); - cframe.ignoring = cframe.dead_tree || !((symbolP != 0) ^ arg); - current_cframe = ((struct conditional_frame *) - obstack_copy (&cond_obstack, &cframe, - sizeof (cframe))); + cframe.ignoring = ! (test_defined ^ is_defined); + } - if (LISTING_SKIP_COND () - && cframe.ignoring - && (cframe.previous_cframe == NULL - || ! cframe.previous_cframe->ignoring)) - listing_list (2); + 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 */ + demand_empty_rest_of_line (); } void -s_if (arg) - int arg; +s_if (int arg) { expressionS operand; struct conditional_frame cframe; @@ -126,7 +145,7 @@ s_if (arg) } else { - expression (&operand); + expression_and_evaluate (&operand); if (operand.X_op != O_constant) as_bad (_("non-constant expression in \".if\" statement")); } @@ -163,12 +182,44 @@ s_if (arg) demand_empty_rest_of_line (); } +/* Performs the .ifb (test_blank == 1) and + the .ifnb (test_blank == 0) pseudo op. */ + +void +s_ifb (int test_blank) +{ + struct conditional_frame cframe; + + initialize_cframe (&cframe); + + if (cframe.dead_tree) + cframe.ignoring = 1; + else + { + int is_eol; + + SKIP_WHITESPACE (); + is_eol = is_end_of_line[(unsigned char) *input_line_pointer]; + cframe.ignoring = (test_blank == !is_eol); + } + + 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); + + ignore_rest_of_line (); +} + /* Get a string for the MRI IFC or IFNC pseudo-ops. */ static char * -get_mri_string (terminator, len) - int terminator; - int *len; +get_mri_string (int terminator, int *len) { char *ret; char *s; @@ -208,8 +259,7 @@ get_mri_string (terminator, len) /* The MRI IFC and IFNC pseudo-ops. */ void -s_ifc (arg) - int arg; +s_ifc (int arg) { char *stop = NULL; char stopc; @@ -250,20 +300,15 @@ s_ifc (arg) } void -s_elseif (arg) - int arg; +s_elseif (int arg) { - expressionS operand; - int t; - 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, _("here is the previous \"else\"")); @@ -276,62 +321,61 @@ s_elseif (arg) as_where (¤t_cframe->else_file_line.file, ¤t_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 */ - - /* Leading whitespace is part of operand. */ - SKIP_WHITESPACE (); + current_cframe->dead_tree |= !current_cframe->ignoring; + current_cframe->ignoring = current_cframe->dead_tree; + } - if (current_cframe != NULL && current_cframe->ignoring) + 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; + + if (current_cframe == NULL) + return; } else { - expression (&operand); + expressionS operand; + int t; + + /* Leading whitespace is part of operand. */ + SKIP_WHITESPACE (); + + expression_and_evaluate (&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; - } + 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; + 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); + { + if (! current_cframe->ignoring) + listing_list (1); + else + listing_list (2); + } demand_empty_rest_of_line (); } void -s_endif (arg) - int arg ATTRIBUTE_UNUSED; +s_endif (int arg ATTRIBUTE_UNUSED) { struct conditional_frame *hold; @@ -362,17 +406,15 @@ s_endif (arg) } void -s_else (arg) - int arg ATTRIBUTE_UNUSED; +s_else (int arg ATTRIBUTE_UNUSED) { 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, _("here is the previous \"else\"")); @@ -385,20 +427,21 @@ s_else (arg) as_where (¤t_cframe->else_file_line.file, ¤t_cframe->else_file_line.line); - if (!current_cframe->dead_tree) + current_cframe->ignoring = + current_cframe->dead_tree | !current_cframe->ignoring; + + if (LISTING_SKIP_COND () + && (current_cframe->previous_cframe == NULL + || ! current_cframe->previous_cframe->ignoring)) { - 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 (! current_cframe->ignoring) + listing_list (1); + else + listing_list (2); + } current_cframe->else_seen = 1; - } /* if error else do it */ + } if (flag_mri) { @@ -410,8 +453,7 @@ s_else (arg) } void -s_ifeqs (arg) - int arg; +s_ifeqs (int arg) { char *s1, *s2; int len1, len2; @@ -449,7 +491,7 @@ s_ifeqs (arg) } int -ignore_input () +ignore_input (void) { char *s; @@ -483,8 +525,7 @@ ignore_input () } static void -initialize_cframe (cframe) - struct conditional_frame *cframe; +initialize_cframe (struct conditional_frame *cframe) { memset (cframe, 0, sizeof (*cframe)); as_where (&cframe->if_file_line.file, @@ -500,8 +541,7 @@ initialize_cframe (cframe) negative, we are being called at the of the input files. */ void -cond_finish_check (nest) - int nest; +cond_finish_check (int nest) { if (current_cframe != NULL && current_cframe->macro_nest >= nest) { @@ -524,8 +564,7 @@ cond_finish_check (nest) nested, and just pop them off the stack. */ void -cond_exit_macro (nest) - int nest; +cond_exit_macro (int nest) { while (current_cframe != NULL && current_cframe->macro_nest >= nest) {