From 8ad7c533ee497f2c6a16cde705a565fcb97dfd12 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 11 Jan 2006 17:39:50 +0000 Subject: [PATCH] Fixes for building on 64-bit hosts: * config/tc-avr.c (mod_index): New union to allow conversion between pointers and integers. (md_begin, avr_ldi_expression): Use it. * config/tc-i370.c (md_assemble): Add cast for argument to print statement. * config/tc-tic54x.c (subsym_substitute): Likewise. * config/tc-mn10200.c (md_assemble): Use a union to convert the opindex field of fr_cgen structure into a pointer so that it can be stored in a frag. * config/tc-mn10300.c (md_assemble): Likewise. * config/tc-frv.c (frv_debug_tomcat): Use %p to print pointer types. * config/tc-v850.c: Replace uses of (int) casts with correct types. * gas/tic54x/address.d: Work with 64bit hosts. * gas/tic54x/addrfar.d: Likewise. * gas/tic54x/align.d: Likewise. * gas/tic54x/all-opcodes.d: Likewise. * gas/tic54x/asg.d: Likewise. * gas/tic54x/cons.d: Likewise. * gas/tic54x/consfar.d: Likewise. * gas/tic54x/extaddr.d: Likewise. * gas/tic54x/field.d: Likewise. * gas/tic54x/labels.d: Likewise. * gas/tic54x/loop.d: Likewise. * gas/tic54x/lp.d: Likewise. * gas/tic54x/macro.d: Likewise. * gas/tic54x/math.d: Likewise. * gas/tic54x/opcodes.d: Likewise. * gas/tic54x/sections.d: Likewise. * gas/tic54x/set.d: Likewise. * gas/tic54x/struct.d: Likewise. * gas/tic54x/subsym.d: Likewise. --- gas/ChangeLog | 18 ++++++++++ gas/config/tc-avr.c | 22 ++++++++++-- gas/config/tc-frv.c | 8 ++--- gas/config/tc-i370.c | 4 +-- gas/config/tc-mn10200.c | 17 +++++++-- gas/config/tc-mn10300.c | 19 ++++++++-- gas/config/tc-tic54x.c | 6 ++-- gas/config/tc-v850.c | 48 +++++++++++++++++++++----- gas/testsuite/ChangeLog | 22 ++++++++++++ gas/testsuite/gas/tic54x/address.d | 2 +- gas/testsuite/gas/tic54x/addrfar.d | 2 +- gas/testsuite/gas/tic54x/align.d | 18 +++++----- gas/testsuite/gas/tic54x/all-opcodes.d | 4 +-- gas/testsuite/gas/tic54x/asg.d | 10 +++--- gas/testsuite/gas/tic54x/cons.d | 34 +++++++++--------- gas/testsuite/gas/tic54x/consfar.d | 34 +++++++++--------- gas/testsuite/gas/tic54x/extaddr.d | 6 ++-- gas/testsuite/gas/tic54x/field.d | 14 ++++---- gas/testsuite/gas/tic54x/labels.d | 24 ++++++------- gas/testsuite/gas/tic54x/loop.d | 4 +-- gas/testsuite/gas/tic54x/lp.d | 2 +- gas/testsuite/gas/tic54x/macro.d | 2 +- gas/testsuite/gas/tic54x/math.d | 2 +- gas/testsuite/gas/tic54x/opcodes.d | 2 +- gas/testsuite/gas/tic54x/sections.d | 46 ++++++++++++------------ gas/testsuite/gas/tic54x/set.d | 4 +-- gas/testsuite/gas/tic54x/struct.d | 2 +- gas/testsuite/gas/tic54x/subsym.d | 6 ++-- 28 files changed, 247 insertions(+), 135 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index f7c8d3fb40c..96a12ad297f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,21 @@ +2006-01-11 Nick Clifton + + Fixes for building on 64-bit hosts: + * config/tc-avr.c (mod_index): New union to allow conversion + between pointers and integers. + (md_begin, avr_ldi_expression): Use it. + * config/tc-i370.c (md_assemble): Add cast for argument to print + statement. + * config/tc-tic54x.c (subsym_substitute): Likewise. + * config/tc-mn10200.c (md_assemble): Use a union to convert the + opindex field of fr_cgen structure into a pointer so that it can + be stored in a frag. + * config/tc-mn10300.c (md_assemble): Likewise. + * config/tc-frv.c (frv_debug_tomcat): Use %p to print pointer + types. + * config/tc-v850.c: Replace uses of (int) casts with correct + types. + 2006-01-09 H.J. Lu PR gas/2117 diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c index 74cc6c3f28d..2ceaa1fffef 100644 --- a/gas/config/tc-avr.c +++ b/gas/config/tc-avr.c @@ -1,6 +1,6 @@ /* tc-avr.c -- Assembler code for the ATMEL AVR - Copyright 1999, 2000, 2001, 2002, 2004, 2005 + Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. Contributed by Denis Chertykov @@ -174,6 +174,14 @@ static struct exp_mod_s exp_mod[] = {"hhi8", -BFD_RELOC_AVR_HI8_LDI, -BFD_RELOC_AVR_HI8_LDI_NEG, 0}, }; +/* A union used to store indicies into the exp_mod[] array + in a hash table which expects void * data types. */ +typedef union +{ + void * ptr; + int index; +} mod_index; + /* Opcode hash table. */ static struct hash_control *avr_hash; @@ -426,7 +434,12 @@ md_begin (void) avr_mod_hash = hash_new (); for (i = 0; i < ARRAY_SIZE (exp_mod); ++i) - hash_insert (avr_mod_hash, EXP_MOD_NAME (i), (void *) (i + 10)); + { + mod_index m; + + m.index = i + 10; + hash_insert (avr_mod_hash, EXP_MOD_NAME (i), m.ptr); + } bfd_set_arch_mach (stdoutput, TARGET_ARCH, avr_mcu->mach); } @@ -509,7 +522,10 @@ avr_ldi_expression (expressionS *exp) if (op[0]) { - mod = (int) hash_find (avr_mod_hash, op); + mod_index m; + + m.ptr = hash_find (avr_mod_hash, op); + mod = m.index; if (mod) { diff --git a/gas/config/tc-frv.c b/gas/config/tc-frv.c index f1771945418..a2f4ccef4a6 100644 --- a/gas/config/tc-frv.c +++ b/gas/config/tc-frv.c @@ -1,5 +1,5 @@ /* tc-frv.c -- Assembler for the Fujitsu FRV. - Copyright 2002, 2003, 2004, 2005 Free Software Foundation. + Copyright 2002, 2003, 2004, 2005, 2006 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -648,11 +648,11 @@ frv_debug_tomcat (start_chain) for (this_insn = this_chain->insn_list; this_insn; this_insn = this_insn->next) { if (this_insn->type == VLIW_LABEL_TYPE) - fprintf (stderr, "Label Value: %d\n", (int) this_insn->sym); + fprintf (stderr, "Label Value: %p\n", this_insn->sym); else if (this_insn->type == VLIW_BRANCH_TYPE) - fprintf (stderr, "%s to %d\n", this_insn->insn->base->name, (int) this_insn->sym); + fprintf (stderr, "%s to %p\n", this_insn->insn->base->name, this_insn->sym); else if (this_insn->type == VLIW_BRANCH_HAS_NOPS) - fprintf (stderr, "nop'd %s to %d\n", this_insn->insn->base->name, (int) this_insn->sym); + fprintf (stderr, "nop'd %s to %p\n", this_insn->insn->base->name, this_insn->sym); else if (this_insn->type == VLIW_NOP_TYPE) fprintf (stderr, "Nop\n"); else diff --git a/gas/config/tc-i370.c b/gas/config/tc-i370.c index de67ce3e682..d87d2d9f808 100644 --- a/gas/config/tc-i370.c +++ b/gas/config/tc-i370.c @@ -1,7 +1,7 @@ /* tc-i370.c -- Assembler for the IBM 360/370/390 instruction set. Loosely based on the ppc files by Linas Vepstas 1998, 99 Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. This file is part of GAS, the GNU Assembler. @@ -2102,7 +2102,7 @@ md_assemble (char *str) if (! register_name (&ex)) as_bad ("expecting a register for operand %d", - opindex_ptr - opcode->operands + 1); + (int) (opindex_ptr - opcode->operands + 1)); } /* Check for an address constant expression. */ diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c index 44fd21064f6..909652ef6e0 100644 --- a/gas/config/tc-mn10200.c +++ b/gas/config/tc-mn10200.c @@ -1,6 +1,6 @@ /* tc-mn10200.c -- Assembler code for the Matsushita 10200 Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -1191,6 +1191,18 @@ keep_going: /* Write out the instruction. */ if (relaxable && fc > 0) { + /* On a 64-bit host the size of an 'int' is not the same + as the size of a pointer, so we need a union to convert + the opindex field of the fr_cgen structure into a char * + so that it can be stored in the frag. We do not have + to worry about loosing accuracy as we are not going to + be even close to the 32bit limit of the int. */ + union + { + int opindex; + char * ptr; + } + opindex_converter; int type; /* bCC */ @@ -1218,10 +1230,11 @@ keep_going: else type = 3; + opindex_converter.opindex = fixups[0].opindex; f = frag_var (rs_machine_dependent, 8, 8 - size, type, fixups[0].exp.X_add_symbol, fixups[0].exp.X_add_number, - (char *)fixups[0].opindex); + opindex_converter.ptr); number_to_chars_bigendian (f, insn, size); if (8 - size > 4) { diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c index 963b1b6b209..102c2eacef8 100644 --- a/gas/config/tc-mn10300.c +++ b/gas/config/tc-mn10300.c @@ -1,6 +1,6 @@ /* tc-mn10300.c -- Assembler code for the Matsushita 10300 - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -2005,6 +2005,18 @@ keep_going: if (relaxable && fc > 0) { + /* On a 64-bit host the size of an 'int' is not the same + as the size of a pointer, so we need a union to convert + the opindex field of the fr_cgen structure into a char * + so that it can be stored in the frag. We do not have + to worry about loosing accuracy as we are not going to + be even close to the 32bit limit of the int. */ + union + { + int opindex; + char * ptr; + } + opindex_converter; int type; /* We want to anchor the line info to the previous frag (if @@ -2044,10 +2056,11 @@ keep_going: else type = 3; + opindex_converter.opindex = fixups[0].opindex; f = frag_var (rs_machine_dependent, 8, 8 - size, type, fixups[0].exp.X_add_symbol, fixups[0].exp.X_add_number, - (char *)fixups[0].opindex); + opindex_converter.ptr); /* This is pretty hokey. We basically just care about the opcode, so we have to write out the first word big endian. diff --git a/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c index b81041f35c0..f84afcd838e 100644 --- a/gas/config/tc-tic54x.c +++ b/gas/config/tc-tic54x.c @@ -1,5 +1,5 @@ /* tc-tic54x.c -- Assembly code for the Texas Instruments TMS320C54X - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Contributed by Timothy Wall (twall@cygnus.com) @@ -4985,7 +4985,7 @@ subsym_substitute (line, forced) if (beg < 1) { as_bad (_("Invalid subscript (use 1 to %d)"), - strlen (value)); + (int) strlen (value)); break; } if (*input_line_pointer == ',') @@ -4995,7 +4995,7 @@ subsym_substitute (line, forced) if (beg + len > strlen (value)) { as_bad (_("Invalid length (use 0 to %d"), - strlen (value) - beg); + (int) strlen (value) - beg); break; } } diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c index 1358e95de3b..79849561601 100644 --- a/gas/config/tc-v850.c +++ b/gas/config/tc-v850.c @@ -1,6 +1,6 @@ /* tc-v850.c -- Assembler code for the NEC V850 - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -1221,13 +1221,29 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, fragS *fragP) { + /* This code performs some nasty type punning between the + fr_opcode field of the frag structure (a char *) and the + fx_r_type field of the fix structure (a bfd_reloc_code_real_type) + On a 64bit host this causes problems because these two fields + are not the same size, but since we know that we are only + ever storing small integers in the fields, it is safe to use + a union to convert between them. */ + union u + { + bfd_reloc_code_real_type fx_r_type; + char * fr_opcode; + } + opcode_converter; subseg_change (sec, 0); + opcode_converter.fr_opcode = fragP->fr_opcode; + /* In range conditional or unconditional branch. */ if (fragP->fr_subtype == 0 || fragP->fr_subtype == 2) { fix_new (fragP, fragP->fr_fix, 2, fragP->fr_symbol, - fragP->fr_offset, 1, BFD_RELOC_UNUSED + (int)fragP->fr_opcode); + fragP->fr_offset, 1, + BFD_RELOC_UNUSED + opcode_converter.fx_r_type); fragP->fr_fix += 2; } /* Out of range conditional branch. Emit a branch around a jump. */ @@ -1249,8 +1265,8 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, target. */ md_number_to_chars ((char *) buffer + 2, 0x00000780, 4); fix_new (fragP, fragP->fr_fix + 2, 4, fragP->fr_symbol, - fragP->fr_offset, 1, BFD_RELOC_UNUSED + - (int) fragP->fr_opcode + 1); + fragP->fr_offset, 1, + BFD_RELOC_UNUSED + opcode_converter.fx_r_type + 1); fragP->fr_fix += 6; } /* Out of range unconditional branch. Emit a jump. */ @@ -1258,8 +1274,8 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, { md_number_to_chars (fragP->fr_fix + fragP->fr_literal, 0x00000780, 4); fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol, - fragP->fr_offset, 1, BFD_RELOC_UNUSED + - (int) fragP->fr_opcode + 1); + fragP->fr_offset, 1, + BFD_RELOC_UNUSED + opcode_converter.fx_r_type + 1); fragP->fr_fix += 4; } else @@ -2036,6 +2052,20 @@ md_assemble (char *str) if (relaxable && fc > 0) { + /* On a 64-bit host the size of an 'int' is not the same + as the size of a pointer, so we need a union to convert + the opindex field of the fr_cgen structure into a char * + so that it can be stored in the frag. We do not have + to worry about loosing accuracy as we are not going to + be even close to the 32bit limit of the int. */ + union + { + int opindex; + char * ptr; + } + opindex_converter; + + opindex_converter.opindex = fixups[0].opindex; insn_size = 2; fc = 0; @@ -2044,7 +2074,7 @@ md_assemble (char *str) f = frag_var (rs_machine_dependent, 4, 2, 2, fixups[0].exp.X_add_symbol, fixups[0].exp.X_add_number, - (char *) fixups[0].opindex); + opindex_converter.ptr); md_number_to_chars (f, insn, insn_size); md_number_to_chars (f + 2, 0, 2); } @@ -2053,7 +2083,7 @@ md_assemble (char *str) f = frag_var (rs_machine_dependent, 6, 4, 0, fixups[0].exp.X_add_symbol, fixups[0].exp.X_add_number, - (char *) fixups[0].opindex); + opindex_converter.ptr); md_number_to_chars (f, insn, insn_size); md_number_to_chars (f + 2, 0, 4); } diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 7fe9e787abd..3a7d155966c 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,25 @@ +2006-01-11 Nick Clifton + + * gas/tic54x/address.d: Work with 64bit hosts. + * gas/tic54x/addrfar.d: Likewise. + * gas/tic54x/align.d: Likewise. + * gas/tic54x/all-opcodes.d: Likewise. + * gas/tic54x/asg.d: Likewise. + * gas/tic54x/cons.d: Likewise. + * gas/tic54x/consfar.d: Likewise. + * gas/tic54x/extaddr.d: Likewise. + * gas/tic54x/field.d: Likewise. + * gas/tic54x/labels.d: Likewise. + * gas/tic54x/loop.d: Likewise. + * gas/tic54x/lp.d: Likewise. + * gas/tic54x/macro.d: Likewise. + * gas/tic54x/math.d: Likewise. + * gas/tic54x/opcodes.d: Likewise. + * gas/tic54x/sections.d: Likewise. + * gas/tic54x/set.d: Likewise. + * gas/tic54x/struct.d: Likewise. + * gas/tic54x/subsym.d: Likewise. + 2006-01-09 H.J. Lu PR gas/2117 diff --git a/gas/testsuite/gas/tic54x/address.d b/gas/testsuite/gas/tic54x/address.d index b8a7ba086b0..7d49c041275 100644 --- a/gas/testsuite/gas/tic54x/address.d +++ b/gas/testsuite/gas/tic54x/address.d @@ -5,7 +5,7 @@ Disassembly of section .text: -00000000 <_addressing>: +0+00 <_addressing>: 0: 1801.* 1: 1881.* 2: 1989.* diff --git a/gas/testsuite/gas/tic54x/addrfar.d b/gas/testsuite/gas/tic54x/addrfar.d index 9c426332d7b..9d8ec06126f 100644 --- a/gas/testsuite/gas/tic54x/addrfar.d +++ b/gas/testsuite/gas/tic54x/addrfar.d @@ -7,7 +7,7 @@ Disassembly of section .text: -00000000 <_addressing>: +0+000 <_addressing>: 0: 1801.* 1: 1881.* 2: 1989.* diff --git a/gas/testsuite/gas/tic54x/align.d b/gas/testsuite/gas/tic54x/align.d index d50f06e4393..6a39217a3e2 100644 --- a/gas/testsuite/gas/tic54x/align.d +++ b/gas/testsuite/gas/tic54x/align.d @@ -4,26 +4,26 @@ .*: +file format .*c54x.* Sections: -Idx Name Size VMA LMA File off Algn - 0 .text 00000089 00000000 00000000 0000.... 2..7 +Idx Name Size VMA + LMA + File off Algn + 0 .text 00000089 0+000 0+000 0000.... 2..7 CONTENTS, ALLOC, LOAD, .... - 1 .data 00000005 00000000 00000000 0000.... 2..1 + 1 .data 00000005 0+000 0+000 0000.... 2..1 CONTENTS, ALLOC, LOAD, DATA - 2 .bss 00000000 00000000 00000000 0000.... 2..0 + 2 .bss 00000000 0+000 0+000 0000.... 2..0 ALLOC Disassembly of section .text: -00000000 <.text>: +0+000 <.text>: 0: 4160.* 1: 0001.* 2: 0002.* ... -00000004 : +0+004 : 4: 0003.* ... -00000006 : +0+006 : 6: 0061.* 7: 0062.* 8: 0063.* @@ -31,7 +31,7 @@ Disassembly of section .text: a: 0065.* ... -00000010 : +0+010 : 10: 0008.* 11: 0000.* 12: 0001.* @@ -43,7 +43,7 @@ Disassembly of section .text: 18: 0007.* ... -00000080 : +0+080 : 80: 0004.* 81: 0000.* 82: 0001.* diff --git a/gas/testsuite/gas/tic54x/all-opcodes.d b/gas/testsuite/gas/tic54x/all-opcodes.d index ae37380e567..7e192aa5682 100644 --- a/gas/testsuite/gas/tic54x/all-opcodes.d +++ b/gas/testsuite/gas/tic54x/all-opcodes.d @@ -6,7 +6,7 @@ Disassembly of section .text: -00000000 : +0+000 : 0: e300.* 1: e304.* 2: e308.* @@ -219145,7 +219145,7 @@ Disassembly of section .text: 357ff: 6629.* 35800: 1df8.* 35801: 662a.* -00035802 : +0+035802 : 35802: f073.* 35803: 5802.* .*35803: ARELEXT16.* diff --git a/gas/testsuite/gas/tic54x/asg.d b/gas/testsuite/gas/tic54x/asg.d index d49762a3e4a..37e25160bf6 100644 --- a/gas/testsuite/gas/tic54x/asg.d +++ b/gas/testsuite/gas/tic54x/asg.d @@ -5,17 +5,17 @@ Disassembly of section .text: -00000000 : +0+000 : 0: f000.* 1: 0064.* -00000002 : +0+002 : 2: 1090.* -00000003 : +0+003 : 3: 1090.* -00000004 : +0+004 : 4: f000.* 5: 0000.* 6: f000.* @@ -127,5 +127,5 @@ Disassembly of section .text: 70: 0063.* 71: 0064.* -00000072 : +0+072 : 72: 0100.* diff --git a/gas/testsuite/gas/tic54x/cons.d b/gas/testsuite/gas/tic54x/cons.d index ebd20a8b3da..5a6ceced281 100644 --- a/gas/testsuite/gas/tic54x/cons.d +++ b/gas/testsuite/gas/tic54x/cons.d @@ -5,55 +5,55 @@ Disassembly of section .text: -00000000 : +0+000 : 0: 0003.* 1: 0004.* -00000002 : +0+002 : 2: 0009.* 3: 000a.* 4: 000b.* -00000005 : +0+005 : 5: 000f.* 6: 0010.* -00000007 : +0+007 : 7: 6440.* 8: 0123.* 9: 4000.* a: 0000.* b: 1234.* -0000000c : +0+00c : c: 00aa.* d: 00bb.* -0000000e : +0+00e : e: 0ccc.* -0000000f : +0+00f : f: 0eee.* 10: efff.* ... -00000012 : +0+012 : 12: eeee.* 13: ffff.* -00000014 : +0+014 : 14: dddd.* -00000015 : +0+015 : 15: 3fff.* 16: ffac.* ... -00000018 : +0+018 : 18: 3fff.* 19: ffac.* -0000001a : +0+01a : 1a: 0061.* 1b: 0062.* 1c: 0063.* @@ -67,7 +67,7 @@ Disassembly of section .text: 24: 0067.* 25: 0030.* -00000026 : +0+026 : 26: 6162.* 27: 6364.* 28: 6162.* @@ -75,7 +75,7 @@ Disassembly of section .text: 2a: 6566.* 2b: 6700.* -0000002c : +0+02c : 2c: 0000.* 2d: abcd.* 2e: 0000.* @@ -85,17 +85,17 @@ Disassembly of section .text: 32: 0000.* 33: 006f.* -00000034 : +0+034 : 34: 0000.* 35: 002c.* 36: aabb.* 37: ccdd.* -00000038 : +0+038 : 38: 0000.* ... -0000003a : +0+03a : 3a: 1234.* 3b: 5678.* 3c: 0000.* diff --git a/gas/testsuite/gas/tic54x/consfar.d b/gas/testsuite/gas/tic54x/consfar.d index 8c8a5323d57..bdb46a29e3d 100644 --- a/gas/testsuite/gas/tic54x/consfar.d +++ b/gas/testsuite/gas/tic54x/consfar.d @@ -7,55 +7,55 @@ Disassembly of section .text: -00000000 : +0+000 : 0: 0003.* 1: 0004.* -00000002 : +0+002 : 2: 0009.* 3: 000a.* 4: 000b.* -00000005 : +0+005 : 5: 000f.* 6: 0010.* -00000007 : +0+007 : 7: 6440.* 8: 0123.* 9: 4000.* a: 0000.* b: 1234.* -0000000c : +0+00c : c: 00aa.* d: 00bb.* -0000000e : +0+00e : e: 0ccc.* -0000000f : +0+00f : f: 0eee.* 10: efff.* ... -00000012 : +0+012 : 12: eeee.* 13: ffff.* -00000014 : +0+014 : 14: dddd.* -00000015 : +0+015 : 15: 3fff.* 16: ffac.* ... -00000018 : +0+018 : 18: 3fff.* 19: ffac.* -0000001a : +0+01a : 1a: 0061.* 1b: 0062.* 1c: 0063.* @@ -69,7 +69,7 @@ Disassembly of section .text: 24: 0067.* 25: 0030.* -00000026 : +0+026 : 26: 6162.* 27: 6364.* 28: 6162.* @@ -77,7 +77,7 @@ Disassembly of section .text: 2a: 6566.* 2b: 6700.* -0000002c : +0+02c : 2c: 0000.* 2d: abcd.* 2e: 0000.* @@ -87,18 +87,18 @@ Disassembly of section .text: 32: 0000.* 33: 006f.* -00000034 : +0+034 : 34: 0000.* .*34: ARELEXT.* 35: 002c.* 36: aabb.* 37: ccdd.* -00000038 : +0+038 : 38: 0000.* ... -0000003a : +0+03a : 3a: 1234.* 3b: 5678.* 3c: 0000.* diff --git a/gas/testsuite/gas/tic54x/extaddr.d b/gas/testsuite/gas/tic54x/extaddr.d index 2a396449d5a..5537e44cc7e 100644 --- a/gas/testsuite/gas/tic54x/extaddr.d +++ b/gas/testsuite/gas/tic54x/extaddr.d @@ -5,7 +5,7 @@ Disassembly of section .text: -00000000 <.text>: +0+000 <.text>: 0: f062.* 1: 0000.* .*1: RELEXTMS7.* @@ -14,7 +14,7 @@ Disassembly of section .text: .*3: RELEXT16.* 4: f4e2.* -00000005 : +0+005 : 5: f881.* 6: 0080.* .*5: ARELEXT.* @@ -49,7 +49,7 @@ Disassembly of section .text: 20: f495.* ... -00010080 : +0+010080 : 10080: f881.* 10081: 0080.* .*10080: ARELEXT.* diff --git a/gas/testsuite/gas/tic54x/field.d b/gas/testsuite/gas/tic54x/field.d index 618cb4ae2f4..60a4868904c 100644 --- a/gas/testsuite/gas/tic54x/field.d +++ b/gas/testsuite/gas/tic54x/field.d @@ -5,26 +5,26 @@ Disassembly of section .text: -00000000 : +0+000 : 0: 2af0.* 1: 5600.* -00000001 : +0+001 : 1: 5600.* -00000002 : +0+002 : 2: 0001.* -00000003 : +0+003 : 3: 0000.* 4: 4321.* -00000005 : +0+005 : 5: 000f.* -00000006 : +0+006 : 6: 6000.* 7: 008a.* -00000007 : +0+007 : 7: 008a.* diff --git a/gas/testsuite/gas/tic54x/labels.d b/gas/testsuite/gas/tic54x/labels.d index 42e2160a9d7..794f11ff081 100644 --- a/gas/testsuite/gas/tic54x/labels.d +++ b/gas/testsuite/gas/tic54x/labels.d @@ -5,7 +5,7 @@ Disassembly of section .text: -00000000 : +0+000 : 0: 1000.* 1: 0800.* 2: f843.* @@ -14,50 +14,50 @@ Disassembly of section .text: 5: f073.* 6: 0008.* -00000007 <\$1.*>: +0+007 <\$1.*>: 7: 1000.* -00000008 <\$2.*>: +0+008 <\$2.*>: 8: 0000.* 9: f843.* a: 000c.* b: 8000.* -0000000c <\$1.*>: +0+00c <\$1.*>: c: f495.* d: f495.* -0000000e : +0+00e : e: f000.* f: 0001.* 10: f073.* 11: 000e.* -00000012 : +0+012 : 12: f845.* 13: 0012.* -00000014 : +0+014 : 14: f000.* 15: 0003.* 16: f073.* 17: 0014.* -00000018 : +0+018 : 18: f000.* 19: 0004.* 1a: f073.* 1b: 0018.* -0000001c : +0+01c : 1c: f073.* 1d: 0014.* Disassembly of section new_sect: -00000000 : +0+000 : 0: f495.* -00000001 : +0+001 : 1: f000.* 2: 0005.* 3: f495.* @@ -65,7 +65,7 @@ Disassembly of section new_sect: 5: f073.* 6: 0001.* -00000007 : +0+007 : 7: f000.* 8: 0006.* 9: f495.* diff --git a/gas/testsuite/gas/tic54x/loop.d b/gas/testsuite/gas/tic54x/loop.d index f06752453f6..592564a89aa 100644 --- a/gas/testsuite/gas/tic54x/loop.d +++ b/gas/testsuite/gas/tic54x/loop.d @@ -5,10 +5,10 @@ Disassembly of section .text: -00000000 <.text>: +0+000 <.text>: ... -00000001