fix a mmix assertion failure

fix a mmix assertion failure

[Alan Modra]

	* symbols.c (fb_label_name): Allow an augend of 2 for mmix.

Index: gas/symbols.c
===================================================================
RCS file: /cvs/src/src/gas/symbols.c,v
retrieving revision 1.54
diff -u -p -r1.54 symbols.c
--- gas/symbols.c	21 Jan 2005 05:54:38 -0000	1.54
+++ gas/symbols.c	1 Mar 2005 10:51:53 -0000
@@ -1,6 +1,6 @@
 /* symbols.c -symbol table-
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004
+   1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -1561,7 +1561,13 @@ fb_label_name (long n,	/* We just saw "n
   char symbol_name_temporary[20];	/* Build up a number, BACKWARDS.  */
 
   know (n >= 0);
-  know (augend == 0 || augend == 1);
+  know (
+#ifdef TC_MMIX
+	(unsigned long) augend <= 2 /* See mmix_fb_label.  */
+#else
+	(unsigned long) augend <= 1
+#endif
+	);
   p = symbol_name_build;
 #ifdef LOCAL_LABEL_PREFIX
   *p++ = LOCAL_LABEL_PREFIX;

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre

Re: fix a mmix assertion failure

[Andreas Schwab]

Alan Modra <amodra@bigpond.net.au> writes:

> @@ -1561,7 +1561,13 @@ fb_label_name (long n,	/* We just saw "n
>    char symbol_name_temporary[20];	/* Build up a number, BACKWARDS.  */
>  
>    know (n >= 0);
> -  know (augend == 0 || augend == 1);
> +  know (
> +#ifdef TC_MMIX
> +	(unsigned long) augend <= 2 /* See mmix_fb_label.  */
> +#else
> +	(unsigned long) augend <= 1
> +#endif
> +	);

That won't work when know is a macro.  You can't have preprocessor
directives inside a macro parameter.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: fix a mmix assertion failure

[Alan Modra]

On Wed, Mar 02, 2005 at 12:20:40AM +0100, Andreas Schwab wrote:
> Alan Modra <amodra@bigpond.net.au> writes:
> 
> > @@ -1561,7 +1561,13 @@ fb_label_name (long n,	/* We just saw "n
> >    char symbol_name_temporary[20];	/* Build up a number, BACKWARDS.  */
> >  
> >    know (n >= 0);
> > -  know (augend == 0 || augend == 1);
> > +  know (
> > +#ifdef TC_MMIX
> > +	(unsigned long) augend <= 2 /* See mmix_fb_label.  */
> > +#else
> > +	(unsigned long) augend <= 1
> > +#endif
> > +	);
> 
> That won't work when know is a macro.  You can't have preprocessor
> directives inside a macro parameter.

Arggh.  I should know that!

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre

Re: fix a mmix assertion failure

[Hans-Peter Nilsson]

On Wed, 2 Mar 2005, Alan Modra wrote:

> 	* symbols.c (fb_label_name): Allow an augend of 2 for mmix.

Yuck.  Are you ok with me reverting that later on as part of a
MMIX-local solution?  (No, I haven't looked further.)

brgds, H-P

Re: fix a mmix assertion failure

[Alan Modra]

On Tue, Mar 01, 2005 at 06:39:14PM -0500, Hans-Peter Nilsson wrote:
> On Wed, 2 Mar 2005, Alan Modra wrote:
> 
> > 	* symbols.c (fb_label_name): Allow an augend of 2 for mmix.
> 
> Yuck.  Are you ok with me reverting that later on as part of a
> MMIX-local solution?

Of course!

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre