This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[COMMIT] Update GAS ports to build on a 64-bit host


Hi Guys,

  I have just upgraded to running a 64-bit OS with a 64-bit version of
  gcc 4 installed and I found that several ports would not build
  because of problems with their GAS specific code.  So I am applying
  the attached patch to fix the bugs.

  I was unable to perform my normal regression tests (due having lost
  all of my regression data), but I did run the testsuites for the
  affected ports and they all seem OK apart from the ARC port.  This
  one appears to be broken (lots of unexpected failures in the GAS
  testsuite) but I need some more time to find out exactly what is
  wrong with it.  So I am not going to apply the patch to tc-arc.c
  just yet.  I will apply the patches to the other files though.

Cheers
  Nick

gas/ChangeLog
2006-01-11  Nick Clifton  <nickc@redhat.com>

	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/testsuite/ChangeLog
2006-01-11  Nick Clifton  <nickc@redhat.com>

	* 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.

Index: gas/config/tc-arc.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-arc.c,v
retrieving revision 1.37
diff -c -3 -p -r1.37 tc-arc.c
*** gas/config/tc-arc.c	11 Oct 2005 11:16:16 -0000	1.37
--- gas/config/tc-arc.c	11 Jan 2006 17:28:51 -0000
***************
*** 1,6 ****
  /* tc-arc.c -- Assembler for the ARC
!    Copyright 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005
!    Free Software Foundation, Inc.
     Contributed by Doug Evans (dje@cygnus.com).
  
     This file is part of GAS, the GNU Assembler.
--- 1,6 ----
  /* tc-arc.c -- Assembler for the ARC
!    Copyright 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
!    2006  Free Software Foundation, Inc.
     Contributed by Doug Evans (dje@cygnus.com).
  
     This file is part of GAS, the GNU Assembler.
*************** init_opcode_tables (int mach)
*** 246,252 ****
  	 output registers into the object file's symbol table.  */
        symbol_table_insert (symbol_create (arc_reg_names[i].name,
  					  reg_section,
! 					  (int) &arc_reg_names[i],
  					  &zero_address_frag));
      }
  
--- 246,252 ----
  	 output registers into the object file's symbol table.  */
        symbol_table_insert (symbol_create (arc_reg_names[i].name,
  					  reg_section,
! 					  (valueT) &arc_reg_names[i],
  					  &zero_address_frag));
      }
  
*************** arc_extoper (int opertype)
*** 550,556 ****
        if ((symbolP = symbol_find (name)))
  	{
  	  if (S_GET_SEGMENT (symbolP) == reg_section)
! 	    S_SET_VALUE (symbolP, (int) &ext_oper->operand);
  	  else
  	    {
  	      as_bad ("attempt to override symbol: %s", name);
--- 550,556 ----
        if ((symbolP = symbol_find (name)))
  	{
  	  if (S_GET_SEGMENT (symbolP) == reg_section)
! 	    S_SET_VALUE (symbolP, (valueT) &ext_oper->operand);
  	  else
  	    {
  	      as_bad ("attempt to override symbol: %s", name);
*************** arc_extoper (int opertype)
*** 564,570 ****
  	{
  	  /* If its not there, add it.  */
  	  symbol_table_insert (symbol_create (name, reg_section,
! 					      (int) &ext_oper->operand, &zero_address_frag));
  	}
      }
  
--- 564,571 ----
  	{
  	  /* If its not there, add it.  */
  	  symbol_table_insert (symbol_create (name, reg_section,
! 					      (valueT) &ext_oper->operand,
! 					      &zero_address_frag));
  	}
      }
  
*************** md_operand (expressionS *expressionP)
*** 1165,1171 ****
  	    {
  	      input_line_pointer += l + 1;
  	      expressionP->X_op = O_register;
! 	      expressionP->X_add_number = (int) &ext_oper->operand;
  	      return;
  	    }
  	  ext_oper = ext_oper->next;
--- 1166,1172 ----
  	    {
  	      input_line_pointer += l + 1;
  	      expressionP->X_op = O_register;
! 	      expressionP->X_add_number = (offsetT) &ext_oper->operand;
  	      return;
  	    }
  	  ext_oper = ext_oper->next;
*************** md_operand (expressionS *expressionP)
*** 1177,1183 ****
  	    {
  	      input_line_pointer += l + 1;
  	      expressionP->X_op = O_register;
! 	      expressionP->X_add_number = (int) &arc_reg_names[i];
  	      break;
  	    }
  	}
--- 1178,1184 ----
  	    {
  	      input_line_pointer += l + 1;
  	      expressionP->X_op = O_register;
! 	      expressionP->X_add_number = (offsetT) &arc_reg_names[i];
  	      break;
  	    }
  	}
