Fix T_SHORT macro conflict.

This commit is contained in:
Alan Modra
2000-12-06 02:40:55 +00:00
parent 3c077de93f
commit 50705ef487
2 changed files with 118 additions and 111 deletions

View File

@ -1,26 +1,30 @@
2000-12-06 Mark Elbrecht <snowball3@bigfoot.com>
* config/tc-i386.c (T_SHORT): Undefine before defining.
2000-12-05 Kazu Hirata <kazu@hxi.com> 2000-12-05 Kazu Hirata <kazu@hxi.com>
* config/tc-mips.c: Fix formatting. * config/tc-mips.c: Fix formatting.
2000-12-04 Matthew Hiller <hiller@redhat.com> 2000-12-04 Matthew Hiller <hiller@redhat.com>
* config/tc-d10v.c (flag_allow_gstabs_packing): New variable. * config/tc-d10v.c (flag_allow_gstabs_packing): New variable.
(md_longopts): New options --gstabs-packing, --no-gstabs-packing. (md_longopts): New options --gstabs-packing, --no-gstabs-packing.
(md_show_usage): Ditto. (md_show_usage): Ditto.
(md_parse_option): Ditto. (md_parse_option): Ditto.
(d10v_cleanup): Writes pending instruction only if (d10v_cleanup): Writes pending instruction only if
! outputting_stabs_line_debug || ! flag_allow_gstabs_packing. ! outputting_stabs_line_debug || ! flag_allow_gstabs_packing.
Fix compile time warning messages. Fix compile time warning messages.
* doc/c-d10v.texi: Documents new options. * doc/c-d10v.texi: Documents new options.
2000-12-04 Matthew Hiller <hiller@redhat.com> 2000-12-04 Matthew Hiller <hiller@redhat.com>
* stabs.c (outputting_stabs_line_debug): New variable. * stabs.c (outputting_stabs_line_debug): New variable.
(stabs_generate_asm_lineno): Set outputting_stabs_line_debug at (stabs_generate_asm_lineno): Set outputting_stabs_line_debug at
function entry and unset at function exit. function entry and unset at function exit.
* read.h (outputting_stabs_line_debug): New extern declaration. * read.h (outputting_stabs_line_debug): New extern declaration.
* as.c: Include dwarf2dbg.h for definition of dwarf2_finish. * as.c: Include dwarf2dbg.h for definition of dwarf2_finish.
@ -50,81 +54,81 @@
2000-12-01 Chris Demetriou <cgd@sibyte.com> 2000-12-01 Chris Demetriou <cgd@sibyte.com>
* config/tc-mips.c (mips_ip): When calculating offsets, * config/tc-mips.c (mips_ip): When calculating offsets,
don't accept as constant the difference between the don't accept as constant the difference between the
addresses of symbols in two different sections. addresses of symbols in two different sections.
* config/tc-mips.c (macro_build): Add new 'U' and 'J' operand * config/tc-mips.c (macro_build): Add new 'U' and 'J' operand
specifiers. specifiers.
(validate_mips_insn): Likewise. Also, update 'B' operand (validate_mips_insn): Likewise. Also, update 'B' operand
specifier to use OP_*_CODE20 constants and delete 'm' operand specifier to use OP_*_CODE20 constants and delete 'm' operand
specifier. specifier.
(mips_ip): Remove 'm' operand specifier, add 'U' and 'J' (mips_ip): Remove 'm' operand specifier, add 'U' and 'J'
operand specifiers. Change warning generated by 'B' operand operand specifiers. Change warning generated by 'B' operand
specifier to reflect its new multi-purpose usage. specifier to reflect its new multi-purpose usage.
* config/tc-mips.c (mips_set_options): Use ISA_UNKNOWN rather than * config/tc-mips.c (mips_set_options): Use ISA_UNKNOWN rather than
-1, and update comment. -1, and update comment.
(file_mips_isa): Likewise. (file_mips_isa): Likewise.
(mips_cpu): Use CPU_UNKNOWN rather than -1, and update comment. (mips_cpu): Use CPU_UNKNOWN rather than -1, and update comment.
(ISA_HAS_COPROC_DELAYS, ISA_HAS_64BIT_REGS, gpr_interlocks): Use (ISA_HAS_COPROC_DELAYS, ISA_HAS_64BIT_REGS, gpr_interlocks): Use
ISA_* constants rather than hard-coded numbers. ISA_* constants rather than hard-coded numbers.
(mips_cpu_info): New structure. (mips_cpu_info): New structure.
(mips_cpu_info_table): New table describing CPU and ISA names (mips_cpu_info_table): New table describing CPU and ISA names
and numbers. and numbers.
(mips_cpu_info_from_name, mips_cpu_info_from_isa, (mips_cpu_info_from_name, mips_cpu_info_from_isa,
mips_cpu_info_from_cpu): New functions. mips_cpu_info_from_cpu): New functions.
(mips_isa_to_str): New function to get string for ISA name. (mips_isa_to_str): New function to get string for ISA name.
(mips_cpu_to_str): Convert to use mips_cpu_info_from_cpu, and (mips_cpu_to_str): Convert to use mips_cpu_info_from_cpu, and
return const char *. return const char *.
(md_begin): Redo CPU and ISA selection logic, using (md_begin): Redo CPU and ISA selection logic, using
mips_cpu_info_from_*. Convert to use ISA_* constants rather mips_cpu_info_from_*. Convert to use ISA_* constants rather
than hard-coded numbers. than hard-coded numbers.
(append_insn, mips_emit_delays, macro, macro2): Convert to use (append_insn, mips_emit_delays, macro, macro2): Convert to use
ISA_* constants rather than hard-coded numbers. ISA_* constants rather than hard-coded numbers.
(mips_ip): Convert to use mips_isa_to_str to get ISA name. (mips_ip): Convert to use mips_isa_to_str to get ISA name.
(md_longopts): Delete OPTION_NO_MIPS32. (md_longopts): Delete OPTION_NO_MIPS32.
(md_parse_option): Convert to use ISA_* constants rather than (md_parse_option): Convert to use ISA_* constants rather than
hard-coded numbers. Make OPTIONS_MIPS32 case treat MIPS32 hard-coded numbers. Make OPTIONS_MIPS32 case treat MIPS32
as an ISA. Delete OPTION_NO_MIPS32 case. Convert OPTION_MCPU as an ISA. Delete OPTION_NO_MIPS32 case. Convert OPTION_MCPU
to use strcasecmp to recognize "default" and to use to use strcasecmp to recognize "default" and to use
mips_cpu_info_from_name to get CPU numbers from argument. mips_cpu_info_from_name to get CPU numbers from argument.
(md_show_usage): Move -mips32 so it's with the rest of the ISA (md_show_usage): Move -mips32 so it's with the rest of the ISA
flags. Change 4Kc, 4Kp and 4Km CPU entries to just be flags. Change 4Kc, 4Kp and 4Km CPU entries to just be
mips32-4k. mips32-4k.
(s_mipsset): Accept ISA value 32. (s_mipsset): Accept ISA value 32.
* doc/as.texinfo: Clean up MIPS options summary slightly, * doc/as.texinfo: Clean up MIPS options summary slightly,
remove -no-mips32. Add note about -mips4 and -mips32 remove -no-mips32. Add note about -mips4 and -mips32
specifying those ISA levels. Delete -mips32 and -no-mips32 specifying those ISA levels. Delete -mips32 and -no-mips32
cpu flag descriptions. cpu flag descriptions.
* doc/c-mips.texi: Add -mips32 to list of ISA switches. Clean * doc/c-mips.texi: Add -mips32 to list of ISA switches. Clean
up the supported CPU switch list, and replace 4Kc, 4Km, and up the supported CPU switch list, and replace 4Kc, 4Km, and
4Kp entries with a single mips32-4k entry. Note that you can 4Kp entries with a single mips32-4k entry. Note that you can
use ".set mips32". use ".set mips32".
* tc-mips.c (ISA_HAS_64BIT_REGS): Add checks for ISA_MIPS5 and * tc-mips.c (ISA_HAS_64BIT_REGS): Add checks for ISA_MIPS5 and
ISA_MIPS64. ISA_MIPS64.
(md_longopts, OPTION_MIPS5, OPTION_MIPS64): Add options for (md_longopts, OPTION_MIPS5, OPTION_MIPS64): Add options for
-mips5 and -mips64. -mips5 and -mips64.
(md_parse_option): Add cases for OPTION_MIPS5 and (md_parse_option): Add cases for OPTION_MIPS5 and
OPTION_MIPS64. OPTION_MIPS64.
(md_show_usage): Mention -mips5 and -mips64 arguments. (md_show_usage): Mention -mips5 and -mips64 arguments.
(s_mipsset): Add cases for MIPS5 and MIPS64. (s_mipsset): Add cases for MIPS5 and MIPS64.
(mips_cpu_info_table): Add entries for MIPS5 and MIPS64 ISAs (mips_cpu_info_table): Add entries for MIPS5 and MIPS64 ISAs
and pseudo-CPUs. and pseudo-CPUs.
* doc/as.texinfo: Mention -mips5 and -mips64 options * doc/as.texinfo: Mention -mips5 and -mips64 options
and their meanings. and their meanings.
* doc/c-mips.texi: Likewise. Also update introduction * doc/c-mips.texi: Likewise. Also update introduction
and ".set" usage information. and ".set" usage information.
* config/tc-mips.c (md_show_usage): Add "sb1" to the * config/tc-mips.c (md_show_usage): Add "sb1" to the
CPU list. CPU list.
(mips_cpu_info_table): Add SB-1 entries. (mips_cpu_info_table): Add SB-1 entries.
* doc/c-mips.texi: Add "sb1" to the list of CPUs * doc/c-mips.texi: Add "sb1" to the list of CPUs
known to the -mcpu option. known to the -mcpu option.
* doc/as.texinfo: Correct description of MIPS -mcpu * doc/as.texinfo: Correct description of MIPS -mcpu
option, by copying some of the text from doc/c-mips.texi. option, by copying some of the text from doc/c-mips.texi.
2000-12-01 Joel Sherrill <joel@OARcorp.com> 2000-12-01 Joel Sherrill <joel@OARcorp.com>
@ -207,7 +211,7 @@
* Makefile.in: Regenerate. * Makefile.in: Regenerate.
* config/tc-cris.c: Include dwarf2dbg.h. * config/tc-cris.c: Include dwarf2dbg.h.
(md_pseudo_table): Add .file and .loc. (md_pseudo_table): Add .file and .loc.
(md_assemble): Call dwarf2_emit_insn if generating ELF. (md_assemble): Call dwarf2_emit_insn if generating ELF.
(s_cris_file, s_cris_loc): New. (s_cris_file, s_cris_loc): New.
* config/tc-cris.h (DWARF2_LINE_MIN_INSN_LENGTH): Define. * config/tc-cris.h (DWARF2_LINE_MIN_INSN_LENGTH): Define.
@ -654,9 +658,9 @@
2000-10-27 Aldy Hernandez <aldyh@redhat.com> 2000-10-27 Aldy Hernandez <aldyh@redhat.com>
* config/tc-arm.c (psrs): Remove lowercase versions of spsr* and * config/tc-arm.c (psrs): Remove lowercase versions of spsr* and
cpsr*. cpsr*.
(arm_psr_parse): Handle lowercase CPSR and SPSR. (arm_psr_parse): Handle lowercase CPSR and SPSR.
2000-10-25 Nick Clifton <nickc@redhat.com> 2000-10-25 Nick Clifton <nickc@redhat.com>
@ -744,10 +748,10 @@
2000-10-18 Michael Sokolov <msokolov@ivan.Harhan.ORG> 2000-10-18 Michael Sokolov <msokolov@ivan.Harhan.ORG>
* config/tc-m68k.h (RELAX_RELOC_*): New definitions for both * config/tc-m68k.h (RELAX_RELOC_*): New definitions for both
BFD_ASSEMBLER and !BFD_ASSEMBLER. BFD_ASSEMBLER and !BFD_ASSEMBLER.
* config/tc-m68k.c (md_convert_frag_1): Use them instead of * config/tc-m68k.c (md_convert_frag_1): Use them instead of
BFD_RELOC_*. BFD_RELOC_*.
2000-10-17 Kazu Hirata <kazu@hxi.com> 2000-10-17 Kazu Hirata <kazu@hxi.com>
@ -998,19 +1002,19 @@
2000-09-13 Anders Norlander <anorland@acc.umu.se> 2000-09-13 Anders Norlander <anorland@acc.umu.se>
* config/tc-mips.c (md_begin): Recognize 4Kc, 4Km and 4Kp processors. * config/tc-mips.c (md_begin): Recognize 4Kc, 4Km and 4Kp processors.
(md_parse_option): Ditto. (md_parse_option): Ditto.
(md_longopts): Add -mips32 option. (md_longopts): Add -mips32 option.
(md_show_usage): Document new options. (md_show_usage): Document new options.
(mips_ip): Assemble sdbbp 20 bit 'm' args for MIPS32. (mips_ip): Assemble sdbbp 20 bit 'm' args for MIPS32.
(mips_ip): Assemble mfc0 with a sub-selection code. (mips_ip): Assemble mfc0 with a sub-selection code.
(validate_mips_insn): Handle 'H' (OP_*_SEL) and 'm' (OP_*_CODE20). (validate_mips_insn): Handle 'H' (OP_*_SEL) and 'm' (OP_*_CODE20).
(mips_cpu_to_str): New function. (mips_cpu_to_str): New function.
(mips_ip): Use mips_cpu_to_str instead of printing numeric cpu value. (mips_ip): Use mips_cpu_to_str instead of printing numeric cpu value.
Use CPU_* defines instead of hardcoded numbers. Use CPU_* defines instead of hardcoded numbers.
* doc/as.texinfo: Document new options. * doc/as.texinfo: Document new options.
* doc/c-mips.texi: Ditto. * doc/c-mips.texi: Ditto.
2000-09-12 Kazu Hirata <kazu@hxi.com> 2000-09-12 Kazu Hirata <kazu@hxi.com>
@ -1438,8 +1442,8 @@ Thu Aug 24 20:41:05 2000 Denis Chertykov <denisc@overta.ru>
2000-08-14 Mark Elbrecht <snowball3@bigfoot.com> 2000-08-14 Mark Elbrecht <snowball3@bigfoot.com>
* config/obj-coff.c (obj_coff_endef) [BFD_ASSEMBLER]: Set the debug * config/obj-coff.c (obj_coff_endef) [BFD_ASSEMBLER]: Set the debug
flag for storage types C_ARG, C_REGPARM, C_FIELD, C_MOS, C_MOE, flag for storage types C_ARG, C_REGPARM, C_FIELD, C_MOS, C_MOE,
C_MOU, and C_EOS. C_MOU, and C_EOS.
2000-08-14 Jason Eckhardt <jle@cygnus.com> 2000-08-14 Jason Eckhardt <jle@cygnus.com>
@ -1771,7 +1775,7 @@ Thu Jul 27 11:25:01 2000 Andrew Cagney <cagney@b1.cygnus.com>
2000-07-12 Mark Elbrecht <snowball3@bigfoot.com> 2000-07-12 Mark Elbrecht <snowball3@bigfoot.com>
* config/obj-coff.c (coff_frob_section): Add padding to the last * config/obj-coff.c (coff_frob_section): Add padding to the last
section when aligning it increases its size. section when aligning it increases its size.
2000-07-11 Kazu Hirata <kazu@hxi.com> 2000-07-11 Kazu Hirata <kazu@hxi.com>
@ -2813,7 +2817,7 @@ Tue Apr 25 11:02:02 2000 Jeffrey A Law (law@cygnus.com)
2000-04-24 Mark Klein <mklein@dis.com> 2000-04-24 Mark Klein <mklein@dis.com>
* obj-som.c: Terminate obj_pseudo_table. * obj-som.c: Terminate obj_pseudo_table.
Mon Apr 24 15:21:11 2000 Clinton Popetz <cpopetz@cygnus.com> Mon Apr 24 15:21:11 2000 Clinton Popetz <cpopetz@cygnus.com>
@ -7340,7 +7344,7 @@ Fri Jun 5 10:50:53 1998 Nick Clifton <nickc@cygnus.com>
* config/tc-d30v.c (md_assemble): Store previous segment state * config/tc-d30v.c (md_assemble): Store previous segment state
with previous instruction. with previous instruction.
Wed Jun 3 18:21:56 1998 Alan Modra <alan@spri.levels.unisa.edu.au> Wed Jun 3 18:21:56 1998 Alan Modra <alan@spri.levels.unisa.edu.au>
* config/tc-i386.c (SCALE1_WHEN_NO_INDEX): Define. * config/tc-i386.c (SCALE1_WHEN_NO_INDEX): Define.
(ebp, esp): Remove static variables. (ebp, esp): Remove static variables.

View File

@ -4330,7 +4330,9 @@ struct intel_token
static struct intel_token cur_token, prev_token; static struct intel_token cur_token, prev_token;
/* Token codes for the intel parser. */
/* Token codes for the intel parser. Since T_SHORT is already used
by COFF, undefine it first to prevent a warning. */
#define T_NIL -1 #define T_NIL -1
#define T_CONST 1 #define T_CONST 1
#define T_REG 2 #define T_REG 2
@ -4339,6 +4341,7 @@ static struct intel_token cur_token, prev_token;
#define T_DWORD 5 #define T_DWORD 5
#define T_QWORD 6 #define T_QWORD 6
#define T_XWORD 7 #define T_XWORD 7
#undef T_SHORT
#define T_SHORT 8 #define T_SHORT 8
#define T_OFFSET 9 #define T_OFFSET 9
#define T_PTR 10 #define T_PTR 10