From 37dedf66338d1471695d1a0a7421ec281a0305f2 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 6 Oct 2005 11:44:07 +0000 Subject: * config/tc-sh.c (allow_dollar_register_prefix): New variable. (parse_reg_without_prefix): New function. (parse_reg): Check for '$' register prefix if --allow-reg-prefix is set. (option md_longopts): Add allow-reg-prefix option. * doc/c-sh.texi: Document --allow-reg-prefix option. * NEWS: Mention the new switch. * gas/sh/basic.exp: Run reg-prefix test. * gas/sh/reg-prefix.s: New * gas/sh/reg-prefix.d: New --- gas/ChangeLog | 11 ++++ gas/NEWS | 4 ++ gas/config/tc-sh.c | 111 +++++++++++++++++++++++++++----------- gas/doc/c-sh.texi | 40 +++++++------- gas/testsuite/ChangeLog | 7 +++ gas/testsuite/gas/sh/basic.exp | 5 +- gas/testsuite/gas/sh/reg-prefix.d | 9 ++++ gas/testsuite/gas/sh/reg-prefix.s | 2 + 8 files changed, 139 insertions(+), 50 deletions(-) create mode 100644 gas/testsuite/gas/sh/reg-prefix.d create mode 100644 gas/testsuite/gas/sh/reg-prefix.s diff --git a/gas/ChangeLog b/gas/ChangeLog index d38b205..446cf70 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,14 @@ +2005-10-06 Khem Raj + NIIBE Yutaka + + * config/tc-sh.c (allow_dollar_register_prefix): New variable. + (parse_reg_without_prefix): New function. + (parse_reg): Check for '$' register prefix if --allow-reg-prefix is + set. + (option md_longopts): Add allow-reg-prefix option. + * doc/c-sh.texi: Document --allow-reg-prefix option. + * NEWS: Mention the new switch. + 2005-10-03 Arnold Metselaar * doc/as.texinfo (Infix Ops): '<' and '>' are not shift diff --git a/gas/NEWS b/gas/NEWS index 4b70aca..d3db8df 100644 --- a/gas/NEWS +++ b/gas/NEWS @@ -1,5 +1,9 @@ -*- text -*- +* The SH target supports a new command line switch --enable-reg-prefix which, + if enabled, will allow register names to be optionally prefixed with a $ + character. This allows register names to be distinguished from label names. + * Macros with a variable number of arguments are now supported. See the documentation for how this works. diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c index 555842b..0b294e0 100644 --- a/gas/config/tc-sh.c +++ b/gas/config/tc-sh.c @@ -134,7 +134,11 @@ int sh_small; static int dont_adjust_reloc_32; -/* preset architecture set, if given; zero otherwise. */ +/* Flag to indicate that '$' is allowed as a register prefix. */ + +static int allow_dollar_register_prefix; + +/* Preset architecture set, if given; zero otherwise. */ static unsigned int preset_target_arch; @@ -869,8 +873,8 @@ static int reg_b; /* Try to parse a reg name. Return the number of chars consumed. */ -static int -parse_reg (char *src, int *mode, int *reg) +static unsigned int +parse_reg_without_prefix (char *src, int *mode, int *reg) { char l0 = TOLOWER (src[0]); char l1 = l0 ? TOLOWER (src[1]) : 0; @@ -1225,6 +1229,36 @@ parse_reg (char *src, int *mode, int *reg) return 0; } +/* Like parse_reg_without_prefix, but this version supports + $-prefixed register names if enabled by the user. */ + +static unsigned int +parse_reg (char *src, int *mode, int *reg) +{ + unsigned int prefix; + unsigned int consumed; + + if (src[0] == '$') + { + if (allow_dollar_register_prefix) + { + src ++; + prefix = 1; + } + else + return 0; + } + else + prefix = 0; + + consumed = parse_reg_without_prefix (src, mode, reg); + + if (consumed == 0) + return 0; + + return consumed + prefix; +} + static char * parse_exp (char *s, sh_operand_info *op) { @@ -3005,31 +3039,39 @@ s_uses (int ignore ATTRIBUTE_UNUSED) demand_empty_rest_of_line (); } +enum options +{ + OPTION_RELAX = OPTION_MD_BASE, + OPTION_BIG, + OPTION_LITTLE, + OPTION_SMALL, + OPTION_DSP, + OPTION_ISA, + OPTION_RENESAS, + OPTION_ALLOW_REG_PREFIX, +#ifdef HAVE_SH64 + OPTION_ABI, + OPTION_NO_MIX, + OPTION_SHCOMPACT_CONST_CRANGE, + OPTION_NO_EXPAND, + OPTION_PT32, +#endif + OPTION_DUMMY /* Not used. This is just here to make it easy to add and subtract options from this enum. */ +}; + const char *md_shortopts = ""; struct option md_longopts[] = { -#define OPTION_RELAX (OPTION_MD_BASE) -#define OPTION_BIG (OPTION_MD_BASE + 1) -#define OPTION_LITTLE (OPTION_BIG + 1) -#define OPTION_SMALL (OPTION_LITTLE + 1) -#define OPTION_DSP (OPTION_SMALL + 1) -#define OPTION_ISA (OPTION_DSP + 1) -#define OPTION_RENESAS (OPTION_ISA + 1) - {"relax", no_argument, NULL, OPTION_RELAX}, {"big", no_argument, NULL, OPTION_BIG}, {"little", no_argument, NULL, OPTION_LITTLE}, {"small", no_argument, NULL, OPTION_SMALL}, {"dsp", no_argument, NULL, OPTION_DSP}, - {"isa", required_argument, NULL, OPTION_ISA}, + {"isa", required_argument, NULL, OPTION_ISA}, {"renesas", no_argument, NULL, OPTION_RENESAS}, + {"allow-reg-prefix", no_argument, NULL, OPTION_ALLOW_REG_PREFIX}, #ifdef HAVE_SH64 -#define OPTION_ABI (OPTION_RENESAS + 1) -#define OPTION_NO_MIX (OPTION_ABI + 1) -#define OPTION_SHCOMPACT_CONST_CRANGE (OPTION_NO_MIX + 1) -#define OPTION_NO_EXPAND (OPTION_SHCOMPACT_CONST_CRANGE + 1) -#define OPTION_PT32 (OPTION_NO_EXPAND + 1) {"abi", required_argument, NULL, OPTION_ABI}, {"no-mix", no_argument, NULL, OPTION_NO_MIX}, {"shcompact-const-crange", no_argument, NULL, OPTION_SHCOMPACT_CONST_CRANGE}, @@ -3070,6 +3112,10 @@ md_parse_option (int c, char *arg ATTRIBUTE_UNUSED) dont_adjust_reloc_32 = 1; break; + case OPTION_ALLOW_REG_PREFIX: + allow_dollar_register_prefix = 1; + break; + case OPTION_ISA: if (strcasecmp (arg, "dsp") == 0) preset_target_arch = arch_sh_up & ~(arch_sh_sp_fpu|arch_sh_dp_fpu); @@ -3097,6 +3143,7 @@ md_parse_option (int c, char *arg ATTRIBUTE_UNUSED) { extern const bfd_arch_info_type bfd_sh_arch; bfd_arch_info_type const *bfd_arch = &bfd_sh_arch; + preset_target_arch = 0; for (; bfd_arch; bfd_arch=bfd_arch->next) { @@ -3173,19 +3220,21 @@ md_show_usage (FILE *stream) { fprintf (stream, _("\ SH options:\n\ --little generate little endian code\n\ --big generate big endian code\n\ --relax alter jump instructions for long displacements\n\ --renesas disable optimization with section symbol for\n\ +--little generate little endian code\n\ +--big generate big endian code\n\ +--relax alter jump instructions for long displacements\n\ +--renesas disable optimization with section symbol for\n\ compatibility with Renesas assembler.\n\ --small align sections to 4 byte boundaries, not 16\n\ --dsp enable sh-dsp insns, and disable floating-point ISAs.\n\ --isa=[any use most appropriate isa\n\ +--small align sections to 4 byte boundaries, not 16\n\ +--dsp enable sh-dsp insns, and disable floating-point ISAs.\n\ +--allow-reg-prefix allow '$' as a register name prefix.\n\ +--isa=[any use most appropriate isa\n\ | dsp same as '-dsp'\n\ | fp")); { extern const bfd_arch_info_type bfd_sh_arch; bfd_arch_info_type const *bfd_arch = &bfd_sh_arch; + for (; bfd_arch; bfd_arch=bfd_arch->next) if (bfd_arch->mach != bfd_mach_sh5) { @@ -3196,19 +3245,19 @@ SH options:\n\ fprintf (stream, "]\n"); #ifdef HAVE_SH64 fprintf (stream, _("\ --isa=[shmedia set as the default instruction set for SH64\n\ +--isa=[shmedia set as the default instruction set for SH64\n\ | SHmedia\n\ | shcompact\n\ | SHcompact]\n")); fprintf (stream, _("\ --abi=[32|64] set size of expanded SHmedia operands and object\n\ +--abi=[32|64] set size of expanded SHmedia operands and object\n\ file type\n\ --shcompact-const-crange emit code-range descriptors for constants in\n\ +--shcompact-const-crange emit code-range descriptors for constants in\n\ SHcompact code sections\n\ --no-mix disallow SHmedia code in the same section as\n\ +--no-mix disallow SHmedia code in the same section as\n\ constants and SHcompact code\n\ --no-expand do not expand MOVI, PT, PTA or PTB instructions\n\ --expand-pt32 with -abi=64, expand PT, PTA and PTB instructions\n\ +--no-expand do not expand MOVI, PT, PTA or PTB instructions\n\ +--expand-pt32 with -abi=64, expand PT, PTA and PTB instructions\n\ to 32 bits only\n")); #endif /* HAVE_SH64 */ } @@ -4263,7 +4312,7 @@ sh_parse_name (char const *name, expressionS *exprP, char *nextcharP) exprP->X_add_symbol = GOT_symbol; no_suffix: /* If we have an absolute symbol or a reg, then we know its - value now. */ + value now. */ segment = S_GET_SEGMENT (exprP->X_add_symbol); if (segment == absolute_section) { diff --git a/gas/doc/c-sh.texi b/gas/doc/c-sh.texi index 59aebe0..e6dbe4b 100644 --- a/gas/doc/c-sh.texi +++ b/gas/doc/c-sh.texi @@ -1,4 +1,4 @@ -@c Copyright 1991, 1992, 1993, 1994, 1995, 1997, 2001, 2003, 2004 +@c Copyright 1991, 1992, 1993, 1994, 1995, 1997, 2001, 2003, 2004, 2005 @c Free Software Foundation, Inc. @c This is part of the GAS manual. @c For copying conditions, see the file as.texinfo. @@ -24,39 +24,43 @@ (formerly Hitachi) / SuperH SH family. @table @code -@kindex -little -@kindex -big -@kindex -relax -@kindex -small -@kindex -dsp -@kindex -renesas - -@item -little +@kindex --little +@kindex --big +@kindex --relax +@kindex --small +@kindex --dsp +@kindex --renesas +@kindex --allow-reg-prefix + +@item --little Generate little endian code. -@item -big +@item --big Generate big endian code. -@item -relax +@item --relax Alter jump instructions for long displacements. -@item -small +@item --small Align sections to 4 byte boundaries, not 16. -@item -dsp +@item --dsp Enable sh-dsp insns, and disable sh3e / sh4 insns. -@item -renesas +@item --renesas Disable optimization with section symbol for compatibility with Renesas assembler. -@item -isa=sh4 | sh4a +@item --allow-reg-prefix +Allow '$' as a register name prefix. + +@item --isa=sh4 | sh4a Specify the sh4 or sh4a instruction set. -@item -isa=dsp +@item --isa=dsp Enable sh-dsp insns, and disable sh3e / sh4 insns. -@item -isa=fp +@item --isa=fp Enable sh2e, sh3e, sh4, and sh4a insn sets. -@item -isa=all +@item --isa=all Enable sh1, sh2, sh2e, sh3, sh3e, sh4, sh4a, and sh-dsp insn sets. @end table diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 890576e..fa3cd2a 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2005-10-06 Khem Raj + NIIBE Yutaka + + * gas/sh/basic.exp: Run reg-prefix test. + * gas/sh/reg-prefix.s: New + * gas/sh/reg-prefix.d: New + 2005-09-30 Catherine Moore * gas/bfin: New testsuite for bfin. diff --git a/gas/testsuite/gas/sh/basic.exp b/gas/testsuite/gas/sh/basic.exp index 13a9052..093048b 100644 --- a/gas/testsuite/gas/sh/basic.exp +++ b/gas/testsuite/gas/sh/basic.exp @@ -162,8 +162,11 @@ if [istarget sh*-*-*] then { run_dump_test "tlsnopic" - # Test -renesas. + # Test --renesas. run_dump_test "renesas-1" + + # Test --allow-reg-prefix. + run_dump_test "reg-prefix" } } diff --git a/gas/testsuite/gas/sh/reg-prefix.d b/gas/testsuite/gas/sh/reg-prefix.d new file mode 100644 index 0000000..82896c6 --- /dev/null +++ b/gas/testsuite/gas/sh/reg-prefix.d @@ -0,0 +1,9 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#as: --allow-reg-prefix +#name: SH --allow-reg-prefix option +# Test SH register names prefixed with $: + +.*: file format elf.*sh.* + +Disassembly of section .text: +0x00000000 01 63 movli.l @r1,r0 diff --git a/gas/testsuite/gas/sh/reg-prefix.s b/gas/testsuite/gas/sh/reg-prefix.s new file mode 100644 index 0000000..13a7c12 --- /dev/null +++ b/gas/testsuite/gas/sh/reg-prefix.s @@ -0,0 +1,2 @@ + .text + movli.l @r1,$r0 -- cgit v1.1