Index: gas/config/tc-avr.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-avr.c,v
retrieving revision 1.29
diff -c -3 -p -r1.29 tc-avr.c
*** gas/config/tc-avr.c	12 Oct 2005 10:56:46 -0000	1.29
--- gas/config/tc-avr.c	11 Jan 2006 17:28:51 -0000
***************
*** 1,6 ****
  /* tc-avr.c -- Assembler code for the ATMEL AVR
  
!    Copyright 1999, 2000, 2001, 2002, 2004, 2005
     Free Software Foundation, Inc.
     Contributed by Denis Chertykov <denisc@overta.ru>
  
--- 1,6 ----
  /* tc-avr.c -- Assembler code for the ATMEL AVR
  
!    Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006
     Free Software Foundation, Inc.
     Contributed by Denis Chertykov <denisc@overta.ru>
  
*************** static struct exp_mod_s exp_mod[] =
*** 174,179 ****
--- 174,187 ----
    {"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;
  
*************** md_begin (void)
*** 426,432 ****
    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));
  
    bfd_set_arch_mach (stdoutput, TARGET_ARCH, avr_mcu->mach);
  }
--- 434,445 ----
    avr_mod_hash = hash_new ();
  
    for (i = 0; i < ARRAY_SIZE (exp_mod); ++i)
!     {
!       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);
  }
*************** avr_ldi_expression (expressionS *exp)
*** 509,515 ****
  
    if (op[0])
      {
!       mod = (int) hash_find (avr_mod_hash, op);
  
        if (mod)
  	{
--- 522,531 ----
  
    if (op[0])
      {
!       mod_index m;
!       
!       m.ptr = hash_find (avr_mod_hash, op);
!       mod = m.index;
  
        if (mod)
  	{
Index: gas/config/tc-frv.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-frv.c,v
retrieving revision 1.18
diff -c -3 -p -r1.18 tc-frv.c
*** gas/config/tc-frv.c	7 Jun 2005 17:54:16 -0000	1.18
--- gas/config/tc-frv.c	11 Jan 2006 17:28:52 -0000
***************
*** 1,5 ****
  /* tc-frv.c -- Assembler for the Fujitsu FRV.
!    Copyright 2002, 2003, 2004, 2005 Free Software Foundation.
  
     This file is part of GAS, the GNU Assembler.
  
--- 1,5 ----
  /* tc-frv.c -- Assembler for the Fujitsu FRV.
!    Copyright 2002, 2003, 2004, 2005, 2006 Free Software Foundation.
  
     This file is part of GAS, the GNU Assembler.
  
*************** frv_debug_tomcat (start_chain)
*** 648,658 ****
        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);
  	  else if (this_insn->type == VLIW_BRANCH_TYPE)
! 	    fprintf (stderr, "%s to %d\n", this_insn->insn->base->name, (int) 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);
  	  else if (this_insn->type == VLIW_NOP_TYPE)
  	    fprintf (stderr, "Nop\n");
  	  else
--- 648,658 ----
        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: %p\n", this_insn->sym);
  	  else if (this_insn->type == VLIW_BRANCH_TYPE)
! 	    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 %p\n", this_insn->insn->base->name, this_insn->sym);
  	  else if (this_insn->type == VLIW_NOP_TYPE)
  	    fprintf (stderr, "Nop\n");
  	  else
Index: gas/config/tc-i370.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-i370.c,v
retrieving revision 1.28
diff -c -3 -p -r1.28 tc-i370.c
*** gas/config/tc-i370.c	7 Jun 2005 17:54:16 -0000	1.28
--- gas/config/tc-i370.c	11 Jan 2006 17:28:53 -0000
***************
*** 1,7 ****
  /* tc-i370.c -- Assembler for the IBM 360/370/390 instruction set.
     Loosely based on the ppc files by Linas Vepstas <linas@linas.org> 1998, 99
     Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
!    2004, 2005 Free Software Foundation, Inc.
     Written by Ian Lance Taylor, Cygnus Support.
  
     This file is part of GAS, the GNU Assembler.
--- 1,7 ----
  /* tc-i370.c -- Assembler for the IBM 360/370/390 instruction set.
     Loosely based on the ppc files by Linas Vepstas <linas@linas.org> 1998, 99
     Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
!    2004, 2005, 2006 Free Software Foundation, Inc.
     Written by Ian Lance Taylor, Cygnus Support.
  
     This file is part of GAS, the GNU Assembler.
*************** md_assemble (char *str)
*** 2102,2108 ****
  
            if (! register_name (&ex))
  	    as_bad ("expecting a register for operand %d",
! 		    opindex_ptr - opcode->operands + 1);
          }
  
        /* Check for an address constant expression.  */
--- 2102,2108 ----
  
            if (! register_name (&ex))
  	    as_bad ("expecting a register for operand %d",
! 		    (int) (opindex_ptr - opcode->operands + 1));
          }
  
        /* Check for an address constant expression.  */
Index: gas/config/tc-mn10200.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-mn10200.c,v
retrieving revision 1.19
diff -c -3 -p -r1.19 tc-mn10200.c
*** gas/config/tc-mn10200.c	7 Jun 2005 17:54:17 -0000	1.19
--- gas/config/tc-mn10200.c	11 Jan 2006 17:28:53 -0000
***************
*** 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.
  
     This file is part of GAS, the GNU Assembler.
  
--- 1,6 ----
  /* tc-mn10200.c -- Assembler code for the Matsushita 10200
     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.
  
*************** keep_going:
*** 1191,1196 ****
--- 1191,1208 ----
    /* 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  */
