FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* config/tc-m68k.c (s_reg): Rename local op to rop to avoid

Browse source 
confusion with macro op.
This commit is contained in:
Ian Lance Taylor 1995-08-14 21:33:29 +00:00
parent f2cc4ccdc3
commit 8e11ad0acd
2 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gas/ChangeLog
View file

@ -5,6 +5,9 @@ Mon Aug 14 14:08:07 1995 Jeff Law (law@snake.cs.utah.edu)
Mon Aug 14 15:45:07 1995 Ian Lance Taylor <ian@cygnus.com> Mon Aug 14 15:45:07 1995 Ian Lance Taylor <ian@cygnus.com>
* config/tc-m68k.c (s_reg): Rename local op to rop to avoid
confusion with macro op.
* gasp.c (strip_comments): Comment out; it's not used. * gasp.c (strip_comments): Comment out; it's not used.
(do_end): Add parameter. In MRI mode, print it out. (do_end): Add parameter. In MRI mode, print it out.
(do_irp): New static function. (do_irp): New static function.

36
gas/config/tc-m68k.c
View file

@ -4375,7 +4375,7 @@ s_reg (ignore)
{ {
char *s; char *s;
int c; int c;
struct m68k_op op; struct m68k_op rop;
unsigned long mask; unsigned long mask;
if (mri_line_label == NULL) if (mri_line_label == NULL)
@ -4398,12 +4398,12 @@ s_reg (ignore)
c = *input_line_pointer; c = *input_line_pointer;
*input_line_pointer = '\0'; *input_line_pointer = '\0';
if (m68k_ip_op (s, &op) != 0) if (m68k_ip_op (s, &rop) != 0)
{ {
if (op.error == NULL) if (rop.error == NULL)
as_bad ("bad register list"); as_bad ("bad register list");
else else
as_bad ("bad register list: %s", op.error); as_bad ("bad register list: %s", rop.error);
*input_line_pointer = c; *input_line_pointer = c;
ignore_rest_of_line (); ignore_rest_of_line ();
return; return;
@ -4411,22 +4411,22 @@ s_reg (ignore)
*input_line_pointer = c; *input_line_pointer = c;
if (op.mode == REGLST) if (rop.mode == REGLST)
mask = op.mask; mask = rop.mask;
else if (op.mode == DREG) else if (rop.mode == DREG)
mask = 1 << (op.reg - DATA0); mask = 1 << (rop.reg - DATA0);
else if (op.mode == AREG) else if (rop.mode == AREG)
mask = 1 << (op.reg - ADDR0 + 8); mask = 1 << (rop.reg - ADDR0 + 8);
else if (op.mode == FPREG) else if (rop.mode == FPREG)
mask = 1 << (op.reg - FP0 + 16); mask = 1 << (rop.reg - FP0 + 16);
else if (op.mode == CONTROL else if (rop.mode == CONTROL
&& op.reg == FPI) && rop.reg == FPI)
mask = 1 << 24; mask = 1 << 24;
else if (op.mode == CONTROL else if (rop.mode == CONTROL
&& op.reg == FPS) && rop.reg == FPS)
mask = 1 << 25; mask = 1 << 25;
else if (op.mode == CONTROL else if (rop.mode == CONTROL
&& op.reg == FPC) && rop.reg == FPC)
mask = 1 << 26; mask = 1 << 26;
else else
{ {