espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-28 15:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

* config/tc-z8k.c (parse_reg): Be case insensitive when checking

Browse Source 
register names.
	(get_ctrl_operand): Be case insensitive when checking ctrl names.
This commit is contained in:
Christian Groessler
2003-12-05 23:40:04 +00:00
parent 24bc63c55a
commit f69532ae1b
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -1,4 +1,8 @@
* 2003-12-06 Christian Groessler <chris@groessler.org>
* config/tc-z8k.c (parse_reg): Be case insensitive when checking
register names.
(get_ctrl_operand): Be case insensitive when checking ctrl names.
2003-12-05 Nick Clifton <nickc@redhat.com> 2003-12-05 Nick Clifton <nickc@redhat.com>

37
gas/config/tc-z8k.c
View File

@ -246,7 +246,10 @@ parse_reg (char *src, int *mode, unsigned int *reg)
char *res = 0; char *res = 0;
char regno; char regno;
if (src[0] == 's' && src[1] == 'p' && (src[2] == 0 || src[2] == ',')) /* Check for stack pointer "sp" alias. */
if ((src[0] == 's' || src[0] == 'S')
&& (src[1] == 'p' || src[1] == 'P')
&& (src[2] == 0 || src[2] == ','))
{ {
if (segmented_mode) if (segmented_mode)
{ {
@ -260,9 +263,10 @@ parse_reg (char *src, int *mode, unsigned int *reg)
} }
return src + 2; return src + 2;
} }
if (src[0] == 'r')
if (src[0] == 'r' || src[0] == 'R')
{ {
if (src[1] == 'r') if (src[1] == 'r' || src[1] == 'R')
{ {
if (src[2] < '0' || src[2] > '9') if (src[2] < '0' || src[2] > '9')
return res; /* Assume no register name but a label starting with 'rr'. */ return res; /* Assume no register name but a label starting with 'rr'. */
@ -274,7 +278,7 @@ parse_reg (char *src, int *mode, unsigned int *reg)
if (regno & 1) if (regno & 1)
as_bad (_("register rr%d does not exist"), regno); as_bad (_("register rr%d does not exist"), regno);
} }
else if (src[1] == 'h') else if (src[1] == 'h' || src[1] == 'H')
{ {
if (src[2] < '0' || src[2] > '9') if (src[2] < '0' || src[2] > '9')
return res; /* Assume no register name but a label starting with 'rh'. */ return res; /* Assume no register name but a label starting with 'rh'. */
@ -284,7 +288,7 @@ parse_reg (char *src, int *mode, unsigned int *reg)
if (regno > 7) if (regno > 7)
as_bad (_("register rh%d out of range"), regno); as_bad (_("register rh%d out of range"), regno);
} }
else if (src[1] == 'l') else if (src[1] == 'l' || src[1] == 'L')
{ {
if (src[2] < '0' || src[2] > '9') if (src[2] < '0' || src[2] > '9')
return res; /* Assume no register name but a label starting with 'rl'. */ return res; /* Assume no register name but a label starting with 'rl'. */
@ -295,7 +299,7 @@ parse_reg (char *src, int *mode, unsigned int *reg)
as_bad (_("register rl%d out of range"), regno); as_bad (_("register rl%d out of range"), regno);
*reg += 8; *reg += 8;
} }
else if (src[1] == 'q') else if (src[1] == 'q' || src[1] == 'Q')
{ {
if (src[2] < '0' || src[2] > '9') if (src[2] < '0' || src[2] > '9')
return res; /* Assume no register name but a label starting with 'rq'. */ return res; /* Assume no register name but a label starting with 'rq'. */
@ -410,7 +414,7 @@ static void
get_ctrl_operand (char **ptr, struct z8k_op *mode, unsigned int dst ATTRIBUTE_UNUSED) get_ctrl_operand (char **ptr, struct z8k_op *mode, unsigned int dst ATTRIBUTE_UNUSED)
{ {
char *src = *ptr; char *src = *ptr;
int i; int i, l;
while (*src == ' ') while (*src == ' ')
src++; src++;
@ -418,18 +422,15 @@ get_ctrl_operand (char **ptr, struct z8k_op *mode, unsigned int dst ATTRIBUTE_UN
mode->mode = CLASS_CTRL; mode->mode = CLASS_CTRL;
for (i = 0; ctrl_table[i].name; i++) for (i = 0; ctrl_table[i].name; i++)
{ {
int j; l = strlen (ctrl_table[i].name);
if (! strncasecmp (ctrl_table[i].name, src, l))
for (j = 0; ctrl_table[i].name[j]; j++)
{ {
if (ctrl_table[i].name[j] != src[j])
goto fail;
}
the_ctrl = ctrl_table[i].value; the_ctrl = ctrl_table[i].value;
*ptr = src + j; if (*(src + l) && *(src + l) != ',')
break;
*ptr = src + l; /* Valid control name found: "consume" it. */
return; return;
fail: }
;
} }
the_ctrl = 0; the_ctrl = 0;
return; return;
@ -721,13 +722,10 @@ get_operands (const opcode_entry_type *opcode, char *op_end, op_type *operand)
ptr++; /* Consume rest of line. */ ptr++; /* Consume rest of line. */
} }
} }
else if (opcode->arg_info[0] == CLASS_FLAGS) else if (opcode->arg_info[0] == CLASS_FLAGS)
get_flags_operand (&ptr, operand + 0, 0); get_flags_operand (&ptr, operand + 0, 0);
else if (opcode->arg_info[0] == (CLASS_IMM + (ARG_IMM2))) else if (opcode->arg_info[0] == (CLASS_IMM + (ARG_IMM2)))
get_interrupt_operand (&ptr, operand + 0, 0); get_interrupt_operand (&ptr, operand + 0, 0);
else else
get_operand (&ptr, operand + 0, 0); get_operand (&ptr, operand + 0, 0);
@ -751,7 +749,6 @@ get_operands (const opcode_entry_type *opcode, char *op_end, op_type *operand)
as_bad (_("invalid condition code '%s'"), savptr); as_bad (_("invalid condition code '%s'"), savptr);
} }
} }
else if (opcode->arg_info[0] == CLASS_CTRL) else if (opcode->arg_info[0] == CLASS_CTRL)
{ {
get_ctrl_operand (&ptr, operand + 0, 0); get_ctrl_operand (&ptr, operand + 0, 0);