*************** keep_going:
*** 1218,1227 ****
        else
  	type = 3;
  
        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);
        number_to_chars_bigendian (f, insn, size);
        if (8 - size > 4)
  	{
--- 1230,1240 ----
        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,
! 		    opindex_converter.ptr);
        number_to_chars_bigendian (f, insn, size);
        if (8 - size > 4)
  	{
Index: gas/config/tc-mn10300.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-mn10300.c,v
retrieving revision 1.54
diff -c -3 -p -r1.54 tc-mn10300.c
*** gas/config/tc-mn10300.c	11 Oct 2005 11:16:16 -0000	1.54
--- gas/config/tc-mn10300.c	11 Jan 2006 17:28:53 -0000
***************
*** 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.
  
     This file is part of GAS, the GNU Assembler.
  
--- 1,6 ----
  /* tc-mn10300.c -- Assembler code for the Matsushita 10300
!    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.
  
*************** keep_going:
*** 2005,2010 ****
--- 2005,2022 ----
  
    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
*************** keep_going:
*** 2044,2053 ****
        else
  	type = 3;
  
        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);
  
        /* This is pretty hokey.  We basically just care about the
  	 opcode, so we have to write out the first word big endian.
--- 2056,2066 ----
        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,
! 		    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.
Index: gas/config/tc-tic54x.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-tic54x.c,v
retrieving revision 1.24
diff -c -3 -p -r1.24 tc-tic54x.c
*** gas/config/tc-tic54x.c	11 Aug 2005 01:25:28 -0000	1.24
--- gas/config/tc-tic54x.c	11 Jan 2006 17:28:55 -0000
***************
*** 1,5 ****
  /* tc-tic54x.c -- Assembly code for the Texas Instruments TMS320C54X
!    Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
     Free Software Foundation, Inc.
     Contributed by Timothy Wall (twall@cygnus.com)
  
--- 1,5 ----
  /* tc-tic54x.c -- Assembly code for the Texas Instruments TMS320C54X
!    Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
     Free Software Foundation, Inc.
     Contributed by Timothy Wall (twall@cygnus.com)
  
*************** subsym_substitute (line, forced)
*** 4985,4991 ****
  		      if (beg < 1)
  			{
  			  as_bad (_("Invalid subscript (use 1 to %d)"),
! 				  strlen (value));
  			  break;
  			}
  		      if (*input_line_pointer == ',')
--- 4985,4991 ----
  		      if (beg < 1)
  			{
  			  as_bad (_("Invalid subscript (use 1 to %d)"),
! 				  (int) strlen (value));
  			  break;
  			}
  		      if (*input_line_pointer == ',')
*************** subsym_substitute (line, forced)
*** 4995,5001 ****
  			  if (beg + len > strlen (value))
  			    {
  			      as_bad (_("Invalid length (use 0 to %d"),
! 				      strlen (value) - beg);
  			      break;
  			    }
  			}
--- 4995,5001 ----
  			  if (beg + len > strlen (value))
  			    {
  			      as_bad (_("Invalid length (use 0 to %d"),
! 				      (int) strlen (value) - beg);
  			      break;
  			    }
  			}
Index: gas/config/tc-v850.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-v850.c,v
retrieving revision 1.49
diff -c -3 -p -r1.49 tc-v850.c
*** gas/config/tc-v850.c	7 Jun 2005 17:54:18 -0000	1.49
--- gas/config/tc-v850.c	11 Jan 2006 17:28:55 -0000
***************
*** 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.
  
     This file is part of GAS, the GNU Assembler.
  
--- 1,6 ----
  /* tc-v850.c -- Assembler code for the NEC V850
!    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.
  
*************** md_convert_frag (bfd *abfd ATTRIBUTE_UNU
*** 1221,1233 ****
  		 asection *sec,
  		 fragS *fragP)
  {
    subseg_change (sec, 0);
  
    /* 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_fix += 2;
      }
    /* Out of range conditional branch.  Emit a branch around a jump.  */
--- 1221,1249 ----
  		 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 + opcode_converter.fx_r_type);
        fragP->fr_fix += 2;
      }
    /* Out of range conditional branch.  Emit a branch around a jump.  */
*************** md_convert_frag (bfd *abfd ATTRIBUTE_UNU
*** 1249,1256 ****
  	 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_fix += 6;
      }
    /* Out of range unconditional branch.  Emit a jump.  */
--- 1265,1272 ----
  	 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 + opcode_converter.fx_r_type + 1);
        fragP->fr_fix += 6;
      }
    /* Out of range unconditional branch.  Emit a jump.  */
*************** md_convert_frag (bfd *abfd ATTRIBUTE_UNU
*** 1258,1265 ****
      {
        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_fix += 4;
      }
    else
--- 1274,1281 ----
      {
        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 + opcode_converter.fx_r_type + 1);
        fragP->fr_fix += 4;
      }
    else
*************** md_assemble (char *str)
*** 2036,2041 ****
--- 2052,2071 ----
  
    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;
  
*************** md_assemble (char *str)
*** 2044,2050 ****
  	  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);
  	  md_number_to_chars (f, insn, insn_size);
  	  md_number_to_chars (f + 2, 0, 2);
  	}
--- 2074,2080 ----
  	  f = frag_var (rs_machine_dependent, 4, 2, 2,
  			fixups[0].exp.X_add_symbol,
  			fixups[0].exp.X_add_number,
! 			opindex_converter.ptr);
  	  md_number_to_chars (f, insn, insn_size);
  	  md_number_to_chars (f + 2, 0, 2);
  	}
*************** md_assemble (char *str)
*** 2053,2059 ****
  	  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);
  	  md_number_to_chars (f, insn, insn_size);
  	  md_number_to_chars (f + 2, 0, 4);
  	}
--- 2083,2089 ----
  	  f = frag_var (rs_machine_dependent, 6, 4, 0,
  			fixups[0].exp.X_add_symbol,
  			fixups[0].exp.X_add_number,
! 			opindex_converter.ptr);
  	  md_number_to_chars (f, insn, insn_size);
  	  md_number_to_chars (f + 2, 0, 4);
  	}

===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/address.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 address.d
*** gas/testsuite/gas/tic54x/address.d	20 Jun 2000 13:52:30 -0000	1.1
--- gas/testsuite/gas/tic54x/address.d	11 Jan 2006 17:28:56 -0000
***************
*** 5,11 ****
  
  Disassembly of section .text:
  
! 00000000 <_addressing>:
     0:	1801.*
     1:	1881.*
     2:	1989.*
--- 5,11 ----
  
  Disassembly of section .text:
  
! 0+00 <_addressing>:
     0:	1801.*
     1:	1881.*
     2:	1989.*
