darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* expr.c (operand <case '$'>): Use DOLLAR_AMBIGU rather than flag_mri_m68k

Browse source 
as condition for parsing the '$' as a prefix.
* as.h (DOLLAR_AMBIGU): Define if needed.
This commit is contained in:
Nick Clifton 2005-11-08 15:48:26 +00:00
parent 08333dc498
commit 4fa6945e82
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gas/ChangeLog
View file

@ -1,3 +1,9 @@
2005-11-08 Arnold Metselaar <arnold.metselaar@planet.nl>
* expr.c (operand <case '$'>): Use DOLLAR_AMBIGU rather than
flag_mri_m68k as condition for parsing the '$' as a prefix.
* as.h (DOLLAR_AMBIGU): Define if needed.
2005-11-08 Nathan Sidwell <nathan@codesourcery.com>
Add ms2 support.

5
gas/as.h
View file

@ -586,6 +586,7 @@ int generic_force_reloc (struct fix *);
#ifdef TC_M68K
/* True if we are assembling in m68k MRI mode. */
COMMON int flag_m68k_mri;
#define DOLLAR_AMBIGU flag_m68k_mri
#else
#define flag_m68k_mri 0
#endif
@ -596,6 +597,10 @@ COMMON unsigned int found_comment;
COMMON char * found_comment_file;
#endif
#ifndef DOLLAR_AMBIGU
#define DOLLAR_AMBIGU 0
#endif
#ifndef NUMBERS_WITH_SUFFIX
#define NUMBERS_WITH_SUFFIX 0
#endif

6
gas/expr.c
View file

@ -1095,10 +1095,10 @@ operand (expressionS *expressionP, enum expr_mode mode)
if (! flag_m68k_mri)
goto de_fault;
#endif
if (flag_m68k_mri && hex_p (*input_line_pointer))
if (DOLLAR_AMBIGU && hex_p (*input_line_pointer))
{
/* In MRI mode, '$' is also used as the prefix for a
hexadecimal constant. */
/* In MRI mode and on Z80, '$' is also used as the prefix
for a hexadecimal constant. */
integer_constant (16, expressionP);
break;
}