This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
[RFA:] tc-sh.c: Recognize register names case-insensitively
- To: binutils at sourceware dot cygnus dot com
- Subject: [RFA:] tc-sh.c: Recognize register names case-insensitively
- From: Hans-Peter Nilsson <hp at bitrange dot com>
- Date: Sun, 26 Nov 2000 15:43:39 -0500 (EST)
In <URL:http://semiconductor.hitachi.com/products/pdf/h14tp003d4.pdf>, the
SH4 programming manual, Hitachi names registers in capitals. The GAS port
recognizes registers in lower-case only. This patch makes GAS recognize
register names case-insensitively. Although tolower is normally a macro,
not a function call, it probably helps to keep the first two characters in
local variables.
Ok to commit?
* config/tc-sh.c (parse_reg): Parse names case-insensitively.
Index: tc-sh.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-sh.c,v
retrieving revision 1.28
diff -p -c -r1.28 tc-sh.c
*** tc-sh.c 2000/11/17 08:47:52 1.28
--- tc-sh.c 2000/11/26 19:21:54
*************** parse_reg (src, mode, reg)
*** 462,474 ****
int *mode;
int *reg;
{
/* We use ! IDENT_CHAR for the next character after the register name, to
make sure that we won't accidentally recognize a symbol name such as
'sram' or sr_ram as being a reference to the register 'sr'. */
! if (src[0] == 'r')
{
! if (src[1] == '1')
{
if (src[2] >= '0' && src[2] <= '5'
&& ! IDENT_CHAR ((unsigned char) src[3]))
--- 462,477 ----
int *mode;
int *reg;
{
+ char l0 = tolower (src[0]);
+ char l1 = l0 ? tolower (src[1]) : 0;
+
/* We use ! IDENT_CHAR for the next character after the register name, to
make sure that we won't accidentally recognize a symbol name such as
'sram' or sr_ram as being a reference to the register 'sr'. */
! if (l0 == 'r')
{
! if (l1 == '1')
{
if (src[2] >= '0' && src[2] <= '5'
&& ! IDENT_CHAR ((unsigned char) src[3]))
*************** parse_reg (src, mode, reg)
*** 478,513 ****
return 3;
}
}
! if (src[1] >= '0' && src[1] <= '9'
&& ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_REG_N;
! *reg = (src[1] - '0');
return 2;
}
! if (src[1] >= '0' && src[1] <= '7' && strncmp (&src[2], "_bank", 5) == 0
&& ! IDENT_CHAR ((unsigned char) src[7]))
{
*mode = A_REG_B;
! *reg = (src[1] - '0');
return 7;
}
! if (src[1] == 'e' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_RE;
return 2;
}
! if (src[1] == 's' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_RS;
return 2;
}
}
! if (src[0] == 'a')
{
! if (src[1] == '0')
{
if (! IDENT_CHAR ((unsigned char) src[2]))
{
--- 481,516 ----
return 3;
}
}
! if (l1 >= '0' && l1 <= '9'
&& ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_REG_N;
! *reg = (l1 - '0');
return 2;
}
! if (l1 >= '0' && l1 <= '7' && strncasecmp (&src[2], "_bank", 5) == 0
&& ! IDENT_CHAR ((unsigned char) src[7]))
{
*mode = A_REG_B;
! *reg = (l1 - '0');
return 7;
}
! if (l1 == 'e' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_RE;
return 2;
}
! if (l1 == 's' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_RS;
return 2;
}
}
! if (l0 == 'a')
{
! if (l1 == '0')
{
if (! IDENT_CHAR ((unsigned char) src[2]))
{
*************** parse_reg (src, mode, reg)
*** 515,528 ****
*reg = A_A0_NUM;
return 2;
}
! if (src[2] == 'g' && ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = DSP_REG_N;
*reg = A_A0G_NUM;
return 3;
}
}
! if (src[1] == '1')
{
if (! IDENT_CHAR ((unsigned char) src[2]))
{
--- 518,531 ----
*reg = A_A0_NUM;
return 2;
}
! if (tolower (src[2]) == 'g' && ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = DSP_REG_N;
*reg = A_A0G_NUM;
return 3;
}
}
! if (l1 == '1')
{
if (! IDENT_CHAR ((unsigned char) src[2]))
{
*************** parse_reg (src, mode, reg)
*** 530,536 ****
*reg = A_A1_NUM;
return 2;
}
! if (src[2] == 'g' && ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = DSP_REG_N;
*reg = A_A1G_NUM;
--- 533,539 ----
*reg = A_A1_NUM;
return 2;
}
! if (tolower (src[2]) == 'g' && ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = DSP_REG_N;
*reg = A_A1G_NUM;
*************** parse_reg (src, mode, reg)
*** 538,561 ****
}
}
! if (src[1] == 'x' && src[2] >= '0' && src[2] <= '1'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_REG_N;
! *reg = 4 + (src[1] - '0');
return 3;
}
! if (src[1] == 'y' && src[2] >= '0' && src[2] <= '1'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_REG_N;
! *reg = 6 + (src[1] - '0');
return 3;
}
! if (src[1] == 's' && src[2] >= '0' && src[2] <= '3'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
! int n = src[1] - '0';
*mode = A_REG_N;
*reg = n | ((~n & 2) << 1);
--- 541,564 ----
}
}
! if (l1 == 'x' && src[2] >= '0' && src[2] <= '1'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_REG_N;
! *reg = 4 + (l1 - '0');
return 3;
}
! if (l1 == 'y' && src[2] >= '0' && src[2] <= '1'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_REG_N;
! *reg = 6 + (l1 - '0');
return 3;
}
! if (l1 == 's' && src[2] >= '0' && src[2] <= '3'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
! int n = l1 - '0';
*mode = A_REG_N;
*reg = n | ((~n & 2) << 1);
*************** parse_reg (src, mode, reg)
*** 563,583 ****
}
}
! if (src[0] == 'i' && src[1] && ! IDENT_CHAR ((unsigned char) src[3]))
{
! if (src[1] == 's')
{
*mode = A_REG_N;
*reg = 8;
return 2;
}
! if (src[1] == 'x')
{
*mode = A_REG_N;
*reg = 8;
return 2;
}
! if (src[1] == 'y')
{
*mode = A_REG_N;
*reg = 9;
--- 566,586 ----
}
}
! if (l0 == 'i' && l1 && ! IDENT_CHAR ((unsigned char) src[3]))
{
! if (l1 == 's')
{
*mode = A_REG_N;
*reg = 8;
return 2;
}
! if (l1 == 'x')
{
*mode = A_REG_N;
*reg = 8;
return 2;
}
! if (l1 == 'y')
{
*mode = A_REG_N;
*reg = 9;
*************** parse_reg (src, mode, reg)
*** 585,689 ****
}
}
! if (src[0] == 'x' && src[1] >= '0' && src[1] <= '1'
&& ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = DSP_REG_N;
! *reg = A_X0_NUM + src[1] - '0';
return 2;
}
! if (src[0] == 'y' && src[1] >= '0' && src[1] <= '1'
&& ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = DSP_REG_N;
! *reg = A_Y0_NUM + src[1] - '0';
return 2;
}
! if (src[0] == 'm' && src[1] >= '0' && src[1] <= '1'
&& ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = DSP_REG_N;
! *reg = src[1] == '0' ? A_M0_NUM : A_M1_NUM;
return 2;
}
! if (src[0] == 's'
! && src[1] == 's'
! && src[2] == 'r' && ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_SSR;
return 3;
}
! if (src[0] == 's' && src[1] == 'p' && src[2] == 'c'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_SPC;
return 3;
}
! if (src[0] == 's' && src[1] == 'g' && src[2] == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_SGR;
return 3;
}
! if (src[0] == 'd' && src[1] == 's' && src[2] == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_DSR;
return 3;
}
! if (src[0] == 'd' && src[1] == 'b' && src[2] == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_DBR;
return 3;
}
! if (src[0] == 's' && src[1] == 'r' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_SR;
return 2;
}
! if (src[0] == 's' && src[1] == 'p' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_REG_N;
*reg = 15;
return 2;
}
! if (src[0] == 'p' && src[1] == 'r' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_PR;
return 2;
}
! if (src[0] == 'p' && src[1] == 'c' && ! IDENT_CHAR ((unsigned char) src[2]))
{
/* Don't use A_DISP_PC here - that would accept stuff like 'mova pc,r0'
and use an uninitialized immediate. */
*mode = A_PC;
return 2;
}
! if (src[0] == 'g' && src[1] == 'b' && src[2] == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_GBR;
return 3;
}
! if (src[0] == 'v' && src[1] == 'b' && src[2] == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_VBR;
return 3;
}
! if (src[0] == 'm' && src[1] == 'a' && src[2] == 'c'
&& ! IDENT_CHAR ((unsigned char) src[4]))
{
if (src[3] == 'l')
--- 588,692 ----
}
}
! if (l0 == 'x' && l1 >= '0' && l1 <= '1'
&& ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = DSP_REG_N;
! *reg = A_X0_NUM + l1 - '0';
return 2;
}
! if (l0 == 'y' && l1 >= '0' && l1 <= '1'
&& ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = DSP_REG_N;
! *reg = A_Y0_NUM + l1 - '0';
return 2;
}
! if (l0 == 'm' && l1 >= '0' && l1 <= '1'
&& ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = DSP_REG_N;
! *reg = l1 == '0' ? A_M0_NUM : A_M1_NUM;
return 2;
}
! if (l0 == 's'
! && l1 == 's'
! && tolower (src[2]) == 'r' && ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_SSR;
return 3;
}
! if (l0 == 's' && l1 == 'p' && tolower (src[2]) == 'c'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_SPC;
return 3;
}
! if (l0 == 's' && l1 == 'g' && tolower (src[2]) == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_SGR;
return 3;
}
! if (l0 == 'd' && l1 == 's' && tolower (src[2]) == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_DSR;
return 3;
}
! if (l0 == 'd' && l1 == 'b' && tolower (src[2]) == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_DBR;
return 3;
}
! if (l0 == 's' && l1 == 'r' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_SR;
return 2;
}
! if (l0 == 's' && l1 == 'p' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_REG_N;
*reg = 15;
return 2;
}
! if (l0 == 'p' && l1 == 'r' && ! IDENT_CHAR ((unsigned char) src[2]))
{
*mode = A_PR;
return 2;
}
! if (l0 == 'p' && l1 == 'c' && ! IDENT_CHAR ((unsigned char) src[2]))
{
/* Don't use A_DISP_PC here - that would accept stuff like 'mova pc,r0'
and use an uninitialized immediate. */
*mode = A_PC;
return 2;
}
! if (l0 == 'g' && l1 == 'b' && tolower (src[2]) == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_GBR;
return 3;
}
! if (l0 == 'v' && l1 == 'b' && tolower (src[2]) == 'r'
&& ! IDENT_CHAR ((unsigned char) src[3]))
{
*mode = A_VBR;
return 3;
}
! if (l0 == 'm' && l1 == 'a' && tolower (src[2]) == 'c'
&& ! IDENT_CHAR ((unsigned char) src[4]))
{
if (src[3] == 'l')
*************** parse_reg (src, mode, reg)
*** 697,709 ****
return 4;
}
}
! if (src[0] == 'm' && src[1] == 'o' && src[2] == 'd'
&& ! IDENT_CHAR ((unsigned char) src[4]))
{
*mode = A_MOD;
return 3;
}
! if (src[0] == 'f' && src[1] == 'r')
{
if (src[2] == '1')
{
--- 700,712 ----
return 4;
}
}
! if (l0 == 'm' && l1 == 'o' && tolower (src[2]) == 'd'
&& ! IDENT_CHAR ((unsigned char) src[4]))
{
*mode = A_MOD;
return 3;
}
! if (l0 == 'f' && l1 == 'r')
{
if (src[2] == '1')
{
*************** parse_reg (src, mode, reg)
*** 723,729 ****
return 3;
}
}
! if (src[0] == 'd' && src[1] == 'r')
{
if (src[2] == '1')
{
--- 726,732 ----
return 3;
}
}
! if (l0 == 'd' && l1 == 'r')
{
if (src[2] == '1')
{
*************** parse_reg (src, mode, reg)
*** 743,749 ****
return 3;
}
}
! if (src[0] == 'x' && src[1] == 'd')
{
if (src[2] == '1')
{
--- 746,752 ----
return 3;
}
}
! if (l0 == 'x' && l1 == 'd')
{
if (src[2] == '1')
{
*************** parse_reg (src, mode, reg)
*** 763,769 ****
return 3;
}
}
! if (src[0] == 'f' && src[1] == 'v')
{
if (src[2] == '1'&& src[3] == '2' && ! IDENT_CHAR ((unsigned char) src[4]))
{
--- 766,772 ----
return 3;
}
}
! if (l0 == 'f' && l1 == 'v')
{
if (src[2] == '1'&& src[3] == '2' && ! IDENT_CHAR ((unsigned char) src[4]))
{
*************** parse_reg (src, mode, reg)
*** 779,800 ****
return 3;
}
}
! if (src[0] == 'f' && src[1] == 'p' && src[2] == 'u' && src[3] == 'l'
&& ! IDENT_CHAR ((unsigned char) src[4]))
{
*mode = FPUL_N;
return 4;
}
! if (src[0] == 'f' && src[1] == 'p' && src[2] == 's' && src[3] == 'c'
! && src[4] == 'r' && ! IDENT_CHAR ((unsigned char) src[5]))
{
*mode = FPSCR_N;
return 5;
}
! if (src[0] == 'x' && src[1] == 'm' && src[2] == 't' && src[3] == 'r'
! && src[4] == 'x' && ! IDENT_CHAR ((unsigned char) src[5]))
{
*mode = XMTRX_M4;
return 5;
--- 782,806 ----
return 3;
}
}
! if (l0 == 'f' && l1 == 'p' && tolower (src[2]) == 'u'
! && tolower (src[3]) == 'l'
&& ! IDENT_CHAR ((unsigned char) src[4]))
{
*mode = FPUL_N;
return 4;
}
! if (l0 == 'f' && l1 == 'p' && tolower (src[2]) == 's'
! && tolower (src[3]) == 'c'
! && tolower (src[4]) == 'r' && ! IDENT_CHAR ((unsigned char) src[5]))
{
*mode = FPSCR_N;
return 5;
}
! if (l0 == 'x' && l1 == 'm' && tolower (src[2]) == 't'
! && tolower (src[3]) == 'r'
! && tolower (src[4]) == 'x' && ! IDENT_CHAR ((unsigned char) src[5]))
{
*mode = XMTRX_M4;
return 5;
brgds, H-P