Index: gas/testsuite/gas/tic54x/addrfar.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/addrfar.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 addrfar.d
*** gas/testsuite/gas/tic54x/addrfar.d	20 Jun 2000 13:52:30 -0000	1.1
--- gas/testsuite/gas/tic54x/addrfar.d	11 Jan 2006 17:28:56 -0000
***************
*** 7,13 ****
  
  Disassembly of section .text:
  
! 00000000 <_addressing>:
     0:	1801.*
     1:	1881.*
     2:	1989.*
--- 7,13 ----
  
  Disassembly of section .text:
  
! 0+000 <_addressing>:
     0:	1801.*
     1:	1881.*
     2:	1989.*
Index: gas/testsuite/gas/tic54x/align.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/align.d,v
retrieving revision 1.3
diff -c -3 -p -r1.3 align.d
*** gas/testsuite/gas/tic54x/align.d	26 Aug 2002 10:37:58 -0000	1.3
--- gas/testsuite/gas/tic54x/align.d	11 Jan 2006 17:28:56 -0000
***************
*** 4,29 ****
  .*: +file format .*c54x.*
  
  Sections:
! Idx Name          Size      VMA       LMA       File off  Algn
!   0 .text         00000089  00000000  00000000  0000....  2..7
                    CONTENTS, ALLOC, LOAD, ....
!   1 .data         00000005  00000000  00000000  0000....  2..1
                    CONTENTS, ALLOC, LOAD, DATA
!   2 .bss          00000000  00000000  00000000  0000....  2..0
                    ALLOC
  Disassembly of section .text:
  
! 00000000 <.text>:
     0:	4160.*
     1:	0001.*
     2:	0002.*
  	...
  
! 00000004 <even>:
     4:	0003.*
  	...
  
! 00000006 <align2>:
     6:	0061.*
     7:	0062.*
     8:	0063.*
--- 4,29 ----
  .*: +file format .*c54x.*
  
  Sections:
! Idx Name          Size      VMA + LMA + File off  Algn
!   0 .text         00000089  0+000  0+000  0000....  2..7
                    CONTENTS, ALLOC, LOAD, ....
!   1 .data         00000005  0+000  0+000  0000....  2..1
                    CONTENTS, ALLOC, LOAD, DATA
!   2 .bss          00000000  0+000  0+000  0000....  2..0
                    ALLOC
  Disassembly of section .text:
  
! 0+000 <.text>:
     0:	4160.*
     1:	0001.*
     2:	0002.*
  	...
  
! 0+004 <even>:
     4:	0003.*
  	...
  
! 0+006 <align2>:
     6:	0061.*
     7:	0062.*
     8:	0063.*
*************** Disassembly of section .text:
*** 31,37 ****
     a:	0065.*
  	...
  
! 00000010 <align8>:
    10:	0008.*
    11:	0000.*
    12:	0001.*
--- 31,37 ----
     a:	0065.*
  	...
  
! 0+010 <align8>:
    10:	0008.*
    11:	0000.*
    12:	0001.*
*************** Disassembly of section .text:
*** 43,49 ****
    18:	0007.*
  	...
  
! 00000080 <align128>:
    80:	0004.*
    81:	0000.*
    82:	0001.*
--- 43,49 ----
    18:	0007.*
  	...
  
! 0+080 <align128>:
    80:	0004.*
    81:	0000.*
    82:	0001.*
Index: gas/testsuite/gas/tic54x/all-opcodes.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/all-opcodes.d,v
retrieving revision 1.2
diff -c -3 -p -r1.2 all-opcodes.d
*** gas/testsuite/gas/tic54x/all-opcodes.d	13 Nov 2001 14:22:44 -0000	1.2
--- gas/testsuite/gas/tic54x/all-opcodes.d	11 Jan 2006 17:29:23 -0000
***************
*** 6,12 ****
  
  Disassembly of section .text:
  
! 00000000 <start>:
         0:	e300.*
         1:	e304.*
         2:	e308.*
--- 6,12 ----
  
  Disassembly of section .text:
  
! 0+000 <start>:
         0:	e300.*
         1:	e304.*
         2:	e308.*
*************** Disassembly of section .text:
*** 219145,219151 ****
     357ff:	6629.*
     35800:	1df8.*
     35801:	662a.*
! 00035802 <testend>:
     35802:	f073.*
     35803:	5802.*
  .*35803: ARELEXT16.*
--- 219145,219151 ----
     357ff:	6629.*
     35800:	1df8.*
     35801:	662a.*
! 0+035802 <testend>:
     35802:	f073.*
     35803:	5802.*
  .*35803: ARELEXT16.*
Index: gas/testsuite/gas/tic54x/asg.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/asg.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 asg.d
*** gas/testsuite/gas/tic54x/asg.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/asg.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,21 ****
  
  Disassembly of section .text:
  
! 00000000 <L1>:
     0:	f000.*
     1:	0064.*
  
! 00000002 <L2>:
     2:	1090.*
  
! 00000003 <L3>:
     3:	1090.*
  
! 00000004 <newlabel>:
     4:	f000.*
     5:	0000.*
     6:	f000.*
--- 5,21 ----
  
  Disassembly of section .text:
  
! 0+000 <L1>:
     0:	f000.*
     1:	0064.*
  
! 0+002 <L2>:
     2:	1090.*
  
! 0+003 <L3>:
     3:	1090.*
  
! 0+004 <newlabel>:
     4:	f000.*
     5:	0000.*
     6:	f000.*
*************** Disassembly of section .text:
*** 127,131 ****
    70:	0063.*
    71:	0064.*
  
! 00000072 <end>:
    72:	0100.*
--- 127,131 ----
    70:	0063.*
    71:	0064.*
  
! 0+072 <end>:
    72:	0100.*
Index: gas/testsuite/gas/tic54x/cons.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/cons.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 cons.d
*** gas/testsuite/gas/tic54x/cons.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/cons.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,59 ****
  
  Disassembly of section .text:
  
