Remove is_intel_syntax from i386_is_register.

2010-04-21  H.J. Lu  <hongjiu.lu@intel.com>

	* config/tc-i386.c (i386_is_register): Remove is_intel_syntax.
	(x86_cons): Updated.
	(parse_register): Likewise.
	(tc_x86_parse_to_dw2regnum): Likewise.
	* config/tc-i386-intel.c (i386_intel_simplify): Likewise.
	(i386_intel_operand): Likewise.
This commit is contained in:
H.J. Lu
2010-04-22 00:43:38 +00:00
parent f9bdfd293e
commit 8d46fc7c2f
3 changed files with 19 additions and 13 deletions

View File

@ -1,3 +1,12 @@
2010-04-21 H.J. Lu <hongjiu.lu@intel.com>
* config/tc-i386.c (i386_is_register): Remove is_intel_syntax.
(x86_cons): Updated.
(parse_register): Likewise.
(tc_x86_parse_to_dw2regnum): Likewise.
* config/tc-i386-intel.c (i386_intel_simplify): Likewise.
(i386_intel_operand): Likewise.
2010-04-21 H.J. Lu <hongjiu.lu@intel.com> 2010-04-21 H.J. Lu <hongjiu.lu@intel.com>
PR gas/11509 PR gas/11509

View File

@ -347,8 +347,7 @@ static int i386_intel_simplify (expressionS *e)
intel_state.op_modifier = e->X_op; intel_state.op_modifier = e->X_op;
/* FALLTHROUGH */ /* FALLTHROUGH */
case O_short: case O_short:
if (i386_is_register (symbol_get_value_expression (e->X_add_symbol), if (i386_is_register (symbol_get_value_expression (e->X_add_symbol)))
1))
{ {
as_bad (_("invalid use of register")); as_bad (_("invalid use of register"));
return 0; return 0;
@ -359,8 +358,7 @@ static int i386_intel_simplify (expressionS *e)
break; break;
case O_full_ptr: case O_full_ptr:
if (i386_is_register (symbol_get_value_expression (e->X_op_symbol), if (i386_is_register (symbol_get_value_expression (e->X_op_symbol)))
1))
{ {
as_bad (_("invalid use of register")); as_bad (_("invalid use of register"));
return 0; return 0;
@ -859,7 +857,7 @@ i386_intel_operand (char *operand_string, int got_a_float)
break; break;
intel_state.seg = expP->X_add_symbol; intel_state.seg = expP->X_add_symbol;
} }
if (!i386_is_register (expP, 1)) if (!i386_is_register (expP))
{ {
as_bad (_("segment register name expected")); as_bad (_("segment register name expected"));
return 0; return 0;

View File

@ -3534,13 +3534,12 @@ swap_operands (void)
} }
} }
/* The X_md field is set to register number plus 1 to indicate register
expression in Intel syntax. */
static int static int
i386_is_register (const expressionS *e, int is_intel_syntax) i386_is_register (const expressionS *e)
{ {
return (e->X_op == O_register return e->X_op == O_register || e->X_md;
|| (is_intel_syntax
&& e->X_op == O_constant
&& e->X_md));
} }
/* Try to ensure constant immediates are represented in the smallest /* Try to ensure constant immediates are represented in the smallest
@ -6487,7 +6486,7 @@ x86_cons (expressionS *exp, int size)
if (exp->X_op == O_constant if (exp->X_op == O_constant
|| exp->X_op == O_absent || exp->X_op == O_absent
|| exp->X_op == O_illegal || exp->X_op == O_illegal
|| i386_is_register (exp, intel_syntax) || i386_is_register (exp)
|| exp->X_op == O_big) || exp->X_op == O_big)
{ {
char c = *input_line_pointer; char c = *input_line_pointer;
@ -7966,7 +7965,7 @@ parse_register (char *reg_string, char **end_op)
{ {
const expressionS *e = symbol_get_value_expression (symbolP); const expressionS *e = symbol_get_value_expression (symbolP);
know (i386_is_register (e, intel_syntax)); know (i386_is_register (e));
know (e->X_add_number >= 0 know (e->X_add_number >= 0
&& (valueT) e->X_add_number < i386_regtab_size); && (valueT) e->X_add_number < i386_regtab_size);
r = i386_regtab + e->X_add_number; r = i386_regtab + e->X_add_number;
@ -8873,7 +8872,7 @@ tc_x86_parse_to_dw2regnum (expressionS *exp)
register_chars['.'] = saved_register_dot; register_chars['.'] = saved_register_dot;
allow_naked_reg = saved_naked_reg; allow_naked_reg = saved_naked_reg;
if (i386_is_register (exp, intel_syntax) && exp->X_add_number >= 0) if (i386_is_register (exp) && exp->X_add_number >= 0)
{ {
if ((addressT) exp->X_add_number < i386_regtab_size) if ((addressT) exp->X_add_number < i386_regtab_size)
{ {