! 00000000 <binary>:
     0:	0003.*
     1:	0004.*
  
! 00000002 <octal>:
     2:	0009.*
     3:	000a.*
     4:	000b.*
  
! 00000005 <hex>:
     5:	000f.*
     6:	0010.*
  
! 00000007 <field>:
     7:	6440.*
     8:	0123.*
     9:	4000.*
     a:	0000.*
     b:	1234.*
  
! 0000000c <byte>:
     c:	00aa.*
     d:	00bb.*
  
! 0000000e <word>:
     e:	0ccc.*
  
! 0000000f <xlong>:
     f:	0eee.*
    10:	efff.*
  	...
  
! 00000012 <long>:
    12:	eeee.*
    13:	ffff.*
  
! 00000014 <int>:
    14:	dddd.*
  
! 00000015 <xfloat>:
    15:	3fff.*
    16:	ffac.*
  	...
  
! 00000018 <float>:
    18:	3fff.*
    19:	ffac.*
  
! 0000001a <string>:
    1a:	0061.*
    1b:	0062.*
    1c:	0063.*
--- 5,59 ----
  
  Disassembly of section .text:
  
! 0+000 <binary>:
     0:	0003.*
     1:	0004.*
  
! 0+002 <octal>:
     2:	0009.*
     3:	000a.*
     4:	000b.*
  
! 0+005 <hex>:
     5:	000f.*
     6:	0010.*
  
! 0+007 <field>:
     7:	6440.*
     8:	0123.*
     9:	4000.*
     a:	0000.*
     b:	1234.*
  
! 0+00c <byte>:
     c:	00aa.*
     d:	00bb.*
  
! 0+00e <word>:
     e:	0ccc.*
  
! 0+00f <xlong>:
     f:	0eee.*
    10:	efff.*
  	...
  
! 0+012 <long>:
    12:	eeee.*
    13:	ffff.*
  
! 0+014 <int>:
    14:	dddd.*
  
! 0+015 <xfloat>:
    15:	3fff.*
    16:	ffac.*
  	...
  
! 0+018 <float>:
    18:	3fff.*
    19:	ffac.*
  
! 0+01a <string>:
    1a:	0061.*
    1b:	0062.*
    1c:	0063.*
*************** Disassembly of section .text:
*** 67,73 ****
    24:	0067.*
    25:	0030.*
  
! 00000026 <pstring>:
    26:	6162.*
    27:	6364.*
    28:	6162.*
--- 67,73 ----
    24:	0067.*
    25:	0030.*
  
! 0+026 <pstring>:
    26:	6162.*
    27:	6364.*
    28:	6162.*
*************** Disassembly of section .text:
*** 75,81 ****
    2a:	6566.*
    2b:	6700.*
  
! 0000002c <DAT1>:
    2c:	0000.*
    2d:	abcd.*
    2e:	0000.*
--- 75,81 ----
    2a:	6566.*
    2b:	6700.*
  
! 0+02c <DAT1>:
    2c:	0000.*
    2d:	abcd.*
    2e:	0000.*
*************** Disassembly of section .text:
*** 85,101 ****
    32:	0000.*
    33:	006f.*
  
! 00000034 <xlong.0>:
    34:	0000.*
    35:	002c.*
    36:	aabb.*
    37:	ccdd.*
  
! 00000038 <DAT2>:
    38:	0000.*
  	...
  
! 0000003a <DAT3>:
    3a:	1234.*
    3b:	5678.*
    3c:	0000.*
--- 85,101 ----
    32:	0000.*
    33:	006f.*
  
! 0+034 <xlong.0>:
    34:	0000.*
    35:	002c.*
    36:	aabb.*
    37:	ccdd.*
  
! 0+038 <DAT2>:
    38:	0000.*
  	...
  
! 0+03a <DAT3>:
    3a:	1234.*
    3b:	5678.*
    3c:	0000.*
Index: gas/testsuite/gas/tic54x/consfar.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/consfar.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 consfar.d
*** gas/testsuite/gas/tic54x/consfar.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/consfar.d	11 Jan 2006 17:29:23 -0000
***************
*** 7,61 ****
  
  Disassembly of section .text:
  
! 00000000 <binary>:
     0:	0003.*
     1:	0004.*
  
! 00000002 <octal>:
     2:	0009.*
     3:	000a.*
     4:	000b.*
  
! 00000005 <hex>:
     5:	000f.*
     6:	0010.*
  
! 00000007 <field>:
     7:	6440.*
     8:	0123.*
     9:	4000.*
     a:	0000.*
     b:	1234.*
  
! 0000000c <byte>:
     c:	00aa.*
     d:	00bb.*
  
! 0000000e <word>:
     e:	0ccc.*
  
! 0000000f <xlong>:
     f:	0eee.*
    10:	efff.*
  	...
  
! 00000012 <long>:
    12:	eeee.*
    13:	ffff.*
  
! 00000014 <int>:
    14:	dddd.*
  
! 00000015 <xfloat>:
    15:	3fff.*
    16:	ffac.*
  	...
  
! 00000018 <float>:
    18:	3fff.*
    19:	ffac.*
  
! 0000001a <string>:
    1a:	0061.*
    1b:	0062.*
    1c:	0063.*
--- 7,61 ----
  
  Disassembly of section .text:
  
! 0+000 <binary>:
     0:	0003.*
     1:	0004.*
  
! 0+002 <octal>:
     2:	0009.*
     3:	000a.*
     4:	000b.*
  
! 0+005 <hex>:
     5:	000f.*
     6:	0010.*
  
! 0+007 <field>:
     7:	6440.*
     8:	0123.*
     9:	4000.*
     a:	0000.*
     b:	1234.*
  
! 0+00c <byte>:
     c:	00aa.*
     d:	00bb.*
  
! 0+00e <word>:
     e:	0ccc.*
  
! 0+00f <xlong>:
     f:	0eee.*
    10:	efff.*
  	...
  
! 0+012 <long>:
    12:	eeee.*
    13:	ffff.*
  
! 0+014 <int>:
    14:	dddd.*
  
! 0+015 <xfloat>:
    15:	3fff.*
    16:	ffac.*
  	...
  
! 0+018 <float>:
    18:	3fff.*
    19:	ffac.*
  
! 0+01a <string>:
    1a:	0061.*
    1b:	0062.*
    1c:	0063.*
*************** Disassembly of section .text:
*** 69,75 ****
    24:	0067.*
    25:	0030.*
  
! 00000026 <pstring>:
    26:	6162.*
    27:	6364.*
    28:	6162.*
--- 69,75 ----
    24:	0067.*
    25:	0030.*
  
! 0+026 <pstring>:
    26:	6162.*
    27:	6364.*
    28:	6162.*
*************** Disassembly of section .text:
*** 77,83 ****
    2a:	6566.*
    2b:	6700.*
  
! 0000002c <DAT1>:
    2c:	0000.*
    2d:	abcd.*
    2e:	0000.*
--- 77,83 ----
    2a:	6566.*
    2b:	6700.*
  
! 0+02c <DAT1>:
    2c:	0000.*
    2d:	abcd.*
    2e:	0000.*
*************** Disassembly of section .text:
*** 87,104 ****
    32:	0000.*
    33:	006f.*
  
! 00000034 <xlong.0>:
    34:	0000.*
  .*34: ARELEXT.*
    35:	002c.*
    36:	aabb.*
    37:	ccdd.*
  
! 00000038 <DAT2>:
    38:	0000.*
  	...
  
! 0000003a <DAT3>:
    3a:	1234.*
    3b:	5678.*
    3c:	0000.*
--- 87,104 ----
    32:	0000.*
    33:	006f.*
  
! 0+034 <xlong.0>:
    34:	0000.*
  .*34: ARELEXT.*
    35:	002c.*
    36:	aabb.*
    37:	ccdd.*
  
! 0+038 <DAT2>:
    38:	0000.*
  	...
  
! 0+03a <DAT3>:
    3a:	1234.*
    3b:	5678.*
    3c:	0000.*
Index: gas/testsuite/gas/tic54x/extaddr.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/extaddr.d,v
retrieving revision 1.3
diff -c -3 -p -r1.3 extaddr.d
*** gas/testsuite/gas/tic54x/extaddr.d	26 Aug 2002 10:37:58 -0000	1.3
--- gas/testsuite/gas/tic54x/extaddr.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,11 ****
  
  Disassembly of section .text:
  
! 00000000 <.text>:
         0:	f062.*
         1:	0000.*
  .*1: RELEXTMS7.*
--- 5,11 ----
  
  Disassembly of section .text:
  
! 0+000 <.text>:
         0:	f062.*
         1:	0000.*
  .*1: RELEXTMS7.*
*************** Disassembly of section .text:
*** 14,20 ****
  .*3: RELEXT16.*
         4:	f4e2.*
  
! 00000005 <start>:
         5:	f881.*
         6:	0080.*
  .*5: ARELEXT.*
--- 14,20 ----
  .*3: RELEXT16.*
         4:	f4e2.*
  
! 0+005 <start>:
         5:	f881.*
         6:	0080.*
  .*5: ARELEXT.*
*************** Disassembly of section .text:
*** 49,55 ****
        20:	f495.*
  	...
  
! 00010080 <end>:
     10080:	f881.*
     10081:	0080.*
  .*10080: ARELEXT.*
--- 49,55 ----
        20:	f495.*
  	...
  
! 0+010080 <end>:
     10080:	f881.*
     10081:	0080.*
  .*10080: ARELEXT.*
Index: gas/testsuite/gas/tic54x/field.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/field.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 field.d
*** gas/testsuite/gas/tic54x/field.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/field.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,30 ****
  
  Disassembly of section .text:
  
! 00000000 <f1>:
     0:	2af0.*
     1:	5600.*
  
! 00000001 <f2>:
     1:	5600.*
  
! 00000002 <f4>:
     2:	0001.*
  
! 00000003 <f5>:
     3:	0000.*
     4:	4321.*
  
! 00000005 <f6>:
     5:	000f.*
  
! 00000006 <f7>:
     6:	6000.*
     7:	008a.*
  
! 00000007 <f8>:
     7:	008a.*
--- 5,30 ----
  
  Disassembly of section .text:
  
! 0+000 <f1>:
     0:	2af0.*
     1:	5600.*
  
! 0+001 <f2>:
     1:	5600.*
  
! 0+002 <f4>:
     2:	0001.*
  
! 0+003 <f5>:
     3:	0000.*
     4:	4321.*
  
! 0+005 <f6>:
     5:	000f.*
  
! 0+006 <f7>:
     6:	6000.*
     7:	008a.*
  
! 0+007 <f8>:
     7:	008a.*
Index: gas/testsuite/gas/tic54x/labels.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/labels.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 labels.d
*** gas/testsuite/gas/tic54x/labels.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/labels.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,11 ****
  
  Disassembly of section .text:
  
! 00000000 <label1>:
     0:	1000.*
     1:	0800.*
     2:	f843.*
--- 5,11 ----
  
  Disassembly of section .text:
  
! 0+000 <label1>:
     0:	1000.*
     1:	0800.*
     2:	f843.*
*************** Disassembly of section .text:
*** 14,63 ****
     5:	f073.*
     6:	0008.*
  
! 00000007 <\$1.*>:
     7:	1000.*
  
! 00000008 <\$2.*>:
     8:	0000.*
     9:	f843.*
     a:	000c.*
     b:	8000.*
  
! 0000000c <\$1.*>:
     c:	f495.*
     d:	f495.*
  
! 0000000e <lab.*>:
     e:	f000.*
     f:	0001.*
    10:	f073.*
    11:	000e.*
  
! 00000012 <lab.*>:
    12:	f845.*
    13:	0012.*
  
! 00000014 <lab.*>:
    14:	f000.*
    15:	0003.*
    16:	f073.*
    17:	0014.*
  
! 00000018 <lab.*>:
    18:	f000.*
    19:	0004.*
    1a:	f073.*
    1b:	0018.*
  
! 0000001c <after_macro>:
    1c:	f073.*
    1d:	0014.*
  Disassembly of section new_sect:
  
! 00000000 <new_section>:
     0:	f495.*
  
! 00000001 <lab.7>:
     1:	f000.*
     2:	0005.*
     3:	f495.*
--- 14,63 ----
     5:	f073.*
     6:	0008.*
  
! 0+007 <\$1.*>:
     7:	1000.*
  
! 0+008 <\$2.*>:
     8:	0000.*
     9:	f843.*
     a:	000c.*
     b:	8000.*
  
! 0+00c <\$1.*>:
     c:	f495.*
     d:	f495.*
  
! 0+00e <lab.*>:
     e:	f000.*
     f:	0001.*
    10:	f073.*
    11:	000e.*
  
! 0+012 <lab.*>:
    12:	f845.*
    13:	0012.*
  
! 0+014 <lab.*>:
    14:	f000.*
    15:	0003.*
    16:	f073.*
    17:	0014.*
  
! 0+018 <lab.*>:
    18:	f000.*
    19:	0004.*
    1a:	f073.*
    1b:	0018.*
  
! 0+01c <after_macro>:
    1c:	f073.*
    1d:	0014.*
  Disassembly of section new_sect:
  
! 0+000 <new_section>:
     0:	f495.*
  
! 0+001 <lab.7>:
     1:	f000.*
     2:	0005.*
     3:	f495.*
*************** Disassembly of section new_sect:
*** 65,71 ****
     5:	f073.*
     6:	0001.*
  
! 00000007 <lab.8>:
     7:	f000.*
     8:	0006.*
     9:	f495.*
--- 65,71 ----
     5:	f073.*
     6:	0001.*
  
! 0+007 <lab.8>:
     7:	f000.*
     8:	0006.*
     9:	f495.*
Index: gas/testsuite/gas/tic54x/loop.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/loop.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 loop.d
*** gas/testsuite/gas/tic54x/loop.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/loop.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,14 ****
  
  Disassembly of section .text:
  
! 00000000 <.text>:
  	...
  
! 00000001 <label>:
     1:	0000.*
     2:	0001.*
     3:	0002.*
--- 5,14 ----
  
  Disassembly of section .text:
  
! 0+000 <.text>:
  	...
  
! 0+001 <label>:
     1:	0000.*
     2:	0001.*
     3:	0002.*
Index: gas/testsuite/gas/tic54x/lp.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/lp.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 lp.d
*** gas/testsuite/gas/tic54x/lp.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/lp.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,10 ****
  
  Disassembly of section .text:
  
! 00000000 <.text>:
     0:	f49f.*
  
--- 5,10 ----
  
  Disassembly of section .text:
  
! 0+000 <.text>:
     0:	f49f.*
  
Index: gas/testsuite/gas/tic54x/macro.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/macro.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 macro.d
*** gas/testsuite/gas/tic54x/macro.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/macro.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,11 ****
  
  Disassembly of section .text:
  
! 00000000 <.text>:
     0:	f000.*
     1:	0000.* 
     2:	f300.*
--- 5,11 ----
  
  Disassembly of section .text:
  
! 0+000 <.text>:
     0:	f000.*
     1:	0000.* 
     2:	f300.*
Index: gas/testsuite/gas/tic54x/math.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/math.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 math.d
*** gas/testsuite/gas/tic54x/math.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/math.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,11 ****
  
  Disassembly of section .text:
  
! 00000000 <.text>:
     0:	3fc9.*
     1:	0fd8.*
  	...
--- 5,11 ----
  
  Disassembly of section .text:
  
! 0+000 <.text>:
     0:	3fc9.*
     1:	0fd8.*
  	...
Index: gas/testsuite/gas/tic54x/opcodes.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/opcodes.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 opcodes.d
*** gas/testsuite/gas/tic54x/opcodes.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/opcodes.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,11 ****
  
  Disassembly of section .text:
  
! 00000000 <_opcodes>:
     0:	e39a 	abdst  \*ar3\+,\*ar4\+
     1:	f485 	abs    a
     2:	f585 	abs    a,b
--- 5,11 ----
  
  Disassembly of section .text:
  
! 0+000 <_opcodes>:
     0:	e39a 	abdst  \*ar3\+,\*ar4\+
     1:	f485 	abs    a
     2:	f585 	abs    a,b
Index: gas/testsuite/gas/tic54x/sections.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/sections.d,v
retrieving revision 1.2
diff -c -3 -p -r1.2 sections.d
*** gas/testsuite/gas/tic54x/sections.d	13 Nov 2001 14:22:49 -0000	1.2
--- gas/testsuite/gas/tic54x/sections.d	11 Jan 2006 17:29:23 -0000
***************
*** 4,76 ****
  .*: +file format .*c54x.*
  
  Sections:
! Idx Name          Size      VMA       LMA       File off  Algn
!   0 .text         0000001b  00000000  00000000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, RELOC, CODE
!   1 .data         00000007  00000000  00000000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, DATA
!   2 .bss          00000014  00000000  00000000  0000....  2..0
                    ALLOC
!   3 newvars       00000017  00000000  00000000  0000....  2..1
                    ALLOC, BLOCK
!   4 vectors       00000002  00000000  00000000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, CODE, BLOCK
!   5 clink         00000002  00000000  00000000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, DATA, CLINK
!   6 blksect       00000002  00000000  00000000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, DATA, BLOCK
  Disassembly of section .text:
  
! 00000000 <.text>:
     0:	1234.*
  
! 00000001 <add>:
     1:	100f.*
  
! 00000002 <aloop>:
     2:	f010.*
     3:	0001.*
     4:	f842.*
     5:	0002.*
  
! 00000006 <mpy>:
     6:	110a.*
  
! 00000007 <mloop>:
     7:	f166.*
     8:	000a.*
     9:	f868.*
     a:	0007.*
  
! 0000000b <space>:
  	...
  
! 00000012 <bes>:
  	...
  
! 00000013 <spacep>:
    13:	000b.*
  
! 00000014 <besp>:
    14:	0012.*
  
! 00000015 <pk1>:
  	...
  
! 00000016 <endpk1>:
    16:	0000.*
  	...
  
! 00000018 <endpk2>:
  	...
  
! 00000019 <pk3>:
  	...
  
! 0000001a <endpk3>:
  	...
  Disassembly of section vectors:
  
! 00000000 <vectors>:
     0:	f495.*
     1:	f495.*
--- 4,76 ----
  .*: +file format .*c54x.*
  
  Sections:
! Idx Name          Size      VMA + LMA + File off  Algn
!   0 .text         0000001b  0+000  0+000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, RELOC, CODE
!   1 .data         00000007  0+000  0+000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, DATA
!   2 .bss          00000014  0+000  0+000  0000....  2..0
                    ALLOC
!   3 newvars       00000017  0+000  0+000  0000....  2..1
                    ALLOC, BLOCK
!   4 vectors       00000002  0+000  0+000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, CODE, BLOCK
!   5 clink         00000002  0+000  0+000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, DATA, CLINK
!   6 blksect       00000002  0+000  0+000  0000....  2..0
                    CONTENTS, ALLOC, LOAD, DATA, BLOCK
  Disassembly of section .text:
  
! 0+000 <.text>:
     0:	1234.*
  
! 0+001 <add>:
     1:	100f.*
  
! 0+002 <aloop>:
     2:	f010.*
     3:	0001.*
     4:	f842.*
     5:	0002.*
  
! 0+006 <mpy>:
     6:	110a.*
  
! 0+007 <mloop>:
     7:	f166.*
     8:	000a.*
     9:	f868.*
     a:	0007.*
  
! 0+00b <space>:
  	...
  
! 0+012 <bes>:
  	...
  
! 0+013 <spacep>:
    13:	000b.*
  
! 0+014 <besp>:
    14:	0012.*
  
! 0+015 <pk1>:
  	...
  
! 0+016 <endpk1>:
    16:	0000.*
  	...
  
! 0+018 <endpk2>:
  	...
  
! 0+019 <pk3>:
  	...
  
! 0+01a <endpk3>:
  	...
  Disassembly of section vectors:
  
! 0+000 <vectors>:
     0:	f495.*
     1:	f495.*
Index: gas/testsuite/gas/tic54x/set.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/set.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 set.d
*** gas/testsuite/gas/tic54x/set.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/set.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,16 ****
  
  Disassembly of section .text:
  
! 00000000 <.text>:
     0:	7711.*
     1:	0056.* 
     2:	f000.*
     3:	0035.* 
  
! 00000004 <LABEL>:
     4:	000a.*
     5:	0035.*
--- 5,16 ----
  
  Disassembly of section .text:
  
! 0+000 <.text>:
     0:	7711.*
     1:	0056.* 
     2:	f000.*
     3:	0035.* 
  
! 0+004 <LABEL>:
     4:	000a.*
     5:	0035.*
Index: gas/testsuite/gas/tic54x/struct.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/struct.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 struct.d
*** gas/testsuite/gas/tic54x/struct.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/struct.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,11 ****
  
  Disassembly of section .text:
  
! 00000000 <.text>:
     0:	0001.*
     1:	0002.*
     2:	8002.*
--- 5,11 ----
  
  Disassembly of section .text:
  
! 0+000 <.text>:
     0:	0001.*
     1:	0002.*
     2:	8002.*
Index: gas/testsuite/gas/tic54x/subsym.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/tic54x/subsym.d,v
retrieving revision 1.1
diff -c -3 -p -r1.1 subsym.d
*** gas/testsuite/gas/tic54x/subsym.d	20 Jun 2000 13:52:32 -0000	1.1
--- gas/testsuite/gas/tic54x/subsym.d	11 Jan 2006 17:29:23 -0000
***************
*** 5,14 ****
  
  Disassembly of section .text:
  
! 00000000 <.text>:
     0:	0018.*
  
! 00000001 <label>:
     1:	0005.*
     2:	0005.*
     3:	0006.*
--- 5,14 ----
  
  Disassembly of section .text:
  
! 0+000 <.text>:
     0:	0018.*
  
! 0+001 <label>:
     1:	0005.*
     2:	0005.*
     3:	0006.*
*************** Disassembly of section .text:
*** 33,39 ****
    16:	0000.*
    17:	0001.*
  
! 00000018 <x>:
    18:	0001.*
    19:	0001.*
  	...
--- 33,39 ----
    16:	0000.*
    17:	0001.*
  
! 0+018 <x>:
    18:	0001.*
    19:	0001.*
  	...

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]