Changeset 609 for branches/GNU/src/binutils/include

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

Location:

branches/GNU/src/binutils/include

Files:

• ChangeLog (modified) (3 diffs, 1 prop)
• ansidecl.h (modified) (6 diffs, 1 prop)
• aout/ChangeLog (modified) (10 diffs, 1 prop)
• aout/aout64.h (modified) (19 diffs, 1 prop)
• aout/dynix3.h (modified) (1 diff, 1 prop)
• aout/hp300hpux.h (modified) (2 diffs, 1 prop)
• bfdlink.h (modified) (25 diffs, 1 prop)
• bout.h (modified) (5 diffs, 1 prop)
• coff/ChangeLog (modified) (1 diff, 1 prop)
• coff/a29k.h (modified) (7 diffs, 1 prop)
• coff/alpha.h (modified) (6 diffs, 1 prop)
• coff/apollo.h (modified) (5 diffs, 1 prop)
• coff/arm.h (modified) (7 diffs, 1 prop)
• coff/ecoff.h (modified) (3 diffs, 1 prop)
• coff/go32exe.h (modified) (1 diff, 1 prop)
• coff/h8300.h (modified) (3 diffs, 1 prop)
• coff/h8500.h (modified) (4 diffs, 1 prop)
• coff/i386.h (modified) (6 diffs, 1 prop)
• coff/i860.h (modified) (3 diffs, 1 prop)
• coff/i960.h (modified) (9 diffs, 1 prop)
• coff/ia64.h (modified) (5 diffs, 1 prop)
• coff/internal.h (modified) (21 diffs, 1 prop)
• coff/m68k.h (modified) (5 diffs, 1 prop)
• coff/m88k.h (modified) (9 diffs, 1 prop)
• coff/mcore.h (modified) (5 diffs, 1 prop)
• coff/mips.h (modified) (13 diffs, 1 prop)
• coff/mipspe.h (modified) (2 diffs, 1 prop)
• coff/powerpc.h (modified) (2 diffs, 1 prop)
• coff/rs6000.h (modified) (3 diffs, 1 prop)
• coff/rs6k64.h (modified) (13 diffs, 1 prop)
• coff/sh.h (modified) (6 diffs, 1 prop)
• coff/sparc.h (modified) (4 diffs, 1 prop)
• coff/ti.h (modified) (8 diffs, 1 prop)
• coff/tic30.h (modified) (3 diffs, 1 prop)
• coff/tic54x.h (modified) (2 diffs, 1 prop)
• coff/tic80.h (modified) (6 diffs, 1 prop)
• coff/w65.h (modified) (3 diffs, 1 prop)
• coff/we32k.h (modified) (3 diffs, 1 prop)
• coff/z8k.h (modified) (3 diffs, 1 prop)
• demangle.h (modified) (7 diffs, 1 prop)
• dis-asm.h (modified) (9 diffs, 1 prop)
• dyn-string.h (modified) (4 diffs, 1 prop)
• elf/ChangeLog (modified) (6 diffs, 1 prop)
• elf/alpha.h (modified) (2 diffs, 1 prop)
• elf/arm.h (modified) (5 diffs, 1 prop)
• elf/common.h (modified) (22 diffs, 1 prop)
• elf/cris.h (modified) (2 diffs, 1 prop)
• elf/dwarf2.h (modified) (26 diffs, 1 prop)
• elf/external.h (modified) (1 diff, 1 prop)
• elf/i370.h (modified) (3 diffs, 1 prop)
• elf/i386.h (modified) (1 diff, 1 prop)
• elf/ia64.h (modified) (6 diffs, 1 prop)
• elf/internal.h (modified) (8 diffs, 1 prop)
• elf/m68hc11.h (modified) (2 diffs, 1 prop)
• elf/m68k.h (modified) (1 diff, 1 prop)
• elf/mips.h (modified) (3 diffs, 1 prop)
• elf/ppc.h (modified) (2 diffs, 1 prop)
• elf/sh.h (modified) (5 diffs, 1 prop)
• elf/sparc.h (modified) (2 diffs, 1 prop)
• elf/v850.h (modified) (5 diffs, 1 prop)
• elf/x86-64.h (modified) (3 diffs, 1 prop)
• filenames.h (modified) (2 diffs, 1 prop)
• floatformat.h (modified) (1 diff, 1 prop)
• getopt.h (modified) (2 diffs, 1 prop)
• hashtab.h (modified) (8 diffs, 1 prop)
• libiberty.h (modified) (7 diffs, 1 prop)
• mpw/ChangeLog (modified) (1 diff, 1 prop)
• nlm/ChangeLog (modified) (1 diff, 1 prop)
• nlm/common.h (modified) (3 diffs, 1 prop)
• objalloc.h (modified) (2 diffs, 1 prop)
• opcode/ChangeLog (modified) (26 diffs, 1 prop)
• opcode/a29k.h (modified) (3 diffs, 1 prop)
• opcode/alpha.h (modified) (1 diff, 1 prop)
• opcode/arc.h (modified) (3 diffs, 1 prop)
• opcode/avr.h (modified) (4 diffs, 1 prop)
• opcode/cgen.h (modified) (17 diffs, 1 prop)
• opcode/convex.h (modified) (26 diffs, 1 prop)
• opcode/cris.h (modified) (2 diffs, 1 prop)
• opcode/d10v.h (modified) (3 diffs, 1 prop)
• opcode/d30v.h (modified) (1 diff, 1 prop)
• opcode/h8300.h (modified) (18 diffs, 1 prop)
• opcode/hppa.h (modified) (15 diffs, 1 prop)
• opcode/i386.h (modified) (19 diffs, 1 prop)
• opcode/i860.h (modified) (1 diff, 1 prop)
• opcode/ia64.h (modified) (6 diffs, 1 prop)
• opcode/m68hc11.h (modified) (6 diffs, 1 prop)
• opcode/m88k.h (modified) (8 diffs, 1 prop)
• opcode/mips.h (modified) (16 diffs, 1 prop)
• opcode/ns32k.h (modified) (6 diffs, 1 prop)
• opcode/pj.h (modified) (2 diffs, 1 prop)
• opcode/ppc.h (modified) (5 diffs, 1 prop)
• opcode/sparc.h (modified) (2 diffs, 1 prop)
• opcode/tic54x.h (modified) (3 diffs, 1 prop)
• opcode/v850.h (modified) (2 diffs, 1 prop)
• partition.h (modified) (4 diffs, 1 prop)
• safe-ctype.h (modified) (3 diffs, 1 prop)
• sort.h (modified) (3 diffs, 1 prop)
• splay-tree.h (modified) (6 diffs, 1 prop)

branches/GNU/src/binutils/include/ChangeLog

@@ -1 @@
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
-
-        * Many files: Update copyright notices.
-
-2001-05-28  Philip Blundell  <philb@gnu.org>
-
-        From 2001-05-11  Jakub Jelinek  <jakub@redhat.com>
-        * elf/ia64.h (ELF_STRING_ia64_unwind_once): Define.
-        (ELF_STRING_ia64_unwind_info_once): Define.
+2003-05-21  Nick Clifton  <nickc@redhat.com>
+
+        * bfdlink.h (struct bfd_link_hash_table): Fix typo in comment.
+
+2003-05-09  Alan Modra  <amodra@bigpond.net.au>
+
+        * xtensa-isa-internal.h (xtensa_isa_module_struct): Remove const on
+        gen_num_opcodes_fn return type.
+
+2003-04-28  H.J. Lu <hjl@gnu.org>
+
+        * bfdlink.h (bfd_link_info): Add relax_finalizing.
+
+2003-04-23  H.J. Lu <hjl@gnu.org>
+
+        * bfdlink.h (bfd_link_callbacks): Add error_handler.
+
+2003-04-04  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+        * coff/tic4x.h: Namespace cleanup. Replace s/c4x/tic4x
+        and s/c3x/tic3x/
+        * coff/tc-tic4x.h: Ditto
+        * opcode/tic4x.h: Ditto
+
+2003-04-02  Bob Wilson  <bob.wilson@acm.org>
+
+        * xtensa-config.h: Remove comment indicating that this is a
+        generated file.
+
+2003-04-01  Bob Wilson  <bob.wilson@acm.org>
+
+        * dis-asm.h (print_insn_xtensa): Declare.
+        * xtensa-config.h: New file.
+        * xtensa-isa-internal.h: Likewise.
+        * xtensa-isa.h: Likewise.
+
+2003-03-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * ansidecl.h (ATTRIBUTE_NONNULL, ATTRIBUTE_NULL_PRINTF,
+        ATTRIBUTE_NULL_PRINTF_1, ATTRIBUTE_NULL_PRINTF_2,
+        ATTRIBUTE_NULL_PRINTF_3, ATTRIBUTE_NULL_PRINTF_4,
+        ATTRIBUTE_NULL_PRINTF_5): New.
+        (ATTRIBUTE_PRINTF): Add ATTRIBUTE_NONNULL.
+
+2003-03-17  Jan Hubicka  <jh@suse.cz>
+
+        * hashtab.h (htab_traverse_noresize): Declare.
+
+2003-02-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * libiberty.h: Document return value of physmem routines.
+
+2003-02-20  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * libiberty.h (physmem_total, physmem_available): Prototype.
+
+2003-02-20  Daniel Jacobowitz  <drow@mvista.com>
+
+        * libiberty.h (lrealpath): Add declaration.
+
+2003-01-31  Grant Grundler  <grundler@dsl2.external.hp.com>
+
+        * hppa.h (ldwa, ldda): Add ordered opcodes.
+
+2003-01-26  Daniel Jacobowitz  <drow@mvista.com>
+
+        * hashtab.h (htab_alloc_with_arg, htab_free_with_arg): Add new types.
+        (struct htab): Add alloc_arg, alloc_with_arg_f, free_with_arg_f.
+        (htab_create_alloc_ex): New prototype.
+        (htab_set_functions_ex): New prototype.
+
+2003-01-25  Jakub Jelinek  <jakub@redhat.com>
+
+        * elf/sparc.h: Add TLS relocs.  Move R_SPARC_REV32 to 252.
+
+2003-01-20  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+        * coff/tic4x.h (TICOFF_TARGET_MACHINE_GET): Fixed define bug
+        * coff/ti.h (TICOFF_TARGET_MACHINE_GET): Added macros
+
+2002-07-17  Geoffrey Keating  <geoffk@redhat.com>
+
+        * splay-tree.h (GTY): Define if undefined.
+        (splay_tree_allocate_fn): Return PTR for compatibility, not void *.
+        (struct splay_tree_node_s): Support gengtype.
+        (struct splay_tree_s): Likewise.  Make allocate_data a PTR,
+        not a void *.
+
+2002-01-02  Ben Elliston  <bje@redhat.com>
+
+        * dis-asm.h (print_insn_iq2000): Declare.
+
+2002-12-24    Dmitry Diky <diwil@mail.ru>
+
+        * dis-asm.h: Add msp430 disassembler prototype.
+
+2002-12-27  Chris Demetriou  <cgd@broadcom.com>
+
+        * dis-asm.h (print_mips_disassembler_options): Prototype.
+
+2002-12-23  Alan Modra  <amodra@bigpond.net.au>
+
+        * bfdlink.h (struct bfd_link_info): Add "strip_discarded".
+
+2002-12-20  Alan Modra  <amodra@bigpond.net.au>
+
+        * bfdlink.h (struct bfd_link_info): Replace bfd_boolean fields with
+        bit-fields.  Rearrange to put all like types together.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+        * bfdlink.h: Replace boolean with bfd_boolean.  Formatting.
+
+2002-11-23  Simon Burge  <simonb@wasabisystems.com>
+
+        * libiberty.h (basename): Add NetBSD to the list.
+
+2002-11-22  Daniel Jacobowitz  <drow@mvista.com>
+
+        * libiberty.h (make_relative_prefix): Add prototype.
+
+2002-11-16  Klee Dienes  <kdienes@apple.com>
+
+        * opcode/m88k.h (INSTAB): Remove 'next' field.
+        (instruction): Remove definition; replace with extern declaration
+        and mark as const.
+
+2002-11-14  Egor Duda  <deo@logos-m.ru>
+
+        * bfdlink.h (struct bfd_link_info): Add new boolean
+        field pei386_runtime_pseudo_reloc.
+
+2002-10-26  Roger Sayle  <roger@eyesopen.com>
+
+        * partition.h:  Close the extern "C" scope when compiling with C++.
+
+2002-10-26  Roger Sayle  <roger@eyesopen.com>
+            DJ Delorie <dj@redhat.com>
+
+        PR bootstrap/8351
+        * getopt.h: Avoid prototyping getopt with no arguments in C++.
+
+2002-10-24  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+        * ansidecl.h (__STDC__): Add (__alpha && __cplusplus) to the
+        list of platform compilers that may look, smell and act
+        like __STDC__ but that may not define it.
+
+2002-10-11  David O'Brien  <obrien@FreeBSD.org>
+
+        * getopt.h: getopt is in unistd.h (based on SUSv2).
+
+2002-09-26  Jakub Jelinek  <jakub@redhat.com>
+
+        * elf/x86-64.h: Add TLS relocs.
+
+2002-09-26  Andrew Cagney  <ac131313@redhat.com>
+
+        * regs/: Delete directory.
+
+2002-09-19  Alexandre Oliva  <aoliva@redhat.com>
+
+        * libiberty.h (asprintf, vasprintf): Don't declare them if the
+        corresponding HAVE_DECL_ macro is 1.
+
+2002-09-19  Jakub Jelinek  <jakub@redhat.com>
+
+        * elf/i386.h (R_386_TLS_TPOFF, R_386_TLS_IE, R_386_TLS_GOTIE):
+        Define.
+
+2002-09-19  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+        * dis-asm.h: Remove (errant) trailing semicolon (;) from the
+        extern "C" { } declaration.
+
+2002-09-04  Nick Clifton  <nickc@redhat.com>
+
+        * dis-asm.h (print_ppc_disassembler_options): Prototype.
+
+2002-08-28  Michael Hayes <m.hayes@elec.canterbury.ac.nz>
+
+        * coff/internal.h: Add new relocation types.
+        * coff/ti.h: Add file-header flags for tic4x code.
+        * dis-asm.h: Add standard disassembler for tic4x.
+        * opcode/tic4x.h: New file.
+        * coff/tic4x.h: New file
+
+2002-08-07  H.J. Lu <hjl@gnu.org>
+
+        * bfdlink.h (bfd_link_info): Add allow_undefined_version.
+        (bfd_elf_version_expr): Add symver and script.
+
+2002-07-31  Ian Dall  <ian@sibyl.beware.dropbear.id.au>
+
+        * bfdlink.h (bfd_link_common_skip_ar_symbols): New enum.
+        (struct bfd_link_info): Add new field 'common_skip_ar_symbols'.
+
+2002-07-25  Richard Sandiford  <rsandifo@redhat.com>
+
+        * opcode/mips.h (CPU_R2000): Remove.
+
+2002-07-19  Denis Chertykov  <denisc@overta.ru>
+            Matthew Green  <mrg@redhat.com>
+
+        * dis-asm.h (print_insn_ip2k): Declare.
+
+2002-07-10  Jakub Jelinek  <jakub@redhat.com>
+
+        * elf/common.h (SHT_GNU_LIBLIST, DT_GNU_PRELINKED,
+        DT_GNU_CONFLICT*, DT_GNU_LIBLIST*): Define.
+
+2002-07-01  Alan Modra  <amodra@bigpond.net.au>
+
+        * bfdlink.h (struct bfd_sym_chain): Declare.
+        (struct bfd_link_info): Add gc_sym_list.  Formatting fixes.
+
+2002-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+        * demangle.h: #include "ansidecl.h" rather than #include <ansidecl.h>.
+        * fibheap.h: Likewise.
+        * hashtab.h: Likewise.
+        * partition.h: Likewise.
+        * sort.h: Likewise.
+        * splay-tree.h: Likewise.
+
+2002-06-24  Alan Modra  <amodra@bigpond.net.au>
+
+        * libiberty.h (basename): Don't declare if HAVE_DECL_BASENAME.
+        * getopt.h (getopt): Don't declare if HAVE_DECL_GETOPT.
+
+2002-06-18  Dave Brolley  <brolley@redhat.com>
+
+        From Catherine Moore:
+        * dis-asm.h (print_insn_frv): New prototype.
+
+2002-06-09  Andrew Cagney  <cagney@redhat.com>
+
+        * remote-sim.h: Move to directory gdb/.
+        * callback.h: Move to directory gdb/.
+
+2002-06-07  Charles Wilson  <cwilson@ece.gatech.edu>
+
+        * bfdlink.h (struct bfd_link_info): Change type of
+        pei386_auto_import field to int so that -1 can mean enabled by
+        default and 1 can mean enabled by command line switch.
+
+2002-06-06  DJ Delorie  <dj@redhat.com>
+
+        * hashtab.h (htab): Rearrange new members for backward
+        compatibility.
+        (htab_create): Don't use a macro that requires other headers.
+
+2002-06-05  Geoffrey Keating  <geoffk@redhat.com>
+
+        * hashtab.h (htab_create): Restore prototype for backward
+        compatibility.
+        (htab_try_create): Likewise.
+
+2002-05-22  Geoffrey Keating  <geoffk@redhat.com>
+
+        * hashtab.h (struct htab): Update for change to length specifier.
+
+2002-05-10  Geoffrey Keating  <geoffk@redhat.com>
+
+        * hashtab.h (GTY): Define if undefined.
+        (htab_alloc): New typedef.
+        (htab_free): New typedef.
+        (struct htab): Support gengtype; allow user-specified memory
+        allocation.
+        (htab_create_alloc): New.
+        (htab_create): Replace with #define.
+        (htab_try_create): Delete.
+
+2002-05-31  Michal Ludvig  <mludvig@suse.cz>
+
+        * elf/dwarf2.h (DW_CFA_low_user, DW_CFA_high_user): Renamed
+        to DW_CFA_lo_user, DW_CFA_hi_user respectively.
+        
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+        * dis-asm.h: Prototype print_insn_dlx.
+
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+        * sim-d10v.h: Delete file.  Moved to include/gdb/.
+
+2002-05-23  Jakub Jelinek  <jakub@redhat.com>
+
+        * elf/common.h (PT_TLS, SHF_TLS, STT_TLS, DF_STATIC_TLS): Define.
+        * elf/ia64.h (R_IA64_LTOFF_TPREL22): Renamed from R_IA64_LTOFF_TP22.
+        * elf/i386.h: Add TLS relocs.
+
+2002-05-21  H.J. Lu  (hjl@gnu.org)
+
+        * bfdlink.h (bfd_link_info): Add allow_multiple_definition.
+
+2002-05-17  J"orn Rennecke <joern.rennecke@superh.com>
+
+        * dis-asm.h (print_insn_shl, print_insn_sh64l): Remove prototype.
+
+2002-04-16  David S. Miller  <davem@redhat.com>
+
+        * xregex2.h (__restrict_arr): Define to __restrict on GCC
+        3.1 and later.  Do not redefine.
+
+2002-04-01  Phil Edwards  <pme@gcc.gnu.org>
+
+        * dyn-string.h:  Also allow IN_GLIBCPP_V3 to redefine names.
+
+2002-03-10  Daniel Jacobowitz <drow@mvista.com>
+
+        * gdb: New directory.
+
+2002-03-06  Andrew Cagney  <ac131313@redhat.com>
+
+        * floatformat.h (floatformat_arm_ext): Delete declaration.
+
+2002-02-21  Jim Blandy  <jimb@redhat.com>
+
+        Allow the user to specify functions for allocating memory for
+        splay tree roots and nodes.
+        * splay-tree.h (splay_tree_allocate_fn, splay_tree_deallocate_fn):
+        New types.
+        (splay_tree): New fields: `allocate', `deallocate', and
+        `allocate_data'.
+        (splay_tree_new_with_allocator): New function declaration.
+
+2002-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+        Support arbitrary length fill patterns.
+        * bfdlink.h (enum bfd_link_order_type): Remove bfd_fill_link_order.
+        (struct bfd_link_order): Remove fill.  Add data.size.
+
+2002-02-08  Alexandre Oliva  <aoliva@redhat.com>
+
+        Contribute sh64-elf.
+        2000-11-25  Hans-Peter Nilsson  <hpn@cygnus.com>
+        * dis-asm.h (print_insn_sh64): New prototype.
+        (print_insn_sh64l): New prototype.
+        (print_insn_sh64x_media): New prototype.
+
+2002-02-05  Frank Ch. Eigler  <fche@redhat.com>
+
+        * dis-asm.h (disassemble_info): New field `insn_sets'.
+        (INIT_DISASSEMBLE_INFO): Clear it.
+
+2002-02-05  Jason Merrill  <jason@redhat.com>
+
+        * demangle.h (cplus_demangle_v3): Add "options" parm.
+        (cplus_demangle_v3_type): Remove prototype.
+        (DMGL_VERBOSE): New macro.
+        (DMGL_TYPES): New macro.
+
+2002-02-02  H.J. Lu  (hjl@gnu.org)
+
+        * demangle.h (cplus_demangle_v3_type): New prototype.
+
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+        * dis-asm.h : Add support for or32 targets
+
+2002-01-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * libiberty.h (C_alloca): Add ATTRIBUTE_MALLOC.
+
+2002-01-27  David O'Brien  <obrien@FreeBSD.org>
+
+        * cgen.h (BFD_VERSION): Use BFD_VERSION_DATE instead.
+
+2001-12-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * dis-asm.h (INIT_DISASSEMBLE_INFO_NO_ARCH): Initialise the
+        disassembler_options field (to NULL).
+
+2001-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+        * bfdlink.h (struct bfd_link_info): Add eh_frame_hdr field.
+
+2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
+
+        * dis-asm.h (print_insn_xstormy16): Declare.
+
+2001-12-06  Richard Henderson  <rth@redhat.com>
+
+        * demangle.h (no_demangling): New.
+        (NO_DEMANGLING_STYLE_STRING): New.
+
+2001-11-14  Alan Modra  <amodra@bigpond.net.au>
+
+        * dis-asm.h (print_insn_i386): Declare.
+
+2001-11-11  Timothy Wall  <twall@alum.mit.edu>
+
+        * dis-asm.h: Fix comment to refer to octets rather than bytes.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+        * dis-asm.h (print_insn_mmix): Add prototype.
+
+2001-10-24  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+        * safe-ctype.h (_sch_isbasic, IS_ISOBASIC): New.
+
+2001-10-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * libiberty.h (hex_init): Revert delete.
+
+        * libiberty.h (_hex_value): Const-ify.
+        (hex_init): Delete.
+
+2001-10-16  Christopher Faylor  <cgf@redhat.com>
+
+        * filenames.h: Add cygwin to the list of dosish style path systems.
+
+2001-10-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * demangle.h (demangler_engine): Const-ify.
+        * libiberty.h (buildargv): Likewise.
+
+2001-10-03  Vassili Karpov  <malc@pulsesoft.com>
+
+        * bfdlink.h (struct bfd_link_info): Add nocopyreloc field.
+
+2001-09-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * libiberty.h (reconcat): New function.
+
+2001-09-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * libiberty.h (concat, concat_length, concat_copy, concat_copy2,
+        ACONCAT): Improve comments.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+        * objalloc.h (OBJALLOC_ALIGN): Define using offsetof.
+
+2001-09-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * libiberty.h (concat_length, concat_copy, concat_copy2,
+        libiberty_concat_ptr, ACONCAT): New.
+
+        * libiberty.h (ASTRDUP): New macro.
+        libiberty_optr, libiberty_nptr, libiberty_len): Declare.
+
+2001-08-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * ansidecl.h: Update comments reflecting previous change.
+
+2001-08-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * ansidecl.h (VA_OPEN, VA_CLOSE): Allow multiple uses.
+
+2001-08-25  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * bfdlink.h (struct bfd_link_info): Change 'spare_dynamic_tags' to
+        unsigned to remove a compile time warning message.
+
+2001-08-24  H.J. Lu  <hjl@gnu.org>
+
+        * bfdlink.h (bfd_link_hash_table_type): New. The linker hash
+        table type, bfd_link_generic_hash_table and
+        bfd_link_elf_hash_table.
+        (bfd_link_hash_table): Add a new field, type, for the linker
+        hash table type.
+
+2001-08-23  Jakub Jelinek  <jakub@redhat.com>
+
+        * bfdlink.h (struct bfd_link_info): Add combreloc and
+        spare_dynamic_tags fields.
+
+2001-08-23  Lars Brinkhoff  <lars@nocrew.org>
+
+        * dyn-string.h, fibheap.h, partition.h, sort.h, splay-tree.h:
+        replace "GNU CC" with "GCC".
+
+2001-08-21  Richard Henderson  <rth@redhat.com>
+
+        * fibheap.h: Tidy formatting.
+        (fibnode_t): Limit degree to 31 bits to avoid warning.
+
+2001-08-20  Daniel Berlin  <dan@cgsoftware.com>
+
+        * fibheap.h: New file. Fibonacci heap.
+
+2001-08-20  Andrew Cagney  <ac131313@redhat.com>
+
+        * floatformat.h (floatformat_arm_ext): Document as deprecated.
+        (floatformat_arm_ext_big, floatformat_arm_ext_littlebyte_bigword)
+        (floatformat_ia64_spill_little, floatformat_ia64_quad_little)
+        (floatformat_ia64_spill_big, floatformat_ia64_quad_big)
+        (floatformat_m88110_harris_ext): Declare.
+
+2001-08-18  Zack Weinberg  <zackw@panix.com>
+
+        * ansidecl.h: Reorganize for readability, remove documentation
+        of obsolete macros, document PARAMS and VPARAMS.  Add new
+        macros VA_OPEN, VA_CLOSE, and VA_FIXEDARG for nicer variadic
+        function implementation.
+
+2001-08-16  Richard Henderson  <rth@redhat.com>
+
+        * hashtab.h (htab_hash_string): Declare.
+
+2001-08-10  Andrew Cagney  <ac131313@redhat.com>
+
+        * libiberty.h (lbasename): Change function declaration to return a
+        const char pointer.
+
+2001-08-02  Mark Kettenis  <kettenis@gnu.org>
+
+        * xregex.h (_REGEX_RE_COMP): Define.
+        (re_comp): Define to xre_comp.
+        (re_exec): Define to xre_exec.
+
+2001-08-02  Charles Wilson  <cwilson@ece.gatech.edu>
+
+        * bfdlink.h (struct bfd_link_info): add new boolean
+        field pei386_auto_import.
+
+2001-07-18  Andreas Jaeger  <aj@suse.de>
+
+        * xregex2.h: Place under LGPL version 2.1.
+
+2001-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * xregex.h: New file to support libiberty regex.
+        * xregex2.h: Ditto.
+
+2001-06-15  Hans-Peter Nilsson  <hp@axis.com>
+
+        * bfdlink.h (struct bfd_link_info): New member export_dynamic.
+
+2001-05-16  Matt Kraai  <kraai@alumni.carnegiemellon.edu>
+
+        * partition.h: Fix misspelling of `implementation'.
+
+2001-05-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * ansidecl.h (NULL_PTR): Delete.
+
+2001-05-07  Zack Weinberg  <zackw@stanford.edu>
+
+        * demangle.h: Use PARAMS for all prototypes.
+        * ternary.h: Use PARAMS for all prototypes.  Use PTR, not void *.
+        Make arguments constant where possible.
+
+2001-05-07  Mark Mitchell  <mark@codesourcery.com>
+
+        * splay-tree.h (splay_tree_max): New function.
+        (splay_tree_min): Likewise.
+
+2001-04-27  Johan Rydberg  <jrydberg@opencores.org>
+
+        * dis-asm.h (print_insn_openrisc): Add prototype.
+
+2001-04-15  Daniel Berlin  <dan@cgsoftware.com>
+
+        * ternary.h: New file - Ternary search tree header.
+
+2001-04-13  Jakub Jelinek  <jakub@redhat.com>
+
+        * bfdlink.h (bfd_link_discard): Add discard_sec_merge.
+
+2001-04-03  Zack Weinberg  <zackw@stanford.edu>
+
+        * ansidecl.h: All logic from gcc/gansidecl.h moved here.
+
+2001-03-31  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * libiberty.h (alloca): Handle setting C_ALLOCA.
+
+2001-03-20  Jim Blandy  <jimb@redhat.com>
+
+        * demangle.h (enum gnu_v3_constructor_kinds,
+        is_gnu_v3_mangled_ctor, enum gnu_v3_destructor_kinds,
+        is_gnu_v3_mangled_dtor): New declarations.
+
+2001-03-14  Nick Clifton  <nickc@redhat.com>
+
+        * ansidecl.h: Fix copyright dates.
+        * demangle.h: Fix copyright dates.
+        * floatformat.h: Fix copyright dates.
+        * fnmatch.h: Fix copyright dates.
+        * getopt.h: Fix copyright dates.
+        * libiberty.h: Add FSF copyright notice.
+        * md5.h: Fix copyright dates.
+        * obstack.h: Fix copyright dates.
+        * splay-tree.h: Fix copyright dates.
+
+2001-03-10  Neil Booth  <neil@daikokuya.demon.co.uk>
+            John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+        * libiberty.h: Add lbasename.
+
+2001-03-06  Zack Weinberg  <zackw@stanford.edu>
+
+        * libiberty.h: Prototype C_alloca; define alloca to either
+        __builtin_alloca or C_alloca as appropriate.
+
+2001-03-01  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+        * safe-ctype.h (_sch_test): Cast enum bit to unsigned short int for pcc
+        compatibility.
+
+2001-02-18  lars brinkhoff  <lars@nocrew.org>
+
+        * dis-asm.h: Add PDP-11 target.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+        * dis-asm.h: Add linux target for S/390.
 
 2001-01-11  Peter Targett  <peter.targett@arccores.com>
@@ -49 +651 @@
         * getopt.h obstack.h: Standarize copyright statement.
 
-2000-12-05  Richard Henderson  <rth@redhat.com>
+2000-12-04  Richard Henderson  <rth@redhat.com>
 
         * demangle.h: Change "new_abi" to "v3" everywhere.
 
-2000-11-29  Zack Weinberg  <zack@wolery.stanford.edu>
+2000-11-22  Zack Weinberg  <zack@wolery.stanford.edu>
 
         * libiberty.h: Move #includes to top.  Prototype xmalloc_failed.
@@ -1803 +2405 @@
 Thu Oct 24 22:11:11 1991  John Gilmore  (gnu at cygnus.com)
 
-        RS/6000 support, by Metin G. Ozisik, Mimi Phûông-Thåo Võ, and
+        RS/6000 support, by Metin G. Ozisik, Mimi Phûông-Thåo Võ, and
         John Gilmore.
 

branches/GNU/src/binutils/include/ansidecl.h

@@ -1 +1 @@
 /* ANSI and traditional C compatability macros
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
@@ -22 +22 @@
    ANSI C is assumed if __STDC__ is #defined.
 
-   Macro        ANSI C definition       Traditional C definition
-   -----        ---- - ----------       ----------- - ----------
-   PTR          `void *'                `char *'
-   LONG_DOUBLE  `long double'           `double'
-   VOLATILE     `volatile'              `'
-   SIGNED       `signed'                `'
-   PTRCONST     `void *const'           `char *'
-   ANSI_PROTOTYPES  1                   not defined
-
-   CONST is also defined, but is obsolete.  Just use const.
-
-   obsolete --     DEFUN (name, arglist, args)
-
-        Defines function NAME.
-
-        ARGLIST lists the arguments, separated by commas and enclosed in
-        parentheses.  ARGLIST becomes the argument list in traditional C.
-
-        ARGS list the arguments with their types.  It becomes a prototype in
-        ANSI C, and the type declarations in traditional C.  Arguments should
-        be separated with `AND'.  For functions with a variable number of
-        arguments, the last thing listed should be `DOTS'.
-
-   obsolete --     DEFUN_VOID (name)
-
-        Defines a function NAME, which takes no arguments.
-
-   obsolete --     EXFUN (name, (prototype))    -- obsolete.
-
-        Replaced by PARAMS.  Do not use; will disappear someday soon.
-        Was used in external function declarations.
-        In ANSI C it is `NAME PROTOTYPE' (so PROTOTYPE should be enclosed in
-        parentheses).  In traditional C it is `NAME()'.
-        For a function that takes no arguments, PROTOTYPE should be `(void)'.
-
-   obsolete --     PROTO (type, name, (prototype)    -- obsolete.
-
-        This one has also been replaced by PARAMS.  Do not use.
-
-   PARAMS ((args))
-
-        We could use the EXFUN macro to handle prototype declarations, but
-        the name is misleading and the result is ugly.  So we just define a
-        simple macro to handle the parameter lists, as in:
-
-              static int foo PARAMS ((int, char));
-
-        This produces:  `static int foo();' or `static int foo (int, char);'
-
-        EXFUN would have done it like this:
-
-              static int EXFUN (foo, (int, char));
-
-        but the function is not external...and it's hard to visually parse
-        the function name out of the mess.   EXFUN should be considered
-        obsolete; new code should be written to use PARAMS.
-
-   DOTS is also obsolete.
-
-   Examples:
-
-        extern int printf PARAMS ((const char *format, ...));
-*/
+   Macro                ANSI C definition       Traditional C definition
+   -----                ---- - ----------       ----------- - ----------
+   ANSI_PROTOTYPES      1                       not defined
+   PTR                  `void *'                `char *'
+   PTRCONST             `void *const'           `char *'
+   LONG_DOUBLE          `long double'           `double'
+   const                not defined             `'
+   volatile             not defined             `'
+   signed               not defined             `'
+   VA_START(ap, var)    va_start(ap, var)       va_start(ap)
+
+   Note that it is safe to write "void foo();" indicating a function
+   with no return value, in all K+R compilers we have been able to test.
+
+   For declaring functions with prototypes, we also provide these:
+
+   PARAMS ((prototype))
+   -- for functions which take a fixed number of arguments.  Use this
+   when declaring the function.  When defining the function, write a
+   K+R style argument list.  For example:
+
+        char *strcpy PARAMS ((char *dest, char *source));
+        ...
+        char *
+        strcpy (dest, source)
+             char *dest;
+             char *source;
+        { ... }
+
+
+   VPARAMS ((prototype, ...))
+   -- for functions which take a variable number of arguments.  Use
+   PARAMS to declare the function, VPARAMS to define it.  For example:
+
+        int printf PARAMS ((const char *format, ...));
+        ...
+        int
+        printf VPARAMS ((const char *format, ...))
+        {
+           ...
+        }
+
+   For writing functions which take variable numbers of arguments, we
+   also provide the VA_OPEN, VA_CLOSE, and VA_FIXEDARG macros.  These
+   hide the differences between K+R <varargs.h> and C89 <stdarg.h> more
+   thoroughly than the simple VA_START() macro mentioned above.
+
+   VA_OPEN and VA_CLOSE are used *instead of* va_start and va_end.
+   Immediately after VA_OPEN, put a sequence of VA_FIXEDARG calls
+   corresponding to the list of fixed arguments.  Then use va_arg
+   normally to get the variable arguments, or pass your va_list object
+   around.  You do not declare the va_list yourself; VA_OPEN does it
+   for you.
+
+   Here is a complete example:
+
+        int
+        printf VPARAMS ((const char *format, ...))
+        {
+           int result;
+
+           VA_OPEN (ap, format);
+           VA_FIXEDARG (ap, const char *, format);
+
+           result = vfprintf (stdout, format, ap);
+           VA_CLOSE (ap);
+
+           return result;
+        }
+
+
+   You can declare variables either before or after the VA_OPEN,
+   VA_FIXEDARG sequence.  Also, VA_OPEN and VA_CLOSE are the beginning
+   and end of a block.  They must appear at the same nesting level,
+   and any variables declared after VA_OPEN go out of scope at
+   VA_CLOSE.  Unfortunately, with a K+R compiler, that includes the
+   argument list.  You can have multiple instances of VA_OPEN/VA_CLOSE
+   pairs in a single function in case you need to traverse the
+   argument list more than once.
+
+   For ease of writing code which uses GCC extensions but needs to be
+   portable to other compilers, we provide the GCC_VERSION macro that
+   simplifies testing __GNUC__ and __GNUC_MINOR__ together, and various
+   wrappers around __attribute__.  Also, __extension__ will be #defined
+   to nothing if it doesn't work.  See below.
+
+   This header also defines a lot of obsolete macros:
+   CONST, VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID,
+   AND, DOTS, NOARGS.  Don't use them.  */
 
 #ifndef _ANSIDECL_H
-
-#define _ANSIDECL_H     1
-
+#define _ANSIDECL_H     1
 
 /* Every source file includes this file,
    so they will all get the switch for lint.  */
 /* LINTLIBRARY */
-
-
-#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32)
-/* All known AIX compilers implement these things (but don't always
-   define __STDC__).  The RISC/OS MIPS compiler defines these things
-   in SVR4 mode, but does not define __STDC__.  */
-
-#define PTR             void *
-#define PTRCONST        void *CONST
-#define LONG_DOUBLE     long double
-
-#ifndef IN_GCC
-#define AND             ,
-#define NOARGS          void
-#define VOLATILE        volatile
-#define SIGNED          signed
-#endif /* ! IN_GCC */
-
-#define PARAMS(paramlist)               paramlist
-#define ANSI_PROTOTYPES                 1
-
-#define VPARAMS(ARGS)                   ARGS
-#define VA_START(va_list,var)           va_start(va_list,var)
-
-/* These are obsolete.  Do not use.  */
-#ifndef IN_GCC
-#define CONST                           const
-#define DOTS                            , ...
-#define PROTO(type, name, arglist)      type name arglist
-#define EXFUN(name, proto)              name proto
-#define DEFUN(name, arglist, args)      name(args)
-#define DEFUN_VOID(name)                name(void)
-#endif /* ! IN_GCC */
-
-#else   /* Not ANSI C.  */
-
-#define PTR             char *
-#define PTRCONST        PTR
-#define LONG_DOUBLE     double
-
-#ifndef IN_GCC
-#define AND             ;
-#define NOARGS
-#define VOLATILE
-#define SIGNED
-#endif /* !IN_GCC */
-
-#ifndef const /* some systems define it in header files for non-ansi mode */
-#define const
-#endif
-
-#define PARAMS(paramlist)               ()
-
-#define VPARAMS(ARGS)                   (va_alist) va_dcl
-#define VA_START(va_list,var)           va_start(va_list)
-
-/* These are obsolete.  Do not use.  */
-#ifndef IN_GCC
-#define CONST
-#define DOTS
-#define PROTO(type, name, arglist)      type name ()
-#define EXFUN(name, proto)              name()
-#define DEFUN(name, arglist, args)      name arglist args;
-#define DEFUN_VOID(name)                name()
-#endif /* ! IN_GCC */
-
-#endif  /* ANSI C.  */
-
 
 /* Using MACRO(x,y) in cpp #if conditionals does not work with some
@@ -181 +137 @@
 #endif /* GCC_VERSION */
 
+#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32) || (defined(__alpha) && defined(__cplusplus))
+/* All known AIX compilers implement these things (but don't always
+   define __STDC__).  The RISC/OS MIPS compiler defines these things
+   in SVR4 mode, but does not define __STDC__.  */
+/* eraxxon@alumni.rice.edu: The Compaq C++ compiler, unlike many other
+   C++ compilers, does not define __STDC__, though it acts as if this
+   was so. (Verified versions: 5.7, 6.2, 6.3, 6.5) */
+
+#define ANSI_PROTOTYPES 1
+#define PTR             void *
+#define PTRCONST        void *const
+#define LONG_DOUBLE     long double
+
+#define PARAMS(ARGS)            ARGS
+#define VPARAMS(ARGS)           ARGS
+#define VA_START(VA_LIST, VAR)  va_start(VA_LIST, VAR)
+
+/* variadic function helper macros */
+/* "struct Qdmy" swallows the semicolon after VA_OPEN/VA_FIXEDARG's
+   use without inhibiting further decls and without declaring an
+   actual variable.  */
+#define VA_OPEN(AP, VAR)        { va_list AP; va_start(AP, VAR); { struct Qdmy
+#define VA_CLOSE(AP)            } va_end(AP); }
+#define VA_FIXEDARG(AP, T, N)   struct Qdmy
+ 
+#undef const
+#undef volatile
+#undef signed
+
+/* inline requires special treatment; it's in C99, and GCC >=2.7 supports
+   it too, but it's not in C89.  */
+#undef inline
+#if __STDC_VERSION__ > 199901L
+/* it's a keyword */
+#else
+# if GCC_VERSION >= 2007
+#  define inline __inline__   /* __inline__ prevents -pedantic warnings */
+# else
+#  define inline  /* nothing */
+# endif
+#endif
+
+/* These are obsolete.  Do not use.  */
+#ifndef IN_GCC
+#define CONST           const
+#define VOLATILE        volatile
+#define SIGNED          signed
+
+#define PROTO(type, name, arglist)      type name arglist
+#define EXFUN(name, proto)              name proto
+#define DEFUN(name, arglist, args)      name(args)
+#define DEFUN_VOID(name)                name(void)
+#define AND             ,
+#define DOTS            , ...
+#define NOARGS          void
+#endif /* ! IN_GCC */
+
+#else   /* Not ANSI C.  */
+
+#undef  ANSI_PROTOTYPES
+#define PTR             char *
+#define PTRCONST        PTR
+#define LONG_DOUBLE     double
+
+#define PARAMS(args)            ()
+#define VPARAMS(args)           (va_alist) va_dcl
+#define VA_START(va_list, var)  va_start(va_list)
+
+#define VA_OPEN(AP, VAR)                { va_list AP; va_start(AP); { struct Qdmy
+#define VA_CLOSE(AP)                    } va_end(AP); }
+#define VA_FIXEDARG(AP, TYPE, NAME)     TYPE NAME = va_arg(AP, TYPE)
+
+/* some systems define these in header files for non-ansi mode */
+#undef const
+#undef volatile
+#undef signed
+#undef inline
+#define const
+#define volatile
+#define signed
+#define inline
+
+#ifndef IN_GCC
+#define CONST
+#define VOLATILE
+#define SIGNED
+
+#define PROTO(type, name, arglist)      type name ()
+#define EXFUN(name, proto)              name()
+#define DEFUN(name, arglist, args)      name arglist args;
+#define DEFUN_VOID(name)                name()
+#define AND             ;
+#define DOTS
+#define NOARGS
+#endif /* ! IN_GCC */
+
+#endif  /* ANSI C.  */
+
 /* Define macros for some gcc attributes.  This permits us to use the
    macros freely, and know that they will come into play for the
@@ -215 +269 @@
 #endif /* ATTRIBUTE_NORETURN */
 
+/* Attribute `nonnull' was valid as of gcc 3.3.  */
+#ifndef ATTRIBUTE_NONNULL
+# if (GCC_VERSION >= 3003)
+#  define ATTRIBUTE_NONNULL(m) __attribute__ ((__nonnull__ (m)))
+# else
+#  define ATTRIBUTE_NONNULL(m)
+# endif /* GNUC >= 3.3 */
+#endif /* ATTRIBUTE_NONNULL */
+
+/* Use ATTRIBUTE_PRINTF when the format specifier must not be NULL.
+   This was the case for the `printf' format attribute by itself
+   before GCC 3.3, but as of 3.3 we need to add the `nonnull'
+   attribute to retain this behavior.  */
 #ifndef ATTRIBUTE_PRINTF
-#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n))) ATTRIBUTE_NONNULL(m)
 #define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
 #define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
@@ -224 +291 @@
 #endif /* ATTRIBUTE_PRINTF */
 
+/* Use ATTRIBUTE_NULL_PRINTF when the format specifier may be NULL.  A
+   NULL format specifier was allowed as of gcc 3.3.  */
+#ifndef ATTRIBUTE_NULL_PRINTF
+# if (GCC_VERSION >= 3003)
+#  define ATTRIBUTE_NULL_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+# else
+#  define ATTRIBUTE_NULL_PRINTF(m, n)
+# endif /* GNUC >= 3.3 */
+# define ATTRIBUTE_NULL_PRINTF_1 ATTRIBUTE_NULL_PRINTF(1, 2)
+# define ATTRIBUTE_NULL_PRINTF_2 ATTRIBUTE_NULL_PRINTF(2, 3)
+# define ATTRIBUTE_NULL_PRINTF_3 ATTRIBUTE_NULL_PRINTF(3, 4)
+# define ATTRIBUTE_NULL_PRINTF_4 ATTRIBUTE_NULL_PRINTF(4, 5)
+# define ATTRIBUTE_NULL_PRINTF_5 ATTRIBUTE_NULL_PRINTF(5, 6)
+#endif /* ATTRIBUTE_NULL_PRINTF */
+
 /* We use __extension__ in some places to suppress -pedantic warnings
    about GCC extensions.  This feature didn't work properly before
@@ -231 +313 @@
 #endif
 
+/* Bootstrap support:  Adjust certain macros defined by Autoconf,
+   which are only valid for the stage1 compiler.  If we detect
+   a modern version of GCC, we are probably in stage2 or beyond,
+   so unconditionally reset the values.  Note that const, inline,
+   etc. have been dealt with above.  */
+#if (GCC_VERSION >= 2007)
+# ifndef HAVE_LONG_DOUBLE
+#  define HAVE_LONG_DOUBLE 1
+# endif
+#endif /* GCC >= 2.7 */
+
 #endif  /* ansidecl.h   */

branches/GNU/src/binutils/include/aout/ChangeLog

@@ -1 @@
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
-
-        * Many files: Update copyright notices.
-
-Mon Apr  3 13:29:08 2000  Hans-Peter Nilsson  <hp@axis.com>
+2003-03-06  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+        * aout64.h (BYTES_IN_WORD): Define if necessary.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+        * aout64.h: Formatting fixes.
+        (N_TXTADDR): Evaluate to a bfd_vma.
+        (N_DATADDR): Avoid negative unsigned warning.
+        * hp300hpux.h: Formatting fixes.
+        (N_DATADDR): Avoid negative unsigned warning.
+
+2000-04-03  Hans-Peter Nilsson  <hp@axis.com>
 
         * aout64.h (RELOC_EXT_BITS_EXTERN_BIG): Wrap definition in #ifndef.
@@ -17 +25 @@
         defined as 0.
 
-Sun Jun 28 11:33:48 1998  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
+1998-06-28  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
 
         * stab.def:  Add N_ALIAS from SunPro F77.
 
-Mon Mar 11 12:15:52 1996  Ian Lance Taylor  <ian@cygnus.com>
+1996-03-11  Ian Lance Taylor  <ian@cygnus.com>
 
         * stab.def: Use __define_stab_duplicate rather than __define_stab
@@ -28 +36 @@
         stab.def.
 
-Fri Oct 27 17:47:16 1995  Niklas Hallqvist  <niklas@appli.se>
+1995-10-27  Niklas Hallqvist  <niklas@appli.se>
 
         * aout64.h, host.h, hp300hpux.h, sun4.h: Changed PAGE_SIZE to
         TARGET_PAGE_SIZE.
 
-Tue Sep 12 12:07:02 1995  Ian Lance Taylor  <ian@cygnus.com>
+1995-09-12  Ian Lance Taylor  <ian@cygnus.com>
 
         * sun4.h (struct internal_sun4_dynamic_link): Change all fields
         from long to unsigned long.
 
-Wed Jul 12 00:15:13 1995  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
+1995-07-12  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
 
         * sun4.h (PAGE_SIZE): Undefine before defining.
 
-Thu Jun 16 14:22:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1994-09-04  Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+        * aout64.h: Only define QMAGIC if it isn't already defined.
+
+1994-06-16  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
         * aout64.h (BMAGIC): Define.
 
-Sat Jun 11 16:16:09 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1994-06-11  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
         Add weak symbols as an extension to a.out.
@@ -52 +64 @@
         * stab.def: Update symbol value table.
 
-Thu Jun  2 17:13:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1994-06-02  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
         * sun4.h (EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE): Correct from 28 to
         24.  Fix up ld_got comment.
 
-Wed Mar 30 00:31:49 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+1994-03-30  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
         * dynix3.h:  Cleanup, adapt to current bfd version.
 
-Sat Feb 26 10:25:53 1994  Ian Lance Taylor  (ian@cygnus.com)
+1994-02-26  Ian Lance Taylor  (ian@cygnus.com)
 
         * aout64.h: Add casts to avoid warnings from SVR4 cc.
 
-Fri Feb 11 12:56:04 1994  Stan Shebs  (shebs@andros.cygnus.com)
+1994-02-11  Stan Shebs  (shebs@andros.cygnus.com)
 
         * ar.h (ARMAG, ARMAGB, ARFMAG): Change '\n' to '\012', for greater
         portability.
 
-Fri Jan 21 00:59:06 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1994-01-21  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
         * sun4.h: Added information about SunOS shared libraries.
 
-Fri Jan  7 08:20:13 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+1994-01-07  Jim Kingdon  (kingdon@deneb.cygnus.com)
 
         * aout64.h (N_TXTADDR): Add comment regarding OMAGIC and NMAGIC.
 
-Sat Dec 25 14:55:41 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+1993-12-25  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
         * aout64.h (N_DATOFF): Don't pad (revert change of 8 Jul 1993).
 
-Tue Nov 16 15:43:46 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+1993-11-16  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
         * aout64.h: New macros ZMAGIC_DISK_BLOCK_SIZE and N_DISK_BLOCK_SIZE
@@ -88 +100 @@
         (N_TXTOFF, N_DATOFF): Use them.
 
-Thu Nov  4 00:33:48 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+1993-11-04  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
 
         * aout64.h (RELOC_STD_BITS_RELATIVE_LITTLE): Fixed value to match
@@ -94 +106 @@
         (RELOC_STD_BITS_JMPTABLE_LITTLE): Likewise.
 
-Wed Nov  3 13:48:27 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+1993-11-03  David J. Mackenzie  (djm@thepub.cygnus.com)
 
         * aout64.h (RELOC_STD_BITS_BASEREL_LITTLE): Make it 0x10 (Ken's
         suggestion) to avoid conflict with RELOC_STD_BITS_EXTERN_LITTLE.
 
-Fri Oct 29 15:09:52 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+1993-10-29  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
         * hp300hpux.h (N_SHARED_LIB): Define to be 0.
 
-Mon Sep 13 21:00:56 1993  John Gilmore  (gnu@cygnus.com)
+1993-09-13  John Gilmore  (gnu@cygnus.com)
 
         * ar.h (ARMAP_TIME_OFFSET):  Add and describe.
@@ -111 +123 @@
         * aout64.h [ARCH_SIZE != 64]: Allow N_BADMAG to be overridden.
 
-Mon Aug 16 14:30:14 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+1993-08-16  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
         * stab_gnu.h: Include aout/stab.def not just stab.def.
 
-Sun Jul 18 21:41:47 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
+1993-07-18  Jim Kingdon  (kingdon@rtl.cygnus.com)
 
         * dynix3.h: New, for symmetry running dynix.
 
-Thu Jul  8 12:52:22 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+1993-07-08  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
         * aout64.h (N_BADMAG): Recognize QMAGIC.
@@ -125 +137 @@
         N_DATOFF: Pad text size if we need to.
 
-Fri Jun 18 19:19:38 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+1993-06-18  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
         * stab.def (N_ECOML): Fix comment.
 
-Mon May 31 09:21:30 1993  Jim Kingdon  (kingdon@cygnus.com)
+1993-05-31  Jim Kingdon  (kingdon@cygnus.com)
 
         * stab.def: Remove Solaris information on N_FUN stabstring grammar;
         I've transferred it to gdb/doc/stabs.texinfo, where it belongs.
 
-Mon May 10 05:48:43 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+1993-05-10  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
 
         * hp300hpux.h: Patch from Glenn Engel for linker problem and
@@ -144 +156 @@
         (N_HEADER_IN_TEXT, N_DATADDR): New macros.
 
-Thu Apr 29 12:07:37 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+1993-04-29  Ken Raeburn  (raeburn@deneb.cygnus.com)
 
         * hp300hpux.h: New file from Glenn Engel, glenne@lsid.hp.com.
 
-Tue Apr 27 05:51:04 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+1993-04-27  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
 
         * aout64.h (struct external_exec, *MAGIC, N_BADMAG): Don't define
@@ -157 +169 @@
         `external_nlist' is already defined as a macro.
 
-Sat Aug 15 04:23:02 1992  John Gilmore  (gnu@cygnus.com)
+1992-08-15  John Gilmore  (gnu@cygnus.com)
 
         * adobe.h:  Add description of a.out.adobe format.
 
-Fri Jul  3 00:36:52 1992  John Gilmore  (gnu at cygnus.com)
+1992-07-03  John Gilmore  (gnu at cygnus.com)
 
         * stab.def:  Update more Solaris definitions.
         * stab_gnu.h:  Add N_SO language types, and Solaris basic float types.
 
-Sun Jun 14 10:53:53 1992  John Gilmore  (gnu at cygnus.com)
+1992-06-14  John Gilmore  (gnu at cygnus.com)
 
         * stab.def:  Update descriptions of Solaris-2 stabs; add N_UNDF.
 
-Thu Jun 11 01:12:07 1992  John Gilmore  (gnu at cygnus.com)
+1992-06-11  John Gilmore  (gnu at cygnus.com)
 
         * stab.def:  Add N_OBJ and N_OPT from Solaris-2.
 
-Thu Jan 30 18:12:44 1992  John Gilmore  (gnu at cygnus.com)
-
-        * aout/aout64.h: N_TXTSIZE needs some more parentheses.
+1992-01-30  John Gilmore  (gnu at cygnus.com)
+
+        * aout64.h: N_TXTSIZE needs some more parentheses.
         I don't trust C precedence.
 
-Wed Dec 18 14:32:01 1991  Per Bothner  (bothner at cygnus.com)
-
-        * aout/aout64.h:  Move common sunos-specific test
+1991-12-18  Per Bothner  (bothner at cygnus.com)
+
+        * aout64.h:  Move common sunos-specific test
         to recognize shared libraries into new macro N_SHARED_LIB.
-        Use it to simplify&reformat N_TXTADDR, N_TXTOFF, N_TXTSIZE.
-
-Sat Nov 30 20:34:52 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-        * ChangeLog, aout64.h, ar.h, encap.h, host.h, hp.h, ranlib.h,
-        reloc.h, stab.def, stab_gnu.h, sun4.h: All moved from the
-        devo/include directory
+        Use it to simplify & reformat N_TXTADDR, N_TXTOFF, N_TXTSIZE.
+
+1991-11-30  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+        * aout64.h, ar.h, encap.h, host.h, hp.h, ranlib.h, reloc.h,
+        stab.def, stab_gnu.h, sun4.h: All moved from the devo/include
+        directory.
 
 

branches/GNU/src/binutils/include/aout/aout64.h

@@ -1 +1 @@
 /* `a.out' object-file definitions, including extensions to 64-bit fields
 
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -20 +20 @@
 #define __A_OUT_64_H__
 
-/* This is the layout on disk of the 32-bit or 64-bit exec header. */
+#ifndef BYTES_IN_WORD
+#define BYTES_IN_WORD 4
+#endif
+
+/* This is the layout on disk of the 32-bit or 64-bit exec header.  */
 
 #ifndef external_exec
 struct external_exec 
 {
-  bfd_byte e_info[4];           /* magic number and stuff               */
-  bfd_byte e_text[BYTES_IN_WORD]; /* length of text section in bytes    */
-  bfd_byte e_data[BYTES_IN_WORD]; /* length of data section in bytes    */
-  bfd_byte e_bss[BYTES_IN_WORD]; /* length of bss area in bytes                 */
-  bfd_byte e_syms[BYTES_IN_WORD]; /* length of symbol table in bytes    */
-  bfd_byte e_entry[BYTES_IN_WORD]; /* start address                     */
-  bfd_byte e_trsize[BYTES_IN_WORD]; /* length of text relocation info   */
-  bfd_byte e_drsize[BYTES_IN_WORD]; /* length of data relocation info   */
+  bfd_byte e_info[4];               /* Magic number and stuff.  */
+  bfd_byte e_text[BYTES_IN_WORD];   /* Length of text section in bytes.  */
+  bfd_byte e_data[BYTES_IN_WORD];   /* Length of data section in bytes.  */
+  bfd_byte e_bss[BYTES_IN_WORD];    /* Length of bss area in bytes.  */
+  bfd_byte e_syms[BYTES_IN_WORD];   /* Length of symbol table in bytes.  */
+  bfd_byte e_entry[BYTES_IN_WORD];  /* Start address.  */
+  bfd_byte e_trsize[BYTES_IN_WORD]; /* Length of text relocation info.  */
+  bfd_byte e_drsize[BYTES_IN_WORD]; /* Length of data relocation info.  */
 };
 
 #define EXEC_BYTES_SIZE (4 + BYTES_IN_WORD * 7)
 
-/* Magic numbers for a.out files */
+/* Magic numbers for a.out files.  */
 
 #if ARCH_SIZE==64
-#define OMAGIC 0x1001           /* Code indicating object file  */
+#define OMAGIC 0x1001           /* Code indicating object file.  */
 #define ZMAGIC 0x1002           /* Code indicating demand-paged executable.  */
 #define NMAGIC 0x1003           /* Code indicating pure executable.  */
@@ -50 +54 @@
                         && N_MAGIC(x) != ZMAGIC)
 #else
-#define OMAGIC 0407             /* ...object file or impure executable.  */
+#define OMAGIC 0407             /* Object file or impure executable.  */
 #define NMAGIC 0410             /* Code indicating pure executable.  */
 #define ZMAGIC 0413             /* Code indicating demand-paged executable.  */
@@ -127 +131 @@
     * QMAGIC is always like a ZMAGIC for which N_HEADER_IN_TEXT is true,
     and for which the starting address is TARGET_PAGE_SIZE (or should this be
-    SEGMENT_SIZE?) (TEXT_START_ADDR only applies to ZMAGIC, not to QMAGIC).
-    */
+    SEGMENT_SIZE?) (TEXT_START_ADDR only applies to ZMAGIC, not to QMAGIC).  */
 
 /* This macro is only relevant for ZMAGIC files; QMAGIC always has the header
    in the text.  */
 #ifndef N_HEADER_IN_TEXT
-#define N_HEADER_IN_TEXT(x) (((x).a_entry & (TARGET_PAGE_SIZE-1)) >= EXEC_BYTES_SIZE)
+#define N_HEADER_IN_TEXT(x) \
+  (((x).a_entry & (TARGET_PAGE_SIZE-1)) >= EXEC_BYTES_SIZE)
 #endif
 
@@ -153 +157 @@
 #ifndef N_TXTADDR
 #define N_TXTADDR(x) \
-    (/* The address of a QMAGIC file is always one page in, */ \
-     /* with the header in the text.  */ \
-     N_IS_QMAGIC (x) ? TARGET_PAGE_SIZE + EXEC_BYTES_SIZE : \
-     N_MAGIC(x) != ZMAGIC ? 0 : /* object file or NMAGIC */\
-     N_SHARED_LIB(x) ? 0 :      \
-     N_HEADER_IN_TEXT(x)  ?     \
-            TEXT_START_ADDR + EXEC_BYTES_SIZE : /* no padding */\
-            TEXT_START_ADDR                     /* a page of padding */\
-    )
+    (/* The address of a QMAGIC file is always one page in,             \
+        with the header in the text.  */                                \
+     N_IS_QMAGIC (x)                                                    \
+     ? (bfd_vma) TARGET_PAGE_SIZE + EXEC_BYTES_SIZE                     \
+     : (N_MAGIC (x) != ZMAGIC                                           \
+        ? (bfd_vma) 0   /* Object file or NMAGIC.  */                   \
+        : (N_SHARED_LIB (x)                                             \
+           ? (bfd_vma) 0                                                \
+           : (N_HEADER_IN_TEXT (x)                                      \
+              ? (bfd_vma) TEXT_START_ADDR + EXEC_BYTES_SIZE             \
+              : (bfd_vma) TEXT_START_ADDR))))
 #endif
 
@@ -179 +185 @@
 /* Offset in an a.out of the start of the text section. */
 #ifndef N_TXTOFF
-#define N_TXTOFF(x)     \
-    (/* For {O,N,Q}MAGIC, no padding.  */ \
-     N_MAGIC(x) != ZMAGIC ? EXEC_BYTES_SIZE : \
-     N_SHARED_LIB(x) ? 0 : \
-     N_HEADER_IN_TEXT(x) ?      \
-            EXEC_BYTES_SIZE :                   /* no padding */\
-            ZMAGIC_DISK_BLOCK_SIZE              /* a page of padding */\
-    )
+#define N_TXTOFF(x)                                                     \
+    (/* For {O,N,Q}MAGIC, no padding.  */                               \
+     N_MAGIC (x) != ZMAGIC                                              \
+     ? EXEC_BYTES_SIZE                                                  \
+     : (N_SHARED_LIB (x)                                                \
+        ? 0                                                             \
+        : (N_HEADER_IN_TEXT (x)                                         \
+           ? EXEC_BYTES_SIZE            /* No padding.  */              \
+           : ZMAGIC_DISK_BLOCK_SIZE     /* A page of padding.  */)))
 #endif
 /* Size of the text section.  It's always as stated, except that we
@@ -195 +202 @@
 #ifndef N_TXTSIZE
 #define N_TXTSIZE(x) \
-    (/* For QMAGIC, we don't consider the header part of the text section.  */\
-     N_IS_QMAGIC (x) ? (x).a_text - EXEC_BYTES_SIZE : \
-     (N_MAGIC(x) != ZMAGIC || N_SHARED_LIB(x)) ? (x).a_text : \
-     N_HEADER_IN_TEXT(x)  ?     \
-            (x).a_text - EXEC_BYTES_SIZE:       /* no padding */\
-            (x).a_text                          /* a page of padding */\
-    )
+  (/* For QMAGIC, we don't consider the header part of the text section.  */\
+   N_IS_QMAGIC (x)                                                      \
+   ? (x).a_text - EXEC_BYTES_SIZE                                       \
+   : ((N_MAGIC (x) != ZMAGIC || N_SHARED_LIB (x))                       \
+      ? (x).a_text                                                      \
+      : (N_HEADER_IN_TEXT (x)                                           \
+         ? (x).a_text - EXEC_BYTES_SIZE /* No padding.  */              \
+         : (x).a_text                   /* A page of padding.  */ )))
 #endif
 /* The address of the data segment in virtual memory.
    It is the text segment address, plus text segment size, rounded
-   up to a N_SEGSIZE boundary for pure or pageable files. */
+   up to a N_SEGSIZE boundary for pure or pageable files.  */
 #ifndef N_DATADDR
 #define N_DATADDR(x) \
-    (N_MAGIC(x)==OMAGIC? (N_TXTADDR(x)+N_TXTSIZE(x)) \
-     :  (N_SEGSIZE(x) + ((N_TXTADDR(x)+N_TXTSIZE(x)-1) & ~(N_SEGSIZE(x)-1))))
+  (N_MAGIC (x) == OMAGIC                                                \
+   ? (N_TXTADDR (x) + N_TXTSIZE (x))                                    \
+   : (N_SEGSIZE (x) + ((N_TXTADDR (x) + N_TXTSIZE (x) - 1)              \
+                       & ~ (bfd_vma) (N_SEGSIZE (x) - 1))))
 #endif
 /* The address of the BSS segment -- immediately after the data segment.  */
 
-#define N_BSSADDR(x)    (N_DATADDR(x) + (x).a_data)
+#define N_BSSADDR(x)    (N_DATADDR (x) + (x).a_data)
 
 /* Offsets of the various portions of the file after the text segment.  */
@@ -230 +240 @@
 
 #ifndef N_DATOFF
-#define N_DATOFF(x) \
- (N_TXTOFF(x) + N_TXTSIZE(x))
-#endif
-
+#define N_DATOFF(x)     (N_TXTOFF (x) + N_TXTSIZE (x))
+#endif
 #ifndef N_TRELOFF
-#define N_TRELOFF(x)    ( N_DATOFF(x) + (x).a_data )
+#define N_TRELOFF(x)    (N_DATOFF (x) + (x).a_data)
 #endif
 #ifndef N_DRELOFF
-#define N_DRELOFF(x)    ( N_TRELOFF(x) + (x).a_trsize )
+#define N_DRELOFF(x)    (N_TRELOFF (x) + (x).a_trsize)
 #endif
 #ifndef N_SYMOFF
-#define N_SYMOFF(x)     ( N_DRELOFF(x) + (x).a_drsize )
+#define N_SYMOFF(x)     (N_DRELOFF (x) + (x).a_drsize)
 #endif
 #ifndef N_STROFF
-#define N_STROFF(x)     ( N_SYMOFF(x) + (x).a_syms )
+#define N_STROFF(x)     (N_SYMOFF (x) + (x).a_syms)
 #endif
 
@@ -250 +258 @@
 /* Symbols */
 #ifndef external_nlist
-struct external_nlist {
-  bfd_byte e_strx[BYTES_IN_WORD];       /* index into string table of name */
-  bfd_byte e_type[1];                   /* type of symbol */
-  bfd_byte e_other[1];                  /* misc info (usually empty) */
-  bfd_byte e_desc[2];                   /* description field */
-  bfd_byte e_value[BYTES_IN_WORD];      /* value of symbol */
+struct external_nlist
+{
+  bfd_byte e_strx[BYTES_IN_WORD];       /* Index into string table of name.  */
+  bfd_byte e_type[1];                   /* Type of symbol.  */
+  bfd_byte e_other[1];                  /* Misc info (usually empty).  */
+  bfd_byte e_desc[2];                   /* Description field.  */
+  bfd_byte e_value[BYTES_IN_WORD];      /* Value of symbol.  */
 };
 #define EXTERNAL_NLIST_SIZE (BYTES_IN_WORD+4+BYTES_IN_WORD)
 #endif
 
-struct internal_nlist {
-  unsigned long n_strx;                 /* index into string table of name */
-  unsigned char n_type;                 /* type of symbol */
-  unsigned char n_other;                /* misc info (usually empty) */
-  unsigned short n_desc;                /* description field */
-  bfd_vma n_value;                      /* value of symbol */
+struct internal_nlist
+{
+  unsigned long n_strx;                 /* Index into string table of name.  */
+  unsigned char n_type;                 /* Type of symbol.  */
+  unsigned char n_other;                /* Misc info (usually empty).  */
+  unsigned short n_desc;                /* Description field.  */
+  bfd_vma n_value;                      /* Value of symbol.  */
 };
 
 /* The n_type field is the symbol type, containing:  */
 
-#define N_UNDF  0       /* Undefined symbol */
-#define N_ABS   2       /* Absolute symbol -- defined at particular addr */
-#define N_TEXT  4       /* Text sym -- defined at offset in text seg */
-#define N_DATA  6       /* Data sym -- defined at offset in data seg */
-#define N_BSS   8       /* BSS  sym -- defined at offset in zero'd seg */
-#define N_COMM  0x12    /* Common symbol (visible after shared lib dynlink) */
-#define N_FN    0x1f    /* File name of .o file */
-#define N_FN_SEQ 0x0C   /* N_FN from Sequent compilers (sigh) */
+#define N_UNDF  0       /* Undefined symbol.  */
+#define N_ABS   2       /* Absolute symbol -- defined at particular addr.  */
+#define N_TEXT  4       /* Text sym -- defined at offset in text seg.  */
+#define N_DATA  6       /* Data sym -- defined at offset in data seg.  */
+#define N_BSS   8       /* BSS  sym -- defined at offset in zero'd seg.  */
+#define N_COMM  0x12    /* Common symbol (visible after shared lib dynlink).  */
+#define N_FN    0x1f    /* File name of .o file.  */
+#define N_FN_SEQ 0x0C   /* N_FN from Sequent compilers (sigh).  */
 /* Note: N_EXT can only be usefully OR-ed with N_UNDF, N_ABS, N_TEXT,
    N_DATA, or N_BSS.  When the low-order bit of other types is set,
    (e.g. N_WARNING versus N_FN), they are two different types.  */
-#define N_EXT   1       /* External symbol (as opposed to local-to-this-file) */
+#define N_EXT   1       /* External symbol (as opposed to local-to-this-file).  */
 #define N_TYPE  0x1e
-#define N_STAB  0xe0    /* If any of these bits are on, it's a debug symbol */
+#define N_STAB  0xe0    /* If any of these bits are on, it's a debug symbol.  */
 
 #define N_INDR 0x0a
@@ -299 +309 @@
 
 /* These appear as input to LD, in a .o file.  */
-#define N_SETA  0x14            /* Absolute set element symbol */
-#define N_SETT  0x16            /* Text set element symbol */
-#define N_SETD  0x18            /* Data set element symbol */
-#define N_SETB  0x1A            /* Bss set element symbol */
+#define N_SETA  0x14            /* Absolute set element symbol.  */
+#define N_SETT  0x16            /* Text set element symbol.  */
+#define N_SETD  0x18            /* Data set element symbol.  */
+#define N_SETB  0x1A            /* Bss set element symbol.  */
 
 /* This is output from LD.  */
@@ -333 +343 @@
   the target with a displacement of 16 or 32 bits. On the sparc, move
   instructions use an offset of 14 bits, so the offset is stored in
-  the reloc field, and the data in the section is ignored.
-*/
+  the reloc field, and the data in the section is ignored.  */
 
 /* This structure describes a single relocation to be performed.
@@ -341 +350 @@
    Likewise, the data-relocation section applies to the data section.  */
 
-struct reloc_std_external {
-  bfd_byte      r_address[BYTES_IN_WORD];       /* offset of of data to relocate        */
-  bfd_byte r_index[3];  /* symbol table index of symbol         */
-  bfd_byte r_type[1];   /* relocation type                      */
+struct reloc_std_external
+{
+  bfd_byte r_address[BYTES_IN_WORD];    /* Offset of of data to relocate.  */
+  bfd_byte r_index[3];                  /* Symbol table index of symbol.  */
+  bfd_byte r_type[1];                   /* Relocation type.  */
 };
 
@@ -367 +377 @@
 #define RELOC_STD_BITS_RELATIVE_LITTLE  ((unsigned int) 0x40)
 
-#define RELOC_STD_SIZE  (BYTES_IN_WORD + 3 + 1)         /* Bytes per relocation entry */
+#define RELOC_STD_SIZE  (BYTES_IN_WORD + 3 + 1)         /* Bytes per relocation entry.  */
 
 struct reloc_std_internal
@@ -390 +400 @@
   /* The next three bits are for SunOS shared libraries, and seem to
      be undocumented.  */
-  unsigned int r_baserel:1;     /* Linkage table relative */
-  unsigned int r_jmptable:1;    /* pc-relative to jump table */
-  unsigned int r_relative:1;    /* "relative relocation" */
+  unsigned int r_baserel:1;     /* Linkage table relative.  */
+  unsigned int r_jmptable:1;    /* pc-relative to jump table.  */
+  unsigned int r_relative:1;    /* "relative relocation".  */
   /* unused */
-  unsigned int r_pad:1;         /* Padding -- set to zero */
-};
-
-
-/* EXTENDED RELOCS  */
-
-struct reloc_ext_external {
-  bfd_byte r_address[BYTES_IN_WORD];    /* offset of of data to relocate        */
-  bfd_byte r_index[3];  /* symbol table index of symbol         */
-  bfd_byte r_type[1];   /* relocation type                      */
-  bfd_byte r_addend[BYTES_IN_WORD];     /* datum addend                         */
+  unsigned int r_pad:1;         /* Padding -- set to zero.  */
+};
+
+
+/* EXTENDED RELOCS.   */
+
+struct reloc_ext_external
+{
+  bfd_byte r_address[BYTES_IN_WORD];    /* Offset of of data to relocate.  */
+  bfd_byte r_index[3];                  /* Symbol table index of symbol.  */
+  bfd_byte r_type[1];                   /* Relocation type.  */
+  bfd_byte r_addend[BYTES_IN_WORD];     /* Datum addend.  */
 };
 
@@ -431 +442 @@
 #endif
 
-/* Bytes per relocation entry */
+/* Bytes per relocation entry.  */
 #define RELOC_EXT_SIZE  (BYTES_IN_WORD + 3 + 1 + BYTES_IN_WORD)
 
 enum reloc_type
 {
-  /* simple relocations */
+  /* Simple relocations.  */
   RELOC_8,                      /* data[0:7] = addend + sv              */
   RELOC_16,                     /* data[0:15] = addend + sv             */
   RELOC_32,                     /* data[0:31] = addend + sv             */
-  /* pc-rel displacement */
+  /* PC-rel displacement.  */
   RELOC_DISP8,                  /* data[0:7] = addend - pc + sv         */
   RELOC_DISP16,                 /* data[0:15] = addend - pc + sv        */
   RELOC_DISP32,                 /* data[0:31] = addend - pc + sv        */
-  /* Special */
+  /* Special.  */
   RELOC_WDISP30,                /* data[0:29] = (addend + sv - pc)>>2   */
   RELOC_WDISP22,                /* data[0:21] = (addend + sv - pc)>>2   */
@@ -453 +464 @@
   RELOC_SFA_BASE,               
   RELOC_SFA_OFF13,
-  /* P.I.C. (base-relative) */
+  /* P.I.C. (base-relative).  */
   RELOC_BASE10,                 /* Not sure - maybe we can do this the */
   RELOC_BASE13,                 /* right way now */
   RELOC_BASE22,
-  /* for some sort of pc-rel P.I.C. (?) */
+  /* For some sort of pc-rel P.I.C. (?)  */
   RELOC_PC10,
   RELOC_PC22,
-  /* P.I.C. jump table */
+  /* P.I.C. jump table.  */
   RELOC_JMP_TBL,
-  /* reputedly for shared libraries somehow */
+  /* Reputedly for shared libraries somehow.  */
   RELOC_SEGOFF16,
   RELOC_GLOB_DAT,
@@ -474 +485 @@
   RELOC_HLO10,                  /* data[0:9] = (addend + sv) >> 32      */
   
-  /* 29K relocation types */
+  /* 29K relocation types.  */
   RELOC_JUMPTARG,
   RELOC_CONST,
   RELOC_CONSTH,
   
-  /* All the new ones I can think of, for sparc v9 */
-
+  /* All the new ones I can think of, for sparc v9.  */
   RELOC_64,                     /* data[0:63] = addend + sv             */
   RELOC_DISP64,                 /* data[0:63] = addend - pc + sv        */
@@ -490 +500 @@
      Since this is a clean slate, can we throw away the ones we dont
      understand ? Should we sort the values ? What about using a
-     microcode format like the 68k ?
-     */
+     microcode format like the 68k ?  */
   NO_RELOC
   };
 
 
-struct reloc_internal {
-  bfd_vma r_address;            /* offset of of data to relocate        */
-  long  r_index;                /* symbol table index of symbol         */
-  enum reloc_type r_type;       /* relocation type                      */
-  bfd_vma r_addend;             /* datum addend                         */
+struct reloc_internal
+{
+  bfd_vma r_address;            /* Offset of of data to relocate.  */
+  long  r_index;                /* Symbol table index of symbol.  */
+  enum reloc_type r_type;       /* Relocation type.  */
+  bfd_vma r_addend;             /* Datum addend.  */
 };
 
@@ -507 +517 @@
 
    Q.
-   What about archive indexes ?
-
- */
+   What about archive indexes ?  */
 
 #endif                          /* __A_OUT_64_H__ */

branches/GNU/src/binutils/include/aout/dynix3.h

@@ -23 +23 @@
 
 /* struct exec for Dynix 3
- *
- * a_gdtbl and a_bootstrap are only for standalone binaries.
- * Shared data fields are not supported by the kernel as of Dynix 3.1,
- * but are supported by Dynix compiler programs.
- */
-struct dynix_external_exec {
-        unsigned char e_info[4];
-        unsigned char e_text[4];
-        unsigned char e_data[4];
-        unsigned char e_bss[4];
-        unsigned char e_syms[4];
-        unsigned char e_entry[4];
-        unsigned char e_trsize[4];
-        unsigned char e_drsize[4];
-        unsigned char e_g_code[8], e_g_data[8], e_g_desc[8];
-        unsigned char e_shdata[4];
-        unsigned char e_shbss[4];
-        unsigned char e_shdrsize[4];
-        unsigned char e_bootstrap[44];
-        unsigned char e_reserved[12];
-        unsigned char e_version[4];
-};
+ 
+   a_gdtbl and a_bootstrap are only for standalone binaries.
+   Shared data fields are not supported by the kernel as of Dynix 3.1,
+   but are supported by Dynix compiler programs.  */
+struct dynix_external_exec
+  {
+    unsigned char e_info[4];
+    unsigned char e_text[4];
+    unsigned char e_data[4];
+    unsigned char e_bss[4];
+    unsigned char e_syms[4];
+    unsigned char e_entry[4];
+    unsigned char e_trsize[4];
+    unsigned char e_drsize[4];
+    unsigned char e_g_code[8];
+    unsigned char e_g_data[8];
+    unsigned char e_g_desc[8];
+    unsigned char e_shdata[4];
+    unsigned char e_shbss[4];
+    unsigned char e_shdrsize[4];
+    unsigned char e_bootstrap[44];
+    unsigned char e_reserved[12];
+    unsigned char e_version[4];
+  };
 
 #define EXEC_BYTES_SIZE (128)
 
-/*
- * All executables under Dynix are demand paged with read-only text,
- * Thus no NMAGIC.
- *
- * ZMAGIC has a page of 0s at virtual 0,
- * XMAGIC has an invalid page at virtual 0
- */
+/* All executables under Dynix are demand paged with read-only text,
+   Thus no NMAGIC.
+  
+   ZMAGIC has a page of 0s at virtual 0,
+   XMAGIC has an invalid page at virtual 0.  */
 #define OMAGIC  0x12eb          /* .o */
 #define ZMAGIC  0x22eb          /* zero @ 0, demand load */

branches/GNU/src/binutils/include/aout/hp300hpux.h

@@ -1 +1 @@
 /* Special version of <a.out.h> for use under hp-ux.
-   Copyright 1988, 1993, 1995 Free Software Foundation, Inc. */
+   Copyright 1988, 1993, 1995, 2001 Free Software Foundation, Inc. */
 
 struct hp300hpux_exec_bytes
@@ -74 +74 @@
 
 #define N_DATADDR(x) \
-    ((N_MAGIC(x)==OMAGIC || N_MAGIC(x)==HPUX_DOT_O_MAGIC) ? \
-        (N_TXTADDR(x)+N_TXTSIZE(x)) \
-     :  (N_SEGSIZE(x) + ((N_TXTADDR(x)+N_TXTSIZE(x)-1) & ~(N_SEGSIZE(x)-1))))
+  ((N_MAGIC (x) == OMAGIC || N_MAGIC (x) == HPUX_DOT_O_MAGIC)           \
+   ? (N_TXTADDR (x) + N_TXTSIZE (x))                                    \
+   : (N_SEGSIZE (x) + ((N_TXTADDR (x) + N_TXTSIZE (x) - 1)              \
+                       & ~ (bfd_vma) (N_SEGSIZE (x) - 1))))
 
-#define _N_BADMACH(x)                                                   \
-(((N_MACHTYPE (x)) != HP9000S200_ID) &&                                 \
- ((N_MACHTYPE (x)) != HP98x6_ID))
+#define _N_BADMACH(x) \
+  (((N_MACHTYPE (x)) != HP9000S200_ID) && ((N_MACHTYPE (x)) != HP98x6_ID))
 
 #define _N_BADMAG(x)      (N_MAGIC(x) != HPUX_DOT_O_MAGIC \

branches/GNU/src/binutils/include/bfdlink.h

@@ -1 +1 @@
 /* bfdlink.h -- header file for BFD link routines
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002
    Free Software Foundation, Inc.
    Written by Steve Chamberlain and Ian Lance Taylor, Cygnus Support.
 
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef BFDLINK_H
@@ -36 +36 @@
 enum bfd_link_discard
 {
+  discard_sec_merge,    /* Discard local temporary symbols in SEC_MERGE
+                           sections.  */
   discard_none,         /* Don't discard any locals.  */
   discard_l,            /* Discard local temporary symbols.  */
   discard_all           /* Discard all locals.  */
 };
+
+/* Describes the type of hash table entry structure being used.
+   Different hash table structure have different fields and so
+   support different linking features.  */
+enum bfd_link_hash_table_type
+  {
+    bfd_link_generic_hash_table,
+    bfd_link_elf_hash_table
+  };
 
 
@@ -55 +66 @@
   bfd_link_hash_indirect,       /* Symbol is an indirect link.  */
   bfd_link_hash_warning         /* Like indirect, but warn if referenced.  */
+};
+
+enum bfd_link_common_skip_ar_aymbols
+{
+  bfd_link_common_skip_none,
+  bfd_link_common_skip_text,
+  bfd_link_common_skip_data,
+  bfd_link_common_skip_all
 };
 
@@ -111 +130 @@
         {
           /* The linker needs to know three things about common
-             symbols: the size, the alignment, and the section in
-             which the symbol should be placed.  We store the size
-             here, and we allocate a small structure to hold the
-             section and the alignment.  The alignment is stored as a
-             power of two.  We don't store all the information
-             directly because we don't want to increase the size of
-             the union; this structure is a major space user in the
-             linker.  */
+             symbols: the size, the alignment, and the section in
+             which the symbol should be placed.  We store the size
+             here, and we allocate a small structure to hold the
+             section and the alignment.  The alignment is stored as a
+             power of two.  We don't store all the information
+             directly because we don't want to increase the size of
+             the union; this structure is a major space user in the
+             linker.  */
           bfd_size_type size;   /* Common symbol size.  */
           struct bfd_link_hash_common_entry
@@ -146 +165 @@
   /* Entries are added to the tail of the undefs list.  */
   struct bfd_link_hash_entry *undefs_tail;
-};
-
-/* Look up an entry in a link hash table.  If FOLLOW is true, this
+  /* The type of the link hash table.  */
+  enum bfd_link_hash_table_type type;
+};
+
+/* Look up an entry in a link hash table.  If FOLLOW is TRUE, this
    follows bfd_link_hash_indirect and bfd_link_hash_warning links to
    the real symbol.  */
 extern struct bfd_link_hash_entry *bfd_link_hash_lookup
-  PARAMS ((struct bfd_link_hash_table *, const char *, boolean create,
-           boolean copy, boolean follow));
+  PARAMS ((struct bfd_link_hash_table *, const char *, bfd_boolean create,
+           bfd_boolean copy, bfd_boolean follow));
 
 /* Look up an entry in the main linker hash table if the symbol might
@@ -160 +181 @@
 
 extern struct bfd_link_hash_entry *bfd_wrapped_link_hash_lookup
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean, boolean,
-           boolean));
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, bfd_boolean,
+           bfd_boolean, bfd_boolean));
 
 /* Traverse a link hash table.  */
 extern void bfd_link_hash_traverse
   PARAMS ((struct bfd_link_hash_table *,
-           boolean (*) (struct bfd_link_hash_entry *, PTR),
+           bfd_boolean (*) (struct bfd_link_hash_entry *, PTR),
            PTR));
 
@@ -173 +194 @@
   PARAMS ((struct bfd_link_hash_table *, struct bfd_link_hash_entry *));
 
+struct bfd_sym_chain
+{
+  struct bfd_sym_chain *next;
+  const char *name;
+};
+
 
 /* This structure holds all the information needed to communicate
@@ -179 +206 @@
 struct bfd_link_info
 {
-  /* Function callbacks.  */
-  const struct bfd_link_callbacks *callbacks;
-  /* true if BFD should generate a relocateable object file.  */
-  boolean relocateable;
-  /* true if BFD should generate relocation information in the final executable.  */
-  boolean emitrelocations;
-  /* true if BFD should generate a "task linked" object file,
-     similar to relocatable but also with globals converted to statics. */
-  boolean task_link;
-  /* true if BFD should generate a shared object.  */
-  boolean shared;
-  /* true if BFD should pre-bind symbols in a shared object.  */
-  boolean symbolic;
-  /* true if shared objects should be linked directly, not shared.  */
-  boolean static_link;
-  /* true if the output file should be in a traditional format.  This
+  /* TRUE if BFD should generate a relocatable object file.  */
+  unsigned int relocateable: 1;
+
+  /* TRUE if BFD should generate relocation information in the final
+     executable.  */
+  unsigned int emitrelocations: 1;
+
+  /* TRUE if BFD should generate a "task linked" object file,
+     similar to relocatable but also with globals converted to
+     statics.  */
+  unsigned int task_link: 1;
+
+  /* TRUE if BFD should generate a shared object.  */
+  unsigned int shared: 1;
+
+  /* TRUE if BFD should pre-bind symbols in a shared object.  */
+  unsigned int symbolic: 1;
+
+  /* TRUE if BFD should export all symbols in the dynamic symbol table
+     of an executable, rather than only those used.  */
+  unsigned int export_dynamic: 1;
+
+  /* TRUE if shared objects should be linked directly, not shared.  */
+  unsigned int static_link: 1;
+
+  /* TRUE if the output file should be in a traditional format.  This
      is equivalent to the setting of the BFD_TRADITIONAL_FORMAT flag
      on the output file, but may be checked when reading the input
      files.  */
-  boolean traditional_format;
-  /* true if we want to produced optimized output files.  This might
+  unsigned int traditional_format: 1;
+
+  /* TRUE if we want to produced optimized output files.  This might
      need much more time and therefore must be explicitly selected.  */
-  boolean optimize;
-  /* true if BFD should generate errors for undefined symbols
+  unsigned int optimize: 1;
+
+  /* TRUE if BFD should generate errors for undefined symbols
      even if generating a shared object.  */
-  boolean no_undefined;
-  /* true if BFD should allow undefined symbols in shared objects even
+  unsigned int no_undefined: 1;
+
+  /* TRUE if BFD should allow undefined symbols in shared objects even
      when no_undefined is set to disallow undefined symbols.  The net
      result will be that undefined symbols in regular objects will
@@ -217 +257 @@
      select an appropriate memset function.  Apparently it is also
      normal for HPPA shared libraries to have undefined symbols.  */
-  boolean allow_shlib_undefined;
+  unsigned int allow_shlib_undefined: 1;
+
+  /* TRUE if ok to have multiple definition.  */
+  unsigned int allow_multiple_definition: 1;
+
+  /* TRUE if ok to have version with no definition.  */
+  unsigned int allow_undefined_version: 1;
+
+  /* TRUE if symbols should be retained in memory, FALSE if they
+     should be freed and reread.  */
+  unsigned int keep_memory: 1;
+
+  /* TRUE if every symbol should be reported back via the notice
+     callback.  */
+  unsigned int notice_all: 1;
+
+  /* TRUE if executable should not contain copy relocs.
+     Setting this true may result in a non-sharable text segment.  */
+  unsigned int nocopyreloc: 1;
+
+  /* TRUE if the new ELF dynamic tags are enabled. */
+  unsigned int new_dtags: 1;
+
+  /* TRUE if non-PLT relocs should be merged into one reloc section
+     and sorted so that relocs against the same symbol come together.  */
+  unsigned int combreloc: 1;
+
+  /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
+     should be created.  */
+  unsigned int eh_frame_hdr: 1;
+
+  /* TRUE if global symbols in discarded sections should be stripped.  */
+  unsigned int strip_discarded: 1;
+
+  /* TRUE if relaxation is being finalized.  */
+  unsigned int relax_finalizing: 1;
+
   /* Which symbols to strip.  */
   enum bfd_link_strip strip;
+
   /* Which local symbols to discard.  */
   enum bfd_link_discard discard;
-  /* true if symbols should be retained in memory, false if they
-     should be freed and reread.  */
-  boolean keep_memory;
+
+  /* Criteria for skipping symbols when detemining
+     whether to include an object from an archive. */
+  enum bfd_link_common_skip_ar_aymbols common_skip_ar_aymbols;
+
+  /* Function callbacks.  */
+  const struct bfd_link_callbacks *callbacks;
+
+  /* Hash table handled by BFD.  */
+  struct bfd_link_hash_table *hash;
+
+  /* Hash table of symbols to keep.  This is NULL unless strip is
+     strip_some.  */
+  struct bfd_hash_table *keep_hash;
+
+  /* Hash table of symbols to report back via the notice callback.  If
+     this is NULL, and notice_all is FALSE, then no symbols are
+     reported back.  */
+  struct bfd_hash_table *notice_hash;
+
+  /* Hash table of symbols which are being wrapped (the --wrap linker
+     option).  If this is NULL, no symbols are being wrapped.  */
+  struct bfd_hash_table *wrap_hash;
+
   /* The list of input BFD's involved in the link.  These are chained
      together via the link_next field.  */
   bfd *input_bfds;
+
   /* If a symbol should be created for each input BFD, this is section
      where those symbols should be placed.  It must be a section in
@@ -234 +333 @@
      linker command language.  */
   asection *create_object_symbols_section;
-  /* Hash table handled by BFD.  */
-  struct bfd_link_hash_table *hash;
-  /* Hash table of symbols to keep.  This is NULL unless strip is
-     strip_some.  */
-  struct bfd_hash_table *keep_hash;
-  /* true if every symbol should be reported back via the notice
-     callback.  */
-  boolean notice_all;
-  /* Hash table of symbols to report back via the notice callback.  If
-     this is NULL, and notice_all is false, then no symbols are
-     reported back.  */
-  struct bfd_hash_table *notice_hash;
-  /* Hash table of symbols which are being wrapped (the --wrap linker
-     option).  If this is NULL, no symbols are being wrapped.  */
-  struct bfd_hash_table *wrap_hash;
+
+  /* List of global symbol names that are starting points for marking
+     sections against garbage collection.  */
+  struct bfd_sym_chain *gc_sym_list;
+
   /* If a base output file is wanted, then this points to it */
   PTR base_file;
-
-  /* If non-zero, specifies that branches which are problematic for the
-  MPC860 C0 (or earlier) should be checked for and modified.  It gives the
-  number of bytes that should be checked at the end of each text page. */
-  int mpc860c0;
 
   /* The function to call when the executable or shared object is
      loaded.  */
   const char *init_function;
+
   /* The function to call when the executable or shared object is
      unloaded.  */
   const char *fini_function;
 
-  /* true if the new ELF dynamic tags are enabled. */ 
-  boolean new_dtags;
+  /* If non-zero, specifies that branches which are problematic for the
+     MPC860 C0 (or earlier) should be checked for and modified.  It gives the
+     number of bytes that should be checked at the end of each text page.  */
+  int mpc860c0;
+
+  /* Non-zero if auto-import thunks for DATA items in pei386 DLLs
+     should be generated/linked against.  Set to 1 if this feature
+     is explicitly requested by the user, -1 if enabled by default.  */
+  int pei386_auto_import;
+
+  /* Non-zero if runtime relocs for DATA items with non-zero addends
+     in pei386 DLLs should be generated.  Set to 1 if this feature
+     is explicitly requested by the user, -1 if enabled by default.  */
+  int pei386_runtime_pseudo_reloc;
+
+  /* How many spare .dynamic DT_NULL entries should be added?  */
+  unsigned int spare_dynamic_tags;
 
   /* May be used to set DT_FLAGS for ELF. */
@@ -277 +377 @@
    called by the BFD linker routines.  The first argument to each
    callback function is the bfd_link_info structure being used.  Each
-   function returns a boolean value.  If the function returns false,
+   function returns a boolean value.  If the function returns FALSE,
    then the BFD function which called it will return with a failure
    indication.  */
@@ -287 +387 @@
      name of the symbol which caused the archive element to be pulled
      in.  */
-  boolean (*add_archive_element) PARAMS ((struct bfd_link_info *,
-                                          bfd *abfd,
-                                          const char *name));
+  bfd_boolean (*add_archive_element)
+    PARAMS ((struct bfd_link_info *, bfd *abfd, const char *name));
   /* A function which is called when a symbol is found with multiple
      definitions.  NAME is the symbol which is defined multiple times.
@@ -296 +395 @@
      the new value.  OBFD may be NULL.  OSEC and NSEC may be
      bfd_com_section or bfd_ind_section.  */
-  boolean (*multiple_definition) PARAMS ((struct bfd_link_info *,
-                                          const char *name,
-                                          bfd *obfd,
-                                          asection *osec,
-                                          bfd_vma oval,
-                                          bfd *nbfd,
-                                          asection *nsec,
-                                          bfd_vma nval));
+  bfd_boolean (*multiple_definition)
+    PARAMS ((struct bfd_link_info *, const char *name,
+             bfd *obfd, asection *osec, bfd_vma oval,
+             bfd *nbfd, asection *nsec, bfd_vma nval));
   /* A function which is called when a common symbol is defined
      multiple times.  NAME is the symbol appearing multiple times.
@@ -315 +410 @@
      bfd_link_hash_indirect.  If NTYPE is bfd_link_hash_common, NSIZE
      is the size of the new symbol.  */
-  boolean (*multiple_common) PARAMS ((struct bfd_link_info *,
-                                      const char *name,
-                                      bfd *obfd,
-                                      enum bfd_link_hash_type otype,
-                                      bfd_vma osize,
-                                      bfd *nbfd,
-                                      enum bfd_link_hash_type ntype,
-                                      bfd_vma nsize));
+  bfd_boolean (*multiple_common)
+    PARAMS ((struct bfd_link_info *, const char *name,
+             bfd *obfd, enum bfd_link_hash_type otype, bfd_vma osize,
+             bfd *nbfd, enum bfd_link_hash_type ntype, bfd_vma nsize));
   /* A function which is called to add a symbol to a set.  ENTRY is
      the link hash table entry for the set itself (e.g.,
@@ -329 +420 @@
      get the size of the entry when generating an executable file.
      ABFD, SEC and VALUE identify the value to add to the set.  */
-  boolean (*add_to_set) PARAMS ((struct bfd_link_info *,
-                                 struct bfd_link_hash_entry *entry,
-                                 bfd_reloc_code_real_type reloc,
-                                 bfd *abfd, asection *sec, bfd_vma value));
+  bfd_boolean (*add_to_set)
+    PARAMS ((struct bfd_link_info *, struct bfd_link_hash_entry *entry,
+             bfd_reloc_code_real_type reloc, bfd *abfd, asection *sec,
+             bfd_vma value));
   /* A function which is called when the name of a g++ constructor or
      destructor is found.  This is only called by some object file
-     formats.  CONSTRUCTOR is true for a constructor, false for a
+     formats.  CONSTRUCTOR is TRUE for a constructor, FALSE for a
      destructor.  This will use BFD_RELOC_CTOR when generating a
      relocateable file.  NAME is the name of the symbol found.  ABFD,
      SECTION and VALUE are the value of the symbol.  */
-  boolean (*constructor) PARAMS ((struct bfd_link_info *,
-                                  boolean constructor,
-                                  const char *name, bfd *abfd, asection *sec,
-                                  bfd_vma value));
+  bfd_boolean (*constructor)
+    PARAMS ((struct bfd_link_info *, bfd_boolean constructor,
+             const char *name, bfd *abfd, asection *sec, bfd_vma value));
   /* A function which is called to issue a linker warning.  For
      example, this is called when there is a reference to a warning
@@ -350 +440 @@
      which trigerred the warning; either ABFD or SECTION or both may
      be NULL if the location is not known.  */
-  boolean (*warning) PARAMS ((struct bfd_link_info *,
-                              const char *warning, const char *symbol,
-                              bfd *abfd, asection *section,
-                              bfd_vma address));
+  bfd_boolean (*warning)
+    PARAMS ((struct bfd_link_info *, const char *warning, const char *symbol,
+             bfd *abfd, asection *section, bfd_vma address));
   /* A function which is called when a relocation is attempted against
      an undefined symbol.  NAME is the symbol which is undefined.
@@ -359 +448 @@
      reference is made. FATAL indicates whether an undefined symbol is
      a fatal error or not. In some cases SECTION may be NULL.  */
-  boolean (*undefined_symbol) PARAMS ((struct bfd_link_info *,
-                                       const char *name, bfd *abfd,
-                                       asection *section,
-                                       bfd_vma address,
-                                       boolean fatal));
+  bfd_boolean (*undefined_symbol)
+    PARAMS ((struct bfd_link_info *, const char *name, bfd *abfd,
+             asection *section, bfd_vma address, bfd_boolean fatal));
   /* A function which is called when a reloc overflow occurs.  NAME is
      the name of the symbol or section the reloc is against,
@@ -371 +458 @@
      bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
      ABFD will be NULL.  */
-  boolean (*reloc_overflow) PARAMS ((struct bfd_link_info *,
-                                     const char *name,
-                                     const char *reloc_name, bfd_vma addend,
-                                     bfd *abfd, asection *section,
-                                     bfd_vma address));
+  bfd_boolean (*reloc_overflow)
+    PARAMS ((struct bfd_link_info *, const char *name, const char *reloc_name,
+             bfd_vma addend, bfd *abfd, asection *section, bfd_vma address));
   /* A function which is called when a dangerous reloc is performed.
      The canonical example is an a29k IHCONST reloc which does not
@@ -383 +468 @@
      bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
      ABFD will be NULL.  */
-  boolean (*reloc_dangerous) PARAMS ((struct bfd_link_info *,
-                                      const char *message,
-                                      bfd *abfd, asection *section,
-                                      bfd_vma address));
+  bfd_boolean (*reloc_dangerous)
+    PARAMS ((struct bfd_link_info *, const char *message,
+             bfd *abfd, asection *section, bfd_vma address));
   /* A function which is called when a reloc is found to be attached
      to a symbol which is not being written out.  NAME is the name of
@@ -393 +477 @@
      bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
      ABFD will be NULL.  */
-  boolean (*unattached_reloc) PARAMS ((struct bfd_link_info *,
-                                       const char *name,
-                                       bfd *abfd, asection *section,
-                                       bfd_vma address));
+  bfd_boolean (*unattached_reloc)
+    PARAMS ((struct bfd_link_info *, const char *name,
+             bfd *abfd, asection *section, bfd_vma address));
   /* A function which is called when a symbol in notice_hash is
      defined or referenced.  NAME is the symbol.  ABFD, SECTION and
      ADDRESS are the value of the symbol.  If SECTION is
      bfd_und_section, this is a reference.  */
-  boolean (*notice) PARAMS ((struct bfd_link_info *, const char *name,
-                             bfd *abfd, asection *section, bfd_vma address));
+  bfd_boolean (*notice)
+    PARAMS ((struct bfd_link_info *, const char *name,
+             bfd *abfd, asection *section, bfd_vma address));
+  /* A function which is called for reporting a linker error. ID is the
+     error identifier. The remaining input is the same as einfo () in
+     ld.  */
+  bfd_boolean (*error_handler)
+    PARAMS ((int id, const char * fmt, ...));
 };
 
@@ -415 +504 @@
   bfd_undefined_link_order,     /* Undefined.  */
   bfd_indirect_link_order,      /* Built from a section.  */
-  bfd_fill_link_order,          /* Fill with a 16 bit constant.  */
   bfd_data_link_order,          /* Set to explicit data.  */
   bfd_section_reloc_link_order, /* Relocate against a section.  */
@@ -424 +512 @@
    attached to the section whose contents they are describing.  */
 
-struct bfd_link_order 
+struct bfd_link_order
 {
   /* Next link_order in chain.  */
@@ -431 +519 @@
   enum bfd_link_order_type type;
   /* Offset within output section.  */
-  bfd_vma offset;  
+  bfd_vma offset;
   /* Size within output section.  */
   bfd_size_type size;
   /* Type specific information.  */
-  union 
+  union
     {
-      struct 
+      struct
         {
           /* Section to include.  If this is used, then
@@ -449 +537 @@
       struct
         {
-          /* Value to fill with.  */
-          unsigned int value;
-        } fill;
-      struct
-        {
-          /* Data to put into file.  The size field gives the number
-             of bytes which this field points to.  */
+          /* Size of contents, or zero when contents size == size
+             within output section.
+             A non-zero value allows filling of the output section
+             with an arbitrary repeated pattern.  */
+          unsigned int size;
+          /* Data to put into file.  */
           bfd_byte *contents;
         } data;
@@ -521 +608 @@
   const char *pattern;
   /* Matching function.  */
-  int (*match) PARAMS((struct bfd_elf_version_expr *, const char *));
+  int (*match) PARAMS ((struct bfd_elf_version_expr *, const char *));
+  /* Defined by ".symver".  */
+  unsigned int symver: 1;
+  /* Defined by version script.  */
+  unsigned int script : 1;
 };
 

branches/GNU/src/binutils/include/bout.h

@@ -52 +52 @@
 #define BMAGIC  0415
 /* We don't accept the following (see N_BADMAG macro).
- * They're just here so GNU code will compile.
- */
+   They're just here so GNU code will compile.  */
 #define OMAGIC  0407            /* old impure format */
 #define NMAGIC  0410            /* read-only text */
@@ -59 +58 @@
 
 /* FILE HEADER
- *      All 'lengths' are given as a number of bytes.
- *      All 'alignments' are for relinkable files only;  an alignment of
- *              'n' indicates the corresponding segment must begin at an
- *              address that is a multiple of (2**n).
- */
-struct external_exec {
-        /* Standard stuff */
-        unsigned char e_info[4];        /* Identifies this as a b.out file */
-        unsigned char e_text[4];        /* Length of text */
-        unsigned char e_data[4];        /* Length of data */
-        unsigned char e_bss[4];         /* Length of uninitialized data area */
-        unsigned char e_syms[4];        /* Length of symbol table */
-        unsigned char e_entry[4];       /* Runtime start address */
-        unsigned char e_trsize[4];      /* Length of text relocation info */
-        unsigned char e_drsize[4];      /* Length of data relocation info */
+        All 'lengths' are given as a number of bytes.
+        All 'alignments' are for relinkable files only;  an alignment of
+                'n' indicates the corresponding segment must begin at an
+                address that is a multiple of (2**n).  */
+struct external_exec
+  {
+    /* Standard stuff */
+    unsigned char e_info[4];    /* Identifies this as a b.out file */
+    unsigned char e_text[4];    /* Length of text */
+    unsigned char e_data[4];    /* Length of data */
+    unsigned char e_bss[4];     /* Length of uninitialized data area */
+    unsigned char e_syms[4];    /* Length of symbol table */
+    unsigned char e_entry[4];   /* Runtime start address */
+    unsigned char e_trsize[4];  /* Length of text relocation info */
+    unsigned char e_drsize[4];  /* Length of data relocation info */
 
-        /* Added for i960 */
-        unsigned char e_tload[4];       /* Text runtime load address */
-        unsigned char e_dload[4];       /* Data runtime load address */
-        unsigned char e_talign[1];      /* Alignment of text segment */
-        unsigned char e_dalign[1];      /* Alignment of data segment */
-        unsigned char e_balign[1];      /* Alignment of bss segment */
-        unsigned char e_relaxable[1];   /* Assembled with enough info to allow linker to relax */
-};
+    /* Added for i960 */
+    unsigned char e_tload[4];   /* Text runtime load address */
+    unsigned char e_dload[4];   /* Data runtime load address */
+    unsigned char e_talign[1];  /* Alignment of text segment */
+    unsigned char e_dalign[1];  /* Alignment of data segment */
+    unsigned char e_balign[1];  /* Alignment of bss segment */
+    unsigned char e_relaxable[1];/* Assembled with enough info to allow linker to relax */
+  };
 
 #define EXEC_BYTES_SIZE (sizeof (struct external_exec))
 
 /* These macros use the a_xxx field names, since they operate on the exec
-   structure after it's been byte-swapped and realigned on the host machine. */
+   structure after it's been byte-swapped and realigned on the host machine.  */
 #define N_BADMAG(x)     (((x).a_info)!=BMAGIC)
 #define N_TXTOFF(x)     EXEC_BYTES_SIZE
@@ -104 +103 @@
 #endif
 
-/* A single entry in the symbol table
- */
-struct nlist {
-        union {
-                char    *n_name;
-                struct nlist *n_next;
-                long    n_strx;         /* Index into string table      */
-        } n_un;
-        unsigned char n_type;   /* See below                            */
-        char    n_other;        /* Used in i80960 support -- see below  */
-        short   n_desc;
-        unsigned long n_value;
-};
+/* A single entry in the symbol table.  */
+struct nlist
+  {
+    union
+      {
+        char*          n_name;
+        struct nlist * n_next;
+        long           n_strx;  /* Index into string table      */
+      } n_un;
+
+    unsigned char n_type;       /* See below                            */
+    char          n_other;      /* Used in i80960 support -- see below  */
+    short         n_desc;
+    unsigned long n_value;
+  };
 
 
-/* Legal values of n_type
- */
+/* Legal values of n_type.  */
 #define N_UNDF  0       /* Undefined symbol     */
 #define N_ABS   2       /* Absolute symbol      */
@@ -133 +133 @@
 
 /* MEANING OF 'n_other'
- *
- * If non-zero, the 'n_other' fields indicates either a leaf procedure or
- * a system procedure, as follows:
- *
- *      1 <= n_other <= 32 :
- *              The symbol is the entry point to a system procedure.
- *              'n_value' is the address of the entry, as for any other
- *              procedure.  The system procedure number (which can be used in
- *              a 'calls' instruction) is (n_other-1).  These entries come from
- *              '.sysproc' directives.
- *
- *      n_other == N_CALLNAME
- *              the symbol is the 'call' entry point to a leaf procedure.
- *              The *next* symbol in the symbol table must be the corresponding
- *              'bal' entry point to the procedure (see following).  These
- *              entries come from '.leafproc' directives in which two different
- *              symbols are specified (the first one is represented here).
- *      
- *
- *      n_other == N_BALNAME
- *              the symbol is the 'bal' entry point to a leaf procedure.
- *              These entries result from '.leafproc' directives in which only
- *              one symbol is specified, or in which the same symbol is
- *              specified twice.
- *
- * Note that an N_CALLNAME entry *must* have a corresponding N_BALNAME entry,
- * but not every N_BALNAME entry must have an N_CALLNAME entry.
- */
+ 
+  If non-zero, the 'n_other' fields indicates either a leaf procedure or
+  a system procedure, as follows:
+ 
+        1 <= n_other <= 32 :
+                The symbol is the entry point to a system procedure.
+                'n_value' is the address of the entry, as for any other
+                procedure.  The system procedure number (which can be used in
+                a 'calls' instruction) is (n_other-1).  These entries come from
+                '.sysproc' directives.
+ 
+        n_other == N_CALLNAME
+                the symbol is the 'call' entry point to a leaf procedure.
+                The *next* symbol in the symbol table must be the corresponding
+                'bal' entry point to the procedure (see following).  These
+                entries come from '.leafproc' directives in which two different
+                symbols are specified (the first one is represented here).
+        
+ 
+        n_other == N_BALNAME
+                the symbol is the 'bal' entry point to a leaf procedure.
+                These entries result from '.leafproc' directives in which only
+                one symbol is specified, or in which the same symbol is
+                specified twice.
+ 
+  Note that an N_CALLNAME entry *must* have a corresponding N_BALNAME entry,
+  but not every N_BALNAME entry must have an N_CALLNAME entry.  */
 #define N_CALLNAME      ((char)-1)
 #define N_BALNAME       ((char)-2)
@@ -168 +167 @@
 
 #define b_out_relocation_info relocation_info
-struct relocation_info {
-        int      r_address;     /* File address of item to be relocated */
-        unsigned
+struct relocation_info
+  {
+    int  r_address;     /* File address of item to be relocated.  */
+    unsigned
 #define r_index r_symbolnum
-                r_symbolnum:24,/* Index of symbol on which relocation is based,
-                                *       if r_extern is set.  Otherwise set to
-                                *       either N_TEXT, N_DATA, or N_BSS to
-                                *       indicate section on which relocation is
-                                *       based.
-                                */
-                r_pcrel:1,      /* 1 => relocate PC-relative; else absolute
-                                 *      On i960, pc-relative implies 24-bit
-                                 *      address, absolute implies 32-bit.
-                                 */
-                r_length:2,     /* Number of bytes to relocate:
-                                 *      0 => 1 byte
-                                 *      1 => 2 bytes -- used for 13 bit pcrel
-                                 *      2 => 4 bytes 
-                                 */
-                r_extern:1,
-                r_bsr:1,        /* Something for the GNU NS32K assembler */
-                r_disp:1,       /* Something for the GNU NS32K assembler */
-                r_callj:1,      /* 1 if relocation target is an i960 'callj' */
-                r_relaxable:1;  /* 1 if enough info is left to relax
-                                   the data */
+    r_symbolnum:24,     /* Index of symbol on which relocation is based,
+                           if r_extern is set.  Otherwise set to
+                           either N_TEXT, N_DATA, or N_BSS to
+                           indicate section on which relocation is
+                           based.  */
+      r_pcrel:1,        /* 1 => relocate PC-relative; else absolute
+                           On i960, pc-relative implies 24-bit
+                           address, absolute implies 32-bit.  */
+      r_length:2,       /* Number of bytes to relocate:
+                           0 => 1 byte
+                           1 => 2 bytes -- used for 13 bit pcrel
+                           2 => 4 bytes.  */
+      r_extern:1,
+      r_bsr:1,          /* Something for the GNU NS32K assembler.  */
+      r_disp:1,         /* Something for the GNU NS32K assembler.  */
+      r_callj:1,        /* 1 if relocation target is an i960 'callj'.  */
+      r_relaxable:1;    /* 1 if enough info is left to relax the data.  */
 };

branches/GNU/src/binutils/include/coff/ChangeLog

@@ -1 @@
-2001-06-11  Alan Modra  <amodra@bigpond.net.au>
-
-        Merge from mainline.
-        2001-02-09  David Mosberger  <davidm@hpl.hp.com>
+2003-04-24 Dhananjay Deshpande <dhananjayd@kpitcummins.com> 
+
+        * coff/h8300.h (H8300HNMAGIC, H8300SNMAGIC): New.
+        (H8300HNBADMAG, H8300SNBADMAG): New.
+
+2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
+
+        * sh.h: Replace occurrances of 'Hitachi' with 'Renesas'.
+        * h8300.h: Likewise.
+        * h8500.h: Likewise.
+
+2003-03-25  Stan Cox   <scox@redhat.com>
+            Nick Clifton  <nickc@redhat.com>
+            
+        Contribute support for Intel's iWMMXt chip - an ARM variant:
+
+        * arm.h (ARM_NOTE_SECTION): Define.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+        * ecoff.h: Replace boolean with bfd_boolean.
+        * xcoff.h: Likewise.
+
+2002-03-18  Tom Rix  <trix@redhat.com>
+
+        * rs6k64.h: Add U64_TOCMAGIC, AIX 5 64 bit magic number.
+
+2002-02-01  Tom Rix  <trix@redhat.com>
+
+        * xcoff.h: Conditionally support <aiaff> for pre AIX 4.3.
+ 
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+        * or32.h: New file.
+
+2001-12-24  Tom Rix  <trix@redhat.com>
+
+        * xcoff.h (xcoff_big_format_p): Make <bigaf> the default archive 
+        format.
+        (XCOFFARMAG_ELEMENT_SIZE, XCOFFARMAGBIG_ELEMENT_SIZE): Define for 
+        archive header ascii elements.  
+
+2001-12-17  Tom Rix  <trix@redhat.com>
+
+        * xcoff.h :  Add .except and .typchk section string and styp flags.
+        Fix xcoff_big_format_p macro.  
+
+2001-12-16  Tom Rix  <trix@redhat.com>
+
+        * xcoff.h : Clean up formatting. 
+
+2002-01-15  Richard Earnshaw  <rearnsha@arm.com>
+
+        * arm.h (F_VFP_FLOAT): Define.
+
+2001-11-11  Timothy Wall  <twall@alum.mit.edu>
+
+        * ti.h: Move arch-specific stuff from here...
+        (COFF_ADJUST_SYM_IN/OUT): Optionally put page flag into symbol
+        value. 
+        * tic54x.h: ...to here.
+        
+2001-10-26  Christian Groessler  <cpg@aladdin.de>
+
+        * external.h (GET_LINENO_LNNO): Fix usage of H_GET_32/16.
+        (PUT_LINENO_LNNO): Likewise with H_PUT_32/16.
+
+2001-09-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * ti.h (GET_SCNHDR_PAGE): Fix compile time warning.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+        * external.h (GET_LINENO_LNNO): Use H_GET_32/16.
+        (PUT_LINENO_LNNO): Use H_PUT_32/16.
+        * m88k.h (GET_LNSZ_SIZE, GET_LNSZ_LNNO, GET_SCN_NRELOC,
+        GET_SCN_NLINNO): Use H_GET_32.
+        (PUT_LNSZ_LNNO, PUT_LNSZ_SIZE, PUT_SCN_NRELOC, PUT_SCN_NLINNO):
+        Use H_PUT_32.
+        * ti.h: Formatting fixes.  Make use of H_GET_* and H_PUT_* throughout.
+        * xcoff.h: White space changes.
+
+2001-09-05  Tom Rix <trix@redhat.com>
+
+        * xcoff.h : Add XCOFF_SYSCALL32 and XCOFF_SYSCALL64 hash table flags.
+        
+2001-08-27  Andreas Jaeger  <aj@suse.de>
+
+        * xcoff.h (struct __rtinit): Make proper prototype for rtl.
+
+Fri Aug 24 01:18:51 2001  J"orn Rennecke <amylaar@redhat.com>
+
+        * internal.h (R_JMP2, R_JMPL2, R_MOVL2): Comment spelling fix.
+
+2001-04-05  Tom Rix <trix@redhat.com>
+
+        * rs6000.h : move xcoff32 external structures from xcofflink. 
+        * rs6k64.h : move xcoff64 external structures from xcofflink. 
+        * internal.h : promote 32 bit structure elements to 64 bit
+        for xcoff64 support
+        * xcoff.h : New file.
+        
+2001-03-23  Nick Clifton  <nickc@redhat.com>
+
+        * a29k.h: Fix compile time warning.
+        * external.h: Fix compile time warning.
+        * m88k.h: Fix compile time warning.
+
+2001-03-13  Nick Clifton  <nickc@redhat.com>
+
+        * external.h: New file. Common structure definitions found in
+        other COFF header files.
+
+        * a29k.h: Use external.h.
+        * apollo.h: Use external.h.
+        * arm.h: Use external.h.
+        * h8300.h: Use external.h.
+        * h8500.h: Use external.h.
+        * i386.h: Use external.h.
+        * i860.h: Use external.h.
+        * ia64.h: Use external.h.
+        * m68k.h: Use external.h.
+        * m88k.h: Use external.h.
+        * mcore.h: Use external.h.
+        * mips.h: Use external.h.
+        * mipspe.h: Use external.h.
+        * powerpc.h: Use external.h.
+        * rs6000.h: Use external.h.
+        * rs6k64.h: Use external.h.
+        * sh.h: Use external.h.
+        * sparc.h: Use external.h.
+        * tic30.h: Use external.h.
+        * tic80.h: Use external.h.
+        * w65.h: Use external.h.
+        * we32k.h: Use external.h.
+        * z8k.h: Use external.h.
+
+2001-02-09  David Mosberger  <davidm@hpl.hp.com>
+
         * pe.h (PEPAOUTSZ): Rename from PEP64AOUTSZ.
         Rename from PEPAOUTHDR.
 
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
-
-        * Many files: Update copyright notices.
-
-2001-02-17  Philip Blundell  <philb@gnu.org>
-
-        From 2001-01-23  H.J. Lu  <hjl@gnu.org>
+2001-01-23  H.J. Lu  <hjl@gnu.org>
+
         * pe.h (struct external_PEI_DOS_hdr): New.
         (struct external_PEI_IMAGE_hdr): New.

branches/GNU/src/binutils/include/coff/a29k.h

@@ -23 +23 @@
 #endif
 
-/****************************************************************/
-
-/*
-** File Header and related definitions
-*/
-
-struct external_filehdr
-{
-        char f_magic[2];        /* magic number          */
-        char f_nscns[2];        /* number of sections      */
-        char f_timdat[4];       /* time & date stamp        */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)  */
-        char f_flags[2];        /* flags                        */
-};
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
 
 /*
@@ -53 +34 @@
 #define SIPRBOMAGIC     0573    /* Am29000 (Byte 0 is LSB) */
 
-
 #define A29K_MAGIC_BIG          SIPFBOMAGIC     
 #define A29K_MAGIC_LITTLE       SIPRBOMAGIC     
-#define A29KBADMAG(x)   (((x).f_magic!=A29K_MAGIC_BIG) && \
-                          ((x).f_magic!=A29K_MAGIC_LITTLE))
+#define A29KBADMAG(x)   ( ((x).f_magic != A29K_MAGIC_BIG) && \
+                          ((x).f_magic != A29K_MAGIC_LITTLE))
 
 #define OMAGIC A29K_MAGIC_BIG
@@ -71 +51 @@
 /*--------------------------------------------------------------*/
 
-/*
-** Optional (a.out) header 
-*/
-
-typedef struct external_aouthdr 
-{
-  char  magic[2];              /* type of file                   */
-  char  vstamp[2];            /* version stamp                  */
-  char  tsize[4];              /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];              /* initialized data "  "         */
-  char  bsize[4];              /* uninitialized data "   "           */
-  char  entry[4];              /* entry pt.                         */
-  char  text_start[4];    /* base of text used for this file */
-  char  data_start[4];    /* base of data used for this file */
-} AOUTHDR;
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
 
 /* aouthdr magic numbers */
@@ -94 +56 @@
 #define SHMAGIC 0406            /* NYU/Ultra3 shared data executable 
                                    (writable text) */
-
+#undef  _ETEXT
 #define _ETEXT          "_etext"
 
 /*--------------------------------------------------------------*/
 
-/*
-** Section header and related definitions
-*/
 
-struct external_scnhdr 
-{
-        char        s_name[8];      /* section name              */
-        char        s_paddr[4];     /* physical address, aliased s_nlib */
-        char        s_vaddr[4];     /* virtual address        */
-        char        s_size[4];      /* section size              */
-        char        s_scnptr[4];    /* file ptr to raw data for section */
-        char        s_relptr[4];    /* file ptr to relocation       */
-        char        s_lnnoptr[4];   /* file ptr to line numbers     */
-        char        s_nreloc[2];    /* number of relocation entries */
-        char        s_nlnno[2];     /* number of line number entries*/
-        char        s_flags[4];     /* flags                    */
-};
-
-#define SCNHDR  struct  external_scnhdr
-#define SCNHSZ  40
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
+/* More names of "special" sections.  */
 #define _LIT    ".lit"
 
@@ -151 +88 @@
 */
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];      /* (virtual) address of reference */
   char r_symndx[4];     /* index into symbol table */
@@ -200 +138 @@
 /*--------------------------------------------------------------*/
 
-/*
-** Line number entry declaration and related definitions
-*/
-
-struct external_lineno 
-{
-   union {
-         char l_symndx[4]; /* function name symbol index, iff l_lnno == 0*/
-         char l_paddr[4];  /* (physical) address of line number    */
-   } l_addr;
-   char l_lnno[2];      /* line number    */
-};
-
-#define LINENO          struct external_lineno
-#define LINESZ          6               /* sizeof (LINENO) */
-
-/*--------------------------------------------------------------*/
-
-/*
-** Symbol entry declaration and related definitions
-*/
-
-#define E_SYMNMLEN      8       /* Number of characters in a symbol name */
-
-struct external_syment
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18
-
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 
@@ -252 +147 @@
 #define C_EXTREG        20              /* external global register */
 #define C_DEFREG        21              /* ext. def. of global register */
-
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
-
-/*
-** Derived symbol mask/shifts.
-*/
-
-#define N_BTMASK        (0xf)
-#define N_BTSHFT        (4)
-#define N_TMASK         (0x30)
-#define N_TSHIFT        (2)
-
-/*--------------------------------------------------------------*/
-
-/*
-** Auxiliary symbol table entry declaration and related 
-** definitions.
-*/
-
-#define E_FILNMLEN      14      /* # characters in a file name    */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                      /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;  /* info about .tv section (in auxent of symbol .tv)) */
-};
-
-#define AUXENT          union external_auxent
-#define AUXESZ          18      

branches/GNU/src/binutils/include/coff/alpha.h

@@ -20 +20 @@
 /********************** FILE HEADER **********************/
 
-struct external_filehdr {
+struct external_filehdr
+{
   unsigned char f_magic[2];     /* magic number                 */
   unsigned char f_nscns[2];     /* number of sections           */
@@ -44 +45 @@
 
 /********************** AOUT "OPTIONAL HEADER" **********************/
-
 
 typedef struct external_aouthdr
@@ -71 +71 @@
 /********************** SECTION HEADER **********************/
 
-struct external_scnhdr {
+struct external_scnhdr
+{
   unsigned char s_name[8];      /* section name                 */
   unsigned char s_paddr[8];     /* physical address, aliased s_nlib */
@@ -89 +90 @@
 /********************** RELOCATION DIRECTIVES **********************/
 
-struct external_reloc {
+struct external_reloc 
+{
   unsigned char r_vaddr[8];
   unsigned char r_symndx[4];
@@ -167 +169 @@
 /* File header as a set of bytes */
 
-struct hdr_ext {
+struct hdr_ext
+{
         unsigned char   h_magic[2];
         unsigned char   h_vstamp[2];
@@ -197 +200 @@
 /* File descriptor external record */
 
-struct fdr_ext {
+struct fdr_ext
+{
         unsigned char   f_adr[8];
         unsigned char   f_cbLineOffset[8];

branches/GNU/src/binutils/include/coff/apollo.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
+#define DO_NOT_DEFINE_AOUTHDR
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
 
 /* Motorola 68000/68008/68010/68020 */
@@ -48 +39 @@
   ((x).f_magic!=MC68KROMAGIC) && ((x).f_magic!=MC68KPGMAGIC) && ((x).f_magic!=M68MAGIC) && ((x).f_magic!=M68TVMAGIC)  && \
   ((x).f_magic!=APOLLOM68KMAGIC) )
-
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
 
 /********************** AOUT "OPTIONAL HEADER" **********************/
@@ -76 +62 @@
 #define AOUTSZ 44
 
+/* Apollo allowa for larger section names by allowing
+   them to be in the string table.  */
 
-
-/********************** SECTION HEADER **********************/
-
-struct external_scnhdr {
-        /* Apollo allow for larger section names by  allowing it to be in
-         * the string table.
-         */
-        char            s_name[8];
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/* If s_zeores is all zeroes, s_offset gives the real location of the name
- * in the string table.
- */
+/* If s_zeores is all zeroes, s_offset gives the real
+   location of the name in the string table.  */
 
 #define s_zeroes section_name.s_name
 #define s_offset (section_name.s_name+4)
 
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
+/* More names of "special" sections.  */
 #define _TV     ".tv"
 #define _INIT   ".init"
@@ -123 +86 @@
 #define _UNWIND ".unwind"               /* Stack unwind information */
 
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2]; /* line number          */
-};
-
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -241 +98 @@
 
 };
-
 
 #define RELOC struct external_reloc

branches/GNU/src/binutils/include/coff/arm.h

@@ -1 +1 @@
 /* ARM COFF support for BFD.
-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -20 +20 @@
 #define COFFARM 1
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr
-{
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
 
 /* Bits for f_flags:
- *      F_RELFLG        relocation info stripped from file
- *      F_EXEC          file is executable (no unresolved external references)
- *      F_LNNO          line numbers stripped from file
- *      F_LSYMS         local symbols stripped from file
- *      F_INTERWORK     file supports switching between ARM and Thumb instruction sets
- *      F_INTERWORK_SET the F_INTERWORK bit is valid
- *      F_APCS_FLOAT    code passes float arguments in float registers
- *      F_PIC           code is reentrant/position-independent
- *      F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax)
- *      F_APCS_26       file uses 26 bit ARM Procedure Calling Standard
- *      F_APCS_SET      the F_APCS_26, F_APCS_FLOAT and F_PIC bits have been initialised
- *      F_SOFT_FLOAT    code does not use floating point instructions
- */
+        F_RELFLG        relocation info stripped from file
+        F_EXEC          file is executable (no unresolved external references)
+        F_LNNO          line numbers stripped from file
+        F_LSYMS         local symbols stripped from file
+        F_INTERWORK     file supports switching between ARM and Thumb instruction sets
+        F_INTERWORK_SET the F_INTERWORK bit is valid
+        F_APCS_FLOAT    code passes float arguments in float registers
+        F_PIC           code is reentrant/position-independent
+        F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax)
+        F_APCS_26       file uses 26 bit ARM Procedure Calling Standard
+        F_APCS_SET      the F_APCS_26, F_APCS_FLOAT and F_PIC bits have been initialised
+        F_SOFT_FLOAT    code does not use floating point instructions.  */
 
 #define F_RELFLG        (0x0001)
@@ -61 +51 @@
 #define F_APCS_SET      (0x0800)
 #define F_SOFT_FLOAT    (0x2000)
+#define F_VFP_FLOAT     (0x4000)
 
 /* Bits stored in flags field of the internal_f structure */
@@ -78 +69 @@
 
 /*
- * ARMMAGIC ought to encoded the procesor type,
- * but it is too late to change it now, instead
- * the flags field of the internal_f structure
- * is used as shown above.
- *
- * XXX - NC 5/6/97
- */
+  ARMMAGIC ought to encoded the procesor type,
+  but it is too late to change it now, instead
+  the flags field of the internal_f structure
+  is used as shown above.
+ 
+  XXX - NC 5/6/97.  */
 
 #define ARMMAGIC        0xa00  /* I just made this up */
@@ -96 +86 @@
 #define ARMBADMAG(x) (((x).f_magic != ARMMAGIC) && ((x).f_magic != ARMPEMAGIC) && ((x).f_magic != THUMBPEMAGIC))
 
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
 #define OMAGIC          0404    /* object files, eg as output */
 #define ZMAGIC          0413    /* demand load format, eg normal ld output */
 #define STMAGIC         0401    /* target shlib */
 #define SHMAGIC         0443    /* host   shlib */
-
 
 /* define some NT default values */
@@ -133 +98 @@
 #define NT_DEF_COMMIT        0x1000
 
-/********************** SECTION HEADER **********************/
-struct external_scnhdr
-{
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-#define _COMMENT ".comment"
-#define _LIB ".lib"
-
 /* We use the .rdata section to hold read only data.  */
 #define _LIT    ".rdata"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno
-{
-        union
-        {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2]; /* line number          */
-};
-
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union
-  {
-    char e_name[E_SYMNMLEN];
-    struct
-    {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-#define N_BTMASK        (0xf)
-#define N_TMASK         (0x30)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-
-union external_auxent
-{
-        struct
-        {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union
-                {
-                        struct
-                        {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union
-                {
-                        struct                  /* if ISFCN, tag, or .bb */
-                        {
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct                  /* if ISARY, up to 4 dimen. */
-                        {
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union
-        {
-                char x_fname[E_FILNMLEN];
-                struct
-                {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct
-        {
-                char x_scnlen[4];       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-                char x_checksum[4];     /* section COMDAT checksum */
-                char x_associated[2];   /* COMDAT associated section index */
-                char x_comdat[1];       /* COMDAT selection number */
-        } x_scn;
-
-        struct
-        {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-#define _ETEXT  "etext"
 
 /********************** RELOCATION DIRECTIVES **********************/
@@ -302 +125 @@
 #define RELSZ 14
 #endif
+
+#define ARM_NOTE_SECTION ".note"

branches/GNU/src/binutils/include/coff/ecoff.h

@@ -3 +3 @@
    symconst.h.
 
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -9 +9 @@
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-   
+
 #ifndef ECOFF_H
 #define ECOFF_H
@@ -431 +431 @@
      ecoff_debug_info structure.  The section argument is used for
      ELF, not straight ECOFF.  */
-  boolean (*read_debug_info) PARAMS ((bfd *, asection *,
-                                      struct ecoff_debug_info *));
+  bfd_boolean (*read_debug_info)
+    PARAMS ((bfd *, asection *, struct ecoff_debug_info *));
 };
 

branches/GNU/src/binutils/include/coff/go32exe.h

@@ -19 +19 @@
 #define STUBSIZE 2048
 
-struct external_filehdr_go32_exe {
-        char stub[STUBSIZE];    /* the stub to load the image   */
-        /* the standard COFF header */
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
+struct external_filehdr_go32_exe
+  {
+    char stub[STUBSIZE];/* the stub to load the image   */
+                        /* the standard COFF header     */
+    char f_magic[2];    /* magic number                 */
+    char f_nscns[2];    /* number of sections           */
+    char f_timdat[4];   /* time & date stamp            */
+    char f_symptr[4];   /* file pointer to symtab       */
+    char f_nsyms[4];    /* number of symtab entries     */
+    char f_opthdr[2];   /* sizeof(optional hdr)         */
+    char f_flags[2];    /* flags                        */
+  };
 
 #undef FILHDR

branches/GNU/src/binutils/include/coff/h8300.h

@@ -1 @@
-/* coff information for Hitachi H8/300 and H8/300-H
+/* coff information for Renesas H8/300 and H8/300-H
 
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
-
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
 
 #define H8300MAGIC      0x8300
 #define H8300HMAGIC     0x8301
 #define H8300SMAGIC     0x8302
+#define H8300HNMAGIC    0x8303
+#define H8300SNMAGIC    0x8304
 
-#define H8300BADMAG(x) (((x).f_magic!=H8300MAGIC))
-#define H8300HBADMAG(x) (((x).f_magic!=H8300HMAGIC))
-#define H8300SBADMAG(x) (((x).f_magic!=H8300SMAGIC))
+#define H8300BADMAG(x)   (((x).f_magic != H8300MAGIC))
+#define H8300HBADMAG(x)  (((x).f_magic != H8300HMAGIC))
+#define H8300SBADMAG(x)  (((x).f_magic != H8300SMAGIC))
+#define H8300HNBADMAG(x) (((x).f_magic != H8300HNMAGIC))
+#define H8300SNBADMAG(x) (((x).f_magic != H8300SNMAGIC))
 
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTHDRSZ 28
-#define AOUTSZ 28
-
-
-
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[4]; /* line number          */
-};
-
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_32(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-#define LINENO  struct external_lineno
-#define LINESZ  8
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-
-/********************** RELOCATION DIRECTIVES **********************/
+/* Relocation directives.  */
 
 /* The external reloc has an offset field, because some of the reloc
    types on the h8 don't have room in the instruction for the entire
-   offset - eg the strange jump and high page addressing modes */
+   offset - eg the strange jump and high page addressing modes.  */
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -212 +47 @@
 };
 
-
 #define RELOC struct external_reloc
 #define RELSZ 16

branches/GNU/src/binutils/include/coff/h8500.h

@@ -1 @@
-/* coff information for Hitachi H8/500
+/* coff information for Renesas H8/500
    
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
-
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
 
 #define H8500MAGIC      0x8500
 
-
-#define H8500BADMAG(x) ((0xffff && ((x).f_magic)!=H8500MAGIC))
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTHDRSZ 28
-#define AOUTSZ 28
-
-
-
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[4]; /* line number          */
-};
-
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_32(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-#define LINENO  struct external_lineno
-#define LINESZ  8
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
+#define H8500BADMAG(x) ((0xffff && ((x).f_magic) != H8500MAGIC))
 
 /********************** RELOCATION DIRECTIVES **********************/
@@ -199 +28 @@
 /* The external reloc has an offset field, because some of the reloc
    types on the h8 don't have room in the instruction for the entire
-   offset - eg the strange jump and high page addressing modes */
+   offset - eg the strange jump and high page addressing modes.  */
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -209 +39 @@
 };
 
-
 #define RELOC struct external_reloc
 #define RELSZ 16

branches/GNU/src/binutils/include/coff/i386.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
 
 /* Bits for f_flags:
- *      F_RELFLG        relocation info stripped from file
- *      F_EXEC          file is executable (no unresolved external references)
- *      F_LNNO          line numbers stripped from file
- *      F_LSYMS         local symbols stripped from file
- *      F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax)
- */
+        F_RELFLG        relocation info stripped from file
+        F_EXEC          file is executable (no unresolved external references)
+        F_LNNO          line numbers stripped from file
+        F_LSYMS         local symbols stripped from file
+        F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax).  */
 
 #define F_RELFLG        (0x0001)
@@ -42 +32 @@
 #define F_LNNO          (0x0004)
 #define F_LSYMS         (0x0008)
-
-
 
 #define I386MAGIC       0x14c
@@ -53 +41 @@
 #define LYNXCOFFMAGIC   0415
 
-#define I386BADMAG(x) (((x).f_magic != I386MAGIC) \
+#define I386BADMAG(x) (  ((x).f_magic != I386MAGIC) \
                        && (x).f_magic != I386AIXMAGIC \
                        && (x).f_magic != I386PTXMAGIC \
                        && (x).f_magic != LYNXCOFFMAGIC)
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-
-
-}
-AOUTHDR;
-
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
 
 #define OMAGIC          0404    /* object files, eg as output */
@@ -88 +50 @@
 #define STMAGIC         0401    /* target shlib */
 #define SHMAGIC         0443    /* host   shlib */
-
 
 /* define some NT default values */
@@ -97 +58 @@
 #define NT_DEF_COMMIT        0x1000
 
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-#define _COMMENT ".comment"
-#define _LIB ".lib"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2]; /* line number          */
-};
-
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-#define N_BTMASK        (0xf)
-#define N_TMASK         (0x30)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-                char x_checksum[4];     /* section COMDAT checksum */
-                char x_associated[2];   /* COMDAT associated section index */
-                char x_comdat[1];       /* COMDAT selection number */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-#       define _ETEXT   "etext"
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-
-
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -239 +67 @@
 };
 
-
 #define RELOC struct external_reloc
 #define RELSZ 10

branches/GNU/src/binutils/include/coff/i860.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
+/* This file was hacked from i386.h   [dolan@ssd.intel.com] */
 
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
 
 /* Bits for f_flags:
- *      F_RELFLG        relocation info stripped from file
- *      F_EXEC          file is executable (no unresolved external references)
- *      F_LNNO          line numbers stripped from file
- *      F_LSYMS         local symbols stripped from file
- *      F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax)
- */
+        F_RELFLG        relocation info stripped from file
+        F_EXEC          file is executable (no unresolved external references)
+        F_LNNO          line numbers stripped from file
+        F_LSYMS         local symbols stripped from file
+        F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax).  */
 
 #define F_RELFLG        (0x0001)
@@ -43 +34 @@
 #define F_LSYMS         (0x0008)
 
-
-
 #define I860MAGIC       0x14d
 
 #define I860BADMAG(x)   ((x).f_magic != I860MAGIC)
 
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
 /* FIXME: What are the a.out magic numbers?  */
 
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-#define _COMMENT ".comment"
-#define _LIB ".lib"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2]; /* line number          */
-};
-
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-#define N_BTMASK        (0xf)
-#define N_TMASK         (0x30)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-#       define _ETEXT   "etext"
-
+#define _ETEXT  "etext"
 
 /********************** RELOCATION DIRECTIVES **********************/
 
-
-
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -214 +51 @@
 };
 
-
 #define RELOC struct external_reloc
 #define RELSZ 10

branches/GNU/src/binutils/include/coff/i960.h

@@ -21 +21 @@
 /********************** FILE HEADER **********************/
 
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
+struct external_filehdr
+{
+  char f_magic[2];      /* magic number                 */
+  char f_nscns[2];      /* number of sections           */
+  char f_timdat[4];     /* time & date stamp            */
+  char f_symptr[4];     /* file pointer to symtab       */
+  char f_nsyms[4];      /* number of symtab entries     */
+  char f_opthdr[2];     /* sizeof(optional hdr)         */
+  char f_flags[2];      /* flags                        */
 };
 
@@ -66 +67 @@
 /********************** AOUT "OPTIONAL HEADER" **********************/
 
-typedef struct {
-        unsigned long   phys_addr;
-        unsigned long   bitarray;
+typedef struct
+{
+  unsigned long phys_addr;
+  unsigned long bitarray;
 } TAGBITS;
-
-
 
 typedef struct 
@@ -100 +100 @@
 /********************** SECTION HEADER **********************/
 
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-        char            s_align[4];     /* section alignment            */
+struct external_scnhdr
+{
+  char          s_name[8];      /* section name                 */
+  char          s_paddr[4];     /* physical address, aliased s_nlib */
+  char          s_vaddr[4];     /* virtual address              */
+  char          s_size[4];      /* section size                 */
+  char          s_scnptr[4];    /* file ptr to raw data for section */
+  char          s_relptr[4];    /* file ptr to relocation       */
+  char          s_lnnoptr[4];   /* file ptr to line numbers     */
+  char          s_nreloc[2];    /* number of relocation entries */
+  char          s_nlnno[2];     /* number of line number entries*/
+  char          s_flags[4];     /* flags                        */
+  char          s_align[4];     /* section alignment            */
 };
 
@@ -133 +133 @@
  * symbol table index of the function name.
  */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2];         /* line number          */
-        char padding[2];        /* force alignment      */
+struct external_lineno
+{
+  union
+  {
+    char l_symndx[4];   /* function name symbol index, iff l_lnno == 0*/
+    char l_paddr[4];    /* (physical) address of line number    */
+  } l_addr;
+
+  char l_lnno[2];               /* line number          */
+  char padding[2];      /* force alignment      */
 };
 
@@ -145 +148 @@
 #define LINENO  struct external_lineno
 #define LINESZ  8
-
 
 /********************** SYMBOLS **********************/
@@ -155 +157 @@
 struct external_syment 
 {
-  union {
+  union
+  {
     char e_name[E_SYMNMLEN];
-    struct {
+
+    struct
+    {
       char e_zeroes[4];
       char e_offset[4];
     } e;
   } e;
+
   char e_value[4];
   char e_scnum[2];
@@ -171 +177 @@
 };
 
-
-
-
 #define N_BTMASK        (0x1f)
 #define N_TMASK         (0x60)
@@ -179 +182 @@
 #define N_TSHIFT        (2)
   
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-        /******************************************
-         *  I960-specific *2nd* aux. entry formats
-         ******************************************/
-        struct {
-          /* This is a very old typo that keeps getting propagated. */
+union external_auxent
+{
+  struct
+  {
+    char x_tagndx[4];   /* str, un, or enum tag indx */
+
+    union
+    {
+      struct
+      {
+        char  x_lnno[2]; /* declaration line number */
+        char  x_size[2]; /* str/union/array size */
+      } x_lnsz;
+
+      char x_fsize[4];  /* size of function */
+
+    } x_misc;
+
+    union
+    {
+      struct            /* if ISFCN, tag, or .bb */
+      {
+        char x_lnnoptr[4];      /* ptr to fcn line # */
+        char x_endndx[4];       /* entry ndx past block end */
+      } x_fcn;
+
+      struct            /* if ISARY, up to 4 dimen. */
+      {
+        char x_dimen[E_DIMNUM][2];
+      } x_ary;
+
+    } x_fcnary;
+
+    char x_tvndx[2];            /* tv index */
+
+  } x_sym;
+
+  union
+  {
+    char x_fname[E_FILNMLEN];
+
+    struct
+    {
+      char x_zeroes[4];
+      char x_offset[4];
+    } x_n;
+
+  } x_file;
+
+  struct
+  {
+    char x_scnlen[4];                   /* section length */
+    char x_nreloc[2];   /* # relocation entries */
+    char x_nlinno[2];   /* # line numbers */
+
+  } x_scn;
+
+  struct
+  {
+    char x_tvfill[4];   /* tv fill value */
+    char x_tvlen[2];    /* length of .tv */
+    char x_tvran[2][2]; /* tv range */
+
+  } x_tv;               /* info about .tv section (in auxent of symbol .tv)) */
+
+  /******************************************
+   *  I960-specific *2nd* aux. entry formats
+   ******************************************/
+  struct
+  {
+    /* This is a very old typo that keeps getting propagated. */
 #define x_stdindx x_stindx
-                char x_stindx[4];       /* sys. table entry */
-        } x_sc; /* system call entry */
-
-        struct {
-                char x_balntry[4]; /* BAL entry point */
-        } x_bal; /* BAL-callable function */
-
-        struct {
-                char x_timestamp[4];            /* time stamp */
-                char    x_idstring[20];         /* producer identity string */
-        } x_ident;                              /* Producer ident info */
-
-};
-
-
+    char x_stindx[4];   /* sys. table entry */
+  } x_sc;       /* system call entry */
+
+  struct
+  {
+    char x_balntry[4]; /* BAL entry point */
+  } x_bal; /* BAL-callable function */
+
+  struct
+  {
+    char x_timestamp[4];                /* time stamp */
+    char        x_idstring[20];         /* producer identity string */
+
+  } x_ident;                            /* Producer ident info */
+};
 
 #define SYMENT  struct external_syment
@@ -252 +279 @@
 /********************** RELOCATION DIRECTIVES **********************/
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];

branches/GNU/src/binutils/include/coff/ia64.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
+#define DO_NOT_DEFINE_AOUTHDR
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
 
 #define IA64MAGIC       0x200
@@ -47 +39 @@
 #define F_LSYMS         (0x0008)
 
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
 /********************** AOUT "OPTIONAL HEADER" **********************/
-
-
 typedef struct 
 {
@@ -83 +68 @@
 #define SHMAGIC         0443    /* host   shlib */
 
-
 /* define some NT default values */
 /*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
@@ -91 +75 @@
 #define NT_DEF_COMMIT        0x1000
 
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-#define _COMMENT ".comment"
-#define _LIB ".lib"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2]; /* line number          */
-};
-
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-#define N_BTMASK        (0xf)
-#define N_TMASK         (0x30)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-                char x_checksum[4];     /* section COMDAT checksum */
-                char x_associated[2];   /* COMDAT associated section index */
-                char x_comdat[1];       /* COMDAT selection number */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-#       define _ETEXT   "etext"
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-
-
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -233 +84 @@
 };
 
-
 #define RELOC struct external_reloc
 #define RELSZ 10

branches/GNU/src/binutils/include/coff/internal.h

@@ -62 +62 @@
   struct internal_extra_pe_filehdr pe;
 
-  /* standard coff  internal info */
+  /* Standard coff internal info.  */
   unsigned short f_magic;       /* magic number                 */
   unsigned short f_nscns;       /* number of sections           */
@@ -75 +75 @@
 
 /* Bits for f_flags:
- *      F_RELFLG        relocation info stripped from file
- *      F_EXEC          file is executable (no unresolved external references)
- *      F_LNNO          line numbers stripped from file
- *      F_LSYMS         local symbols stripped from file
- *      F_AR16WR        file is 16-bit little-endian
- *      F_AR32WR        file is 32-bit little-endian
- *      F_AR32W         file is 32-bit big-endian
- *      F_DYNLOAD       rs/6000 aix: dynamically loadable w/imports & exports
- *      F_SHROBJ        rs/6000 aix: file is a shared object
- *      F_DLL           PE format DLL
- */
+        F_RELFLG        relocation info stripped from file
+        F_EXEC          file is executable (no unresolved external references)
+        F_LNNO          line numbers stripped from file
+        F_LSYMS         local symbols stripped from file
+        F_AR16WR        file is 16-bit little-endian
+        F_AR32WR        file is 32-bit little-endian
+        F_AR32W         file is 32-bit big-endian
+        F_DYNLOAD       rs/6000 aix: dynamically loadable w/imports & exports
+        F_SHROBJ        rs/6000 aix: file is a shared object
+        F_DLL           PE format DLL.  */
 
 #define F_RELFLG        (0x0001)
@@ -98 +97 @@
 #define F_DLL           (0x2000)
 
-/* extra structure which is used in the optional header */
+/* Extra structure which is used in the optional header.  */
 typedef struct _IMAGE_DATA_DIRECTORY 
 {
@@ -175 +174 @@
 
   /* RS/6000 stuff */
-  unsigned long o_toc;          /* address of TOC                       */
+  bfd_vma o_toc;                /* address of TOC                       */
   short o_snentry;              /* section number for entry point */
   short o_sntext;               /* section number for text      */
@@ -186 +185 @@
   short o_modtype;              /* Module type field, 1R,RE,RO  */
   short o_cputype;              /* Encoded CPU type             */
-  unsigned long o_maxstack;     /* max stack size allowed.      */
-  unsigned long o_maxdata;      /* max data size allowed.       */
+  bfd_vma o_maxstack;   /* max stack size allowed.      */
+  bfd_vma o_maxdata;    /* max data size allowed.       */
 
   /* ECOFF stuff */
@@ -201 +200 @@
   long vid[2];                  /* Version id */
 
-
   struct internal_extra_pe_aouthdr pe;
-
 };
 
@@ -323 +320 @@
 };
 
-/*
- * s_flags "type"
- */
+/* s_flags "type".  */
 #define STYP_REG         (0x0000)       /* "regular": allocated, relocated, loaded */
 #define STYP_DSECT       (0x0001)       /* "dummy":  relocated only*/
@@ -344 +339 @@
 #define STYP_LIB         (0x0800)       /* for .lib: same as INFO */
 #define STYP_MERGE       (0x2000)       /* merge section -- combines with text, data or bss sections only */
-#define STYP_REVERSE_PAD (0x4000)       /* section will be padded with no-op instructions wherever padding is necessary and there is a
-                                        
-                                                                             word of contiguous bytes
-                                                                             beginning on a word boundary. */
+#define STYP_REVERSE_PAD (0x4000)       /* section will be padded with no-op instructions
+                                           wherever padding is necessary and there is a
+                                           word of contiguous bytes beginning on a word
+                                           boundary. */
 
 #define STYP_LIT        0x8020  /* Literal data (like STYP_TEXT) */
 
 
-
 /********************** LINE NUMBERS **********************/
 
 /* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
+   Line numbers are grouped on a per function basis; first entry in a function
+   grouping will have l_lnno = 0 and in place of physical address will be the
+   symbol table index of the function name.  */
 
 struct internal_lineno
@@ -365 +358 @@
   union
   {
-    long l_symndx;              /* function name symbol index, iff l_lnno == 0*/
-    long l_paddr;               /* (physical) address of line number    */
+    bfd_signed_vma l_symndx;            /* function name symbol index, iff l_lnno == 0*/
+    bfd_signed_vma l_paddr;             /* (physical) address of line number    */
   }     l_addr;
   unsigned long l_lnno;         /* line number          */
@@ -389 +382 @@
     char *_n_nptr[2];           /* allows for overlaying        */
   }     _n;
-  long n_value;                 /* value of symbol              */
+  bfd_vma n_value;                      /* value of symbol              */
   short n_scnum;                /* section number               */
   unsigned short n_flags;       /* copy of flags from filhdr    */
@@ -401 +394 @@
 #define n_offset        _n._n_n._n_offset
 
-
 /* Relocatable symbols have number of the section in which they are defined,
-   or one of the following: */
+   or one of the following:  */
 
 #define N_UNDEF ((short)0)      /* undefined symbol */
@@ -411 +403 @@
 #define P_TV    ((short)-4)     /* indicates symbol needs postload transfer vector*/
 
-/*
- * Type of a symbol, in low N bits of the word
- */
+/* Type of a symbol, in low N bits of the word.  */
+
 #define T_NULL          0
 #define T_VOID          1       /* function argument (only used by compiler) */
@@ -432 +423 @@
 #define T_LNGDBL        16      /* long double          */
 
-/*
- * derived types, in n_type
-*/
+/* Derived types, in n_type.  */
+
 #define DT_NON          (0)     /* no derived type */
 #define DT_PTR          (1)     /* pointer */
@@ -479 +469 @@
       struct
       {                         /* if ISFCN, tag, or .bb */
-        long x_lnnoptr;         /* ptr to fcn line # */
+        bfd_signed_vma x_lnnoptr;               /* ptr to fcn line # */
         union
         {                       /* entry ndx past block end */
@@ -530 +520 @@
     union
       {                         /* csect length or enclosing csect */
-        long l;
+        bfd_signed_vma l;
         struct coff_ptr_struct *p;
       } x_scnlen;
@@ -611 +601 @@
 
 #define R_DIR16          1
+#define R_REL24          5
 #define R_DIR32          6
 #define R_IMAGEBASE      7
@@ -619 +610 @@
 #define R_PCRWORD       19
 #define R_PCRLONG       20
+#define R_PCR24         21
 #define R_IPRSHORT      24
 #define R_IPRLONG       26
@@ -625 +617 @@
 #define R_TAGWORD       31
 #define R_JUMPTARG      32      /* strange 29k 00xx00xx reloc */
+#define R_PARTLS16      32
+#define R_PARTMS8       33
 
 #define R_PCR16L       128
@@ -650 +644 @@
 
 /* This reloc identifies a bra with an 8-bit pc-relative
-   target that was formerlly a jmp insn with a 16bit target.  */
+   target that was formerly a jmp insn with a 16bit target.  */
 #define R_JMP2          0x44
 
@@ -662 +656 @@
 
 /* This reloc identifies a bra with an 8-bit pc-relative
-   target that was formerlly a jmp insn with a 24bit target.  */
+   target that was formerly a jmp insn with a 24bit target.  */
 #define R_JMPL2         0x47
 
@@ -690 +684 @@
 #define R_MOVL1         0x4c
 
-/* This reloc identifies mov.[wl] insns which formerlly had
+/* This reloc identifies mov.[wl] insns which formerly had
    a 32/24bit absolute address and now have a 16bit absolute address.  */
 #define R_MOVL2         0x4d

branches/GNU/src/binutils/include/coff/m68k.h

@@ -20 +20 @@
 #define GNU_COFF_M68K_H 1
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
 
 /* Motorola 68000/68008/68010/68020 */
@@ -42 +32 @@
 #define M68TVMAGIC      0211
 
-/* this is the magic of the Bull dpx/2 */
+/* This is the magic of the Bull dpx/2 */
 #define MC68KBCSMAGIC   0526
 
@@ -53 +43 @@
 /* This intentionally does not include MC68KBCSMAGIC; it only includes
    magic numbers which imply that names do not have underscores.  */
-#define M68KBADMAG(x) (((x).f_magic!=MC68MAGIC) && ((x).f_magic!=MC68KWRMAGIC) && ((x).f_magic!=MC68TVMAGIC) && \
-  ((x).f_magic!=MC68KROMAGIC) && ((x).f_magic!=MC68KPGMAGIC) && ((x).f_magic!=M68MAGIC) && ((x).f_magic!=M68TVMAGIC) && ((x).f_magic!=LYNXCOFFMAGIC) )
+#define M68KBADMAG(x) (((x).f_magic != MC68MAGIC) \
+                    && ((x).f_magic != MC68KWRMAGIC) \
+                    && ((x).f_magic != MC68TVMAGIC) \
+                    && ((x).f_magic != MC68KROMAGIC) \
+                    && ((x).f_magic != MC68KPGMAGIC) \
+                    && ((x).f_magic != M68MAGIC) \
+                    && ((x).f_magic != M68TVMAGIC) \
+                    && ((x).f_magic != LYNXCOFFMAGIC))
 
 /* Magic numbers for the a.out header.  */
@@ -63 +59 @@
 #define PAGEMAGICPEXECPAGED   0413 /* pure executable (paged) */
 
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-#define _COMMENT ".comment"
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2]; /* line number          */
-};
-
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -227 +69 @@
   char r_offset[4];
 #endif
-
 };
-
 
 #define RELOC struct external_reloc

branches/GNU/src/binutils/include/coff/m88k.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
+#define DO_NOT_DEFINE_SCNHDR
+#define L_LNNO_SIZE 4
+#define DO_NOT_DEFINE_SYMENT
+#define DO_NOT_DEFINE_AUXENT
+#include "coff/external.h"
 
 #define MC88MAGIC  0540           /* 88k BCS executable */
@@ -32 +27 @@
 #define MC88OMAGIC 0555           /* Object file        */
 
-#define MC88BADMAG(x) (((x).f_magic!=MC88MAGIC) &&((x).f_magic!=MC88DMAGIC) && ((x).f_magic != MC88OMAGIC))
+#define MC88BADMAG(x) (((x).f_magic != MC88MAGIC) \
+                    && ((x).f_magic != MC88DMAGIC) \
+                    && ((x).f_magic != MC88OMAGIC))
 
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-#define PAGEMAGIC3 0414 /* Split i&d, zero mapped */
+#define PAGEMAGIC3   0414 /* Split i&d, zero mapped */
 #define PAGEMAGICBCS 0413
 
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-/* compute size of a header */
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
-
 /********************** SECTION HEADER **********************/
-
 
 struct external_scnhdr 
@@ -82 +50 @@
 };
 
-
 #define SCNHDR  struct external_scnhdr
 #define SCNHSZ  44
 
-/*
- * names of "special" sections
- */
+/* Names of "special" sections.  */
 #define _TEXT   ".text"
 #define _DATA   ".data"
 #define _BSS    ".bss"
 #define _COMMENT ".comment"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno{
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-
-        char l_lnno[4];
-
-};
-
-#define LINENO  struct external_lineno
-#define LINESZ  8
 
 
@@ -123 +68 @@
 struct external_syment 
 {
-  union {
+  union
+  {
     char e_name[E_SYMNMLEN];
-    struct {
+
+    struct
+    {
       char e_zeroes[4];
       char e_offset[4];
     } e;
+
   } e;
+
   char e_value[4];
   char e_scnum[2];
@@ -138 +88 @@
 };
 
-
-
-
 #define N_BTMASK        017
 #define N_TMASK         060
@@ -146 +93 @@
 #define N_TSHIFT        2
 
-
 /* Note that this isn't the same shape as other coffs */
-union external_auxent {
-  struct {
+union external_auxent
+{
+  struct
+  {
     char x_tagndx[4];           /* str, un, or enum tag indx */
     /* 4 */
-    union {
+    
+    union
+    {
       char x_fsize[4];          /* size of function */
-      struct {
+
+      struct
+      {
         char  x_lnno[4];        /* declaration line number */
         char  x_size[4];        /* str/union/array size */
       } x_lnsz;
+
     } x_misc;
     
     /* 12 */
-    union {
-      struct {                  /* if ISFCN, tag, or .bb */
+    union
+    {
+      struct                    /* if ISFCN, tag, or .bb */
+      {
         char x_lnnoptr[4];      /* ptr to fcn line # */
         char x_endndx[4];               /* entry ndx past block end */
       } x_fcn;
-      struct {                  /* if ISARY, up to 4 dimen. */
+
+      struct                    /* if ISARY, up to 4 dimen. */
+      {
         char x_dimen[E_DIMNUM][2];
       } x_ary;
+
     } x_fcnary;
     /* 20 */
@@ -174 +132 @@
   } x_sym;
   
-  union {
+  union
+  {
     char x_fname[E_FILNMLEN];
-    struct {
+
+    struct
+    {
       char x_zeroes[4];
       char x_offset[4];
     } x_n;
+
   } x_file;
   
-  struct {
+  struct
+  {
     char x_scnlen[4];           /* section length */
     char x_nreloc[4];           /* # relocation entries */
@@ -188 +151 @@
   } x_scn;
   
-  struct {
+  struct
+  {
     char x_tvfill[4];           /* tv fill value */
     char x_tvlen[2];            /* length of .tv */
     char x_tvran[2][2];         /* tv range */
   } x_tv;                       /* info about .tv section (in auxent of symbol .tv)) */
-
 };
 
-#define GET_FCN_LNNOPTR(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *)ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
-#define GET_FCN_ENDNDX(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_endndx)
-#define PUT_FCN_LNNOPTR(abfd, in, ext)  bfd_h_put_32(abfd,  in, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
-#define PUT_FCN_ENDNDX(abfd, in, ext) bfd_h_put_32(abfd, in, (bfd_byte *)   ext->x_sym.x_fcnary.x_fcn.x_endndx)
-#define GET_LNSZ_SIZE(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_misc.x_lnsz.x_size)
-#define GET_LNSZ_LNNO(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_misc.x_lnsz.x_lnno)
-#define PUT_LNSZ_LNNO(abfd, in, ext) bfd_h_put_32(abfd, in, (bfd_byte *) ext->x_sym.x_misc.x_lnsz.x_lnno)
-#define PUT_LNSZ_SIZE(abfd, in, ext) bfd_h_put_32(abfd, in, (bfd_byte *) ext->x_sym.x_misc.x_lnsz.x_size)
-#define GET_SCN_SCNLEN(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) ext->x_scn.x_scnlen)
-#define GET_SCN_NRELOC(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) ext->x_scn.x_nreloc)
-#define GET_SCN_NLINNO(abfd, ext)  bfd_h_get_32(abfd, (bfd_byte *) ext->x_scn.x_nlinno)
-#define PUT_SCN_SCNLEN(abfd,in, ext) bfd_h_put_32(abfd, in, (bfd_byte *) ext->x_scn.x_scnlen)
-#define PUT_SCN_NRELOC(abfd,in, ext) bfd_h_put_32(abfd, in, (bfd_byte *)ext->x_scn.x_nreloc)
-#define PUT_SCN_NLINNO(abfd,in, ext)  bfd_h_put_32(abfd,in, (bfd_byte *) ext->x_scn.x_nlinno)
-#define GET_LINENO_LNNO(abfd, ext)  bfd_h_get_32(abfd, (bfd_byte *) (ext->l_lnno))
-#define PUT_LINENO_LNNO(abfd,val, ext)  bfd_h_put_32(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-
+#define GET_LNSZ_SIZE(abfd, ext) \
+  H_GET_32 (abfd, ext->x_sym.x_misc.x_lnsz.x_size)
+#define GET_LNSZ_LNNO(abfd, ext) \
+  H_GET_32 (abfd, ext->x_sym.x_misc.x_lnsz.x_lnno)
+#define PUT_LNSZ_LNNO(abfd, in, ext) \
+  H_PUT_32 (abfd, in, ext->x_sym.x_misc.x_lnsz.x_lnno)
+#define PUT_LNSZ_SIZE(abfd, in, ext) \
+  H_PUT_32 (abfd, in, ext->x_sym.x_misc.x_lnsz.x_size)
+#define GET_SCN_NRELOC(abfd, ext) \
+  H_GET_32 (abfd, ext->x_scn.x_nreloc)
+#define GET_SCN_NLINNO(abfd, ext) \
+  H_GET_32 (abfd, ext->x_scn.x_nlinno)
+#define PUT_SCN_NRELOC(abfd, in, ext) \
+  H_PUT_32 (abfd, in, ext->x_scn.x_nreloc)
+#define PUT_SCN_NLINNO(abfd, in, ext) \
+  H_PUT_32 (abfd,in, ext->x_scn.x_nlinno)
 
 #define SYMENT  struct external_syment
@@ -220 +181 @@
 #define AUXESZ  20
 
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];

branches/GNU/src/binutils/include/coff/mcore.h

@@ -23 +23 @@
 #define _COFF_MORE_H
 
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
+
+#define MCOREMAGIC      0xb00  /* I just made this up */ 
+
+#define MCOREBADMAG(x) (((x).f_magic != MCOREMAGIC))
 
 #define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
@@ -37 +44 @@
 #define PEMCORE
 
-typedef struct 
-{
-  char  magic      [2];         /* type of file                         */
-  char  vstamp     [2];         /* version stamp                        */
-  char  tsize      [4];         /* text size in bytes, padded to FW bdry*/
-  char  dsize      [4];         /* initialized data "  "                */
-  char  bsize      [4];         /* uninitialized data "   "             */
-  char  entry      [4];         /* entry pt.                            */
-  char  text_start [4];         /* base of text used for this file */
-  char  data_start [4];         /* base of data used for this file */
-}
-AOUTHDR;
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
 #define OMAGIC          0404    /* object files, eg as output */
 #define ZMAGIC          0413    /* demand load format, eg normal ld output */
@@ -61 +52 @@
 #define IMAGE_NT_OPTIONAL_HDR_MAGIC        0x10b
 
-
 /* Define some NT default values. */
 #define NT_SECTION_ALIGNMENT 0x1000
@@ -67 +57 @@
 #define NT_DEF_RESERVE       0x100000
 #define NT_DEF_COMMIT        0x1000
-
 
 struct external_reloc
@@ -80 +69 @@
 #define RELSZ 14
 
-#define MCOREMAGIC      0xb00  /* I just made this up */ 
-
-#define MCOREBADMAG(x) (((x).f_magic!= MCOREMAGIC))
-
-struct external_filehdr
-{
-  char f_magic  [2];    /* magic number                 */
-  char f_nscns  [2];    /* number of sections           */
-  char f_timdat [4];    /* time & date stamp            */
-  char f_symptr [4];    /* file pointer to symtab       */
-  char f_nsyms  [4];    /* number of symtab entries     */
-  char f_opthdr [2];    /* sizeof(optional hdr)         */
-  char f_flags  [2];    /* flags                        */
-};
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union
-  {
-    char e_name [E_SYMNMLEN];
-    struct
-    {
-      char e_zeroes [4];
-      char e_offset [4];
-    } e;
-  } e;
-  
-  char e_value  [4];
-  char e_scnum  [2];
-  char e_type   [2];
-  char e_sclass [1];
-  char e_numaux [1];
-};
-
-#define N_BTMASK        0xf
-#define N_TMASK         0x30
-#define N_BTSHFT        4
-#define N_TSHIFT        2
-
-union external_auxent
-{
-  struct
-  {
-    char x_tagndx [4];          /* str, un, or enum tag indx */
-    
-    union
-    {
-      struct
-      {
-        char  x_lnno [2];       /* declaration line number */
-        char  x_size [2];       /* str/union/array size */
-      } x_lnsz;
-
-      char x_fsize [4];         /* size of function */
-
-    } x_misc;
-
-    union
-    {
-      struct                    /* if ISFCN, tag, or .bb */
-      {
-        char x_lnnoptr [4];     /* ptr to fcn line # */
-        char x_endndx  [4];     /* entry ndx past block end */
-      } x_fcn;
-
-      struct                    /* if ISARY, up to 4 dimen. */
-      {
-        char x_dimen [E_DIMNUM][2];
-      } x_ary;
-      
-    } x_fcnary;
-
-    char x_tvndx [2];           /* tv index */
-
-  } x_sym;
-
-  union
-  {
-    char x_fname [E_FILNMLEN];
-    
-    struct
-    {
-      char x_zeroes [4];
-      char x_offset [4];
-    } x_n;
-    
-  } x_file;
-
-  struct
-  {
-    char x_scnlen     [4];      /* section length */
-    char x_nreloc     [2];      /* # relocation entries */
-    char x_nlinno     [2];      /* # line numbers */
-    char x_checksum   [4];      /* section COMDAT checksum */
-    char x_associated [2];      /* COMDAT associated section index */
-    char x_comdat     [1];      /* COMDAT selection number */
-  } x_scn;
-
-  struct
-  {
-    char x_tvfill [4];          /* tv fill value */
-    char x_tvlen  [2];          /* length of .tv */
-    char x_tvran  [2][2];       /* tv range */
-  } x_tv;                       /* info about .tv section (in auxent of symbol .tv)) */
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-/* 1 line number entry for every "breakpointable" source line in a section.
-   Line numbers are grouped on a per function basis; first entry in a function
-   grouping will have l_lnno = 0 and in place of physical address will be the
-   symbol table index of the function name.  */
-struct external_lineno
-{
-  union
-  {
-    char l_symndx [4];  /* function name symbol index, iff l_lnno == 0*/
-    char l_paddr  [4];  /* (physical) address of line number    */
-  } l_addr;
-
-  char l_lnno [2];      /* line number          */
-};
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-#define GET_LINENO_LNNO(abfd, ext)     bfd_h_get_32 (abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_32 (abfd, val, (bfd_byte *) (ext->l_lnno));
-
-struct external_scnhdr
-{
-  char  s_name    [8];  /* section name                 */
-  char  s_paddr   [4];  /* physical address, aliased s_nlib */
-  char  s_vaddr   [4];  /* virtual address              */
-  char  s_size    [4];  /* section size                 */
-  char  s_scnptr  [4];  /* file ptr to raw data for section */
-  char  s_relptr  [4];  /* file ptr to relocation       */
-  char  s_lnnoptr [4];  /* file ptr to line numbers     */
-  char  s_nreloc  [2];  /* number of relocation entries */
-  char  s_nlnno   [2];  /* number of line number entries*/
-  char  s_flags   [4];  /* flags                        */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-/* Names of "special" sections.  */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-
-
-
 #endif /* __COFF_MCORE_H */

branches/GNU/src/binutils/include/coff/mips.h

@@ -18 +18 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-  unsigned char f_magic[2];     /* magic number                 */
-  unsigned char f_nscns[2];     /* number of sections           */
-  unsigned char f_timdat[4];    /* time & date stamp            */
-  unsigned char f_symptr[4];    /* file pointer to symtab       */
-  unsigned char f_nsyms[4];     /* number of symtab entries     */
-  unsigned char f_opthdr[2];    /* sizeof(optional hdr)         */
-  unsigned char f_flags[2];     /* flags                        */
-};
+#define DO_NOT_DEFINE_AOUTHDR
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
 
 /* Magic numbers are defined in coff/ecoff.h.  */
@@ -39 +31 @@
                               ((x).f_magic!=MIPS_MAGIC_BIG3))
 
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
 
 /********************** AOUT "OPTIONAL HEADER" **********************/
-
 
 typedef struct external_aouthdr
@@ -66 +55 @@
 #define AOUTHDRSZ 56
 
-/********************** SECTION HEADER **********************/
-
-struct external_scnhdr {
-  unsigned char s_name[8];      /* section name                 */
-  unsigned char s_paddr[4];     /* physical address, aliased s_nlib */
-  unsigned char s_vaddr[4];     /* virtual address              */
-  unsigned char s_size[4];      /* section size                 */
-  unsigned char s_scnptr[4];    /* file ptr to raw data for section */
-  unsigned char s_relptr[4];    /* file ptr to relocation       */
-  unsigned char s_lnnoptr[4];   /* file ptr to line numbers     */
-  unsigned char s_nreloc[2];    /* number of relocation entries */
-  unsigned char s_nlnno[2];     /* number of line number entries*/
-  unsigned char s_flags[4];     /* flags                        */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-struct external_reloc {
-  unsigned char r_vaddr[4];
-  unsigned char r_bits[4];
-};
+struct external_reloc
+  {
+    unsigned char r_vaddr[4];
+    unsigned char r_bits[4];
+  };
 
 #define RELOC struct external_reloc
@@ -179 +151 @@
 /* File header as a set of bytes */
 
-struct hdr_ext {
+struct hdr_ext
+{
         unsigned char   h_magic[2];
         unsigned char   h_vstamp[2];
@@ -209 +182 @@
 /* File descriptor external record */
 
-struct fdr_ext {
+struct fdr_ext
+{
         unsigned char   f_adr[4];
         unsigned char   f_rss[4];
@@ -255 +229 @@
 /* Procedure descriptor external record */
 
-struct pdr_ext {
+struct pdr_ext
+{
         unsigned char   p_adr[4];
         unsigned char   p_isym[4];
@@ -274 +249 @@
 /* Runtime procedure table */
 
-struct rpdr_ext {
+struct rpdr_ext
+{
         unsigned char   p_adr[4];
         unsigned char   p_regmask[4];
@@ -290 +266 @@
 /* Line numbers */
 
-struct line_ext {
+struct line_ext
+{
         unsigned char   l_line[4];
 };
@@ -296 +273 @@
 /* Symbol external record */
 
-struct sym_ext {
+struct sym_ext
+{
         unsigned char   s_iss[4];
         unsigned char   s_value[4];
@@ -336 +314 @@
 /* External symbol external record */
 
-struct ext_ext {
+struct ext_ext
+{
         unsigned char   es_bits1[1];
         unsigned char   es_bits2[1];
@@ -354 +333 @@
 /* Dense numbers external record */
 
-struct dnr_ext {
+struct dnr_ext
+{
         unsigned char   d_rfd[4];
         unsigned char   d_index[4];
@@ -361 +341 @@
 /* Relative file descriptor */
 
-struct rfd_ext {
+struct rfd_ext
+{
   unsigned char rfd[4];
 };
@@ -367 +348 @@
 /* Optimizer symbol external record */
 
-struct opt_ext {
+struct opt_ext
+{
   unsigned char o_bits1[1];
   unsigned char o_bits2[1];

branches/GNU/src/binutils/include/coff/mipspe.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
-
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
 
 #define MIPS_ARCH_MAGIC_WINCE   0x0166  /* Windows CE - little endian */
 #define MIPS_PE_MAGIC           0x010b
 
-#define MIPSBADMAG(x) \
- ((x).f_magic!=MIPS_ARCH_MAGIC_WINCE)
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTHDRSZ 28
-#define AOUTSZ 28
-
-
-
+#define MIPSBADMAG(x) ((x).f_magic != MIPS_ARCH_MAGIC_WINCE)
 
 /* define some NT default values */
@@ -71 +33 @@
 #define NT_DEF_COMMIT        0x1000
 
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2]; /* line number          */
-};
-
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_16(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-                char x_checksum[4];     /* section COMDAT checksum */
-                char x_associated[2];   /* COMDAT associated section index */
-                char x_comdat[1];       /* COMDAT selection number */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
 /* The external reloc has an offset field, because some of the reloc
    types on the h8 don't have room in the instruction for the entire
-   offset - eg the strange jump and high page addressing modes */
+   offset - eg the strange jump and high page addressing modes.  */
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
   char r_type[2];
 };
-
 
 #define RELOC struct external_reloc

branches/GNU/src/binutils/include/coff/powerpc.h

@@ -19 +19 @@
  
    Initial release: Kim Knuttila (krk@cygnus.com)  */
-
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-  char f_magic[2];      /* magic number                 */
-  char f_nscns[2];      /* number of sections           */
-  char f_timdat[4];     /* time & date stamp            */
-  char f_symptr[4];     /* file pointer to symtab       */
-  char f_nsyms[4];      /* number of symtab entries     */
-  char f_opthdr[2];     /* sizeof(optional hdr)         */
-  char f_flags[2];      /* flags                        */
-};
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
 
 /* Bits for f_flags:
- *      F_RELFLG        relocation info stripped from file
- *      F_EXEC          file is executable (no unresolved external references)
- *      F_LNNO          line numbers stripped from file
- *      F_LSYMS         local symbols stripped from file
- *      F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax)
- */
+        F_RELFLG        relocation info stripped from file
+        F_EXEC          file is executable (no unresolved external references)
+        F_LNNO          line numbers stripped from file
+        F_LSYMS         local symbols stripped from file
+        F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax).  */
 
 #define F_RELFLG        (0x0001)
@@ -58 +45 @@
 #define PPCBADMAG(x) ((x).f_magic != PPCMAGIC) 
 
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
-/********************** SECTION HEADER **********************/
-
-struct external_scnhdr {
-  char          s_name[8];      /* section name                     */
-  char          s_paddr[4];     /* physical address, aliased s_nlib */
-  char          s_vaddr[4];     /* virtual address                  */
-  char          s_size[4];      /* section size                     */
-  char          s_scnptr[4];    /* file ptr to raw data for section */
-  char          s_relptr[4];    /* file ptr to relocation           */
-  char          s_lnnoptr[4];   /* file ptr to line numbers         */
-  char          s_nreloc[2];    /* number of relocation entries     */
-  char          s_nlnno[2];     /* number of line number entries    */
-  char          s_flags[4];     /* flags                            */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-#define _COMMENT ".comment"
-#define _LIB ".lib"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-  union {
-    char l_symndx[4];   /* function name symbol index, iff l_lnno == 0 */
-    char l_paddr[4];    /* (physical) address of line number           */
-  } l_addr;
-  char l_lnno[2];       /* line number                                 */
-};
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8     /* # characters in a symbol name       */
-
-/* Allow the file name length to be overridden in the including file   */
-#ifndef E_FILNMLEN
-#define E_FILNMLEN      14
-#endif
-
-#define E_DIMNUM        4     /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-
-#define N_BTMASK        (0xf)
-#define N_TMASK         (0x30)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-union external_auxent {
-  struct {
-    char x_tagndx[4];              /* str, un, or enum tag indx       */
-    union {
-      struct {
-        char  x_lnno[2];           /* declaration line number         */
-        char  x_size[2];           /* str/union/array size            */
-      } x_lnsz;
-      char x_fsize[4];             /* size of function                */
-    } x_misc;
-    union {
-      struct {                     /* if ISFCN, tag, or .bb           */
-        char x_lnnoptr[4];         /* ptr to fcn line #               */
-        char x_endndx[4];          /* entry ndx past block end        */
-      } x_fcn;
-      struct {                     /* if ISARY, up to 4 dimen.        */
-        char x_dimen[E_DIMNUM][2];
-      } x_ary;
-    } x_fcnary;
-    char x_tvndx[2];               /* tv index                        */
-  } x_sym;
-  
-  union {
-    char x_fname[E_FILNMLEN];
-    struct {
-      char x_zeroes[4];
-      char x_offset[4];
-    } x_n;
-  } x_file;
-  
-  struct {
-    char x_scnlen[4];              /* section length                  */
-    char x_nreloc[2];              /* # relocation entries            */
-    char x_nlinno[2];              /* # line numbers                  */
-    char x_checksum[4];            /* section COMDAT checksum         */
-    char x_associated[2];          /* COMDAT associated section index */
-    char x_comdat[1];              /* COMDAT selection number         */
-  } x_scn;
-};
-
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-#define _ETEXT  "etext"
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];

branches/GNU/src/binutils/include/coff/rs6000.h

@@ -67 +67 @@
 #define AOUTHDRSZ 72
 
-#define RS6K_AOUTHDR_OMAGIC     0x0107  /* old: text & data writeable */
-#define RS6K_AOUTHDR_NMAGIC     0x0108  /* new: text r/o, data r/w */
-#define RS6K_AOUTHDR_ZMAGIC     0x010B  /* paged: text r/o, both page-aligned */
-
-
 /********************** SECTION HEADER **********************/
 
@@ -88 +83 @@
 };
 
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-#define _PAD    ".pad"
-#define _LOADER ".loader"
-
 #define SCNHDR  struct external_scnhdr
 #define SCNHSZ  40
-
-/* XCOFF uses a special .loader section with type STYP_LOADER.  */
-#define STYP_LOADER 0x1000
-
-/* XCOFF uses a special .debug section with type STYP_DEBUG.  */
-#define STYP_DEBUG 0x2000
-
-/* XCOFF handles line number or relocation overflow by creating
-   another section header with STYP_OVRFLO set.  */
-#define STYP_OVRFLO 0x8000
 
 /********************** LINE NUMBERS **********************/
@@ -242 +218 @@
 /* For new sections we havn't heard of before */
 #define DEFAULT_SECTION_ALIGNMENT 4
+
+/* The ldhdr structure.  This appears at the start of the .loader
+   section.  */
+
+struct external_ldhdr
+{
+  bfd_byte l_version[4];
+  bfd_byte l_nsyms[4];
+  bfd_byte l_nreloc[4];
+  bfd_byte l_istlen[4];
+  bfd_byte l_nimpid[4];
+  bfd_byte l_impoff[4];
+  bfd_byte l_stlen[4];
+  bfd_byte l_stoff[4];
+};
+
+#define LDHDRSZ (8 * 4)
+
+struct external_ldsym
+{
+  union
+    {
+      bfd_byte _l_name[SYMNMLEN];
+      struct
+        {
+          bfd_byte _l_zeroes[4];
+          bfd_byte _l_offset[4];
+        } _l_l;
+    } _l;
+  bfd_byte l_value[4];
+  bfd_byte l_scnum[2];
+  bfd_byte l_smtype[1];
+  bfd_byte l_smclas[1];
+  bfd_byte l_ifile[4];
+  bfd_byte l_parm[4];
+};
+
+#define LDSYMSZ (8 + 3 * 4 + 2 + 2)
+
+struct external_ldrel
+{
+  bfd_byte l_vaddr[4];
+  bfd_byte l_symndx[4];
+  bfd_byte l_rtype[2];
+  bfd_byte l_rsecnm[2];
+};
+
+#define LDRELSZ (2 * 4 + 2 * 2)

branches/GNU/src/binutils/include/coff/rs6k64.h

@@ -1 +1 @@
 /* IBM RS/6000 "XCOFF64" file definitions for BFD.
-   Copyright (C) 2000 Free Software Foundation, Inc.  
+   Copyright (C) 2000, 2002 Free Software Foundation, Inc.  
 
    This program is free software; you can redistribute it and/or modify
@@ -14 +14 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-*/
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /********************** FILE HEADER **********************/
 
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[8];/* file pointer to symtab      */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-        char f_nsyms[4];        /* number of symtab entries     */
-};
-
-        /* IBM RS/6000 */
-#define U803XTOCMAGIC 0757      /* readonly text segments and TOC, XCOFF64 */
-
-#define BADMAG(x) ((x).f_magic != U803XTOCMAGIC)
+struct external_filehdr
+{
+  char f_magic[2];      /* magic number                 */
+  char f_nscns[2];      /* number of sections           */
+  char f_timdat[4];     /* time & date stamp            */
+  char f_symptr[8];     /* file pointer to symtab       */
+  char f_opthdr[2];     /* sizeof(optional hdr)         */
+  char f_flags[2];      /* flags                        */
+  char f_nsyms[4];      /* number of symtab entries     */
+};
+
+/* IBM RS/6000.  */
+#define U803XTOCMAGIC 0757      /* Aix 4.3 64-bit XCOFF */
+#define U64_TOCMAGIC  0767      /* AIX 5+ 64-bit XCOFF */
+#define BADMAG(x) ((x).f_magic != U803XTOCMAGIC && (x).f_magic != U64_TOCMAGIC)
 
 #define FILHDR  struct external_filehdr
@@ -38 +38 @@
 
 /********************** AOUT "OPTIONAL HEADER" **********************/
-
 
 typedef struct 
@@ -45 +44 @@
   unsigned char vstamp[2];              /* version stamp                */
   unsigned char o_debugger[4];          /* reserved                     */
-  unsigned char text_start[8];  /* base of text used for this file */
-  unsigned char data_start[8];  /* base of data used for this file */
-  unsigned char o_toc[8];       /* address of TOC */
+  unsigned char text_start[8];          /* base of text used for this file */
+  unsigned char data_start[8];          /* base of data used for this file */
+  unsigned char o_toc[8];               /* address of TOC */
   unsigned char o_snentry[2];           /* section number of entry point */
   unsigned char o_sntext[2];            /* section number of .text section */
@@ -63 +62 @@
   unsigned char bsize[8];               /* uninitialized data "   "     */
   unsigned char entry[8];               /* entry pt.                    */
-  unsigned char o_maxstack[8];  /* max stack size (??)          */
-  unsigned char o_maxdata[8];   /* max data size (??)           */
+  unsigned char o_maxstack[8];          /* max stack size (??)          */
+  unsigned char o_maxdata[8];           /* max data size (??)           */
   unsigned char o_resv3[16];            /* reserved                     */
 }
@@ -73 +72 @@
 #define AOUTHDRSZ 72
 
-#define RS6K_AOUTHDR_OMAGIC     0x0107  /* old: text & data writeable */
-#define RS6K_AOUTHDR_NMAGIC     0x0108  /* new: text r/o, data r/w */
-#define RS6K_AOUTHDR_ZMAGIC     0x010B  /* paged: text r/o, both page-aligned */
-
-
 /********************** SECTION HEADER **********************/
 
-
-struct external_scnhdr {
-        char    s_name[8];              /* section name                 */
-        char    s_paddr[8];     /* physical address, aliased s_nlib */
-        char    s_vaddr[8];     /* virtual address              */
-        char    s_size[8];      /* section size                 */
-        char    s_scnptr[8];    /* file ptr to raw data for section */
-        char    s_relptr[8];    /* file ptr to relocation       */
-        char    s_lnnoptr[8];   /* file ptr to line numbers     */
-        char    s_nreloc[4];    /* number of relocation entries */
-        char    s_nlnno[4];     /* number of line number entries*/
-        char    s_flags[4];             /* flags                        */
-        char    s_pad[4];               /* padding */  
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-#define _PAD    ".pad"
-#define _LOADER ".loader"
+struct external_scnhdr
+{
+  char  s_name[8];      /* section name                 */
+  char  s_paddr[8];     /* physical address, aliased s_nlib */
+  char  s_vaddr[8];     /* virtual address              */
+  char  s_size[8];      /* section size                 */
+  char  s_scnptr[8];    /* file ptr to raw data for section */
+  char  s_relptr[8];    /* file ptr to relocation       */
+  char  s_lnnoptr[8];   /* file ptr to line numbers     */
+  char  s_nreloc[4];    /* number of relocation entries */
+  char  s_nlnno[4];     /* number of line number entries*/
+  char  s_flags[4];     /* flags                        */
+  char  s_pad[4];       /* padding */  
+};
 
 #define SCNHDR  struct external_scnhdr
@@ -108 +93 @@
 #define SCNHSZ  72
 
-/* XCOFF uses a special .loader section with type STYP_LOADER.  */
-#define STYP_LOADER 0x1000
-
-/* XCOFF uses a special .debug section with type STYP_DEBUG.  */
-#define STYP_DEBUG 0x2000
-
-/* XCOFF handles line number or relocation overflow by creating
-   another section header with STYP_OVRFLO set.  */
-#define STYP_OVRFLO 0x8000
-
 /********************** LINE NUMBERS **********************/
 
 /* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[8];/* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[8];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[4];         /* line number          */
-};
-
+   Line numbers are grouped on a per function basis; first entry in a function
+   grouping will have l_lnno = 0 and in place of physical address will be the
+   symbol table index of the function name.  */
+
+struct external_lineno
+{
+  union
+  {
+    char l_symndx[4];   /* function name symbol index, iff l_lnno == 0*/
+    char l_paddr[8];    /* (physical) address of line number    */
+  } l_addr;
+
+  char l_lnno[4];       /* line number          */
+};
 
 #define LINENO  struct external_lineno
 
 #define LINESZ  12
-
 
 /********************** SYMBOLS **********************/
@@ -147 +123 @@
 struct external_syment 
 {
-  union {
-    char e_value[8];
-  } e;
+  char e_value[8];
   char e_offset[4];
   char e_scnum[2];
@@ -157 +131 @@
 };
 
-
-
 #define N_BTMASK        (017)
 #define N_TMASK         (060)
 #define N_BTSHFT        (4)
 #define N_TSHIFT        (2)
-  
-
-union external_auxent {
-
+
+union external_auxent
+{
     struct {
         union {
@@ -222 +193 @@
 #define SYMNAME_IN_DEBUG(symptr) ((symptr)->n_sclass & DBXMASK)
 
-/* Values for auxtype field in XCOFF64, taken from AIX 4.3 sym.h */
+/* Values for auxtype field in XCOFF64, taken from AIX 4.3 sym.h.  */
 #define _AUX_EXCEPT     255
 #define _AUX_FCN        254
@@ -229 +200 @@
 #define _AUX_CSECT      251
 
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[8];
   char r_symndx[4];
@@ -240 +209 @@
   char r_type[1];
 };
-
 
 #define RELOC struct external_reloc
@@ -250 +218 @@
 /* For new sections we havn't heard of before */
 #define DEFAULT_SECTION_ALIGNMENT 4
+
+/* The ldhdr structure.  This appears at the start of the .loader
+   section.  */
+
+struct external_ldhdr
+{
+  bfd_byte l_version[4];
+  bfd_byte l_nsyms[4];
+  bfd_byte l_nreloc[4];
+  bfd_byte l_istlen[4];
+  bfd_byte l_nimpid[4];
+  bfd_byte l_stlen[4];
+  bfd_byte l_impoff[8];
+  bfd_byte l_stoff[8];
+  bfd_byte l_symoff[8];
+  bfd_byte l_rldoff[8];
+};
+#define LDHDRSZ (56)
+
+struct external_ldsym
+{
+  bfd_byte l_value[8];
+  bfd_byte l_offset[4];
+  bfd_byte l_scnum[2];
+  bfd_byte l_smtype[1];
+  bfd_byte l_smclas[1];
+  bfd_byte l_ifile[4];
+  bfd_byte l_parm[4];
+};
+
+#define LDSYMSZ (24)
+
+struct external_ldrel
+{
+  bfd_byte l_vaddr[8];
+  bfd_byte l_rtype[2];
+  bfd_byte l_rsecnm[2];
+  bfd_byte l_symndx[4];
+};
+
+#define LDRELSZ (16)

branches/GNU/src/binutils/include/coff/sh.h

@@ -1 @@
-/* coff information for Hitachi SH
+/* coff information for Renesas SH
    
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
-
+#ifdef COFF_WITH_PE
+#define L_LNNO_SIZE 2
+#else
+#define L_LNNO_SIZE 4
+#endif
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
 
 #define SH_ARCH_MAGIC_BIG       0x0500
@@ -36 +30 @@
 #define SH_PE_MAGIC             0x010b
 
-
 #define SHBADMAG(x) \
- (((x).f_magic!=SH_ARCH_MAGIC_BIG) && \
-  ((x).f_magic!=SH_ARCH_MAGIC_WINCE) && \
-  ((x).f_magic!=SH_ARCH_MAGIC_LITTLE))
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTHDRSZ 28
-#define AOUTSZ 28
-
-
+ (((x).f_magic != SH_ARCH_MAGIC_BIG) && \
+  ((x).f_magic != SH_ARCH_MAGIC_WINCE) && \
+  ((x).f_magic != SH_ARCH_MAGIC_LITTLE))
 
 /* Define some NT default values.  */
@@ -75 +42 @@
 #define NT_DEF_COMMIT        0x1000
 
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-#ifdef COFF_WITH_PE
-        char l_lnno[2]; /* line number          */
-#else
-        char l_lnno[4]; /* line number          */
-#endif
-};
-
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_32(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-#define LINENO  struct external_lineno
-#ifdef COFF_WITH_PE
-#define LINESZ  6
-#undef GET_LINENO_LNNO
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) (ext->l_lnno));
-#undef PUT_LINENO_LNNO
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_16(abfd,val,  (bfd_byte *) (ext->l_lnno));
-#else
-#define LINESZ  8
-#endif
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-                char x_checksum[4];     /* section COMDAT checksum */
-                char x_associated[2];   /* COMDAT associated section index */
-                char x_comdat[1];       /* COMDAT selection number */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
 /* The external reloc has an offset field, because some of the reloc
    types on the h8 don't have room in the instruction for the entire
-   offset - eg the strange jump and high page addressing modes */
+   offset - eg the strange jump and high page addressing modes.  */
 
 #ifndef COFF_WITH_PE
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -237 +58 @@
 };
 #else
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -243 +65 @@
 };
 #endif
-
 
 #define RELOC struct external_reloc

branches/GNU/src/binutils/include/coff/sparc.h

@@ -23 +23 @@
    be used with different systems while still yielding the same results.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr
-{
-  char f_magic[2];              /* magic number                 */
-  char f_nscns[2];              /* number of sections           */
-  char f_timdat[4];             /* time & date stamp            */
-  char f_symptr[4];             /* file pointer to symtab       */
-  char f_nsyms[4];              /* number of symtab entries     */
-  char f_opthdr[2];             /* sizeof(optional hdr)         */
-  char f_flags[2];              /* flags                        */
-};
+#define L_LNNO_SIZE 2
+#define DO_NOT_DEFINE_SYMENT
+#define DO_NOT_DEFINE_AUXENT
+#include "coff/external.h"
 
 #define F_RELFLG        (0x0001)        /* relocation info stripped */
@@ -47 +39 @@
 #define LYNXCOFFMAGIC   (0415)
 
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-typedef struct 
-{
-  char magic[2];                /* type of file                         */
-  char vstamp[2];               /* version stamp                        */
-  char tsize[4];                /* text size in bytes, padded to FW bdry*/
-  char dsize[4];                /* initialized data "  "                */
-  char bsize[4];                /* uninitialized data "   "             */
-  char entry[4];                /* entry pt.                            */
-  char text_start[4];           /* base of text used for this file */
-  char data_start[4];           /* base of data used for this file */
-}
-AOUTHDR;
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
 #define OMAGIC          0404    /* object files, eg as output */
 #define ZMAGIC          0413    /* demand load format, eg normal ld output */
@@ -73 +44 @@
 #define SHMAGIC         0443    /* host   shlib */
 
-/********************** SECTION HEADER **********************/
+/* More names of "special" sections. */
 
-struct external_scnhdr
-{
-  char s_name[8];               /* section name                 */
-  char s_paddr[4];              /* physical address, aliased s_nlib */
-  char s_vaddr[4];              /* virtual address              */
-  char s_size[4];               /* section size                 */
-  char s_scnptr[4];             /* file ptr to raw data for section */
-  char s_relptr[4];             /* file ptr to relocation       */
-  char s_lnnoptr[4];            /* file ptr to line numbers     */
-  char s_nreloc[2];             /* number of relocation entries */
-  char s_nlnno[2];              /* number of line number entries*/
-  char s_flags[4];              /* flags                        */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-/* Names of "special" sections. */
-
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
 #define _TV     ".tv"
 #define _INIT   ".init"
 #define _FINI   ".fini"
-#define _COMMENT ".comment"
-#define _LIB ".lib"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
-   Line numbers are grouped on a per function basis; first entry in a function
-   grouping will have l_lnno = 0 and in place of physical address will be the
-   symbol table index of the function name. */
-
-struct external_lineno
-{
-  union {
-    char l_symndx[4];           /* fn name symbol index, iff l_lnno == 0 */
-    char l_paddr[4];            /* (physical) address of line number */
-  } l_addr;
-  char l_lnno[2];               /* line number */
-};
-
-#define LINENO  struct external_lineno
-#define LINESZ  (6)
 
 /********************** SYMBOLS **********************/
@@ -214 +142 @@
 /********************** RELOCATION DIRECTIVES **********************/
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];

branches/GNU/src/binutils/include/coff/ti.h

@@ -18 +18 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
 #ifndef COFF_TI_H
 #define COFF_TI_H
 
+/* Note "coff/external.h is not used because TI adds extra fields to the structures.  */
+
 /********************** FILE HEADER **********************/
 
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-        char f_target_id[2];    /* magic no. (TI COFF-specific) */
-};
+struct external_filehdr
+  {
+    char f_magic[2];    /* magic number                 */
+    char f_nscns[2];    /* number of sections           */
+    char f_timdat[4];   /* time & date stamp            */
+    char f_symptr[4];   /* file pointer to symtab       */
+    char f_nsyms[4];    /* number of symtab entries     */
+    char f_opthdr[2];   /* sizeof(optional hdr)         */
+    char f_flags[2];    /* flags                        */
+    char f_target_id[2];    /* magic no. (TI COFF-specific) */
+  };
 
 /* COFF0 has magic number in f_magic, and omits f_target_id from the file
@@ -54 +56 @@
 #ifndef TICOFF_TARGET_ARCH
 #error "TICOFF_TARGET_ARCH needs to be defined for your CPU"
+#endif
+
+#ifndef TICOFF_TARGET_MACHINE_GET
+#define TICOFF_TARGET_MACHINE_GET(FLAGS) 0
+#endif
+
+#ifndef TICOFF_TARGET_MACHINE_SET
+#define TICOFF_TARGET_MACHINE_SET(FLAGSP, MACHINE)
 #endif
 
@@ -90 +100 @@
 /* we need to read/write an extra field in the coff file header */
 #ifndef COFF_ADJUST_FILEHDR_IN_POST
-#define COFF_ADJUST_FILEHDR_IN_POST(abfd,src,dst) \
-do { ((struct internal_filehdr *)(dst))->f_target_id = \
-bfd_h_get_16(abfd, (bfd_byte *)(((FILHDR *)(src))->f_target_id)); \
-} while(0)
+#define COFF_ADJUST_FILEHDR_IN_POST(abfd, src, dst) \
+  do                                                                    \
+    {                                                                   \
+      ((struct internal_filehdr *)(dst))->f_target_id =                 \
+        H_GET_16 (abfd, ((FILHDR *)(src))->f_target_id);                \
+    }                                                                   \
+  while (0)
 #endif
 
 #ifndef COFF_ADJUST_FILEHDR_OUT_POST
-#define COFF_ADJUST_FILEHDR_OUT_POST(abfd,src,dst) \
-do { bfd_h_put_16(abfd, ((struct internal_filehdr *)(src))->f_target_id, \
-             (bfd_byte *)(((FILHDR *)(dst))->f_target_id)); \
-} while(0)
+#define COFF_ADJUST_FILEHDR_OUT_POST(abfd, src, dst) \
+  do                                                                    \
+    {                                                                   \
+      H_PUT_16 (abfd, ((struct internal_filehdr *)(src))->f_target_id,  \
+               ((FILHDR *)(dst))->f_target_id);                         \
+    }                                                                   \
+  while (0)
 #endif
 
@@ -111 +127 @@
 #define F_EXEC          (0x0002)
 #define F_LNNO          (0x0004)
+#define F_VERS          (0x0010) /* TMS320C4x code */
 /* F_LSYMS needs to be redefined in your source file */
 #define F_LSYMS_TICOFF  (0x0010) /* normal COFF is 0x8 */
@@ -199 +216 @@
    accordingly 
  */
-#define GET_SCNHDR_NRELOC(ABFD,PTR) \
-(COFF2_P(ABFD) ? bfd_h_get_32 (ABFD,PTR) : bfd_h_get_16 (ABFD, PTR))
-#define PUT_SCNHDR_NRELOC(ABFD,VAL,PTR) \
-(COFF2_P(ABFD) ? bfd_h_put_32 (ABFD,VAL,PTR) : bfd_h_put_16 (ABFD,VAL,PTR))
-#define GET_SCNHDR_NLNNO(ABFD,PTR) \
-(COFF2_P(ABFD) ? bfd_h_get_32 (ABFD,PTR) : bfd_h_get_16 (ABFD, (PTR)-2))
-#define PUT_SCNHDR_NLNNO(ABFD,VAL,PTR) \
-(COFF2_P(ABFD) ? bfd_h_put_32 (ABFD,VAL,PTR) : bfd_h_put_16 (ABFD,VAL,(PTR)-2))
-#define GET_SCNHDR_FLAGS(ABFD,PTR) \
-(COFF2_P(ABFD) ? bfd_h_get_32 (ABFD,PTR) : bfd_h_get_16 (ABFD, (PTR)-4))
-#define PUT_SCNHDR_FLAGS(ABFD,VAL,PTR) \
-(COFF2_P(ABFD) ? bfd_h_put_32 (ABFD,VAL,PTR) : bfd_h_put_16 (ABFD,VAL,(PTR)-4))
-#define GET_SCNHDR_PAGE(ABFD,PTR) \
-(COFF2_P(ABFD) ? bfd_h_get_16 (ABFD,PTR) : bfd_h_get_8 (ABFD, (PTR)-7))
+#define GET_SCNHDR_NRELOC(ABFD, PTR) \
+  (COFF2_P (ABFD) ? H_GET_32 (ABFD, PTR) : H_GET_16 (ABFD, PTR))
+#define PUT_SCNHDR_NRELOC(ABFD, VAL, PTR) \
+  (COFF2_P (ABFD) ? H_PUT_32 (ABFD, VAL, PTR) : H_PUT_16 (ABFD, VAL, PTR))
+#define GET_SCNHDR_NLNNO(ABFD, PTR) \
+  (COFF2_P (ABFD) ? H_GET_32 (ABFD, PTR) : H_GET_16 (ABFD, (PTR) -2))
+#define PUT_SCNHDR_NLNNO(ABFD, VAL, PTR) \
+  (COFF2_P (ABFD) ? H_PUT_32 (ABFD, VAL, PTR) : H_PUT_16 (ABFD, VAL, (PTR) -2))
+#define GET_SCNHDR_FLAGS(ABFD, PTR) \
+  (COFF2_P (ABFD) ? H_GET_32 (ABFD, PTR) : H_GET_16 (ABFD, (PTR) -4))
+#define PUT_SCNHDR_FLAGS(ABFD, VAL, PTR) \
+  (COFF2_P (ABFD) ? H_PUT_32 (ABFD, VAL, PTR) : H_PUT_16 (ABFD, VAL, (PTR) -4))
+#define GET_SCNHDR_PAGE(ABFD, PTR) \
+  (COFF2_P (ABFD) ? H_GET_16 (ABFD, PTR) : (unsigned) H_GET_8 (ABFD, (PTR) -7))
 /* on output, make sure that the "reserved" field is zero */
-#define PUT_SCNHDR_PAGE(ABFD,VAL,PTR) \
-(COFF2_P(ABFD) ? bfd_h_put_16 (ABFD,VAL,PTR) : \
-bfd_h_put_8 (ABFD,VAL,(PTR)-7), bfd_h_put_8 (ABFD, 0, (PTR)-8))
+#define PUT_SCNHDR_PAGE(ABFD, VAL, PTR) \
+  (COFF2_P (ABFD) \
+   ? H_PUT_16 (ABFD, VAL, PTR) \
+   : H_PUT_8 (ABFD, VAL, (PTR) -7), H_PUT_8 (ABFD, 0, (PTR) -8))
 
 /* TI COFF stores section size as number of bytes (address units, not octets),
    so adjust to be number of octets, which is what BFD expects */ 
-#define GET_SCNHDR_SIZE(ABFD,SZP) \
-(bfd_h_get_32(ABFD,SZP)*bfd_octets_per_byte(ABFD))
-#define PUT_SCNHDR_SIZE(ABFD,SZ,SZP) \
-bfd_h_put_32(ABFD,(SZ)/bfd_octets_per_byte(ABFD),SZP)
-
-#define COFF_ADJUST_SCNHDR_IN_POST(ABFD,EXT,INT) \
-do { ((struct internal_scnhdr *)(INT))->s_page = \
-GET_SCNHDR_PAGE(ABFD,(bfd_byte *)((SCNHDR *)(EXT))->s_page); \
-} while(0)
+#define GET_SCNHDR_SIZE(ABFD, SZP) \
+  (H_GET_32 (ABFD, SZP) * bfd_octets_per_byte (ABFD))
+#define PUT_SCNHDR_SIZE(ABFD, SZ, SZP) \
+  H_PUT_32 (ABFD, (SZ) / bfd_octets_per_byte (ABFD), SZP)
+
+#define COFF_ADJUST_SCNHDR_IN_POST(ABFD, EXT, INT) \
+  do                                                                    \
+    {                                                                   \
+      ((struct internal_scnhdr *)(INT))->s_page =                       \
+        GET_SCNHDR_PAGE (ABFD, ((SCNHDR *)(EXT))->s_page);              \
+    }                                                                   \
+   while (0)
 
 /* The line number and reloc overflow checking in coff_swap_scnhdr_out in
@@ -235 +256 @@
    fields.
  */
-#define COFF_ADJUST_SCNHDR_OUT_POST(ABFD,INT,EXT) \
-do { \
-PUT_SCNHDR_NLNNO(ABFD,((struct internal_scnhdr *)(INT))->s_nlnno,\
-                (bfd_byte *)((SCNHDR *)(EXT))->s_nlnno); \
-PUT_SCNHDR_NRELOC(ABFD,((struct internal_scnhdr *)(INT))->s_nreloc,\
-                (bfd_byte *)((SCNHDR *)(EXT))->s_nreloc); \
-PUT_SCNHDR_FLAGS(ABFD,((struct internal_scnhdr *)(INT))->s_flags, \
-                (bfd_byte *)((SCNHDR *)(EXT))->s_flags); \
-PUT_SCNHDR_PAGE(ABFD,((struct internal_scnhdr *)(INT))->s_page, \
-                (bfd_byte *)((SCNHDR *)(EXT))->s_page); \
-} while(0)
-
-/* Page macros
-
-   The first GDB port requires flags in its remote memory access commands to
-   distinguish between data/prog space.  Hopefully we can make this go away
-   eventually.  Stuff the page in the upper bits of a 32-bit address, since
-   the c5x family only uses 16 or 23 bits.
-
-   c2x, c5x and most c54x devices have 16-bit addresses, but the c548 has
-   23-bit program addresses.  Make sure the page flags don't interfere.
-   These flags are used by GDB to identify the destination page for
-   addresses. 
-*/
-
-/* recognized load pages */
-#define PG_PROG         0x0         /* PROG page */
-#define PG_DATA         0x1         /* DATA page */
-
-#define ADDR_MASK       0x00FFFFFF
-#define PG_TO_FLAG(p)   (((unsigned long)(p) & 0xFF) << 24)
-#define FLAG_TO_PG(f)   (((f) >> 24) & 0xFF)
+#define COFF_ADJUST_SCNHDR_OUT_POST(ABFD, INT, EXT) \
+  do                                                                       \
+    {                                                                      \
+      PUT_SCNHDR_NLNNO (ABFD, ((struct internal_scnhdr *)(INT))->s_nlnno,  \
+                        ((SCNHDR *)(EXT))->s_nlnno);                       \
+      PUT_SCNHDR_NRELOC (ABFD, ((struct internal_scnhdr *)(INT))->s_nreloc,\
+                         ((SCNHDR *)(EXT))->s_nreloc);                     \
+      PUT_SCNHDR_FLAGS (ABFD, ((struct internal_scnhdr *)(INT))->s_flags,  \
+                        ((SCNHDR *)(EXT))->s_flags);                       \
+      PUT_SCNHDR_PAGE (ABFD, ((struct internal_scnhdr *)(INT))->s_page,    \
+                       ((SCNHDR *)(EXT))->s_page);                         \
+    }                                                                      \
+   while (0)
 
 /*
@@ -385 +387 @@
 
 /* section lengths are in target bytes (not host bytes) */
-#define GET_SCN_SCNLEN(ABFD,EXT) \
-(bfd_h_get_32(ABFD,(bfd_byte *)(EXT)->x_scn.x_scnlen)*bfd_octets_per_byte(ABFD))
-#define PUT_SCN_SCNLEN(ABFD,INT,EXT) \
-bfd_h_put_32(ABFD,(INT)/bfd_octets_per_byte(ABFD),\
-             (bfd_byte *)(EXT)->x_scn.x_scnlen)
+#define GET_SCN_SCNLEN(ABFD, EXT) \
+  (H_GET_32 (ABFD, (EXT)->x_scn.x_scnlen) * bfd_octets_per_byte (ABFD))
+#define PUT_SCN_SCNLEN(ABFD, INT, EXT) \
+  H_PUT_32 (ABFD, (INT) / bfd_octets_per_byte (ABFD), (EXT)->x_scn.x_scnlen)
 
 /* lnsz size is in bits in COFF file, in bytes in BFD */
 #define GET_LNSZ_SIZE(abfd, ext) \
-(bfd_h_get_16(abfd, (bfd_byte *)ext->x_sym.x_misc.x_lnsz.x_size) / \
- (class != C_FIELD ? 8 : 1))
+ (H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_size) / (class != C_FIELD ? 8 : 1))
 
 #define PUT_LNSZ_SIZE(abfd, in, ext) \
- bfd_h_put_16(abfd, ((class != C_FIELD) ? (in)*8 : (in)), \
-              (bfd_byte*) ext->x_sym.x_misc.x_lnsz.x_size)
+  H_PUT_16 (abfd, ((class != C_FIELD) ? (in) * 8 : (in)), \
+           ext->x_sym.x_misc.x_lnsz.x_size)
  
-/* TI COFF stores offsets for MOS and MOU in bits; BFD expects bytes */
-#define COFF_ADJUST_SYM_IN_POST(ABFD,EXT,INT) \
-do { struct internal_syment *dst = (struct internal_syment *)(INT); \
-if (dst->n_sclass == C_MOS || dst->n_sclass == C_MOU) dst->n_value /= 8; \
-} while (0)
-
-#define COFF_ADJUST_SYM_OUT_POST(ABFD,INT,EXT) \
-do { struct internal_syment *src = (struct internal_syment *)(INT); \
-SYMENT *dst = (SYMENT *)(EXT); \
-if(src->n_sclass == C_MOU || src->n_sclass == C_MOS) \
-bfd_h_put_32(abfd,src->n_value * 8,(bfd_byte *)dst->e_value); \
-} while (0)
+/* TI COFF stores offsets for MOS and MOU in bits; BFD expects bytes 
+   Also put the load page flag of the section into the symbol value if it's an
+   address.  */
+#ifndef NEEDS_PAGE
+#define NEEDS_PAGE(X) 0
+#define PAGE_MASK 0
+#endif
+#define COFF_ADJUST_SYM_IN_POST(ABFD, EXT, INT) \
+  do                                                                    \
+    {                                                                   \
+      struct internal_syment *dst = (struct internal_syment *)(INT);    \
+      if (dst->n_sclass == C_MOS || dst->n_sclass == C_MOU)             \
+        dst->n_value /= 8;                                              \
+      else if (NEEDS_PAGE (dst->n_sclass)) {                            \
+        asection *scn = coff_section_from_bfd_index (abfd, dst->n_scnum); \
+        dst->n_value |= (scn->lma & PAGE_MASK);                         \
+      }                                                                 \
+    }                                                                   \
+   while (0)
+
+#define COFF_ADJUST_SYM_OUT_POST(ABFD, INT, EXT) \
+  do                                                                    \
+    {                                                                   \
+       struct internal_syment *src = (struct internal_syment *)(INT);   \
+       SYMENT *dst = (SYMENT *)(EXT);                                   \
+       if (src->n_sclass == C_MOU || src->n_sclass == C_MOS)            \
+         H_PUT_32 (abfd, src->n_value * 8, dst->e_value);               \
+       else if (NEEDS_PAGE (src->n_sclass)) {                           \
+         H_PUT_32 (abfd, src->n_value &= ~PAGE_MASK, dst->e_value);     \
+       }                                                                \
+    }                                                                   \
+   while (0)
 
 /* Detect section-relative absolute symbols so they get flagged with a sym
    index of -1.
 */
-#define SECTION_RELATIVE_ABSOLUTE_SYMBOL_P(RELOC,SECT) \
-((*(RELOC)->sym_ptr_ptr)->section->output_section == (SECT) \
- && (RELOC)->howto->name[0] == 'A')
+#define SECTION_RELATIVE_ABSOLUTE_SYMBOL_P(RELOC, SECT) \
+  ((*(RELOC)->sym_ptr_ptr)->section->output_section == (SECT) \
+   && (RELOC)->howto->name[0] == 'A')
 
 /********************** RELOCATION DIRECTIVES **********************/
 
-struct external_reloc_v0 {
+struct external_reloc_v0
+{
   char r_vaddr[4];
   char r_symndx[2];
@@ -429 +450 @@
 };
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];

branches/GNU/src/binutils/include/coff/tic30.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
 
 #define TIC30MAGIC      0xC000
 
-#define TIC30BADMAG(x) (((x).f_magic!=TIC30MAGIC))
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTHDRSZ 28
-#define AOUTSZ 28
-
-
-
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[4]; /* line number          */
-};
-
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_32(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-#define LINENO  struct external_lineno
-#define LINESZ  8
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-
-union external_auxent {
-  struct {
-        char x_tagndx[4];       /* str, un, or enum tag indx */
-        union {
-          struct {
-                char  x_lnno[2]; /* declaration line number */
-                char  x_size[2]; /* str/union/array size */
-          } x_lnsz;
-          char x_fsize[4];      /* size of function */
-        } x_misc;
-        union {
-          struct {              /* if ISFCN, tag, or .bb */
-                char x_lnnoptr[4];      /* ptr to fcn line # */
-                char x_endndx[4];       /* entry ndx past block end */
-          } x_fcn;
-          struct {              /* if ISARY, up to 4 dimen. */
-                char x_dimen[E_DIMNUM][2];
-          } x_ary;
-        } x_fcnary;
-        char x_tvndx[2];                /* tv index */
-  } x_sym;
-  
-  union {
-        char x_fname[E_FILNMLEN];
-        struct {
-          char x_zeroes[4];
-          char x_offset[4];
-        } x_n;
-  } x_file;
-  
-  struct {
-        char x_scnlen[4];                       /* section length */
-        char x_nreloc[2];       /* # relocation entries */
-        char x_nlinno[2];       /* # line numbers */
-  } x_scn;
-  
-  struct {
-        char x_tvfill[4];       /* tv fill value */
-        char x_tvlen[2];        /* length of .tv */
-        char x_tvran[2][2];     /* tv range */
-  } x_tv;               /* info about .tv section (in auxent of symbol .tv)) */
-  
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
+#define TIC30BADMAG(x) (((x).f_magic != TIC30MAGIC))
 
 /********************** RELOCATION DIRECTIVES **********************/
@@ -199 +30 @@
    offset - eg with segments */
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -206 +38 @@
   char r_stuff[2];
 };
-
 
 #define RELOC struct external_reloc

branches/GNU/src/binutils/include/coff/tic54x.h

@@ -19 +19 @@
 
 #ifndef COFF_TIC54X_H
+#define COFF_TIC54X_H
 
-#define COFF_TIC54X_H
 #define TIC54X_TARGET_ID 0x98
 #define TIC54XALGMAGIC  0x009B  /* c54x algebraic assembler output */
@@ -30 +30 @@
 #define TICOFF_DEFAULT_MAGIC TICOFF1MAGIC /* we use COFF1 for compatibility */
 
+/* Page macros
+
+   The first GDB port requires flags in its remote memory access commands to
+   distinguish between data/prog space.  Hopefully we can make this go away
+   eventually.  Stuff the page in the upper bits of a 32-bit address, since
+   the c5x family only uses 16 or 23 bits.
+
+   c2x, c5x and most c54x devices have 16-bit addresses, but the c548 has
+   23-bit program addresses.  Make sure the page flags don't interfere.
+   These flags are used by GDB to identify the destination page for
+   addresses. 
+*/
+
+/* Recognized load pages (by common convention).  */
+#define PG_PROG         0x0         /* PROG page */
+#define PG_DATA         0x1         /* DATA page */
+#define PG_IO           0x2         /* I/O page */
+
+/** Indicate whether the given storage class requires a page flag.  */
+#define NEEDS_PAGE(X) ((X)==C_EXT)
+#define PAGE_MASK       0xFF000000
+#define ADDR_MASK       0x00FFFFFF
+#define PG_TO_FLAG(p)   (((unsigned long)(p) & 0xFF) << 24)
+#define FLAG_TO_PG(f)   (((f) >> 24) & 0xFF)
+
 #include "coff/ti.h"
 

branches/GNU/src/binutils/include/coff/tic80.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#define DO_NOT_DEFINE_FILHDR
+#define DO_NOT_DEFINE_SCNHDR
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
+
 /********************** FILE HEADER **********************/
 
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-        char f_target_id[2];    /* target id (TIc80 specific)   */
+struct external_filehdr
+  {
+    char f_magic[2];    /* magic number                 */
+    char f_nscns[2];    /* number of sections           */
+    char f_timdat[4];   /* time & date stamp            */
+    char f_symptr[4];   /* file pointer to symtab       */
+    char f_nsyms[4];    /* number of symtab entries     */
+    char f_opthdr[2];   /* sizeof(optional hdr)         */
+    char f_flags[2];    /* flags                        */
+    char f_target_id[2];/* target id (TIc80 specific)   */
 };
 
@@ -38 +44 @@
 #define FILHSZ  22
 
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
 #define TIC80_AOUTHDR_MAGIC     0x108   /* Goes in the optional file header magic number field */
-
-#define AOUTHDRSZ 28
-#define AOUTSZ 28
-
-
-
 
 /********************** SECTION HEADER **********************/
 
-
-struct external_scnhdr {
+struct external_scnhdr
+{
         char            s_name[8];      /* section name                 */
         char            s_paddr[4];     /* physical address, aliased s_nlib */
@@ -81 +64 @@
 };
 
-/*
- * names of "special" sections
- */
+/* Names of "special" sections.  */
 #define _TEXT   ".text"
 #define _DATA   ".data"
@@ -93 +74 @@
 #define _SYSMEM ".sysmem"
 
-
 #define SCNHDR  struct external_scnhdr
 #define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2];                 /* line number  */
-};
-
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_16(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
   
-/* FIXME - need to correlate with TIc80 Code Generation Tools User's Guide, CG:A-25 */
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
+/* FIXME - need to correlate external_auxent with
+   TIc80 Code Generation Tools User's Guide, CG:A-25 */
 
 /********************** RELOCATION DIRECTIVES **********************/
@@ -206 +84 @@
 /* The external reloc has an offset field, because some of the reloc
    types on the h8 don't have room in the instruction for the entire
-   offset - eg the strange jump and high page addressing modes */
+   offset - eg the strange jump and high page addressing modes.  */
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -214 +93 @@
   char r_type[2];
 };
-
 
 #define RELOC struct external_reloc

branches/GNU/src/binutils/include/coff/w65.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
-
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
 
 #define W65MAGIC        0x6500
 
-
-#define W65BADMAG(x) (((x).f_magic!=W65MAGIC))
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTHDRSZ 28
-#define AOUTSZ 28
-
-
-
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[4]; /* line number          */
-};
-
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_32(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-#define LINENO  struct external_lineno
-#define LINESZ  8
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
+#define W65BADMAG(x) (((x).f_magic != W65MAGIC))
 
 /********************** RELOCATION DIRECTIVES **********************/
@@ -201 +30 @@
    offset - eg the strange jump and high page addressing modes */
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -209 +39 @@
 };
 
-
 #define RELOC struct external_reloc
 #define RELSZ 16

branches/GNU/src/binutils/include/coff/we32k.h

@@ -16 +16 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
 
 /* Bits for f_flags:
- *      F_RELFLG        relocation info stripped from file
- *      F_EXEC          file is executable (no unresolved external references)
- *      F_LNNO          line numbers stripped from file
- *      F_LSYMS         local symbols stripped from file
- *      F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax)
- */
+        F_RELFLG        relocation info stripped from file
+        F_EXEC          file is executable (no unresolved external references)
+        F_LNNO          line numbers stripped from file
+        F_LSYMS         local symbols stripped from file
+        F_AR32WR        file has byte ordering of an AR32WR machine (e.g. vax).  */
 
 #define F_RELFLG        (0x0001)
@@ -49 +37 @@
 #define MTVMAGIC        0x171   /* we32k with transfer vector */
 #define RBOMAGIC        0x172   /* reserved */
-#define WE32KBADMAG(x) (((x).f_magic != WE32KMAGIC) \
+#define WE32KBADMAG(x) (   ((x).f_magic != WE32KMAGIC) \
                         && ((x).f_magic != FBOMAGIC) \
                         && ((x).f_magic != RBOMAGIC) \
                         && ((x).f_magic != MTVMAGIC))
 
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
+/* More names of "special" sections.  */
 #define _TV     ".tv"
 #define _INIT   ".init"
 #define _FINI   ".fini"
 
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[2]; /* line number          */
-};
-
-
-#define LINENO  struct external_lineno
-#define LINESZ  6
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-#define N_BTMASK        (0xf)
-#define N_TMASK         (0x30)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
-  
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-#       define _ETEXT   "etext"
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
-
-
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -217 +56 @@
 };
 
-
 #define RELOC struct external_reloc
 #define RELSZ 10

branches/GNU/src/binutils/include/coff/z8k.h

@@ -17 +17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-        char f_magic[2];        /* magic number                 */
-        char f_nscns[2];        /* number of sections           */
-        char f_timdat[4];       /* time & date stamp            */
-        char f_symptr[4];       /* file pointer to symtab       */
-        char f_nsyms[4];        /* number of symtab entries     */
-        char f_opthdr[2];       /* sizeof(optional hdr)         */
-        char f_flags[2];        /* flags                        */
-};
-
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
 
 /* Type of cpu is stored in flags */
@@ -35 +25 @@
 #define F_MACHMASK 0xf000
 
-#define Z8KMAGIC        0x8000
+#define Z8KMAGIC   0x8000
 
-#define Z8KBADMAG(x) (((x).f_magic!=Z8KMAGIC))
-
-#define FILHDR  struct external_filehdr
-#define FILHSZ  20
-
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-
-typedef struct 
-{
-  char  magic[2];               /* type of file                         */
-  char  vstamp[2];              /* version stamp                        */
-  char  tsize[4];               /* text size in bytes, padded to FW bdry*/
-  char  dsize[4];               /* initialized data "  "                */
-  char  bsize[4];               /* uninitialized data "   "             */
-  char  entry[4];               /* entry pt.                            */
-  char  text_start[4];          /* base of text used for this file */
-  char  data_start[4];          /* base of data used for this file */
-}
-AOUTHDR;
-
-
-#define AOUTHDRSZ 28
-#define AOUTSZ 28
-
-
-
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-        char            s_name[8];      /* section name                 */
-        char            s_paddr[4];     /* physical address, aliased s_nlib */
-        char            s_vaddr[4];     /* virtual address              */
-        char            s_size[4];      /* section size                 */
-        char            s_scnptr[4];    /* file ptr to raw data for section */
-        char            s_relptr[4];    /* file ptr to relocation       */
-        char            s_lnnoptr[4];   /* file ptr to line numbers     */
-        char            s_nreloc[2];    /* number of relocation entries */
-        char            s_nlnno[2];     /* number of line number entries*/
-        char            s_flags[4];     /* flags                        */
-};
-
-/*
- * names of "special" sections
- */
-#define _TEXT   ".text"
-#define _DATA   ".data"
-#define _BSS    ".bss"
-
-
-#define SCNHDR  struct external_scnhdr
-#define SCNHSZ  40
-
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-        union {
-                char l_symndx[4];       /* function name symbol index, iff l_lnno == 0*/
-                char l_paddr[4];        /* (physical) address of line number    */
-        } l_addr;
-        char l_lnno[4]; /* line number          */
-};
-
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_32(abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_32(abfd,val,  (bfd_byte *) (ext->l_lnno));
-
-#define LINENO  struct external_lineno
-#define LINESZ  8
-
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN      8       /* # characters in a symbol name        */
-#define E_FILNMLEN      14      /* # characters in a file name          */
-#define E_DIMNUM        4       /* # array dimensions in auxiliary entry */
-
-struct external_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      char e_zeroes[4];
-      char e_offset[4];
-    } e;
-  } e;
-  char e_value[4];
-  char e_scnum[2];
-  char e_type[2];
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-
-
-#define N_BTMASK        (017)
-#define N_TMASK         (060)
-#define N_BTSHFT        (4)
-#define N_TSHIFT        (2)
+#define Z8KBADMAG(x) (((x).f_magic != Z8KMAGIC))
   
-
-union external_auxent {
-        struct {
-                char x_tagndx[4];       /* str, un, or enum tag indx */
-                union {
-                        struct {
-                            char  x_lnno[2]; /* declaration line number */
-                            char  x_size[2]; /* str/union/array size */
-                        } x_lnsz;
-                        char x_fsize[4];        /* size of function */
-                } x_misc;
-                union {
-                        struct {                /* if ISFCN, tag, or .bb */
-                            char x_lnnoptr[4];  /* ptr to fcn line # */
-                            char x_endndx[4];   /* entry ndx past block end */
-                        } x_fcn;
-                        struct {                /* if ISARY, up to 4 dimen. */
-                            char x_dimen[E_DIMNUM][2];
-                        } x_ary;
-                } x_fcnary;
-                char x_tvndx[2];                /* tv index */
-        } x_sym;
-
-        union {
-                char x_fname[E_FILNMLEN];
-                struct {
-                        char x_zeroes[4];
-                        char x_offset[4];
-                } x_n;
-        } x_file;
-
-        struct {
-                char x_scnlen[4];                       /* section length */
-                char x_nreloc[2];       /* # relocation entries */
-                char x_nlinno[2];       /* # line numbers */
-        } x_scn;
-
-        struct {
-                char x_tvfill[4];       /* tv fill value */
-                char x_tvlen[2];        /* length of .tv */
-                char x_tvran[2][2];     /* tv range */
-        } x_tv;         /* info about .tv section (in auxent of symbol .tv)) */
-
-
-};
-
-#define SYMENT  struct external_syment
-#define SYMESZ  18      
-#define AUXENT  union external_auxent
-#define AUXESZ  18
-
-
-
 /********************** RELOCATION DIRECTIVES **********************/
 
 /* The external reloc has an offset field, because some of the reloc
    types on the z8k don't have room in the instruction for the entire
-   offset - eg with segments */
+   offset - eg with segments.  */
 
-struct external_reloc {
+struct external_reloc
+{
   char r_vaddr[4];
   char r_symndx[4];
@@ -212 +44 @@
 };
 
-
 #define RELOC struct external_reloc
 #define RELSZ 16

branches/GNU/src/binutils/include/demangle.h

@@ -1 +1 @@
 /* Defs for interface to demanglers.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002
    Free Software Foundation, Inc.
    
@@ -22 +22 @@
 #define DEMANGLE_H
 
-#include <ansidecl.h>
+#include "ansidecl.h"
 
 /* Options passed to cplus_demangle (in 2nd parameter). */
@@ -30 +30 @@
 #define DMGL_ANSI        (1 << 1)       /* Include const, volatile, etc */
 #define DMGL_JAVA        (1 << 2)       /* Demangle as Java rather than C++. */
+#define DMGL_VERBOSE     (1 << 3)       /* Include implementation details.  */
+#define DMGL_TYPES       (1 << 4)       /* Also try to demangle type encodings.  */
 
 #define DMGL_AUTO        (1 << 8)
@@ -55 +57 @@
 extern enum demangling_styles
 {
+  no_demangling = -1,
   unknown_demangling = 0,
   auto_demangling = DMGL_AUTO,
@@ -69 +72 @@
 /* Define string names for the various demangling styles. */
 
+#define NO_DEMANGLING_STYLE_STRING            "none"
 #define AUTO_DEMANGLING_STYLE_STRING          "auto"
 #define GNU_DEMANGLING_STYLE_STRING           "gnu"
@@ -95 +99 @@
    pulled from gdb into libiberty because it is useful to binutils also.  */
 
-extern struct demangler_engine
+extern const struct demangler_engine
 {
-  const char *demangling_style_name;
-  enum demangling_styles demangling_style;
-  const char *demangling_style_doc;
+  const char *const demangling_style_name;
+  const enum demangling_styles demangling_style;
+  const char *const demangling_style_doc;
 } libiberty_demanglers[];
 
@@ -122 +126 @@
 cplus_demangle_name_to_style PARAMS ((const char *name));
 
-/* V3 ABI demangling entry point, defined in cp-demangle.c.  */
+/* V3 ABI demangling entry points, defined in cp-demangle.c.  */
 extern char*
-cplus_demangle_v3 PARAMS ((const char* mangled));
+cplus_demangle_v3 PARAMS ((const char* mangled, int options));
+
+extern char*
+java_demangle_v3 PARAMS ((const char* mangled));
+
+
+enum gnu_v3_ctor_kinds {
+  gnu_v3_complete_object_ctor = 1,
+  gnu_v3_base_object_ctor,
+  gnu_v3_complete_object_allocating_ctor
+};
+
+/* Return non-zero iff NAME is the mangled form of a constructor name
+   in the G++ V3 ABI demangling style.  Specifically, return an `enum
+   gnu_v3_ctor_kinds' value indicating what kind of constructor
+   it is.  */
+extern enum gnu_v3_ctor_kinds
+        is_gnu_v3_mangled_ctor PARAMS ((const char *name));
+
+
+enum gnu_v3_dtor_kinds {
+  gnu_v3_deleting_dtor = 1,
+  gnu_v3_complete_object_dtor,
+  gnu_v3_base_object_dtor
+};
+
+/* Return non-zero iff NAME is the mangled form of a destructor name
+   in the G++ V3 ABI demangling style.  Specifically, return an `enum
+   gnu_v3_dtor_kinds' value, indicating what kind of destructor
+   it is.  */
+extern enum gnu_v3_dtor_kinds
+        is_gnu_v3_mangled_dtor PARAMS ((const char *name));
 
 #endif  /* DEMANGLE_H */

branches/GNU/src/binutils/include/dis-asm.h

@@ -1 +1 @@
 /* Interface between the opcode library and its callers.
 
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
    
    This program is free software; you can redistribute it and/or modify
@@ -74 +74 @@
   /* Endianness (for bi-endian cpus).  Mono-endian cpus can ignore this.  */
   enum bfd_endian endian;
+  /* An arch/mach-specific bitmask of selected instruction subsets, mainly
+     for processors with run-time-switchable instruction sets.  The default,
+     zero, means that there is no constraint.  CGEN-based opcodes ports
+     may use ISA_foo masks.  */
+  unsigned long insn_sets;
 
   /* Some targets need information about the current section to accurately
@@ -146 +151 @@
 
   /* Number of octets per incremented target address 
-     Normally one, but some DSPs have byte sizes of 16 or 32 bits
-   */
+     Normally one, but some DSPs have byte sizes of 16 or 32 bits.  */
   unsigned int octets_per_byte;
 
@@ -174 +178 @@
 
 /* Standard disassemblers.  Disassemble one instruction at the given
-   target address.  Return number of bytes processed.  */
+   target address.  Return number of octets processed.  */
 typedef int (*disassembler_ftype)
      PARAMS((bfd_vma, disassemble_info *));
@@ -180 +184 @@
 extern int print_insn_big_mips          PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_little_mips       PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_i386              PARAMS ((bfd_vma, disassemble_info *));
 extern int print_insn_i386_att          PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_i386_intel        PARAMS ((bfd_vma, disassemble_info*));
@@ -194 +199 @@
 extern int print_insn_h8500             PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_alpha             PARAMS ((bfd_vma, disassemble_info*));
-extern disassembler_ftype arc_get_disassembler PARAMS ((void *));
 extern int print_insn_big_arm           PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_little_arm        PARAMS ((bfd_vma, disassemble_info*));
@@ -200 +204 @@
 extern int print_insn_big_a29k          PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_little_a29k       PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_avr               PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_d10v              PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_d30v              PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_dlx               PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_fr30              PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_hppa              PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_i860              PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_i960              PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_sh                PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_shl               PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_hppa              PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_fr30              PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_ip2k              PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_m32r              PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_m88k              PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_mcore             PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_mmix              PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_mn10200           PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_mn10300           PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_msp430            PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_ns32k             PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_openrisc          PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_big_or32          PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_little_or32       PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_pdp11             PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_pj                PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_big_powerpc       PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_little_powerpc    PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_rs6000            PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_w65               PARAMS ((bfd_vma, disassemble_info*));
-extern disassembler_ftype cris_get_disassembler PARAMS ((bfd *));
-extern int print_insn_d10v              PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_d30v              PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_v850              PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_s390              PARAMS ((bfd_vma, disassemble_info*)); 
+extern int print_insn_sh                PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_tic30             PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_vax               PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_tic4x             PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_tic54x            PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_tic80             PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_pj                PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_avr               PARAMS ((bfd_vma, disassemble_info*));
-
+extern int print_insn_v850              PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_vax               PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_w65               PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_xstormy16         PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_xtensa            PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_sh64              PARAMS ((bfd_vma, disassemble_info *));
+extern int print_insn_sh64x_media       PARAMS ((bfd_vma, disassemble_info *));
+extern int print_insn_frv               PARAMS ((bfd_vma, disassemble_info *));
+extern int print_insn_iq2000            PARAMS ((bfd_vma, disassemble_info *));
+
+extern disassembler_ftype arc_get_disassembler PARAMS ((void *));
+extern disassembler_ftype cris_get_disassembler PARAMS ((bfd *));
+
+extern void print_mips_disassembler_options PARAMS ((FILE *));
+extern void print_ppc_disassembler_options PARAMS ((FILE *));
 extern void print_arm_disassembler_options PARAMS ((FILE *));
 extern void parse_arm_disassembler_option  PARAMS ((char *));
@@ -270 +293 @@
   (INFO).arch = bfd_arch_unknown, \
   (INFO).mach = 0, \
+  (INFO).insn_sets = 0, \
   (INFO).endian = BFD_ENDIAN_UNKNOWN, \
   (INFO).octets_per_byte = 1, \
@@ -297 +321 @@
   (INFO).bytes_per_chunk = 0, \
   (INFO).display_endian = BFD_ENDIAN_UNKNOWN, \
+  (INFO).disassembler_options = NULL, \
   (INFO).insn_info_valid = 0
 
 #ifdef __cplusplus
-};
+}
 #endif
 

branches/GNU/src/binutils/include/dyn-string.h

@@ -1 +1 @@
 /* An abstract string datatype.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
-This file is part of GNU CC.
+This file is part of GCC.
    
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
+along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
@@ -46 +46 @@
    demangler are given implementation-reserved names.  */
 
-#ifdef IN_LIBGCC2
+#if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3)
 
 #define dyn_string_init                 __cxa_dyn_string_init
@@ -67 +67 @@
 #define dyn_string_eq                   __cxa_dyn_string_eq
 
-#endif /* IN_LIBGCC2 */
+#endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */
 
 

branches/GNU/src/binutils/include/elf/ChangeLog

@@ -1 @@
-2001-06-11  Alan Modra  <amodra@bigpond.net.au>
-
-        Merge from mainline.
-        2001-05-15  Ralf Baechle  <ralf@gnu.org>
+2003-06-03  Nick Clifton  <nickc@redhat.com>
+
+        * v850.h (R_V850_32): Rename to R_V850_ABS32.
+        Add R_V850_REL32.
+
+2003-04-24 Dhananjay Deshpande <dhananjayd@kpitcummins.com> 
+
+        * elf/h8.h (E_H8_MACH_H8300HN, E_H8_MACH_H8300SN): New
+
+2003-04-23  J"orn Rennecke <joern.rennecke@superh.com>
+
+        * common.h (EM_SH): Amend comment to refer to SuperH.
+
+2003-04-22  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+        * common.h: Replace references to Mitsubishi M32R with
+        references to Renesas M32R.
+
+2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
+
+        * common.h: Replace occurrances of 'Hitachi' with 'Renesas'.
+
+2003-04-01  Bob Wilson  <bob.wilson@acm.org>
+
+        * elf/common.h (EM_XTENSA_OLD): Define.
+        * elf/xtensa.h: New file.
+
+2003-04-01  Nick Clifton  <nickc@redhat.com>
+
+        * arm.h (ARM_NOTE_SECTION): Include .gnu in the string.
+
+2003-03-25  Stan Cox   <scox@redhat.com>
+            Nick Clifton  <nickc@redhat.com>
+            
+        Contribute support for Intel's iWMMXt chip - an ARM variant:
+
+        * arm.h (ARM_NOTE_SECTION): Define.
+
+2003-03-03  J"orn Rennecke <joern.rennecke@superh.com>
+
+        * sh.h (EF_SH_MERGE_MACH): Make sure SH2E & SH3/SH3E merge to SH3E,
+        and SH2E & SH4 merge to SH4, not SH2E.
+
+2003-02-21  Ian Wienand  <ianw@gelato.unsw.edu.au>
+
+        * ia64.h (SHT_IA_64_LOPSREG, SHT_IA_64_HIPSREG,
+        SHT_IA_64_PRIORITY_INIT): Define.
+
+2003-02-18  Alan Modra  <amodra@bigpond.net.au>
+
+        * ppc64.h (IS_PPC64_TLS_RELOC): Rename from IS_TLS_RELOC.
+
+        * ppc.h: Replace DTPMOD64, TPREL64, DTPREL64 with DTPMOD32 etc.
+        (IS_PPC_TLS_RELOC): Define.
+
+2003-02-10  Nick Clifton  <nickc@redhat.com>
+
+        * arm.h (EF_ARM_MAVERICK_FLOAT): Define.
+
+2003-02-05  Alan Modra  <amodra@bigpond.net.au>
+
+        * ppc.h: Add TLS relocs.  Format.
+        * ppc64.h: Likewise.
+
+2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+        * mips.h (EF_MIPS_XGOT): Define.
+
+2003-01-24  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+        * s390.h: Add s390 TLS relocations.
+
+2003-01-23  Nick Clifton  <nickc@redhat.com>
+
+        * Add sh2e support:
+
+        2002-04-02  Alexandre Oliva  <aoliva@redhat.com>
+
+                * sh.h (EF_SH_MERGE_MACH): Handle SH2E.
+
+        2002-04-02  Elena Zannoni  <ezannoni@redhat.com>
+
+                * sh.h (EF_SH2E): New.
+
+2003-01-23  Alan Modra  <amodra@bigpond.net.au>
+
+        * sh.h: Split out various bits to bfd/elf32-sh64.h.
+
+2003-01-20  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+        * s390.h: Rename R_390_GOTOFF to R_390_GOTOFF32. Add new gotoff,
+        gotplt and pltoff relocations.
+
+2003-01-17  Alan Modra  <amodra@bigpond.net.au>
+
+        * common.h: Formatting, typo fixes.
+        (DT_ENCODING): Correct value.
+
+2003-01-17  Fabio Alemagna  <falemagn@aros.org>
+
+        * common.h (ELFOSABI_AROS): Define.
+        (ELFOSABI_OPENVMS): Likewise.
+        (ELFOSABI_NSK): Likewise.
+
+2003-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+        * ppc.h: Split out ppc64 definitions to..
+        * pcc64.h: ..here.  New file.
+        (R_PPC64_REL30): Rename from R_PPC64_ADDR30.
+
+2003-01-13 Dmitry Diky <diwil@mail.ru>
+
+        * elf/common.h (EM_MSP430): Change e_machine value to officially
+        assigned.
+
+2003-01-02  Ben Elliston  <bje@redhat.com>
+
+        * common.h (EM_IQ2000): Define.
+        * iq2000.h: New file.
+
+2002-12-30  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h (E_MIPS_ARCH_32R2): New define.
+
+2002-12-24    Dmitry Diky <diwil@mail.ru>
+
+        * common.h: Define msp430 machine numbers.
+        * msp430.h: New file.  Define msp430 relocs.
+
+2002-12-20  DJ Delorie  <dj@redhat.com>
+
+        * xstormy16.h: Add XSTORMY16_12.
+
+2002-12-16  Andrew MacLeod  <amacleod@redhat.com>
+
+        * xstormy16.h (START_RELOC_NUMBERS) Add relocation numbers
+        for R_XSTORMY16_LO16 and R_XSTORMY16_HI16.
+
+2002-12-10  James Cownie <jcownie@etnus.com>
+
+        * dwarf2.h (DW_TAG_upc_shared_type, DW_TAG_upc_strict_type,
+        DW_TAG_upc_relaxed_type, DW_AT_upc_threads_scaled, DW_LANG_Upc):
+        Define.
+
+2002-12-01  Stephane Carrez  <stcarrez@nerim.fr>
+
+        * m68hc11.h (EF_M68HC12_MACH, EF_M68HCS12_MACH): Define.
+        (EF_M68HC11_MACH_MASK, EF_M68HC11_MACH): Define.
+        (EF_M68HC11_MERGE_MACH, EF_M68HC11_CAN_MERGE_MACH): Define.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+        * mmix.h: Replace boolean with bfd_boolean.
+        * sh.h: Likewise.
+
+2002-11-28  Alan Modra  <amodra@bigpond.net.au>
+
+        * internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
+        elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
+        Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
+        elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
+        Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
+        Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
+        elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
+        elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
+        elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
+        elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
+        Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
+        elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
+        elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
+        elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
+        Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
+        Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
+        Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
+        Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
+        (Elf_Internal_Rel): Delete.
+
+2002-10-11  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+        * sh.h: Add SH TLS relocs.
+
+2002-09-30  Gavin Romig-Koch  <gavin@redhat.com>
+            Ken Raeburn  <raeburn@cygnus.com>
+            Aldy Hernandez  <aldyh@redhat.com>
+            Eric Christopher  <echristo@redhat.com>
+            Richard Sandiford  <rsandifo@redhat.com>
+
+        * mips.h (E_MIPS_MACH_4120, E_MIPS_MACH_5400, E_MIPS_MACH_5500): New.
+
+2002-09-12  Roland McGrath  <roland@redhat.com>
+
+        * dwarf2.h: Updates from GCC version of thie file:
+        (enum dwarf_location_atom): DW_OP_calli -> DW_OP_call_ref.
+        Add DW_OP_GNU_push_tls_address.
+        (DW_OP_lo_user): Change to 0xe0.
+
+2002-08-28  Catherine Moore  <clm@redhat.com>
+
+        * elf/v850.h (R_V850_LONGCALL, R_V850_ALIGN,
+        R_V850_LONGJUMP): New relocations.
+
+2002-08-15  Alan Modra  <amodra@bigpond.net.au>
+
+        * i370.h: Define relocs using reloc-macros.h.
+
+2002-08-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+        * m68hc11.h (E_M68HC12_BANKS, E_M68HC11_I32, E_M68HC11_F64,
+        EF_M68HC11_ABI): Define for ABI specification.
+        (STO_M68HC12_FAR, STO_M68HC12_INTERRUPT): Symbol flags for
+        linker and debugger.
+        (R_M68HC11_24, R_M68HC11_LO16, R_M68HC11_PAGE): New relocs.
+        (R_M68HC11_RL_JUMP, R_M68HC11_RL_GROUP): New reloc for linker
+        relaxation.
+
+2002-07-15  Denis Chertykov  <denisc@overta.ru>
+            Frank Ch. Eigler  <fche@redhat.com>
+            Ben Elliston  <bje@redhat.com>
+            Alan Lehotsky  <alehotsky@cygnus.com>
+            John Healy  <jhealy@redhat.com>
+            Graham Stott  <grahams@redhat.com>
+            Jeff Johnston  <jjohnstn@redhat.com>
+
+        * common.h (EM_IP2K): New macro.
+        (EM_IP2K_OLD): New macro.
+        * ip2k.h: New file.
+
+2002-07-01  Matt Thomas  <matt@3am-software.com>
+
+        * vax.h: Rename EF_* to EF_VAX_*.
+
+2002-06-18  Dave Brolley  <brolley@redhat.com>
+
+        From Catherine Moore, Michael Meissner, Dave Brolley:
+        * common.h (EM_CYGNUS_FRV): New macro.
+        * frv.h: New file.
+
+2002-06-06  Lars Brinkhoff  <lars@nocrew.org>
+
+        * common.h: Change registry@sco.com to registry@caldera.com.
+        (EM_PDP10, EM_PDP11): Define.
+
+2002-06-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+        * sh.h (_bfd_sh64_crange_qsort_cmpb, _bfd_sh64_crange_qsort_cmpl)
+        (_bfd_sh64_crange_bsearch_cmpb, _bfd_sh64_crange_bsearch_cmpl): New
+        prototypes.
+
+2002-06-01  Richard Henderson  <rth@redhat.com>
+
+        * alpha.h (LITUSE_ALPHA_ADDR, LITUSE_ALPHA_BASE, LITUSE_ALPHA_BYTOFF,
+        LITUSE_ALPHA_JSR, LITUSE_ALPHA_TLSGD, LITUSE_ALPHA_TLSLDM): New.
+
+2002-05-30  Richard Henderson  <rth@redhat.com>
+
+        * alpha.h (R_ALPHA_TLSGD, R_ALPHA_TLSLDM, R_ALPHA_DTPMOD64,
+        R_ALPHA_GOTDTPREL, R_ALPHA_DTPREL64, R_ALPHA_DTPRELHI,
+        R_ALPHA_DTPRELLO, R_ALPHA_DTPREL16, R_ALPHA_GOTTPREL, R_ALPHA_TPREL64,
+        R_ALPHA_TPRELHI, R_ALPHA_TPRELLO, R_ALPHA_TPREL16): New.
+
+2002-05-29  Matt Thomas  <matt@3am-software.com>
+
+        * vax.h: New file
+
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+        * common.h (EM_DLX): Define.
+        * dlx.h: New file.
+
+2002-05-08  Jason Thorpe  <thorpej@wasabisystems.com>
+
+        * common.h (NT_GNU_ABI_TAG): Define.
+        (GNU_ABI_TAG_LINUX): Define.
+        (GNU_ABI_TAG_HURD): Define.
+        (GNU_ABI_TAG_SOLARIS): Define.
+        (NT_NETBSD_IDENT): Define.
+        (NT_FREEBSD_ABI_TAG): Define.
+
+2002-04-24  Elena Zannoni  <ezannoni@redhat.com>
+
+        * dwarf2.h: Add DW_AT_GNU_vector.
+
+2002-02-13  Matt Fredette  <fredette@netbsd.org>
+
+        * m68k.h (EF_M68000): Define.
+
+2002-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+        * ppc.h (DT_PPC64_OPD, DT_PPC64_OPDSZ): Define.
+
+2002-02-09  Richard Henderson  <rth@redhat.com>
+
+        * alpha.h (R_ALPHA_BRSGP): New.
+
+2002-02-08  Alexandre Oliva  <aoliva@redhat.com>
+
+        Contribute sh64-elf.
+        2002-01-23  Alexandre Oliva  <aoliva@redhat.com>
+        * sh.h (R_SH_GOTPLT32, R_SH_GOT_LOW16, R_SH_GOT_MEDLOW16,
+        R_SH_GOT_MEDHI16, R_SH_GOT_HI16, R_SH_GOTPLT_LOW16,
+        R_SH_GOTPLT_MEDLOW16, R_SH_GOTPLT_MEDHI16, R_SH_GOTPLT_HI16,
+        R_SH_PLT_LOW16, R_SH_PLT_MEDLOW16, R_SH_PLT_MEDHI16,
+        R_SH_PLT_HI16, R_SH_GOTOFF_LOW16, R_SH_GOTOFF_MEDLOW16,
+        R_SH_GOTOFF_MEDHI16, R_SH_GOTOFF_HI16, R_SH_GOTPC_LOW16,
+        R_SH_GOTPC_MEDLOW16, R_SH_GOTPC_MEDHI16, R_SH_GOTPC_HI16,
+        R_SH_GOT10BY4, R_SH_GOTPLT10BY4, R_SH_GOT10BY8,
+        R_SH_GOTPLT10BY8, R_SH_COPY64, R_SH_GLOB_DAT64, R_SH_JMP_SLOT64,
+        R_SH_RELATIVE64): New relocs.
+        (R_SH_FIRST_INVALID_RELOC_4): Adjust.
+        2001-05-16  Alexandre Oliva  <aoliva@redhat.com>
+        * sh.h: Renumbered and renamed some SH5 relocations to match
+        official numbers and names; moved unmaching ones to the range
+        0xf2-0xff.
+        2001-01-06  Hans-Peter Nilsson  <hpn@cygnus.com>
+        * sh.h (sh64_get_contents_type): Declare.
+        (sh64_address_is_shmedia): Likewise.
+        2000-12-30  Hans-Peter Nilsson  <hpn@cygnus.com>
+        * sh.h (sh64_elf_crange): New type.
+        (struct sh64_section_data): New.
+        (sh64_elf_section_data): New macro.
+        (EF_SH5): Rename back from EF_SH64.
+        2000-12-18  Hans-Peter Nilsson  <hpn@cygnus.com>
+        * sh.h (SHF_SH5_ISA32_MIXED, SHT_SH5_CR_SORTED,
+        SH64_CRANGES_SECTION_NAME, SH64_CRANGE_SIZE,
+        SH64_CRANGE_CR_ADDR_OFFSET, SH64_CRANGE_CR_SIZE_OFFSET,
+        SH64_CRANGE_CR_TYPE_OFFSET): New macros.
+        2000-12-12  Hans-Peter Nilsson  <hpn@cygnus.com>
+        * sh.h (EF_SH64): Don't define EF_SH64_ABI64.
+        2000-11-27  Hans-Peter Nilsson  <hpn@cygnus.com>
+        * sh.h (EF_SH64_32BIT_ABI, EF_SH64_64BIT_ABI): Delete.
+        (EF_SH64_ABI64): New.
+        2000-11-23  Hans-Peter Nilsson  <hpn@cygnus.com>
+        * sh.h (EF_SH64): Rename from EF_SH5.
+        (EF_SH64_32BIT_ABI): New.
+        (EF_SH64_64BIT_ABI): New.
+        (R_SH_PT_16, R_SH_SHMEDIA_CODE
+        R_SH_IMMU5, R_SH_IMMS6, R_SH_IMMU6, R_SH_IMMS10, R_SH_IMMS10BY2,
+        R_SH_IMMS10BY4, R_SH_IMMS10BY8, R_SH_IMMS16, R_SH_IMMU16,
+        R_SH_IMM_LOW16, R_SH_IMM_LOW16_PCREL, R_SH_IMM_MEDLOW16,
+        R_SH_IMM_MEDLOW16_PCREL, R_SH_IMM_MEDHI16, R_SH_IMM_MEDHI16_PCREL,
+        R_SH_IMM_HI16, R_SH_IMM_HI16_PCREL, R_SH_64, R_SH_64_PCREL): New
+        relocs.
+        2000-09-01  Ben Elliston  <bje@redhat.com>
+        * sh.h (EF_SH5): Define.
+
+2002-02-01  Hans-Peter Nilsson  <hp@bitrange.com>
+
+        * mmix.h: Tweak comments.
+        (MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME): New.
+        [BFD_ARCH_SIZE] (_bfd_mmix_prepare_linker_allocated_gregs,
+        _bfd_mmix_finalize_linker_allocated_gregs,
+        _bfd_mmix_check_all_relocs): Provide prototypes.
+
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+        * or32.h: New file.
+        * common.h: Add support for or32 targets.
+
+2002-01-28  Jason Merrill  <jason@redhat.com>
+
+        * dwarf2.h: Sync with gcc version.
+
+2002-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+        * ppc.h (DT_PPC64_GLINK): Define.
+
+2002-01-15  Richard Earnshaw  <rearnsha@arm.com>
+
+        * arm.h (F_VFP_FLOAT, EF_ARM_VFP_FLOAT): Define.
+
+2002-01-09  Jason Thorpe  <thorpej@wasabisystems.com>
+
+        * common.h: Update copyright years.
+        (NT_NETBSDCORE_PROCINFO): Define.
+        (NT_NETBSDCORE_FIRSTMACH): Define.
+
+2002-01-06  Steve Ellcey  <sje@cup.hp.com>
+
+        * ia64.h (ELF_STRING_ia64_unwind_hdr): New Macro for HP-UX.
+        (SHT_IA_64_HP_OPT_ANOT): Ditto
+        (PT_IA_64_HP_OPT_ANOT): Ditto
+        (PT_IA_64_HP_HSL_ANOT): Ditto
+        (PT_IA_64_HP_STACK): Ditto
+        (SHN_IA_64_ANSI_COMMON): Ditto
+
+2001-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+        * external.h (Elf_External_Sym_Shndx): Declare.
+        * internal.h (struct elf_internal_sym <st_shndx>): Make it an
+        unsigned int.
+        * common.h (SHN_BAD): Define.
+
+2001-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+        * elf/common.h (PT_GNU_EH_FRAME): Define.
+
+2001-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+        * common.h (SHN_XINDEX): Comment typo fix.
+        * internal.h (Elf_Internal_Ehdr): Change existing "unsigned short"
+        size, count and index fields to "unsigned int".
+
+2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
+            Richard Henderson  <rth@redhat.com>
+
+        * common.h (EM_XSTORMY16): Define.
+        * xstormy16.h: New file.
+
+2001-11-15  Alan Modra  <amodra@bigpond.net.au>
+
+        * common.h (NT_ARCH): Define.  Remove incorrect comment.
+
+2001-11-11  Geoffrey Keating  <geoffk@redhat.com>
+
+        * dwarf2.h (dwarf_line_number_ops): Add DWARF 3 opcodes.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+        * mmix.h: New file.
+
+2001-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+        * internal.h: White space changes to keep lines under 80 chars.
+
+2001-10-16  Jeff Holcomb  <jeffh@redhat.com>
+
+        * internal.h (elf_internal_shdr): Make contents a unsigned char *.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+        * internal.h (elf_internal_rela): Make r_addend a bfd_vma.
+
+2001-09-13  Alexandre Oliva  <aoliva@redhat.com>
+
+        * common.h (EM_OPENRISC_OLD): Renamed the old EM_OPENRISC entry.
+
+2001-09-12  Alexandre Oliva  <aoliva@redhat.com>
+
+        * common.h (EM_AVR_OLD): Renamed from...
+        (EM_AVR): this, redefined as in the current ELF standard.
+        (EM_PJ_OLD): Renamed from...
+        (EM_PJ): this, redefined as in the current ELF standard.
+        (EM_R30, EM_D10V, EM_D30V, EM_V850, EM_M32R, EM_MN10300,
+        EM_MN10200, EM_OPENRISC, EM_ARC_A5, EM_XTENSA): Defined as in
+        the current ELF standard.
+        (EM_CYGNUS_ARC): Removed, unused for a long time.
+
+2001-09-04  Richard Henderson  <rth@redhat.com>
+
+        * alpha.h (R_ALPHA_OP*, R_ALPHA_IMMED*, R_ALPHA_GPVALUE): Remove.
+        (R_ALPHA_GPREL16): Rename from R_ALPHA_IMMED_GP_16.
+
+2001-08-30  Eric Christopher  <echristo@redhat.com>
+
+        * mips.h: Remove E_MIPS_MACH_MIPS32_4K.
+
+2001-08-29  Jeff Law <law@redhat.com>
+
+        * h8.h (EF_H8_MACH): New mask for encoded machine type.
+        (E_H8_MACH_H8300, E_H8_MACH_H8300H, E_H8_MACH_H8300S): New
+        machine types.
+
+2001-08-26  J"orn Rennecke <amylaar@redhat.com>
+
+        * h8.h: New file.
+
+2001-08-27  Staffan Ulfberg  <staffanu@swox.se>
+
+        * ppc.h: Add relocs from the 64-bit PowerPC ELF ABI revision 1.2.
+
+2001-06-30  Daniel Berlin  <dan@cgsoftware.com>
+
+        * dwarf2.h: Remerge with gcc version,
+        including all new DWARF 2.1 extensions.
+
+2001-06-29  James Cownie <jcownie@etnus.com>
+
+        * dwarf2.h: Add DWARF 2.1 attribues.
+
+2001-06-15  Per Bothner  <per@bothner.com>
+
+        * dwarf2.h:  Partial merge with gcc version.
+        (enum dwarf_descrim_list):  Fix typo -> dwarf_discrim_list.
+        (DW_LANG_Java):  Use value from dwarf 2.1 draft (also used in gcc).
+
+2001-05-15  Ralf Baechle  <ralf@gnu.org>
+
         * common.h: Remove definition of EM_MIPS_RS4_BE.  The constant was
         never in active use and is used otherwise by the ABI.
 
-        2001-05-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+2001-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+        * ia64.h (ELF_STRING_ia64_unwind_once): Define.
+        (ELF_STRING_ia64_unwind_info_once): Define.
+
+2001-05-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
         * external.h: Fix typo.
         * mips.h: Add/Extend many comments with reference to the MIPS ELF64
@@ -25 +514 @@
         (OHW_R10KLDL): Define.
 
-        2001-04-24  Todd Fries  <todd@fries.net>
+2001-04-24  Todd Fries  <todd@fries.net>
+
         * sparc.h: Fix typo.
 
-        2001-03-23  Nick Clifton  <nickc@redhat.com>
+2001-04-20  Johan Rydberg  <jrydberg@opencores.org>
+
+        * openrisc.h: New file.
+        * common.h (EM_OPENRISC): New constant.
+
+2001-04-23  Bo Thorsen  <bo@suse.de>
+
+        * x86-64.h: Add vtable support.
+
+2001-03-23  Nick Clifton  <nickc@redhat.com>
+
         * mips.h: Remove extraneous whitespace.
 
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
-
-        * Many files: Update copyright notices.
+2001-03-22  Hans-Peter Nilsson  <hp@axis.com>
+
+        * cris.h: Add leading comment about PC-relative location.
+        (R_CRIS_COPY, R_CRIS_GLOB_DAT, R_CRIS_JUMP_SLOT, R_CRIS_RELATIVE,
+        R_CRIS_16_GOT, R_CRIS_32_GOT, R_CRIS_16_GOTPLT, R_CRIS_32_GOTPLT,
+        R_CRIS_32_GOTREL, R_CRIS_32_PLT_GOTREL, R_CRIS_32_PLT_PCREL):
+        New relocs.
+
+2001-02-27  Philip Blundell  <pb@futuretv.com>
+
+        * arm.h: Add new definitions from ARM document SWS ESPC 0003 B-01.
+        (EF_PIC, et al.): Rename to EF_ARM_xx.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+        * common.h: Add linux target for S/390.
+        * s390.h: New file.
 
 2001-01-11  Peter Targett  <peter.targett@arccores.com>
@@ -53 +567 @@
 2000-10-16  Chris Demetriou  <cgd@sibyte.com>
 
-        * mips.h (E_MIPS_ARCH_32): New constant.
-        (E_MIPS_MACH_MIPS32, E_MIPS_MACH_MIPS32_4K): Replace the
-        former with the latter.
-
-        * mips.h (E_MIPS_ARCH_5, E_MIPS_ARCH_64): New definitions.
-
-        * mips.h (E_MIPS_MACH_SB1): New constant.
+        * mips.h (E_MIPS_ARCH_32): New constant.
+        (E_MIPS_MACH_MIPS32, E_MIPS_MACH_MIPS32_4K): Replace the
+        former with the latter.
+
+        * mips.h (E_MIPS_ARCH_5, E_MIPS_ARCH_64): New definitions.
+
+        * mips.h (E_MIPS_MACH_SB1): New constant.
 
 2000-11-30  Jan Hubicka  <jh@suse.cz>
 
-        * common.h (EM_X86_64): New macro.
-        * x86-64.h: New file.
+        * common.h (EM_X86_64): New macro.
+        * x86-64.h: New file.
 
 2000-11-27  Hans-Peter Nilsson  <hp@axis.com>
@@ -252 +766 @@
         (ELFOSABI_OPENBSD): Likewise.
 
-Fri Apr 21 13:20:53 2000  Richard Henderson  <rth@cygnus.com>
-                          David Mosberger  <davidm@hpl.hp.com>
+2000-04-21  Richard Henderson  <rth@cygnus.com>
+            David Mosberger  <davidm@hpl.hp.com>
 
         * ia64.h: New file.
@@ -287 +801 @@
         (PF_ARM_ABS): Define.
 
-Wed Apr  5 22:08:59 2000  J"orn Rennecke <amylaar@cygnus.co.uk>
+2000-04-05  J"orn Rennecke <amylaar@cygnus.co.uk>
 
         * sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
@@ -316 +830 @@
         * common.h (ELFOSABI_LINUX): Define.
 
-Thu Feb 17 00:18:33 2000  J"orn Rennecke <amylaar@cygnus.co.uk>
+2000-02-17  J"orn Rennecke <amylaar@cygnus.co.uk>
 
         * sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.

branches/GNU/src/binutils/include/elf/alpha.h

@@ -81 +81 @@
   RELOC_NUMBER (R_ALPHA_SREL64, 11)     /* PC relative 64 bit */
 
-/* Inherited these from ECOFF, but they are not particularly useful
-   and are depreciated.  And not implemented in the BFD, btw.  */
-  RELOC_NUMBER (R_ALPHA_OP_PUSH, 12)    /* OP stack push */
-  RELOC_NUMBER (R_ALPHA_OP_STORE, 13)   /* OP stack pop and store */
-  RELOC_NUMBER (R_ALPHA_OP_PSUB, 14)    /* OP stack subtract */
-  RELOC_NUMBER (R_ALPHA_OP_PRSHIFT, 15) /* OP stack right shift */
+  /* Skip 12 - 16; deprecated ECOFF relocs.  */
 
-  RELOC_NUMBER (R_ALPHA_GPVALUE, 16)
-  RELOC_NUMBER (R_ALPHA_GPRELHIGH, 17)
-  RELOC_NUMBER (R_ALPHA_GPRELLOW, 18)
-  RELOC_NUMBER (R_ALPHA_IMMED_GP_16, 19)
-  RELOC_NUMBER (R_ALPHA_IMMED_GP_HI32, 20)
-  RELOC_NUMBER (R_ALPHA_IMMED_SCN_HI32, 21)
-  RELOC_NUMBER (R_ALPHA_IMMED_BR_HI32, 22)
-  RELOC_NUMBER (R_ALPHA_IMMED_LO32, 23)
+  RELOC_NUMBER (R_ALPHA_GPRELHIGH, 17)  /* GP relative 32 bit, high 16 bits */
+  RELOC_NUMBER (R_ALPHA_GPRELLOW, 18)   /* GP relative 32 bit, low 16 bits */
+  RELOC_NUMBER (R_ALPHA_GPREL16, 19)    /* GP relative 16 bit */
 
-/* These relocations are specific to shared libraries.  */
+  /* Skip 20 - 23; deprecated ECOFF relocs.  */
+
+  /* These relocations are specific to shared libraries.  */
   RELOC_NUMBER (R_ALPHA_COPY, 24)       /* Copy symbol at runtime */
   RELOC_NUMBER (R_ALPHA_GLOB_DAT, 25)   /* Create GOT entry */
@@ -103 +95 @@
   RELOC_NUMBER (R_ALPHA_RELATIVE, 27)   /* Adjust by program base */
 
+  /* Like BRADDR, but assert that the source and target object file
+     share the same GP value, and adjust the target address for 
+     STO_ALPHA_STD_GPLOAD.  */
+  RELOC_NUMBER (R_ALPHA_BRSGP, 28)
+
+  /* Thread-Local Storage.  */
+  RELOC_NUMBER (R_ALPHA_TLSGD, 29)
+  RELOC_NUMBER (R_ALPHA_TLSLDM, 30)
+  RELOC_NUMBER (R_ALPHA_DTPMOD64, 31)
+  RELOC_NUMBER (R_ALPHA_GOTDTPREL, 32)
+  RELOC_NUMBER (R_ALPHA_DTPREL64, 33)
+  RELOC_NUMBER (R_ALPHA_DTPRELHI, 34)
+  RELOC_NUMBER (R_ALPHA_DTPRELLO, 35)
+  RELOC_NUMBER (R_ALPHA_DTPREL16, 36)
+  RELOC_NUMBER (R_ALPHA_GOTTPREL, 37)
+  RELOC_NUMBER (R_ALPHA_TPREL64, 38)
+  RELOC_NUMBER (R_ALPHA_TPRELHI, 39)
+  RELOC_NUMBER (R_ALPHA_TPRELLO, 40)
+  RELOC_NUMBER (R_ALPHA_TPREL16, 41)
+
 END_RELOC_NUMBERS (R_ALPHA_max)
 
+#define LITUSE_ALPHA_ADDR       0
+#define LITUSE_ALPHA_BASE       1
+#define LITUSE_ALPHA_BYTOFF     2
+#define LITUSE_ALPHA_JSR        3
+#define LITUSE_ALPHA_TLSGD      4
+#define LITUSE_ALPHA_TLSLDM     5
+
 #endif /* _ELF_ALPHA_H */

branches/GNU/src/binutils/include/elf/arm.h

@@ -1 +1 @@
 /* ARM ELF support for BFD.
-   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -26 +26 @@
 #define EF_ARM_RELEXEC     0x01
 #define EF_ARM_HASENTRY    0x02
-#define EF_INTERWORK       0x04
-#define EF_APCS_26         0x08
-#define EF_APCS_FLOAT      0x10
-#define EF_PIC             0x20
-#define EF_ALIGN8          0x40         /* 8-bit structure alignment is in use.  */
-#define EF_NEW_ABI         0x80
-#define EF_OLD_ABI         0x100
-#define EF_SOFT_FLOAT      0x200
+#define EF_ARM_INTERWORK   0x04
+#define EF_ARM_APCS_26     0x08
+#define EF_ARM_APCS_FLOAT  0x10
+#define EF_ARM_PIC         0x20
+#define EF_ARM_ALIGN8      0x40         /* 8-bit structure alignment is in use.  */
+#define EF_ARM_NEW_ABI     0x80
+#define EF_ARM_OLD_ABI     0x100
+#define EF_ARM_SOFT_FLOAT  0x200
+#define EF_ARM_VFP_FLOAT   0x400
+#define EF_ARM_MAVERICK_FLOAT 0x800
 
-/* Other constants defined in the ARM ELF spec. version A-08.  */
+/* Other constants defined in the ARM ELF spec. version B-01.  */
 #define EF_ARM_SYMSARESORTED 0x04       /* NB conflicts with EF_INTERWORK */
+#define EF_ARM_DYNSYMSUSESEGIDX 0x08    /* NB conflicts with EF_APCS26 */
+#define EF_ARM_MAPSYMSFIRST 0x10        /* NB conflicts with EF_APCS_FLOAT */
 #define EF_ARM_EABIMASK      0xFF000000
 
@@ -42 +46 @@
 #define EF_ARM_EABI_UNKNOWN  0x00000000
 #define EF_ARM_EABI_VER1     0x01000000
+#define EF_ARM_EABI_VER2     0x02000000
 
 /* Local aliases for some flags to match names used by COFF port.  */
-#define F_INTERWORK        EF_INTERWORK
-#define F_APCS26           EF_APCS_26
-#define F_APCS_FLOAT       EF_APCS_FLOAT
-#define F_PIC              EF_PIC
-#define F_SOFT_FLOAT       EF_SOFT_FLOAT
+#define F_INTERWORK        EF_ARM_INTERWORK
+#define F_APCS26           EF_ARM_APCS_26
+#define F_APCS_FLOAT       EF_ARM_APCS_FLOAT
+#define F_PIC              EF_ARM_PIC
+#define F_SOFT_FLOAT       EF_ARM_SOFT_FLOAT
+#define F_VFP_FLOAT        EF_ARM_VFP_FLOAT
 
 /* Additional symbol types for Thumb.  */
@@ -110 +116 @@
 #else /* not OLD_ARM_ABI */
   FAKE_RELOC   (FIRST_INVALID_RELOC1,  28)
-  FAKE_RELOC   (LAST_INVALID_RELOC1,   99)
+  FAKE_RELOC   (LAST_INVALID_RELOC1,   31)
+  RELOC_NUMBER (R_ARM_ALU_PCREL7_0,    32)
+  RELOC_NUMBER (R_ARM_ALU_PCREL15_8,   33)
+  RELOC_NUMBER (R_ARM_ALU_PCREL23_15,  34)
+  RELOC_NUMBER (R_ARM_LDR_SBREL11_0,   35)
+  RELOC_NUMBER (R_ARM_ALU_SBREL19_12,  36)
+  RELOC_NUMBER (R_ARM_ALU_SBREL27_20,  37)
+  FAKE_RELOC   (FIRST_INVALID_RELOC2,  38)
+  FAKE_RELOC   (LAST_INVALID_RELOC2,   99)
   RELOC_NUMBER (R_ARM_GNU_VTENTRY,    100)
   RELOC_NUMBER (R_ARM_GNU_VTINHERIT,  101)
   RELOC_NUMBER (R_ARM_THM_PC11,       102)   /* Cygnus extension to abi: Thumb unconditional branch.  */
   RELOC_NUMBER (R_ARM_THM_PC9,        103)   /* Cygnus extension to abi: Thumb conditional branch.  */
-  FAKE_RELOC   (FIRST_INVALID_RELOC2, 104)
-  FAKE_RELOC   (LAST_INVALID_RELOC2,  248)
+  FAKE_RELOC   (FIRST_INVALID_RELOC3, 104)
+  FAKE_RELOC   (LAST_INVALID_RELOC3,  248)
   RELOC_NUMBER (R_ARM_RXPC25,         249)
 #endif /* not OLD_ARM_ABI */
@@ -127 +141 @@
 END_RELOC_NUMBERS (R_ARM_max)
 
+/* The name of the note section used to identify arm variants.  */
+#define ARM_NOTE_SECTION ".note.gnu.arm.ident"
+     
 #endif /* _ELF_ARM_H */

branches/GNU/src/binutils/include/elf/common.h

@@ -1 +1 @@
 /* ELF support for BFD.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001
+   2001, 2002, 2003
    Free Software Foundation, Inc.
 
@@ -8 +8 @@
    Programming Support Tools".
 
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
@@ -28 +28 @@
    that are common to both the internal and external representations.
    For example, ELFMAG0 is the byte 0x7F in both the internal (in-memory)
-   and external (in-file) representations. */
+   and external (in-file) representations.  */
 
 #ifndef _ELF_COMMON_H
 #define _ELF_COMMON_H
 
-/* Fields in e_ident[] */
+/* Fields in e_ident[].  */
 
 #define EI_MAG0         0       /* File identification byte 0 index */
-#define ELFMAG0         0x7F    /* Magic number byte 0 */
+#define ELFMAG0            0x7F /* Magic number byte 0 */
 
 #define EI_MAG1         1       /* File identification byte 1 index */
-#define ELFMAG1         'E'     /* Magic number byte 1 */
+#define ELFMAG1             'E' /* Magic number byte 1 */
 
 #define EI_MAG2         2       /* File identification byte 2 index */
-#define ELFMAG2         'L'     /* Magic number byte 2 */
+#define ELFMAG2             'L' /* Magic number byte 2 */
 
 #define EI_MAG3         3       /* File identification byte 3 index */
-#define ELFMAG3         'F'     /* Magic number byte 3 */
+#define ELFMAG3             'F' /* Magic number byte 3 */
 
 #define EI_CLASS        4       /* File class */
-#define ELFCLASSNONE    0       /* Invalid class */
-#define ELFCLASS32      1       /* 32-bit objects */
-#define ELFCLASS64      2       /* 64-bit objects */
+#define ELFCLASSNONE          0 /* Invalid class */
+#define ELFCLASS32            1 /* 32-bit objects */
+#define ELFCLASS64            2 /* 64-bit objects */
 
 #define EI_DATA         5       /* Data encoding */
-#define ELFDATANONE     0       /* Invalid data encoding */
-#define ELFDATA2LSB     1       /* 2's complement, little endian */
-#define ELFDATA2MSB     2       /* 2's complement, big endian */
+#define ELFDATANONE           0 /* Invalid data encoding */
+#define ELFDATA2LSB           1 /* 2's complement, little endian */
+#define ELFDATA2MSB           2 /* 2's complement, big endian */
 
 #define EI_VERSION      6       /* File version */
 
-#define EI_OSABI        7       /* Operating System/ABI indication */
-#define ELFOSABI_NONE   0       /* UNIX System V ABI */
-#define ELFOSABI_HPUX   1       /* HP-UX operating system */
-#define ELFOSABI_NETBSD 2       /* NetBSD */
-#define ELFOSABI_LINUX  3       /* GNU/Linux */
-#define ELFOSABI_HURD   4       /* GNU/Hurd */
-#define ELFOSABI_SOLARIS 6      /* Solaris */
-#define ELFOSABI_AIX    7       /* AIX */
-#define ELFOSABI_IRIX   8       /* IRIX */
-#define ELFOSABI_FREEBSD 9      /* FreeBSD */
-#define ELFOSABI_TRU64  10      /* TRU64 UNIX */
-#define ELFOSABI_MODESTO 11     /* Novell Modesto */
-#define ELFOSABI_OPENBSD 12     /* OpenBSD */
-#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */
-#define ELFOSABI_ARM   97       /* ARM */
-
-#define EI_ABIVERSION   8       /* ABI version */
+#define EI_OSABI        7       /* Operating System/ABI indication */
+#define ELFOSABI_NONE         0 /* UNIX System V ABI */
+#define ELFOSABI_HPUX         1 /* HP-UX operating system */
+#define ELFOSABI_NETBSD       2 /* NetBSD */
+#define ELFOSABI_LINUX        3 /* GNU/Linux */
+#define ELFOSABI_HURD         4 /* GNU/Hurd */
+#define ELFOSABI_SOLARIS      6 /* Solaris */
+#define ELFOSABI_AIX          7 /* AIX */
+#define ELFOSABI_IRIX         8 /* IRIX */
+#define ELFOSABI_FREEBSD      9 /* FreeBSD */
+#define ELFOSABI_TRU64       10 /* TRU64 UNIX */
+#define ELFOSABI_MODESTO     11 /* Novell Modesto */
+#define ELFOSABI_OPENBSD     12 /* OpenBSD */
+#define ELFOSABI_OPENVMS     13 /* OpenVMS */
+#define ELFOSABI_NSK         14 /* Hewlett-Packard Non-Stop Kernel */
+#define ELFOSABI_AROS        15 /* Amiga Research OS */
+#define ELFOSABI_ARM         97 /* ARM */
+#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */
+
+#define EI_ABIVERSION   8       /* ABI version */
 
 #define EI_PAD          9       /* Start of padding bytes */
@@ -87 +90 @@
 #define ET_DYN          3       /* Shared object file */
 #define ET_CORE         4       /* Core file */
-#define ET_LOOS         0xFE00  /* Operating system-specific */
-#define ET_HIOS         0xFEFF  /* Operating system-specific */
+#define ET_LOOS         0xFE00  /* Operating system-specific */
+#define ET_HIOS         0xFEFF  /* Operating system-specific */
 #define ET_LOPROC       0xFF00  /* Processor-specific */
 #define ET_HIPROC       0xFFFF  /* Processor-specific */
 
 /* Values for e_machine, which identifies the architecture.  These numbers
-   are officially assigned by registry@sco.com.  See below for a list of
+   are officially assigned by registry@caldera.com.  See below for a list of
    ad-hoc numbers used during initial development.  */
 
-#define EM_NONE         0       /* No machine */
-#define EM_M32          1       /* AT&T WE 32100 */
-#define EM_SPARC        2       /* SUN SPARC */
-#define EM_386          3       /* Intel 80386 */
-#define EM_68K          4       /* Motorola m68k family */
-#define EM_88K          5       /* Motorola m88k family */
-#define EM_486          6       /* Intel 80486 *//* Reserved for future use */
-#define EM_860          7       /* Intel 80860 */
-#define EM_MIPS         8       /* MIPS R3000 (officially, big-endian only) */
-#define EM_S370         9       /* IBM System/370 */
-#define EM_MIPS_RS3_LE 10       /* MIPS R3000 little-endian (Oct 4 1999 Draft)*/ /* Depreciated */
-
-#define EM_PARISC      15       /* HPPA */
-
-#define EM_VPP550      17       /* Fujitsu VPP500 */
-#define EM_SPARC32PLUS 18       /* Sun's "v8plus" */
-#define EM_960         19       /* Intel 80960 */
-#define EM_PPC         20       /* PowerPC */
-#define EM_PPC64       21       /* 64-bit PowerPC */
-
-#define EM_V800        36       /* NEC V800 series */
-#define EM_FR20        37       /* Fujitsu FR20 */
-#define EM_RH32        38       /* TRW RH32 */
-#define EM_MCORE       39       /* Motorola M*Core */ /* May also be taken by Fujitsu MMA */
-#define EM_RCE         39       /* Old name for MCore */
-#define EM_ARM         40       /* ARM */
-#define EM_OLD_ALPHA   41       /* Digital Alpha */
-#define EM_SH          42       /* Hitachi SH */
-#define EM_SPARCV9     43       /* SPARC v9 64-bit */
-#define EM_TRICORE     44       /* Siemens Tricore embedded processor */
-#define EM_ARC         45       /* ARC Cores */
-#define EM_H8_300      46       /* Hitachi H8/300 */
-#define EM_H8_300H     47       /* Hitachi H8/300H */
-#define EM_H8S         48       /* Hitachi H8S */
-#define EM_H8_500      49       /* Hitachi H8/500 */
-#define EM_IA_64       50       /* Intel IA-64 Processor */
-#define EM_MIPS_X      51       /* Stanford MIPS-X */
-#define EM_COLDFIRE    52       /* Motorola Coldfire */
-#define EM_68HC12      53       /* Motorola M68HC12 */
-#define EM_MMA         54       /* Fujitsu Multimedia Accelerator */
-#define EM_PCP         55       /* Siemens PCP */
-#define EM_NCPU        56       /* Sony nCPU embedded RISC processor */
-#define EM_NDR1        57       /* Denso NDR1 microprocesspr */
-#define EM_STARCORE    58       /* Motorola Star*Core processor */
-#define EM_ME16        59       /* Toyota ME16 processor */
-#define EM_ST100       60       /* STMicroelectronics ST100 processor */
-#define EM_TINYJ       61       /* Advanced Logic Corp. TinyJ embedded processor */
-#define EM_X86_64      62       /* Advanced Micro Devices X86-64 processor */
-
-#define EM_FX66        66       /* Siemens FX66 microcontroller */
-#define EM_ST9PLUS     67       /* STMicroelectronics ST9+ 8/16 bit microcontroller */
-#define EM_ST7         68       /* STMicroelectronics ST7 8-bit microcontroller */
-#define EM_68HC16      69       /* Motorola MC68HC16 Microcontroller */
-#define EM_68HC11      70       /* Motorola MC68HC11 Microcontroller */
-#define EM_68HC08      71       /* Motorola MC68HC08 Microcontroller */
-#define EM_68HC05      72       /* Motorola MC68HC05 Microcontroller */
-#define EM_SVX         73       /* Silicon Graphics SVx */
-#define EM_ST19        74       /* STMicroelectronics ST19 8-bit cpu */
-#define EM_VAX         75       /* Digital VAX */
-#define EM_CRIS        76       /* Axis Communications 32-bit embedded processor */
-#define EM_JAVELIN     77       /* Infineon Technologies 32-bit embedded cpu */
-#define EM_FIREPATH    78       /* Element 14 64-bit DSP processor */
-#define EM_ZSP         79       /* LSI Logic's 16-bit DSP processor */
-#define EM_MMIX        80       /* Donald Knuth's educational 64-bit processor */
-#define EM_HUANY       81       /* Harvard's machine-independent format */
-#define EM_PRISM       82       /* SiTera Prism */
+#define EM_NONE           0     /* No machine */
+#define EM_M32            1     /* AT&T WE 32100 */
+#define EM_SPARC          2     /* SUN SPARC */
+#define EM_386            3     /* Intel 80386 */
+#define EM_68K            4     /* Motorola m68k family */
+#define EM_88K            5     /* Motorola m88k family */
+#define EM_486            6     /* Intel 80486 *//* Reserved for future use */
+#define EM_860            7     /* Intel 80860 */
+#define EM_MIPS           8     /* MIPS R3000 (officially, big-endian only) */
+#define EM_S370           9     /* IBM System/370 */
+#define EM_MIPS_RS3_LE   10     /* MIPS R3000 little-endian (Oct 4 1999 Draft) Deprecated */
+
+#define EM_PARISC        15     /* HPPA */
+
+#define EM_VPP550        17     /* Fujitsu VPP500 */
+#define EM_SPARC32PLUS   18     /* Sun's "v8plus" */
+#define EM_960           19     /* Intel 80960 */
+#define EM_PPC           20     /* PowerPC */
+#define EM_PPC64         21     /* 64-bit PowerPC */
+#define EM_S390          22     /* IBM S/390 */
+
+#define EM_V800          36     /* NEC V800 series */
+#define EM_FR20          37     /* Fujitsu FR20 */
+#define EM_RH32          38     /* TRW RH32 */
+#define EM_MCORE         39     /* Motorola M*Core */ /* May also be taken by Fujitsu MMA */
+#define EM_RCE           39     /* Old name for MCore */
+#define EM_ARM           40     /* ARM */
+#define EM_OLD_ALPHA     41     /* Digital Alpha */
+#define EM_SH            42     /* Renesas (formerly Hitachi) / SuperH SH */
+#define EM_SPARCV9       43     /* SPARC v9 64-bit */
+#define EM_TRICORE       44     /* Siemens Tricore embedded processor */
+#define EM_ARC           45     /* ARC Cores */
+#define EM_H8_300        46     /* Renesas (formerly Hitachi) H8/300 */
+#define EM_H8_300H       47     /* Renesas (formerly Hitachi) H8/300H */
+#define EM_H8S           48     /* Renesas (formerly Hitachi) H8S */
+#define EM_H8_500        49     /* Renesas (formerly Hitachi) H8/500 */
+#define EM_IA_64         50     /* Intel IA-64 Processor */
+#define EM_MIPS_X        51     /* Stanford MIPS-X */
+#define EM_COLDFIRE      52     /* Motorola Coldfire */
+#define EM_68HC12        53     /* Motorola M68HC12 */
+#define EM_MMA           54     /* Fujitsu Multimedia Accelerator */
+#define EM_PCP           55     /* Siemens PCP */
+#define EM_NCPU          56     /* Sony nCPU embedded RISC processor */
+#define EM_NDR1          57     /* Denso NDR1 microprocesspr */
+#define EM_STARCORE      58     /* Motorola Star*Core processor */
+#define EM_ME16          59     /* Toyota ME16 processor */
+#define EM_ST100         60     /* STMicroelectronics ST100 processor */
+#define EM_TINYJ         61     /* Advanced Logic Corp. TinyJ embedded processor */
+#define EM_X86_64        62     /* Advanced Micro Devices X86-64 processor */
+
+#define EM_PDP10         64     /* Digital Equipment Corp. PDP-10 */
+#define EM_PDP11         65     /* Digital Equipment Corp. PDP-11 */
+#define EM_FX66          66     /* Siemens FX66 microcontroller */
+#define EM_ST9PLUS       67     /* STMicroelectronics ST9+ 8/16 bit microcontroller */
+#define EM_ST7           68     /* STMicroelectronics ST7 8-bit microcontroller */
+#define EM_68HC16        69     /* Motorola MC68HC16 Microcontroller */
+#define EM_68HC11        70     /* Motorola MC68HC11 Microcontroller */
+#define EM_68HC08        71     /* Motorola MC68HC08 Microcontroller */
+#define EM_68HC05        72     /* Motorola MC68HC05 Microcontroller */
+#define EM_SVX           73     /* Silicon Graphics SVx */
+#define EM_ST19          74     /* STMicroelectronics ST19 8-bit cpu */
+#define EM_VAX           75     /* Digital VAX */
+#define EM_CRIS          76     /* Axis Communications 32-bit embedded processor */
+#define EM_JAVELIN       77     /* Infineon Technologies 32-bit embedded cpu */
+#define EM_FIREPATH      78     /* Element 14 64-bit DSP processor */
+#define EM_ZSP           79     /* LSI Logic's 16-bit DSP processor */
+#define EM_MMIX          80     /* Donald Knuth's educational 64-bit processor */
+#define EM_HUANY         81     /* Harvard's machine-independent format */
+#define EM_PRISM         82     /* SiTera Prism */
+#define EM_AVR           83     /* Atmel AVR 8-bit microcontroller */
+#define EM_FR30          84     /* Fujitsu FR30 */
+#define EM_D10V          85     /* Mitsubishi D10V */
+#define EM_D30V          86     /* Mitsubishi D30V */
+#define EM_V850          87     /* NEC v850 */
+#define EM_M32R          88     /* Renesas M32R (formerly Mitsubishi M32R) */
+#define EM_MN10300       89     /* Matsushita MN10300 */
+#define EM_MN10200       90     /* Matsushita MN10200 */
+#define EM_PJ            91     /* picoJava */
+#define EM_OPENRISC      92     /* OpenRISC 32-bit embedded processor */
+#define EM_ARC_A5        93     /* ARC Cores Tangent-A5 */
+#define EM_XTENSA        94     /* Tensilica Xtensa Architecture */
+#define EM_IP2K         101     /* Ubicom IP2022 micro controller */
+#define EM_MSP430       105     /* TI msp430 micro controller */
 
 /* If it is necessary to assign new unofficial EM_* values, please pick large
@@ -172 +192 @@
 
    Normally, each entity or maintainer responsible for a machine with an
-   unofficial e_machine number should eventually ask registry@sco.com for
-   an officially blessed number to be added to the list above.  */
-
-#define EM_PJ          99       /* picoJava */
+   unofficial e_machine number should eventually ask registry@caldera.com for
+   an officially blessed number to be added to the list above.  */
+
+#define EM_PJ_OLD      99       /* picoJava */
 
 /* Cygnus PowerPC ELF backend.  Written in the absence of an ABI.  */
@@ -187 +207 @@
 #define EM_PPC_OLD      17
 
-/* Cygnus ARC ELF backend.  Written in the absence of an ABI.  */
-#define EM_CYGNUS_ARC 0x9040
+/* (Deprecated) Temporary number for the OpenRISC processor.  */
+#define EM_OR32         0x8472
 
 /* Cygnus M32R ELF backend.  Written in the absence of an ABI.  */
-#define EM_CYGNUS_M32R 0x9041
+#define EM_CYGNUS_M32R  0x9041
 
 /* Alpha backend magic number.  Written in the absence of an ABI.  */
 #define EM_ALPHA        0x9026
+
+/* old S/390 backend magic number. Written in the absence of an ABI.  */
+#define EM_S390_OLD     0xa390
 
 /* D10V backend magic number.  Written in the absence of an ABI.  */
@@ -215 +238 @@
 /* AVR magic number
    Written in the absense of an ABI.  */
-#define EM_AVR                  0x1057
+#define EM_AVR_OLD              0x1057
+
+/* OpenRISC magic number
+   Written in the absense of an ABI.  */
+#define EM_OPENRISC_OLD         0x3426
+
+/* DLX magic number
+   Written in the absense of an ABI.  */
+#define EM_DLX                  0x5aa5
+
+#define EM_XSTORMY16            0xad45
+
+/* FRV magic number - no EABI available??.  */
+#define EM_CYGNUS_FRV           0x5441
+
+/* Ubicom IP2xxx; no ABI */
+#define EM_IP2K_OLD             0x8217  
+
+/* MSP430 magic number
+      Written in the absense everything.  */
+#define EM_MSP430_OLD           0x1059
+
+/* Vitesse IQ2000.  */
+#define EM_IQ2000               0xFEBA
+
+/* Old, unofficial value for Xtensa.  */
+#define EM_XTENSA_OLD           0xabc7
 
 /* See the above comment before you add a new EM_* value here.  */
@@ -226 +275 @@
 /* Values for program header, p_type field.  */
 
-#define PT_NULL         0               /* Program header table entry unused */
+#define PT_NULL         0               /* Program header table entry unused */
 #define PT_LOAD         1               /* Loadable program segment */
 #define PT_DYNAMIC      2               /* Dynamic linking information */
@@ -233 +282 @@
 #define PT_SHLIB        5               /* Reserved, unspecified semantics */
 #define PT_PHDR         6               /* Entry for header table itself */
-#define PT_LOOS         0x60000000      /* OS-specific */
-#define PT_HIOS         0x6fffffff      /* OS-specific */
+#define PT_TLS          7               /* Thread local storage segment */
+#define PT_LOOS         0x60000000      /* OS-specific */
+#define PT_HIOS         0x6fffffff      /* OS-specific */
 #define PT_LOPROC       0x70000000      /* Processor-specific */
 #define PT_HIPROC       0x7FFFFFFF      /* Processor-specific */
+
+#define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
 
 /* Program segment permissions, in program header p_flags field.  */
@@ -262 +314 @@
 #define SHT_DYNSYM      11              /* Dynamic linking symbol table */
 
-#define SHT_INIT_ARRAY    14            /* Array of ptrs to init functions */
-#define SHT_FINI_ARRAY    15            /* Array of ptrs to finish functions */
+#define SHT_INIT_ARRAY    14            /* Array of ptrs to init functions */
+#define SHT_FINI_ARRAY    15            /* Array of ptrs to finish functions */
 #define SHT_PREINIT_ARRAY 16            /* Array of ptrs to pre-init funcs */
-#define SHT_GROUP         17            /* Section contains a section group */
+#define SHT_GROUP         17            /* Section contains a section group */
 #define SHT_SYMTAB_SHNDX  18            /* Indicies for SHN_XINDEX entries */
 
-#define SHT_LOOS        0x60000000      /* First of OS specific semantics */
-#define SHT_HIOS        0x6fffffff      /* Last of OS specific semantics */
+#define SHT_LOOS        0x60000000      /* First of OS specific semantics */
+#define SHT_HIOS        0x6fffffff      /* Last of OS specific semantics */
+
+#define SHT_GNU_LIBLIST 0x6ffffff7      /* List of prelink dependencies */
 
 /* The next three section types are defined by Solaris, and are named
@@ -296 +350 @@
 #define SHF_STRINGS     (1 << 5)        /* Contains null terminated character strings */
 #define SHF_INFO_LINK   (1 << 6)        /* sh_info holds section header table index */
-#define SHF_LINK_ORDER  (1 << 7)        /* Preserve section ordering when linking */
+#define SHF_LINK_ORDER  (1 << 7)        /* Preserve section ordering when linking */
 #define SHF_OS_NONCONFORMING (1 << 8)   /* OS specific processing required */
 #define SHF_GROUP       (1 << 9)        /* Member of a section group */
+#define SHF_TLS         (1 << 10)       /* Thread local storage section */
 
 /* #define SHF_MASKOS   0x0F000000    *//* OS-specific semantics */
@@ -310 +365 @@
 #define NT_PRPSINFO     3               /* Contains copy of prpsinfo struct */
 #define NT_TASKSTRUCT   4               /* Contains copy of task struct */
-#define NT_PRXFPREG     0x46e62b7f      /* Contains a user_xfpregs_struct; */
+#define NT_PRXFPREG     0x46e62b7f      /* Contains a user_xfpregs_struct; */
                                         /*   note name must be "LINUX".  */
 
@@ -322 +377 @@
 #define NT_WIN32PSTATUS 18              /* Has a struct win32_pstatus */
 
+
+/* Note segments for core files on NetBSD systems.  Note name
+   must start with "NetBSD-CORE".  */
+
+#define NT_NETBSDCORE_PROCINFO  1       /* Has a struct procinfo */
+#define NT_NETBSDCORE_FIRSTMACH 32      /* start of machdep note types */
+
+
 /* Values of note segment descriptor types for object files.  */
-/* (Only for hppa right now.  Should this be moved elsewhere?)  */
 
 #define NT_VERSION      1               /* Contains a version string.  */
+#define NT_ARCH         2               /* Contains an architecture string.  */
+
+/* Values for GNU .note.ABI-tag notes.  Note name is "GNU".  */
+
+#define NT_GNU_ABI_TAG          1
+#define GNU_ABI_TAG_LINUX       0
+#define GNU_ABI_TAG_HURD        1
+#define GNU_ABI_TAG_SOLARIS     2
+
+/* Values for NetBSD .note.netbsd.ident notes.  Note name is "NetBSD".  */
+
+#define NT_NETBSD_IDENT         1
+
+/* Values for FreeBSD .note.ABI-tag notes.  Note name is "FreeBSD".  */
+
+#define NT_FREEBSD_ABI_TAG      1
 
 /* These three macros disassemble and assemble a symbol table st_info field,
@@ -360 +438 @@
 #define STB_GLOBAL      1               /* Symbol visible outside obj */
 #define STB_WEAK        2               /* Like globals, lower precedence */
-#define STB_LOOS        10              /* OS-specific semantics */
-#define STB_HIOS        12              /* OS-specific semantics */
+#define STB_LOOS        10              /* OS-specific semantics */
+#define STB_HIOS        12              /* OS-specific semantics */
 #define STB_LOPROC      13              /* Application-specific semantics */
 #define STB_HIPROC      15              /* Application-specific semantics */
@@ -371 +449 @@
 #define STT_FILE        4               /* Symbol gives a file name */
 #define STT_COMMON      5               /* An uninitialised common block */
-#define STT_LOOS        10              /* OS-specific semantics */
-#define STT_HIOS        12              /* OS-specific semantics */
+#define STT_TLS         6               /* Thread local data object */
+#define STT_LOOS        10              /* OS-specific semantics */
+#define STT_HIOS        12              /* OS-specific semantics */
 #define STT_LOPROC      13              /* Application-specific semantics */
 #define STT_HIPROC      15              /* Application-specific semantics */
@@ -383 +462 @@
 #define SHN_LOPROC      0xFF00          /* Begin range of appl-specific */
 #define SHN_HIPROC      0xFF1F          /* End range of appl-specific */
-#define SHN_LOOS        0xFF20          /* OS specific semantics, lo */
-#define SHN_HIOS        0xFF3F          /* OS specific semantics, hi */
-#define SHN_ABS         0xFFF1          /* Associated symbol is absolute */
-#define SHN_COMMON      0xFFF2          /* Associated symbol is in common */
-#define SHN_XINDEX      0xFFFF          /* Section index it held elsewhere */
-#define SHN_HIRESERVE   0xFFFF          /* End range of reserved indices */
+#define SHN_LOOS        0xFF20          /* OS specific semantics, lo */
+#define SHN_HIOS        0xFF3F          /* OS specific semantics, hi */
+#define SHN_ABS         0xFFF1          /* Associated symbol is absolute */
+#define SHN_COMMON      0xFFF2          /* Associated symbol is in common */
+#define SHN_XINDEX      0xFFFF          /* Section index is held elsewhere */
+#define SHN_HIRESERVE   0xFFFF          /* End range of reserved indices */
+#define SHN_BAD         ((unsigned) -1) /* Used internally by bfd */
 
 /* The following constants control how a symbol may be accessed once it has
@@ -434 +514 @@
 #define DT_TEXTREL      22
 #define DT_JMPREL       23
-#define DT_BIND_NOW     24
-#define DT_INIT_ARRAY   25
-#define DT_FINI_ARRAY   26
+#define DT_BIND_NOW     24
+#define DT_INIT_ARRAY   25
+#define DT_FINI_ARRAY   26
 #define DT_INIT_ARRAYSZ 27
 #define DT_FINI_ARRAYSZ 28
-#define DT_RUNPATH      29
-#define DT_FLAGS        30
-
-#define DT_ENCODING     32
+#define DT_RUNPATH      29
+#define DT_FLAGS        30
+#define DT_ENCODING     31
 #define DT_PREINIT_ARRAY   32
 #define DT_PREINIT_ARRAYSZ 33
@@ -448 +527 @@
 /* Note, the Oct 4, 1999 draft of the ELF ABI changed the values
    for DT_LOOS and DT_HIOS.  Some implementations however, use
-   values outside of the new range (see below).  */
+   values outside of the new range (see below).  */
 #define OLD_DT_LOOS     0x60000000
-#define DT_LOOS         0x6000000d
-#define DT_HIOS         0x6fff0000
-#define OLD_DT_HIOS     0x6fffffff
-
-#define DT_LOPROC       0x70000000
-#define DT_HIPROC       0x7fffffff
+#define DT_LOOS         0x6000000d
+#define DT_HIOS         0x6fff0000
+#define OLD_DT_HIOS     0x6fffffff
+
+#define DT_LOPROC       0x70000000
+#define DT_HIPROC       0x7fffffff
 
 /* The next four dynamic tags are used on Solaris.  We support them
-   everywhere.  Note these values lie outside of the (new) range for
-   OS specific values.  This is a deliberate special case and we
+   everywhere.  Note these values lie outside of the (new) range for
+   OS specific values.  This is a deliberate special case and we
    maintain it for backwards compatability.  */
 #define DT_VALRNGLO     0x6ffffd00
+#define DT_GNU_PRELINKED 0x6ffffdf5
+#define DT_GNU_CONFLICTSZ 0x6ffffdf6
+#define DT_GNU_LIBLISTSZ 0x6ffffdf7
 #define DT_CHECKSUM     0x6ffffdf8
 #define DT_PLTPADSZ     0x6ffffdf9
@@ -473 +555 @@
 
 #define DT_ADDRRNGLO    0x6ffffe00
+#define DT_GNU_CONFLICT 0x6ffffef8
+#define DT_GNU_LIBLIST  0x6ffffef9
 #define DT_CONFIG       0x6ffffefa
 #define DT_DEPAUDIT     0x6ffffefb
@@ -513 +597 @@
 #define DTF_1_CONFEXP   0x00000002
 
-/* Flag values used in the DT_POSFLAG_1 .dynamic entry.  */
+/* Flag values used in the DT_POSFLAG_1 .dynamic entry.  */
 #define DF_P1_LAZYLOAD  0x00000001
 #define DF_P1_GROUPPERM 0x00000002
@@ -533 +617 @@
 #define DF_1_CONLFAT    0x00002000
 
-/* Flag values for the DT_FLAGS entry.  */
+/* Flag values for the DT_FLAGS entry.  */
 #define DF_ORIGIN       (1 << 0)
 #define DF_SYMBOLIC     (1 << 1)
 #define DF_TEXTREL      (1 << 2)
 #define DF_BIND_NOW     (1 << 3)
+#define DF_STATIC_TLS   (1 << 4)
 
 /* These constants are used for the version number of a Elf32_Verdef
@@ -599 +684 @@
 #define SYMINFO_NUM             2
 
-/* Section Group Flags.  */
+/* Section Group Flags.  */
 
 #define GRP_COMDAT              0x1     /* A COMDAT group */

branches/GNU/src/binutils/include/elf/cris.h

@@ -31 +31 @@
   RELOC_NUMBER (R_CRIS_16,              2)
   RELOC_NUMBER (R_CRIS_32,              3)
+
+  /* The "PC" position is the location right after the relocation.  */
   RELOC_NUMBER (R_CRIS_8_PCREL,         4)
   RELOC_NUMBER (R_CRIS_16_PCREL,        5)
@@ -37 +39 @@
   RELOC_NUMBER (R_CRIS_GNU_VTINHERIT,   7)
   RELOC_NUMBER (R_CRIS_GNU_VTENTRY,     8)
+
+  /* Copy contents at dynlinking.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_COPY.  */
+  RELOC_NUMBER (R_CRIS_COPY, 9)
+
+  /* Create GOT entry.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_GLOB_DAT.  */
+  RELOC_NUMBER (R_CRIS_GLOB_DAT, 10)
+
+  /* Create PLT entry.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_JUMP_SLOT.  */
+  RELOC_NUMBER (R_CRIS_JUMP_SLOT, 11)
+
+  /* Adjust by program base.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_RELATIVE.  */
+  RELOC_NUMBER (R_CRIS_RELATIVE, 12)
+
+  /* A 16-bit offset to entry in GOT and request to create GOT entry for
+     that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_16_GOT.  */
+  RELOC_NUMBER (R_CRIS_16_GOT, 13)
+
+  /* A 32-bit offset to entry in GOT and request to create GOT entry for
+     that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOT.  */
+  RELOC_NUMBER (R_CRIS_32_GOT, 14)
+
+  /* A 16-bit offset to entry in PLT part of GOT and request to create PLT
+     entry for that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_16_GOTPLT.  */
+  RELOC_NUMBER (R_CRIS_16_GOTPLT, 15)
+
+  /* A 32-bit offset to entry in PLT part of GOT and request to create PLT
+     entry for that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTPLT.  */
+  RELOC_NUMBER (R_CRIS_32_GOTPLT, 16)
+
+  /* A 32-bit offset from GOT to (local) symbol: no GOT entry should be
+     necessary.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTREL.  */
+  RELOC_NUMBER (R_CRIS_32_GOTREL, 17)
+
+  /* A 32-bit offset from GOT to entry for this symbol in PLT and request
+     to create PLT entry for symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTREL.  */
+  RELOC_NUMBER (R_CRIS_32_PLT_GOTREL, 18)
+
+  /* A 32-bit offset from location after this relocation (addend specifies
+     offset) to entry for this symbol in PLT and request to create PLT
+     entry for symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_PLT_PCREL.  */
+  RELOC_NUMBER (R_CRIS_32_PLT_PCREL, 19)
 
   /* No other relocs must be visible outside the assembler.  */

branches/GNU/src/binutils/include/elf/dwarf2.h

@@ -1 @@
-/* Declarations and definitions of codes relating to the DWARF symbolic
+/* Declarations and definitions of codes relating to the DWARF2 symbolic
    debugging information format.
-   Copyright 1992, 1993, 1995, 1996, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    Written by Gary Funck (gary@intrepid.com) The Ada Joint Program
@@ -10 +11 @@
    (rfg@netcom.com), November 1990.
 
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GNU CC is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by the Free
+   Software Foundation; either version 2, or (at your option) any later
+   version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
 
 /* This file is derived from the DWARF specification (a public document)
@@ -30 +32 @@
    Programming Languages Special Interest Group (UI/PLSIG) and distributed
    by UNIX International.  Copies of this specification are available from
-   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.  */
+   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.
+
+   This file also now contains definitions from the DWARF 3 specification.  */
+
+/* This file is shared between GCC and GDB, and should not contain
+   prototypes.  */
 
 #ifndef _ELF_DWARF2_H
@@ -81 +88 @@
 DWARF2_Internal_PubNames;
 
-/* Strcuture found in .debug_info section.  */
+/* Structure found in .debug_info section.  */
 typedef struct
 {
@@ -122 +129 @@
 
 /* Tag names and codes.  */
-
 enum dwarf_tag
   {
@@ -173 +179 @@
     DW_TAG_variable = 0x34,
     DW_TAG_volatile_type = 0x35,
-    /* SGI/MIPS Extensions */
+    /* DWARF 3.  */
+    DW_TAG_dwarf_procedure = 0x36,
+    DW_TAG_restrict_type = 0x37,
+    DW_TAG_interface_type = 0x38,
+    DW_TAG_namespace = 0x39,
+    DW_TAG_imported_module = 0x3a,
+    DW_TAG_unspecified_type = 0x3b,
+    DW_TAG_partial_unit = 0x3c,
+    DW_TAG_imported_unit = 0x3d,
+    /* SGI/MIPS Extensions.  */
     DW_TAG_MIPS_loop = 0x4081,
-    /* GNU extensions */
-    DW_TAG_format_label = 0x4101,       /* for FORTRAN 77 and Fortran 90 */
-    DW_TAG_function_template = 0x4102,  /* for C++ */
-    DW_TAG_class_template = 0x4103      /* for C++ */
+    /* GNU extensions.  */
+    DW_TAG_format_label = 0x4101,       /* For FORTRAN 77 and Fortran 90.  */
+    DW_TAG_function_template = 0x4102,  /* For C++.  */
+    DW_TAG_class_template = 0x4103,     /* For C++.  */
+    DW_TAG_GNU_BINCL = 0x4104,
+    DW_TAG_GNU_EINCL = 0x4105,
+    /* Extensions for UPC.  See: http://upc.gwu.edu/~upc.  */
+    DW_TAG_upc_shared_type = 0x8765,
+    DW_TAG_upc_strict_type = 0x8766,
+    DW_TAG_upc_relaxed_type = 0x8767
   };
 
@@ -184 +205 @@
 #define DW_TAG_hi_user  0xffff
 
-/* flag that tells whether entry has a child or not */
+/* Flag that tells whether entry has a child or not.  */
 #define DW_children_no   0
 #define DW_children_yes  1
@@ -280 +301 @@
     DW_AT_virtuality = 0x4c,
     DW_AT_vtable_elem_location = 0x4d,
-    /* SGI/MIPS Extensions */
+    /* DWARF 3 values.  */
+    DW_AT_allocated     = 0x4e,
+    DW_AT_associated    = 0x4f,
+    DW_AT_data_location = 0x50,
+    DW_AT_stride        = 0x51,
+    DW_AT_entry_pc      = 0x52,
+    DW_AT_use_UTF8      = 0x53,
+    DW_AT_extension     = 0x54,
+    DW_AT_ranges        = 0x55,
+    DW_AT_trampoline    = 0x56,
+    DW_AT_call_column   = 0x57,
+    DW_AT_call_file     = 0x58,
+    DW_AT_call_line     = 0x59,
+    /* SGI/MIPS extensions.  */
     DW_AT_MIPS_fde = 0x2001,
     DW_AT_MIPS_loop_begin = 0x2002,
@@ -293 +327 @@
     DW_AT_MIPS_has_inlines = 0x200b,
     /* GNU extensions.  */
-    DW_AT_sf_names = 0x2101,
-    DW_AT_src_info = 0x2102,
-    DW_AT_mac_info = 0x2103,
+    DW_AT_sf_names   = 0x2101,
+    DW_AT_src_info   = 0x2102,
+    DW_AT_mac_info   = 0x2103,
     DW_AT_src_coords = 0x2104,
     DW_AT_body_begin = 0x2105,
-    DW_AT_body_end = 0x2106
-  };
-
-#define DW_AT_lo_user   0x2000  /* implementation-defined range start */
-#define DW_AT_hi_user   0x3ff0  /* implementation-defined range end */
+    DW_AT_body_end   = 0x2106,
+    DW_AT_GNU_vector = 0x2107,
+    /* VMS extensions.  */
+    DW_AT_VMS_rtnbeg_pd_address = 0x2201,
+    /* UPC extension.  */
+    DW_AT_upc_threads_scaled = 0x3210
+  };
+
+#define DW_AT_lo_user   0x2000  /* Implementation-defined range start.  */
+#define DW_AT_hi_user   0x3ff0  /* Implementation-defined range end.  */
 
 /* Location atom names and codes.  */
-
 enum dwarf_location_atom
   {
@@ -452 +490 @@
     DW_OP_deref_size = 0x94,
     DW_OP_xderef_size = 0x95,
-    DW_OP_nop = 0x96
-  };
-
-#define DW_OP_lo_user   0x80    /* implementation-defined range start */
-#define DW_OP_hi_user   0xff    /* implementation-defined range end */
+    DW_OP_nop = 0x96,
+    /* DWARF 3 extensions.  */
+    DW_OP_push_object_address = 0x97,
+    DW_OP_call2 = 0x98,
+    DW_OP_call4 = 0x99,
+    DW_OP_call_ref = 0x9a,
+    /* GNU extensions.  */
+    DW_OP_GNU_push_tls_address = 0xe0
+  };
+
+#define DW_OP_lo_user   0xe0    /* Implementation-defined range start.  */
+#define DW_OP_hi_user   0xff    /* Implementation-defined range end.  */
 
 /* Type encodings.  */
-
 enum dwarf_type
   {
@@ -470 +514 @@
     DW_ATE_signed_char = 0x6,
     DW_ATE_unsigned = 0x7,
-    DW_ATE_unsigned_char = 0x8
+    DW_ATE_unsigned_char = 0x8,
+    /* DWARF 3.  */
+    DW_ATE_imaginary_float = 0x9
   };
 
@@ -483 +529 @@
   };
 
-/* access attribute */
+/* Access attribute.  */
 enum dwarf_access_attribute
   {
@@ -491 +537 @@
   };
 
-/* visibility */
+/* Visibility.  */
 enum dwarf_visibility_attribute
   {
@@ -499 +545 @@
   };
 
-/* virtuality */
+/* Virtuality.  */
 enum dwarf_virtuality_attribute
   {
@@ -507 +553 @@
   };
 
-/* case sensitivity */
+/* Case sensitivity.  */
 enum dwarf_id_case
   {
@@ -516 +562 @@
   };
 
-/* calling convention */
+/* Calling convention.  */
 enum dwarf_calling_convention
   {
@@ -527 +573 @@
 #define DW_CC_hi_user 0xff
 
-/* inline attribute */
+/* Inline attribute.  */
 enum dwarf_inline_attribute
   {
@@ -536 +582 @@
   };
 
-/* descriminant lists */
-enum dwarf_descrim_list
+/* Discriminant lists.  */
+enum dwarf_discrim_list
   {
     DW_DSC_label = 0,
@@ -543 +589 @@
   };
 
-/* line number opcodes */
+/* Line number opcodes.  */
 enum dwarf_line_number_ops
   {
@@ -555 +601 @@
     DW_LNS_set_basic_block = 7,
     DW_LNS_const_add_pc = 8,
-    DW_LNS_fixed_advance_pc = 9
-  };
-
-/* line number extended opcodes */
+    DW_LNS_fixed_advance_pc = 9,
+    /* DWARF 3.  */
+    DW_LNS_set_prologue_end = 10,
+    DW_LNS_set_epilogue_begin = 11,
+    DW_LNS_set_isa = 12
+  };
+
+/* Line number extended opcodes.  */
 enum dwarf_line_number_x_ops
   {
@@ -566 +616 @@
   };
 
-/* call frame information */
+/* Call frame information.  */
 enum dwarf_call_frame_info
   {
@@ -587 +637 @@
     DW_CFA_def_cfa_register = 0x0d,
     DW_CFA_def_cfa_offset = 0x0e,
-    /* SGI/MIPS specific */
-    DW_CFA_MIPS_advance_loc8 = 0x1d
+
+    /* DWARF 3.  */
+    DW_CFA_def_cfa_expression = 0x0f,
+    DW_CFA_expression = 0x10,
+    DW_CFA_offset_extended_sf = 0x11,
+    DW_CFA_def_cfa_sf = 0x12,
+    DW_CFA_def_cfa_offset_sf = 0x13,
+
+    /* SGI/MIPS specific.  */
+    DW_CFA_MIPS_advance_loc8 = 0x1d,
+
+    /* GNU extensions.  */
+    DW_CFA_GNU_window_save = 0x2d,
+    DW_CFA_GNU_args_size = 0x2e,
+    DW_CFA_GNU_negative_offset_extended = 0x2f
   };
 
@@ -595 +658 @@
 
 #define DW_CFA_extended   0
-#define DW_CFA_low_user   0x1c
-#define DW_CFA_high_user  0x3f
+#define DW_CFA_lo_user    0x1c
+#define DW_CFA_hi_user    0x3f
 
 #define DW_CHILDREN_no               0x00
@@ -604 +667 @@
 
 /* Source language names and codes.  */
-
 enum dwarf_source_language
   {
@@ -617 +679 @@
     DW_LANG_Pascal83 = 0x0009,
     DW_LANG_Modula2 = 0x000a,
-    DW_LANG_Java = 0x9af4,
-    DW_LANG_Mips_Assembler = 0x8001
-  };
-
-
-#define DW_LANG_lo_user 0x8000  /* implementation-defined range start */
-#define DW_LANG_hi_user 0xffff  /* implementation-defined range start */
+    DW_LANG_Java = 0x000b,
+    /* DWARF 3.  */
+    DW_LANG_C99 = 0x000c,
+    DW_LANG_Ada95 = 0x000d,
+    DW_LANG_Fortran95 = 0x000e,
+    /* MIPS.  */
+    DW_LANG_Mips_Assembler = 0x8001,
+    /* UPC.  */
+    DW_LANG_Upc = 0x8765
+  };
+
+#define DW_LANG_lo_user 0x8000  /* Implementation-defined range start.  */
+#define DW_LANG_hi_user 0xffff  /* Implementation-defined range start.  */
 
 /* Names and codes for macro information.  */
-
 enum dwarf_macinfo_record_type
   {
@@ -636 +703 @@
   };
 
+
+/* @@@ For use with GNU frame unwind information.  */
+
+#define DW_EH_PE_absptr         0x00
+#define DW_EH_PE_omit           0xff
+
+#define DW_EH_PE_uleb128        0x01
+#define DW_EH_PE_udata2         0x02
+#define DW_EH_PE_udata4         0x03
+#define DW_EH_PE_udata8         0x04
+#define DW_EH_PE_sleb128        0x09
+#define DW_EH_PE_sdata2         0x0A
+#define DW_EH_PE_sdata4         0x0B
+#define DW_EH_PE_sdata8         0x0C
+#define DW_EH_PE_signed         0x08
+
+#define DW_EH_PE_pcrel          0x10
+#define DW_EH_PE_textrel        0x20
+#define DW_EH_PE_datarel        0x30
+#define DW_EH_PE_funcrel        0x40
+#define DW_EH_PE_aligned        0x50
+
+#define DW_EH_PE_indirect       0x80
+
 #endif /* _ELF_DWARF2_H */

branches/GNU/src/binutils/include/elf/external.h

@@ -144 +144 @@
 } Elf64_External_Sym;
 
+typedef struct {
+  unsigned char est_shndx[4];           /* Section index */
+} Elf_External_Sym_Shndx;
+
 /* Note segments */
 

branches/GNU/src/binutils/include/elf/i370.h

@@ -1 +1 @@
 /* i370 ELF support for BFD.
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -24 +24 @@
 #define _ELF_I370_H
 
+#include "elf/reloc-macros.h"
+
 /* Processor specific section headers, sh_type field */
 
@@ -42 +44 @@
                                                    are not to be furhter \
                                                    relocated.  */
+
+/* i370 relocations
+   Note that there is really just one relocation that we currently
+   support (and only one that we seem to need, at the moment), and
+   that is the 31-bit address relocation.  Note that the 370/390
+   only supports a 31-bit (2GB) address space.  */
+
+START_RELOC_NUMBERS (i370_reloc_type)
+  RELOC_NUMBER (R_I370_NONE,      0)
+  RELOC_NUMBER (R_I370_ADDR31,    1)
+  RELOC_NUMBER (R_I370_ADDR32,    2)
+  RELOC_NUMBER (R_I370_ADDR16,    3) 
+  RELOC_NUMBER (R_I370_REL31,     4)
+  RELOC_NUMBER (R_I370_REL32,     5)  
+  RELOC_NUMBER (R_I370_ADDR12,    6)
+  RELOC_NUMBER (R_I370_REL12,     7)
+  RELOC_NUMBER (R_I370_ADDR8,     8)
+  RELOC_NUMBER (R_I370_REL8,      9)
+  RELOC_NUMBER (R_I370_COPY,     10)
+  RELOC_NUMBER (R_I370_RELATIVE, 11)
+END_RELOC_NUMBERS (R_I370_max)
+
 #endif /* _ELF_I370_H */
-
-

branches/GNU/src/binutils/include/elf/i386.h

@@ -35 +35 @@
      RELOC_NUMBER (R_386_GOTOFF,    9)  /* 32 bit offset to GOT */
      RELOC_NUMBER (R_386_GOTPC,    10)  /* 32 bit PC relative offset to GOT */
-     FAKE_RELOC   (FIRST_INVALID_RELOC, 11)
-     FAKE_RELOC   (LAST_INVALID_RELOC,  19)
+     RELOC_NUMBER (R_386_32PLT,    11)  /* Used by Sun */
+     FAKE_RELOC   (FIRST_INVALID_RELOC, 12)
+     FAKE_RELOC   (LAST_INVALID_RELOC,  13)
+     RELOC_NUMBER (R_386_TLS_TPOFF,14)
+     RELOC_NUMBER (R_386_TLS_IE,   15)
+     RELOC_NUMBER (R_386_TLS_GOTIE,16)
+     RELOC_NUMBER (R_386_TLS_LE,   17)
+     RELOC_NUMBER (R_386_TLS_GD,   18)
+     RELOC_NUMBER (R_386_TLS_LDM,  19)
      RELOC_NUMBER (R_386_16,       20)
      RELOC_NUMBER (R_386_PC16,     21)
      RELOC_NUMBER (R_386_8,        22)
      RELOC_NUMBER (R_386_PC8,      23)
+     RELOC_NUMBER (R_386_TLS_GD_32,    24)
+     RELOC_NUMBER (R_386_TLS_GD_PUSH,  25)
+     RELOC_NUMBER (R_386_TLS_GD_CALL,  26)
+     RELOC_NUMBER (R_386_TLS_GD_POP,   27)
+     RELOC_NUMBER (R_386_TLS_LDM_32,   28)
+     RELOC_NUMBER (R_386_TLS_LDM_PUSH, 29)
+     RELOC_NUMBER (R_386_TLS_LDM_CALL, 30)
+     RELOC_NUMBER (R_386_TLS_LDM_POP,  31)
+     RELOC_NUMBER (R_386_TLS_LDO_32,   32)
+     RELOC_NUMBER (R_386_TLS_IE_32,    33)
+     RELOC_NUMBER (R_386_TLS_LE_32,    34)
+     RELOC_NUMBER (R_386_TLS_DTPMOD32, 35)
+     RELOC_NUMBER (R_386_TLS_DTPOFF32, 36)
+     RELOC_NUMBER (R_386_TLS_TPOFF32,  37)
+
      /* These are GNU extensions to enable C++ vtable garbage collection.  */
      RELOC_NUMBER (R_386_GNU_VTINHERIT, 250)

branches/GNU/src/binutils/include/elf/ia64.h

@@ -1 +1 @@
 /* IA-64 ELF support for BFD.
-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef _ELF_IA64_H
@@ -25 +24 @@
 /* Bits in the e_flags field of the Elf64_Ehdr:  */
 
-#define EF_IA_64_MASKOS  0x0000000f     /* os-specific flags */
-#define EF_IA_64_ARCH    0xff000000     /* arch. version mask */
+#define EF_IA_64_MASKOS  0x0000000f     /* OS-specific flags.  */
+#define EF_IA_64_ARCH    0xff000000     /* Arch. version mask.  */
 
 /* ??? These four definitions are not part of the SVR4 ABI.
    They were present in David's initial code drop, so it is probable
    that they are used by HP/UX.  */
-#define EF_IA_64_TRAPNIL (1 << 0)       /* trap NIL pointer dereferences */
-#define EF_IA_64_EXT     (1 << 2)       /* program uses arch. extensions */
-#define EF_IA_64_BE      (1 << 3)       /* PSR BE bit set (big-endian) */
-#define EFA_IA_64_EAS2_3 0x23000000     /* ia64 EAS 2.3 */
-
-#define EF_IA_64_ABI64              (1 << 4) /* 64-bit ABI */
+#define EF_IA_64_TRAPNIL (1 << 0)       /* Trap NIL pointer dereferences.  */
+#define EF_IA_64_EXT     (1 << 2)       /* Program uses arch. extensions.  */
+#define EF_IA_64_BE      (1 << 3)       /* PSR BE bit set (big-endian).  */
+#define EFA_IA_64_EAS2_3 0x23000000     /* IA64 EAS 2.3.  */
+
+#define EF_IA_64_ABI64              (1 << 4) /* 64-bit ABI.  */
 /* Not used yet.  */
 #define EF_IA_64_REDUCEDFP          (1 << 5) /* Only FP6-FP11 used.  */
-#define EF_IA_64_CONS_GP            (1 << 6) /* gp as program wide constant. */
-#define EF_IA_64_NOFUNCDESC_CONS_GP (1 << 7) /* And no function descriptors. */
+#define EF_IA_64_CONS_GP            (1 << 6) /* gp as program wide constant.  */
+#define EF_IA_64_NOFUNCDESC_CONS_GP (1 << 7) /* And no function descriptors.  */
 /* Not used yet.  */
 #define EF_IA_64_ABSOLUTE           (1 << 8) /* Load at absolute addresses.  */
@@ -50 +49 @@
 #define ELF_STRING_ia64_unwind_once     ".gnu.linkonce.ia64unw."
 #define ELF_STRING_ia64_unwind_info_once ".gnu.linkonce.ia64unwi."
+/* .IA_64.unwind_hdr is only used by HP-UX.  */
+#define ELF_STRING_ia64_unwind_hdr      ".IA_64.unwind_hdr"
 
 /* Bits in the sh_flags field of Elf64_Shdr:  */
 
-#define SHF_IA_64_SHORT         0x10000000      /* section near gp */
-#define SHF_IA_64_NORECOV       0x20000000      /* spec insns w/o recovery */
+#define SHF_IA_64_SHORT         0x10000000      /* Section near gp.  */
+#define SHF_IA_64_NORECOV       0x20000000      /* Spec insns w/o recovery.  */
 
 /* Possible values for sh_type in Elf64_Shdr: */
 
-#define SHT_IA_64_EXT           (SHT_LOPROC + 0)        /* extension bits */
-#define SHT_IA_64_UNWIND        (SHT_LOPROC + 1)        /* unwind bits */
+#define SHT_IA_64_EXT           (SHT_LOPROC + 0)        /* Extension bits.  */
+#define SHT_IA_64_UNWIND        (SHT_LOPROC + 1)        /* Unwind bits.  */
+#define SHT_IA_64_LOPSREG       (SHT_LOPROC + 0x8000000) 
+/* ABI says (SHT_LOPROC + 0xfffffff) but I think it's a typo -- this makes sense.  */
+#define SHT_IA_64_HIPSREG       (SHT_LOPROC + 0x8ffffff) 
+#define SHT_IA_64_PRIORITY_INIT (SHT_LOPROC + 0x9000000)
+
+/* SHT_IA_64_HP_OPT_ANOT is only generated by HPUX compilers for its
+   optimization annotation section.  GCC does not generate it but we
+   want readelf to know what they are.  Do not use two capital Ns in
+   annotate or sed will turn it into 32 or 64 during the build.  */
+#define SHT_IA_64_HP_OPT_ANOT   0x60000004
 
 /* Bits in the p_flags field of Elf64_Phdr:  */
@@ -67 +78 @@
 /* Possible values for p_type in Elf64_Phdr:  */
 
-#define PT_IA_64_ARCHEXT        (PT_LOPROC + 0) /* arch extension bits */
-#define PT_IA_64_UNWIND         (PT_LOPROC + 1) /* ia64 unwind bits */
+#define PT_IA_64_ARCHEXT        (PT_LOPROC + 0) /* Arch extension bits,  */
+#define PT_IA_64_UNWIND         (PT_LOPROC + 1) /* IA64 unwind bits.  */
+
+/* HP-UX specific values for p_type in Elf64_Phdr.
+   These values are currently just used to make
+   readelf more usable on HP-UX.  */
+
+#define PT_IA_64_HP_OPT_ANOT    (PT_LOOS + 0x12)
+#define PT_IA_64_HP_HSL_ANOT    (PT_LOOS + 0x13)
+#define PT_IA_64_HP_STACK       (PT_LOOS + 0x14)
 
 /* Possible values for d_tag in Elf64_Dyn:  */
@@ -74 +93 @@
 #define DT_IA_64_PLT_RESERVE    (DT_LOPROC + 0)
 
-/* ia64-specific relocation types: */
+/* This section only used by HP-UX, The HP linker gives weak symbols
+   precedence over regular common symbols.  We want common to override
+   weak.  Using this common instead of SHN_COMMON does that.  */
+#define SHN_IA_64_ANSI_COMMON 0xFF00
+
+/* IA64-specific relocation types: */
 
 /* Relocs apply to specific instructions within a bundle.  The least
@@ -171 +195 @@
   RELOC_NUMBER (R_IA64_TPREL64LSB, 0x97) /* @tprel(sym+add), data8 LSB */
 
-  RELOC_NUMBER (R_IA64_LTOFF_TP22, 0x9a) /* @ltoff(@tprel(s+a)), add imm22 */
+  RELOC_NUMBER (R_IA64_LTOFF_TPREL22, 0x9a) /* @ltoff(@tprel(s+a)), add imm22 */
 
   RELOC_NUMBER (R_IA64_DTPMOD64MSB, 0xa6) /* @dtpmod(sym+add), data8 MSB */

branches/GNU/src/binutils/include/elf/internal.h

@@ -1 +1 @@
 /* ELF support for BFD.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
@@ -43 +43 @@
 
 typedef struct elf_internal_ehdr {
-  unsigned char         e_ident[EI_NIDENT];     /* ELF "magic number" */
-  bfd_vma               e_entry;                /* Entry point virtual address */
-  bfd_size_type         e_phoff;                /* Program header table file offset */
-  bfd_size_type         e_shoff;                /* Section header table file offset */
-  unsigned long         e_version;              /* Identifies object file version */
-  unsigned long         e_flags;                /* Processor-specific flags */
-  unsigned short        e_type;                 /* Identifies object file type */
-  unsigned short        e_machine;              /* Specifies required architecture */
-  unsigned short        e_ehsize;               /* ELF header size in bytes */
-  unsigned short        e_phentsize;            /* Program header table entry size */
-  unsigned short        e_phnum;                /* Program header table entry count */
-  unsigned short        e_shentsize;            /* Section header table entry size */
-  unsigned short        e_shnum;                /* Section header table entry count */
-  unsigned short        e_shstrndx;             /* Section header string table index */
+  unsigned char         e_ident[EI_NIDENT]; /* ELF "magic number" */
+  bfd_vma               e_entry;        /* Entry point virtual address */
+  bfd_size_type         e_phoff;        /* Program header table file offset */
+  bfd_size_type         e_shoff;        /* Section header table file offset */
+  unsigned long         e_version;      /* Identifies object file version */
+  unsigned long         e_flags;        /* Processor-specific flags */
+  unsigned short        e_type;         /* Identifies object file type */
+  unsigned short        e_machine;      /* Specifies required architecture */
+  unsigned int          e_ehsize;       /* ELF header size in bytes */
+  unsigned int          e_phentsize;    /* Program header table entry size */
+  unsigned int          e_phnum;        /* Program header table entry count */
+  unsigned int          e_shentsize;    /* Section header table entry size */
+  unsigned int          e_shnum;        /* Section header table entry count */
+  unsigned int          e_shstrndx;     /* Section header string table index */
 } Elf_Internal_Ehdr;
-
-#define elf32_internal_ehdr elf_internal_ehdr
-#define Elf32_Internal_Ehdr Elf_Internal_Ehdr
-#define elf64_internal_ehdr elf_internal_ehdr
-#define Elf64_Internal_Ehdr Elf_Internal_Ehdr
 
 /* Program header */
@@ -78 +73 @@
 
 typedef struct elf_internal_phdr Elf_Internal_Phdr;
-#define elf32_internal_phdr elf_internal_phdr
-#define Elf32_Internal_Phdr Elf_Internal_Phdr
-#define elf64_internal_phdr elf_internal_phdr
-#define Elf64_Internal_Phdr Elf_Internal_Phdr
 
 /* Section header */
@@ -99 +90 @@
   /* The internal rep also has some cached info associated with it. */
   asection *    bfd_section;            /* Associated BFD section.  */
-  PTR           contents;               /* Section contents.  */
+  unsigned char *contents;              /* Section contents.  */
 } Elf_Internal_Shdr;
-
-#define elf32_internal_shdr elf_internal_shdr
-#define Elf32_Internal_Shdr Elf_Internal_Shdr
-#define elf64_internal_shdr elf_internal_shdr
-#define Elf64_Internal_Shdr Elf_Internal_Shdr
 
 /* Symbol table entry */
@@ -115 +101 @@
   unsigned char st_info;                /* Type and binding attributes */
   unsigned char st_other;               /* Visibilty, and target specific */
-  unsigned short st_shndx;              /* Associated section index */
+  unsigned int  st_shndx;               /* Associated section index */
 };
 
 typedef struct elf_internal_sym Elf_Internal_Sym;
-
-#define elf32_internal_sym elf_internal_sym
-#define elf64_internal_sym elf_internal_sym
-#define Elf32_Internal_Sym Elf_Internal_Sym
-#define Elf64_Internal_Sym Elf_Internal_Sym
 
 /* Note segments */
@@ -135 +116 @@
   bfd_vma       descpos;                /* File offset of the descdata */
 } Elf_Internal_Note;
-#define Elf32_Internal_Note     Elf_Internal_Note
-#define elf32_internal_note     elf_internal_note
 
 /* Relocation Entries */
-
-typedef struct elf_internal_rel {
-  bfd_vma       r_offset;       /* Location at which to apply the action */
-  /* This needs to support 64-bit values in elf64.  */
-  bfd_vma       r_info;         /* index and type of relocation */
-} Elf_Internal_Rel;
-
-#define elf32_internal_rel elf_internal_rel
-#define Elf32_Internal_Rel Elf_Internal_Rel
-#define elf64_internal_rel elf_internal_rel
-#define Elf64_Internal_Rel Elf_Internal_Rel
 
 typedef struct elf_internal_rela {
   bfd_vma       r_offset;       /* Location at which to apply the action */
   bfd_vma       r_info;         /* Index and Type of relocation */
-  bfd_signed_vma r_addend;      /* Constant addend used to compute value */
+  bfd_vma       r_addend;       /* Constant addend used to compute value */
 } Elf_Internal_Rela;
-
-#define elf32_internal_rela elf_internal_rela
-#define elf64_internal_rela elf_internal_rela
-#define Elf32_Internal_Rela Elf_Internal_Rela
-#define Elf64_Internal_Rela Elf_Internal_Rela
 
 /* dynamic section structure */
@@ -174 +137 @@
 } Elf_Internal_Dyn;
 
-#define elf32_internal_dyn elf_internal_dyn
-#define elf64_internal_dyn elf_internal_dyn
-#define Elf32_Internal_Dyn Elf_Internal_Dyn
-#define Elf64_Internal_Dyn Elf_Internal_Dyn
-
 /* This structure appears in a SHT_GNU_verdef section.  */
 
@@ -257 +215 @@
 } Elf_Internal_Syminfo;
 
-
-#define elf32_internal_verdef elf_internal_verdef
-#define elf64_internal_verdef elf_internal_verdef
-#define elf32_internal_verdaux elf_internal_verdaux
-#define elf64_internal_verdaux elf_internal_verdaux
-#define elf32_internal_verneed elf_internal_verneed
-#define elf64_internal_verneed elf_internal_verneed
-#define elf32_internal_vernaux elf_internal_vernaux
-#define elf64_internal_vernaux elf_internal_vernaux
-#define elf32_internal_versym elf_internal_versym
-#define elf64_internal_versym elf_internal_versym
-
-#define Elf32_Internal_Verdef Elf_Internal_Verdef
-#define Elf64_Internal_Verdef Elf_Internal_Verdef
-#define Elf32_Internal_Verdaux Elf_Internal_Verdaux
-#define Elf64_Internal_Verdaux Elf_Internal_Verdaux
-#define Elf32_Internal_Verneed Elf_Internal_Verneed
-#define Elf64_Internal_Verneed Elf_Internal_Verneed
-#define Elf32_Internal_Vernaux Elf_Internal_Vernaux
-#define Elf64_Internal_Vernaux Elf_Internal_Vernaux
-#define Elf32_Internal_Versym Elf_Internal_Versym
-#define Elf64_Internal_Versym Elf_Internal_Versym
-#define Elf32_Internal_Syminfo Elf_Internal_Syminfo
-#define Elf64_Internal_Syminfo Elf_Internal_Syminfo
 
 /* This structure is used to describe how sections should be assigned

branches/GNU/src/binutils/include/elf/m68hc11.h

@@ -1 +1 @@
 /* m68hc11 & m68hc12 ELF support for BFD.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -38 +38 @@
   RELOC_NUMBER (R_M68HC11_GNU_VTINHERIT, 9)
   RELOC_NUMBER (R_M68HC11_GNU_VTENTRY, 10)
+
+  RELOC_NUMBER (R_M68HC11_24, 11)
+  RELOC_NUMBER (R_M68HC11_LO16, 12)
+  RELOC_NUMBER (R_M68HC11_PAGE, 13)
+
+     /* GNU extension for linker relaxation.
+        Mark beginning of a jump instruction (any form).  */
+  RELOC_NUMBER (R_M68HC11_RL_JUMP, 20)
+
+     /* Mark beginning of Gcc relaxation group instruction.  */
+  RELOC_NUMBER (R_M68HC11_RL_GROUP, 21)
 END_RELOC_NUMBERS (R_M68HC11_max)
 
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* ABI identification.  */
+#define EF_M68HC11_ABI  0x00000000F
+
+/* Integers are 32-bit long.  */
+#define E_M68HC11_I32   0x000000001
+
+/* Doubles are 64-bit long.  */
+#define E_M68HC11_F64   0x000000002
+
+/* Uses 68HC12 memory banks.  */
+#define E_M68HC12_BANKS 0x000000004
+
+#define EF_M68HC11_MACH_MASK 0xF0
+#define EF_M68HC11_GENERIC   0x00 /* Generic 68HC12/backward compatibility.  */
+#define EF_M68HC12_MACH      0x10 /* 68HC12 microcontroller.  */
+#define EF_M68HCS12_MACH     0x20 /* 68HCS12 microcontroller.  */
+#define EF_M68HC11_MACH(mach) ((mach) & EF_M68HC11_MACH_MASK)
+
+/* True if we can merge machines.  A generic HC12 can work on any proc
+   but once we have specific code, merge is not possible.  */
+#define EF_M68HC11_CAN_MERGE_MACH(mach1, mach2) \
+  ((EF_M68HC11_MACH (mach1) == EF_M68HC11_MACH (mach2)) \
+   || (EF_M68HC11_MACH (mach1) == EF_M68HC11_GENERIC) \
+   || (EF_M68HC11_MACH (mach2) == EF_M68HC11_GENERIC))
+
+#define EF_M68HC11_MERGE_MACH(mach1, mach2) \
+  (((EF_M68HC11_MACH (mach1) == EF_M68HC11_MACH (mach2)) \
+    || (EF_M68HC11_MACH (mach1) == EF_M68HC11_GENERIC)) ? \
+      EF_M68HC11_MACH (mach2) : EF_M68HC11_MACH (mach1))
+
+
+
+/* Special values for the st_other field in the symbol table.  These
+   are used for 68HC12 to identify far functions (must be called with
+   'call' and returns with 'rtc').  */
+#define STO_M68HC12_FAR 0x80
+
+/* Identify interrupt handlers.  This is used by the debugger to
+   correctly compute the stack frame.  */
+#define STO_M68HC12_INTERRUPT 0x40
+     
 #endif

branches/GNU/src/binutils/include/elf/m68k.h

@@ -54 +54 @@
 
 #define EF_CPU32    0x00810000
+#define EF_M68000   0x01000000
 
 #endif

branches/GNU/src/binutils/include/elf/mips.h

@@ -100 +100 @@
 #define EF_MIPS_CPIC            0x00000004
 
+/* ???  Unknown flag, set in IRIX 6's BSDdup2.o in libbsd.a.  */
+#define EF_MIPS_XGOT            0x00000008
+
 /* Code in file uses UCODE (obsolete) */
 #define EF_MIPS_UCODE           0x00000010
@@ -146 +149 @@
 #define E_MIPS_ARCH_64          0x60000000
 
+/* -mips32r2 code.  */
+#define E_MIPS_ARCH_32R2        0x70000000
+
 /* The ABI of the file.  Also see EF_MIPS_ABI2 above. */
 #define EF_MIPS_ABI             0x0000F000
@@ -173 +179 @@
 
 #define E_MIPS_MACH_3900        0x00810000
-
 #define E_MIPS_MACH_4010        0x00820000
 #define E_MIPS_MACH_4100        0x00830000
 #define E_MIPS_MACH_4650        0x00850000
+#define E_MIPS_MACH_4120        0x00870000
 #define E_MIPS_MACH_4111        0x00880000
-#define E_MIPS_MACH_MIPS32_4K   0x00890000
 #define E_MIPS_MACH_SB1         0x008a0000
+#define E_MIPS_MACH_5400        0x00910000
+#define E_MIPS_MACH_5500        0x00980000
 
 

branches/GNU/src/binutils/include/elf/ppc.h

@@ -1 +1 @@
 /* PPC ELF support for BFD.
-   Copyright 1995, 1996, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1998, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
 
    By Michael Meissner, Cygnus Support, <meissner@cygnus.com>, from information
@@ -32 +33 @@
 /* Relocations.  */
 START_RELOC_NUMBERS (elf_ppc_reloc_type)
-  RELOC_NUMBER (R_PPC_NONE, 0)
-  RELOC_NUMBER (R_PPC_ADDR32, 1)
-  RELOC_NUMBER (R_PPC_ADDR24, 2)
-  RELOC_NUMBER (R_PPC_ADDR16, 3)
-  RELOC_NUMBER (R_PPC_ADDR16_LO, 4)
-  RELOC_NUMBER (R_PPC_ADDR16_HI, 5)
-  RELOC_NUMBER (R_PPC_ADDR16_HA, 6)
-  RELOC_NUMBER (R_PPC_ADDR14, 7)
-  RELOC_NUMBER (R_PPC_ADDR14_BRTAKEN, 8)
-  RELOC_NUMBER (R_PPC_ADDR14_BRNTAKEN, 9)
-  RELOC_NUMBER (R_PPC_REL24, 10)
-  RELOC_NUMBER (R_PPC_REL14, 11)
-  RELOC_NUMBER (R_PPC_REL14_BRTAKEN, 12)
-  RELOC_NUMBER (R_PPC_REL14_BRNTAKEN, 13)
-  RELOC_NUMBER (R_PPC_GOT16, 14)
-  RELOC_NUMBER (R_PPC_GOT16_LO, 15)
-  RELOC_NUMBER (R_PPC_GOT16_HI, 16)
-  RELOC_NUMBER (R_PPC_GOT16_HA, 17)
-  RELOC_NUMBER (R_PPC_PLTREL24, 18)
-  RELOC_NUMBER (R_PPC_COPY, 19)
-  RELOC_NUMBER (R_PPC_GLOB_DAT, 20)
-  RELOC_NUMBER (R_PPC_JMP_SLOT, 21)
-  RELOC_NUMBER (R_PPC_RELATIVE, 22)
-  RELOC_NUMBER (R_PPC_LOCAL24PC, 23)
-  RELOC_NUMBER (R_PPC_UADDR32, 24)
-  RELOC_NUMBER (R_PPC_UADDR16, 25)
-  RELOC_NUMBER (R_PPC_REL32, 26)
-  RELOC_NUMBER (R_PPC_PLT32, 27)
-  RELOC_NUMBER (R_PPC_PLTREL32, 28)
-  RELOC_NUMBER (R_PPC_PLT16_LO, 29)
-  RELOC_NUMBER (R_PPC_PLT16_HI, 30)
-  RELOC_NUMBER (R_PPC_PLT16_HA, 31)
-  RELOC_NUMBER (R_PPC_SDAREL16, 32)
-  RELOC_NUMBER (R_PPC_SECTOFF, 33)
-  RELOC_NUMBER (R_PPC_SECTOFF_LO, 34)
-  RELOC_NUMBER (R_PPC_SECTOFF_HI, 35)
-  RELOC_NUMBER (R_PPC_SECTOFF_HA, 36)
+  RELOC_NUMBER (R_PPC_NONE,               0)
+  RELOC_NUMBER (R_PPC_ADDR32,             1)
+  RELOC_NUMBER (R_PPC_ADDR24,             2)
+  RELOC_NUMBER (R_PPC_ADDR16,             3)
+  RELOC_NUMBER (R_PPC_ADDR16_LO,          4)
+  RELOC_NUMBER (R_PPC_ADDR16_HI,          5)
+  RELOC_NUMBER (R_PPC_ADDR16_HA,          6)
+  RELOC_NUMBER (R_PPC_ADDR14,             7)
+  RELOC_NUMBER (R_PPC_ADDR14_BRTAKEN,     8)
+  RELOC_NUMBER (R_PPC_ADDR14_BRNTAKEN,    9)
+  RELOC_NUMBER (R_PPC_REL24,             10)
+  RELOC_NUMBER (R_PPC_REL14,             11)
+  RELOC_NUMBER (R_PPC_REL14_BRTAKEN,     12)
+  RELOC_NUMBER (R_PPC_REL14_BRNTAKEN,    13)
+  RELOC_NUMBER (R_PPC_GOT16,             14)
+  RELOC_NUMBER (R_PPC_GOT16_LO,          15)
+  RELOC_NUMBER (R_PPC_GOT16_HI,          16)
+  RELOC_NUMBER (R_PPC_GOT16_HA,          17)
+  RELOC_NUMBER (R_PPC_PLTREL24,          18)
+  RELOC_NUMBER (R_PPC_COPY,              19)
+  RELOC_NUMBER (R_PPC_GLOB_DAT,          20)
+  RELOC_NUMBER (R_PPC_JMP_SLOT,          21)
+  RELOC_NUMBER (R_PPC_RELATIVE,          22)
+  RELOC_NUMBER (R_PPC_LOCAL24PC,         23)
+  RELOC_NUMBER (R_PPC_UADDR32,           24)
+  RELOC_NUMBER (R_PPC_UADDR16,           25)
+  RELOC_NUMBER (R_PPC_REL32,             26)
+  RELOC_NUMBER (R_PPC_PLT32,             27)
+  RELOC_NUMBER (R_PPC_PLTREL32,          28)
+  RELOC_NUMBER (R_PPC_PLT16_LO,          29)
+  RELOC_NUMBER (R_PPC_PLT16_HI,          30)
+  RELOC_NUMBER (R_PPC_PLT16_HA,          31)
+  RELOC_NUMBER (R_PPC_SDAREL16,          32)
+  RELOC_NUMBER (R_PPC_SECTOFF,           33)
+  RELOC_NUMBER (R_PPC_SECTOFF_LO,        34)
+  RELOC_NUMBER (R_PPC_SECTOFF_HI,        35)
+  RELOC_NUMBER (R_PPC_SECTOFF_HA,        36)
+  RELOC_NUMBER (R_PPC_ADDR30,            37)
+
+  /* Relocs added to support TLS.  */
+  RELOC_NUMBER (R_PPC_TLS,               67)
+  RELOC_NUMBER (R_PPC_DTPMOD32,          68)
+  RELOC_NUMBER (R_PPC_TPREL16,           69)
+  RELOC_NUMBER (R_PPC_TPREL16_LO,        70)
+  RELOC_NUMBER (R_PPC_TPREL16_HI,        71)
+  RELOC_NUMBER (R_PPC_TPREL16_HA,        72)
+  RELOC_NUMBER (R_PPC_TPREL32,           73)
+  RELOC_NUMBER (R_PPC_DTPREL16,          74)
+  RELOC_NUMBER (R_PPC_DTPREL16_LO,       75)
+  RELOC_NUMBER (R_PPC_DTPREL16_HI,       76)
+  RELOC_NUMBER (R_PPC_DTPREL16_HA,       77)
+  RELOC_NUMBER (R_PPC_DTPREL32,          78)
+  RELOC_NUMBER (R_PPC_GOT_TLSGD16,       79)
+  RELOC_NUMBER (R_PPC_GOT_TLSGD16_LO,    80)
+  RELOC_NUMBER (R_PPC_GOT_TLSGD16_HI,    81)
+  RELOC_NUMBER (R_PPC_GOT_TLSGD16_HA,    82)
+  RELOC_NUMBER (R_PPC_GOT_TLSLD16,       83)
+  RELOC_NUMBER (R_PPC_GOT_TLSLD16_LO,    84)
+  RELOC_NUMBER (R_PPC_GOT_TLSLD16_HI,    85)
+  RELOC_NUMBER (R_PPC_GOT_TLSLD16_HA,    86)
+  RELOC_NUMBER (R_PPC_GOT_TPREL16,       87)
+  RELOC_NUMBER (R_PPC_GOT_TPREL16_LO,    88)
+  RELOC_NUMBER (R_PPC_GOT_TPREL16_HI,    89)
+  RELOC_NUMBER (R_PPC_GOT_TPREL16_HA,    90)
+  RELOC_NUMBER (R_PPC_GOT_DTPREL16,      91)
+  RELOC_NUMBER (R_PPC_GOT_DTPREL16_LO,   92)
+  RELOC_NUMBER (R_PPC_GOT_DTPREL16_HI,   93)
+  RELOC_NUMBER (R_PPC_GOT_DTPREL16_HA,   94)
 
 /* The remaining relocs are from the Embedded ELF ABI, and are not
    in the SVR4 ELF ABI.  */
-  RELOC_NUMBER (R_PPC_EMB_NADDR32, 101)
-  RELOC_NUMBER (R_PPC_EMB_NADDR16, 102)
-  RELOC_NUMBER (R_PPC_EMB_NADDR16_LO, 103)
-  RELOC_NUMBER (R_PPC_EMB_NADDR16_HI, 104)
-  RELOC_NUMBER (R_PPC_EMB_NADDR16_HA, 105)
-  RELOC_NUMBER (R_PPC_EMB_SDAI16, 106)
-  RELOC_NUMBER (R_PPC_EMB_SDA2I16, 107)
-  RELOC_NUMBER (R_PPC_EMB_SDA2REL, 108)
-  RELOC_NUMBER (R_PPC_EMB_SDA21, 109)
-  RELOC_NUMBER (R_PPC_EMB_MRKREF, 110)
-  RELOC_NUMBER (R_PPC_EMB_RELSEC16, 111)
-  RELOC_NUMBER (R_PPC_EMB_RELST_LO, 112)
-  RELOC_NUMBER (R_PPC_EMB_RELST_HI, 113)
-  RELOC_NUMBER (R_PPC_EMB_RELST_HA, 114)
-  RELOC_NUMBER (R_PPC_EMB_BIT_FLD, 115)
-  RELOC_NUMBER (R_PPC_EMB_RELSDA, 116)
+  RELOC_NUMBER (R_PPC_EMB_NADDR32,      101)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16,      102)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_LO,   103)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_HI,   104)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_HA,   105)
+  RELOC_NUMBER (R_PPC_EMB_SDAI16,       106)
+  RELOC_NUMBER (R_PPC_EMB_SDA2I16,      107)
+  RELOC_NUMBER (R_PPC_EMB_SDA2REL,      108)
+  RELOC_NUMBER (R_PPC_EMB_SDA21,        109)
+  RELOC_NUMBER (R_PPC_EMB_MRKREF,       110)
+  RELOC_NUMBER (R_PPC_EMB_RELSEC16,     111)
+  RELOC_NUMBER (R_PPC_EMB_RELST_LO,     112)
+  RELOC_NUMBER (R_PPC_EMB_RELST_HI,     113)
+  RELOC_NUMBER (R_PPC_EMB_RELST_HA,     114)
+  RELOC_NUMBER (R_PPC_EMB_BIT_FLD,      115)
+  RELOC_NUMBER (R_PPC_EMB_RELSDA,       116)
 
   /* These are GNU extensions to enable C++ vtable garbage collection.  */
-  RELOC_NUMBER (R_PPC_GNU_VTINHERIT, 253)
-  RELOC_NUMBER (R_PPC_GNU_VTENTRY, 254)
+  RELOC_NUMBER (R_PPC_GNU_VTINHERIT,    253)
+  RELOC_NUMBER (R_PPC_GNU_VTENTRY,      254)
 
 /* This is a phony reloc to handle any old fashioned TOC16 references
    that may still be in object files.  */
-  RELOC_NUMBER (R_PPC_TOC16, 255)
+  RELOC_NUMBER (R_PPC_TOC16,            255)
 
 END_RELOC_NUMBERS (R_PPC_max)
 
+#define IS_PPC_TLS_RELOC(R) \
+  ((R) >= R_PPC_TLS && (R) <= R_PPC_GOT_DTPREL16_HA)
 
 /* Processor specific flags for the ELF header e_flags field.  */

branches/GNU/src/binutils/include/elf/sh.h

@@ -1 +1 @@
 /* SH ELF support for BFD.
-   Copyright 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -34 +34 @@
 #define EF_SH3E            8
 #define EF_SH4             9
+#define EF_SH2E            11
+
+/* This one can only mix in objects from other EF_SH5 objects.  */
+#define EF_SH5            10
 
 #define EF_SH_MERGE_MACH(mach1, mach2) \
@@ -43 +47 @@
       || ((mach2) < EF_SH3 && (mach1) == EF_SH_UNKNOWN)) \
    ? EF_SH3 \
+   : ((mach1) == EF_SH2E && EF_SH_HAS_FP (mach2)) \
+   ? (mach2) \
+   : ((mach2) == EF_SH2E && EF_SH_HAS_FP (mach1)) \
+   ? (mach1) \
+   : (((mach1) == EF_SH2E && (mach2) == EF_SH_UNKNOWN) \
+      || ((mach2) == EF_SH2E && (mach1) == EF_SH_UNKNOWN)) \
+   ? EF_SH2E \
    : (((mach1) == EF_SH3E && (mach2) == EF_SH_UNKNOWN) \
       || ((mach2) == EF_SH3E && (mach1) == EF_SH_UNKNOWN)) \
    ? EF_SH4 \
-   : ((mach1) > (mach2) ? (mach1) : (mach2)))
+   : (((mach1) == EF_SH2E ? 7 : (mach1)) > ((mach2) == EF_SH2E ? 7 : (mach2)) \
+      ? (mach1) : (mach2)))
+
+/* Flags for the st_other symbol field.
+   Keep away from the STV_ visibility flags (bit 0..1).  */
+
+/* A reference to this symbol should by default add 1.  */
+#define STO_SH5_ISA32 (1 << 2)
+
+/* Section contains only SHmedia code (no SHcompact code).  */
+#define SHF_SH5_ISA32           0x40000000
+
+/* Section contains both SHmedia and SHcompact code, and possibly also
+   constants.  */
+#define SHF_SH5_ISA32_MIXED     0x20000000
+
+/* If applied to a .cranges section, marks that the section is sorted by
+   increasing cr_addr values.  */
+#define SHT_SH5_CR_SORTED 0x80000001
+
+/* Symbol should be handled as DataLabel (attached to global SHN_UNDEF
+   symbols).  */
+#define STT_DATALABEL STT_LOPROC
 
 #include "elf/reloc-macros.h"
@@ -80 +113 @@
   RELOC_NUMBER (R_SH_LOOP_END, 37)
   FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_2, 38)
-  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_2, 159)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_2, 44)
+  RELOC_NUMBER (R_SH_DIR5U, 45)
+  RELOC_NUMBER (R_SH_DIR6U, 46)
+  RELOC_NUMBER (R_SH_DIR6S, 47)
+  RELOC_NUMBER (R_SH_DIR10S, 48)
+  RELOC_NUMBER (R_SH_DIR10SW, 49)
+  RELOC_NUMBER (R_SH_DIR10SL, 50)
+  RELOC_NUMBER (R_SH_DIR10SQ, 51)
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_3, 52)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_3, 143)
+  RELOC_NUMBER (R_SH_TLS_GD_32, 144)
+  RELOC_NUMBER (R_SH_TLS_LD_32, 145)
+  RELOC_NUMBER (R_SH_TLS_LDO_32, 146)
+  RELOC_NUMBER (R_SH_TLS_IE_32, 147)
+  RELOC_NUMBER (R_SH_TLS_LE_32, 148)
+  RELOC_NUMBER (R_SH_TLS_DTPMOD32, 149)
+  RELOC_NUMBER (R_SH_TLS_DTPOFF32, 150)
+  RELOC_NUMBER (R_SH_TLS_TPOFF32, 151)
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_4, 152)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_4, 159)
   RELOC_NUMBER (R_SH_GOT32, 160)
   RELOC_NUMBER (R_SH_PLT32, 161)
@@ -89 +141 @@
   RELOC_NUMBER (R_SH_GOTOFF, 166)
   RELOC_NUMBER (R_SH_GOTPC, 167)
+  RELOC_NUMBER (R_SH_GOTPLT32, 168)
+  RELOC_NUMBER (R_SH_GOT_LOW16, 169)
+  RELOC_NUMBER (R_SH_GOT_MEDLOW16, 170)
+  RELOC_NUMBER (R_SH_GOT_MEDHI16, 171)
+  RELOC_NUMBER (R_SH_GOT_HI16, 172)
+  RELOC_NUMBER (R_SH_GOTPLT_LOW16, 173)
+  RELOC_NUMBER (R_SH_GOTPLT_MEDLOW16, 174)
+  RELOC_NUMBER (R_SH_GOTPLT_MEDHI16, 175)
+  RELOC_NUMBER (R_SH_GOTPLT_HI16, 176)
+  RELOC_NUMBER (R_SH_PLT_LOW16, 177)
+  RELOC_NUMBER (R_SH_PLT_MEDLOW16, 178)
+  RELOC_NUMBER (R_SH_PLT_MEDHI16, 179)
+  RELOC_NUMBER (R_SH_PLT_HI16, 180)
+  RELOC_NUMBER (R_SH_GOTOFF_LOW16, 181)
+  RELOC_NUMBER (R_SH_GOTOFF_MEDLOW16, 182)
+  RELOC_NUMBER (R_SH_GOTOFF_MEDHI16, 183)
+  RELOC_NUMBER (R_SH_GOTOFF_HI16, 184)
+  RELOC_NUMBER (R_SH_GOTPC_LOW16, 185)
+  RELOC_NUMBER (R_SH_GOTPC_MEDLOW16, 186)
+  RELOC_NUMBER (R_SH_GOTPC_MEDHI16, 187)
+  RELOC_NUMBER (R_SH_GOTPC_HI16, 188)
+  RELOC_NUMBER (R_SH_GOT10BY4, 189)
+  RELOC_NUMBER (R_SH_GOTPLT10BY4, 190)
+  RELOC_NUMBER (R_SH_GOT10BY8, 191)
+  RELOC_NUMBER (R_SH_GOTPLT10BY8, 192)
+  RELOC_NUMBER (R_SH_COPY64, 193)
+  RELOC_NUMBER (R_SH_GLOB_DAT64, 194)
+  RELOC_NUMBER (R_SH_JMP_SLOT64, 195)
+  RELOC_NUMBER (R_SH_RELATIVE64, 196)
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_5, 197)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_5, 241)
+  RELOC_NUMBER (R_SH_SHMEDIA_CODE, 242)
+  RELOC_NUMBER (R_SH_PT_16, 243)
+  RELOC_NUMBER (R_SH_IMMS16, 244)
+  RELOC_NUMBER (R_SH_IMMU16, 245)
+  RELOC_NUMBER (R_SH_IMM_LOW16, 246)
+  RELOC_NUMBER (R_SH_IMM_LOW16_PCREL, 247)
+  RELOC_NUMBER (R_SH_IMM_MEDLOW16, 248)
+  RELOC_NUMBER (R_SH_IMM_MEDLOW16_PCREL, 249)
+  RELOC_NUMBER (R_SH_IMM_MEDHI16, 250)
+  RELOC_NUMBER (R_SH_IMM_MEDHI16_PCREL, 251)
+  RELOC_NUMBER (R_SH_IMM_HI16, 252)
+  RELOC_NUMBER (R_SH_IMM_HI16_PCREL, 253)
+  RELOC_NUMBER (R_SH_64, 254)
+  RELOC_NUMBER (R_SH_64_PCREL, 255)
 END_RELOC_NUMBERS (R_SH_max)
 

branches/GNU/src/binutils/include/elf/sparc.h

@@ -1 +1 @@
 /* SPARC ELF support for BFD.
-   Copyright 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    By Doug Evans, Cygnus Support, <dje@cygnus.com>.
 
@@ -127 +127 @@
   RELOC_NUMBER (R_SPARC_UA16, 55)
 
-  /* little endian data relocs */
-  RELOC_NUMBER (R_SPARC_REV32, 56)
-
+  RELOC_NUMBER (R_SPARC_TLS_GD_HI22, 56)
+  RELOC_NUMBER (R_SPARC_TLS_GD_LO10, 57)
+  RELOC_NUMBER (R_SPARC_TLS_GD_ADD, 58)
+  RELOC_NUMBER (R_SPARC_TLS_GD_CALL, 59)
+  RELOC_NUMBER (R_SPARC_TLS_LDM_HI22, 60)
+  RELOC_NUMBER (R_SPARC_TLS_LDM_LO10, 61)
+  RELOC_NUMBER (R_SPARC_TLS_LDM_ADD, 62)
+  RELOC_NUMBER (R_SPARC_TLS_LDM_CALL, 63)
+  RELOC_NUMBER (R_SPARC_TLS_LDO_HIX22, 64)
+  RELOC_NUMBER (R_SPARC_TLS_LDO_LOX10, 65)
+  RELOC_NUMBER (R_SPARC_TLS_LDO_ADD, 66)
+  RELOC_NUMBER (R_SPARC_TLS_IE_HI22, 67)
+  RELOC_NUMBER (R_SPARC_TLS_IE_LO10, 68)
+  RELOC_NUMBER (R_SPARC_TLS_IE_LD, 69)
+  RELOC_NUMBER (R_SPARC_TLS_IE_LDX, 70)
+  RELOC_NUMBER (R_SPARC_TLS_IE_ADD, 71)
+  RELOC_NUMBER (R_SPARC_TLS_LE_HIX22, 72)
+  RELOC_NUMBER (R_SPARC_TLS_LE_LOX10, 73)
+  RELOC_NUMBER (R_SPARC_TLS_DTPMOD32, 74)
+  RELOC_NUMBER (R_SPARC_TLS_DTPMOD64, 75)
+  RELOC_NUMBER (R_SPARC_TLS_DTPOFF32, 76)
+  RELOC_NUMBER (R_SPARC_TLS_DTPOFF64, 77)
+  RELOC_NUMBER (R_SPARC_TLS_TPOFF32, 78)
+  RELOC_NUMBER (R_SPARC_TLS_TPOFF64, 79)
+  
   EMPTY_RELOC  (R_SPARC_max_std)
 
   RELOC_NUMBER (R_SPARC_GNU_VTINHERIT, 250)
   RELOC_NUMBER (R_SPARC_GNU_VTENTRY, 251)
+  RELOC_NUMBER (R_SPARC_REV32, 252)
 
 END_RELOC_NUMBERS (R_SPARC_max)

branches/GNU/src/binutils/include/elf/v850.h

@@ -1 +1 @@
 /* V850 ELF support for BFD.
-   Copyright 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
    Created by Michael Meissner, Cygnus Support <meissner@cygnus.com>
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* This file holds definitions specific to the MIPS ELF ABI.  Note
@@ -36 +36 @@
 #define E_V850E_ARCH            0x10000000
 
-/* v850ea code.  */
-#define E_V850EA_ARCH           0x20000000
 
+/* Flags for the st_other field.  */
+#define V850_OTHER_SDA          0x01    /* Symbol had SDA relocations.  */
+#define V850_OTHER_ZDA          0x02    /* Symbol had ZDA relocations.  */
+#define V850_OTHER_TDA          0x04    /* Symbol had TDA relocations.  */
+#define V850_OTHER_TDA_BYTE     0x08    /* Symbol had TDA byte relocations.  */
+#define V850_OTHER_ERROR        0x80    /* Symbol had an error reported.  */
 
-/* Flags for the st_other field */
-#define V850_OTHER_SDA          0x01    /* symbol had SDA relocations */
-#define V850_OTHER_ZDA          0x02    /* symbol had ZDA relocations */
-#define V850_OTHER_TDA          0x04    /* symbol had TDA relocations */
-#define V850_OTHER_TDA_BYTE     0x08    /* symbol had TDA byte relocations */
-#define V850_OTHER_ERROR        0x80    /* symbol had an error reported */
-
-/* V850 relocations */
+/* V850 relocations.  */
 #include "elf/reloc-macros.h"
 
@@ -57 +54 @@
      RELOC_NUMBER (R_V850_HI16, 4)
      RELOC_NUMBER (R_V850_LO16, 5)
-     RELOC_NUMBER (R_V850_32, 6)
+     RELOC_NUMBER (R_V850_ABS32, 6)
      RELOC_NUMBER (R_V850_16, 7)
      RELOC_NUMBER (R_V850_8, 8)
@@ -76 +73 @@
      RELOC_NUMBER (R_V850_GNU_VTINHERIT, 23)
      RELOC_NUMBER (R_V850_GNU_VTENTRY, 24)
+     RELOC_NUMBER (R_V850_LONGCALL, 25)
+     RELOC_NUMBER (R_V850_LONGJUMP, 26)
+     RELOC_NUMBER (R_V850_ALIGN, 27)
+     RELOC_NUMBER (R_V850_REL32, 28)
 END_RELOC_NUMBERS (R_V850_max)
 
@@ -106 +107 @@
 #define SHT_V850_ZCOMMON        0x70000002
 
-
 #endif /* _ELF_V850_H */

branches/GNU/src/binutils/include/elf/x86-64.h

@@ -1 +1 @@
 /* x86_64 ELF support for BFD.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
    Contributed by Jan Hubicka <jh@suse.cz>
 
@@ -26 +26 @@
 START_RELOC_NUMBERS (elf_x86_64_reloc_type)
      RELOC_NUMBER (R_X86_64_NONE,     0)      /* No reloc */
-     RELOC_NUMBER (R_X86_64_64,               1)      /* Direct 64 bit  */
+     RELOC_NUMBER (R_X86_64_64,       1)      /* Direct 64 bit  */
      RELOC_NUMBER (R_X86_64_PC32,     2)      /* PC relative 32 bit signed */
      RELOC_NUMBER (R_X86_64_GOT32,    3)      /* 32 bit GOT entry */
@@ -32 +32 @@
      RELOC_NUMBER (R_X86_64_COPY,     5)      /* Copy symbol at runtime */
      RELOC_NUMBER (R_X86_64_GLOB_DAT, 6)      /* Create GOT entry */
-     RELOC_NUMBER (R_X86_64_JUMP_SLOT,        7)      /* Create PLT entry */
+     RELOC_NUMBER (R_X86_64_JUMP_SLOT,7)      /* Create PLT entry */
      RELOC_NUMBER (R_X86_64_RELATIVE, 8)      /* Adjust by program base */
      RELOC_NUMBER (R_X86_64_GOTPCREL, 9)      /* 32 bit signed pc relative
                                                  offset to GOT */
-     RELOC_NUMBER (R_X86_64_32,               10)     /* Direct 32 bit zero extended */
-     RELOC_NUMBER (R_X86_64_32S,              11)     /* Direct 32 bit sign extended */
-     RELOC_NUMBER (R_X86_64_16,               12)     /* Direct 16 bit zero extended */
+     RELOC_NUMBER (R_X86_64_32,       10)     /* Direct 32 bit zero extended */
+     RELOC_NUMBER (R_X86_64_32S,      11)     /* Direct 32 bit sign extended */
+     RELOC_NUMBER (R_X86_64_16,       12)     /* Direct 16 bit zero extended */
      RELOC_NUMBER (R_X86_64_PC16,     13)     /* 16 bit sign extended pc relative*/
-     RELOC_NUMBER (R_X86_64_8,                14)     /* Direct 8 bit sign extended */
-     RELOC_NUMBER (R_X86_64_PC8,              15)     /* 8 bit sign extended pc relative*/
+     RELOC_NUMBER (R_X86_64_8,        14)     /* Direct 8 bit sign extended */
+     RELOC_NUMBER (R_X86_64_PC8,      15)     /* 8 bit sign extended pc relative*/
+     RELOC_NUMBER (R_X86_64_DTPMOD64, 16)     /* ID of module containing symbol */
+     RELOC_NUMBER (R_X86_64_DTPOFF64, 17)     /* Offset in TLS block */
+     RELOC_NUMBER (R_X86_64_TPOFF64,  18)     /* Offset in initial TLS block */
+     RELOC_NUMBER (R_X86_64_TLSGD,    19)     /* PC relative offset to GD GOT block */
+     RELOC_NUMBER (R_X86_64_TLSLD,    20)     /* PC relative offset to LD GOT block */
+     RELOC_NUMBER (R_X86_64_DTPOFF32, 21)     /* Offset in TLS block */
+     RELOC_NUMBER (R_X86_64_GOTTPOFF, 22)     /* PC relative offset to IE GOT entry */
+     RELOC_NUMBER (R_X86_64_TPOFF32,  23)     /* Offset in initial TLS block */
+     RELOC_NUMBER (R_X86_64_GNU_VTINHERIT, 250)       /* GNU C++ hack  */
+     RELOC_NUMBER (R_X86_64_GNU_VTENTRY, 251)         /* GNU C++ hack  */
 END_RELOC_NUMBERS (R_X86_64_max)
 

branches/GNU/src/binutils/include/filenames.h

@@ -6 +6 @@
    some of them have case-insensitive file names.
 
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -27 +27 @@
 #define FILENAMES_H
 
-#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__)
+#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
 
 #ifndef HAVE_DOS_BASED_FILE_SYSTEM

branches/GNU/src/binutils/include/floatformat.h

@@ -96 +96 @@
 extern const struct floatformat floatformat_i960_ext;
 extern const struct floatformat floatformat_m88110_ext;
-extern const struct floatformat floatformat_arm_ext;
+extern const struct floatformat floatformat_m88110_harris_ext;
+extern const struct floatformat floatformat_arm_ext_big;
+extern const struct floatformat floatformat_arm_ext_littlebyte_bigword;
+/* IA-64 Floating Point register spilt into memory.  */
+extern const struct floatformat floatformat_ia64_spill_big;
+extern const struct floatformat floatformat_ia64_spill_little;
+extern const struct floatformat floatformat_ia64_quad_big;
+extern const struct floatformat floatformat_ia64_quad_little;
 
 /* Convert from FMT to a double.

branches/GNU/src/binutils/include/getopt.h

@@ -1 +1 @@
 /* Declarations for getopt.
-   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000
-   Free Software Foundation, Inc.
+   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000,
+   2002 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -106 +106 @@
    to find the declaration so provide a fully prototyped one.  If it
    is 1, we found it so don't provide any declaration at all.  */
-#if defined (__GNU_LIBRARY__) || (defined (HAVE_DECL_GETOPT) && !HAVE_DECL_GETOPT)
+#if !HAVE_DECL_GETOPT
+#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
 /* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
+   differences in the consts, in unistd.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-# if !defined (HAVE_DECL_GETOPT)
+#else
+#ifndef __cplusplus
 extern int getopt ();
-# endif
-#endif /* __GNU_LIBRARY__ */
+#endif /* __cplusplus */
+#endif
+#endif /* !HAVE_DECL_GETOPT */
+
 extern int getopt_long (int argc, char *const *argv, const char *shortopts,
                         const struct option *longopts, int *longind);

branches/GNU/src/binutils/include/hashtab.h

@@ -1 +1 @@
 /* An expandable hash tables datatype.  
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Vladimir Makarov (vmakarov@cygnus.com).
 
@@ -37 +37 @@
 #endif /* __cplusplus */
 
-#include <ansidecl.h>
+#include "ansidecl.h"
+
+#ifndef GTY
+#define GTY(X)
+#endif
 
 /* The type for a hash code.  */
@@ -64 +68 @@
 typedef int (*htab_trav) PARAMS ((void **, void *));
 
+/* Memory-allocation function, with the same functionality as calloc().
+   Iff it returns NULL, the hash table implementation will pass an error
+   code back to the user, so if your code doesn't handle errors,
+   best if you use xcalloc instead.  */
+typedef PTR (*htab_alloc) PARAMS ((size_t, size_t));
+
+/* We also need a free() routine.  */
+typedef void (*htab_free) PARAMS ((PTR));
+
+/* Memory allocation and deallocation; variants which take an extra
+   argument.  */
+typedef PTR (*htab_alloc_with_arg) PARAMS ((void *, size_t, size_t));
+typedef void (*htab_free_with_arg) PARAMS ((void *, void *));
+
 /* Hash tables are of the following type.  The structure
    (implementation) of this type is not needed for using the hash
    tables.  All work with hash table should be executed only through
-   functions mentioned below. */
+   functions mentioned below.  The size of this structure is subject to
+   change.  */
 
-struct htab
+struct htab GTY(())
 {
   /* Pointer to hash function.  */
@@ -81 +100 @@
 
   /* Table itself.  */
-  PTR *entries;
+  PTR * GTY ((use_param (""), length ("%h.size"))) entries;
 
   /* Current size (in entries) of the hash table */
@@ -100 +119 @@
   unsigned int collisions;
 
-  /* This is non-zero if we are allowed to return NULL for function calls
-     that allocate memory.  */
-  int return_allocation_failure;
+  /* Pointers to allocate/free functions.  */
+  htab_alloc alloc_f;
+  htab_free free_f;
+
+  /* Alternate allocate/free functions, which take an extra argument.  */
+  PTR GTY((skip (""))) alloc_arg;
+  htab_alloc_with_arg alloc_with_arg_f;
+  htab_free_with_arg free_with_arg_f;
 };
 
@@ -112 +136 @@
 /* The prototypes of the package functions. */
 
-extern htab_t   htab_create     PARAMS ((size_t, htab_hash,
-                                         htab_eq, htab_del));
+extern htab_t   htab_create_alloc       PARAMS ((size_t, htab_hash,
+                                                 htab_eq, htab_del,
+                                                 htab_alloc, htab_free));
 
-/* This function is like htab_create, but may return NULL if memory
-   allocation fails, and also signals that htab_find_slot_with_hash and
-   htab_find_slot are allowed to return NULL when inserting.  */
-extern htab_t   htab_try_create PARAMS ((size_t, htab_hash,
-                                         htab_eq, htab_del));
+extern htab_t   htab_create_alloc_ex    PARAMS ((size_t, htab_hash,
+                                                    htab_eq, htab_del,
+                                                    PTR, htab_alloc_with_arg,
+                                                    htab_free_with_arg));
+
+/* Backward-compatibility functions.  */
+extern htab_t htab_create PARAMS ((size_t, htab_hash, htab_eq, htab_del));
+extern htab_t htab_try_create PARAMS ((size_t, htab_hash, htab_eq, htab_del));
+
+extern void     htab_set_functions_ex   PARAMS ((htab_t, htab_hash,
+                                                 htab_eq, htab_del,
+                                                 PTR, htab_alloc_with_arg,
+                                                 htab_free_with_arg));
+
 extern void     htab_delete     PARAMS ((htab_t));
 extern void     htab_empty      PARAMS ((htab_t));
@@ -135 +169 @@
 
 extern void     htab_traverse   PARAMS ((htab_t, htab_trav, void *));
+extern void     htab_traverse_noresize  PARAMS ((htab_t, htab_trav, void *));
 
 extern size_t   htab_size       PARAMS ((htab_t));
@@ -146 +181 @@
 extern htab_eq htab_eq_pointer;
 
+/* A hash function for null-terminated strings.  */
+extern hashval_t htab_hash_string PARAMS ((const PTR));
+
 #ifdef __cplusplus
 }

branches/GNU/src/binutils/include/libiberty.h

@@ -1 +1 @@
 /* Function declarations for libiberty.
 
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
    
    Note - certain prototypes declared in this header file are for
@@ -52 +52 @@
    malloc.  Use freeargv to free the vector.  */
 
-extern char **buildargv PARAMS ((char *)) ATTRIBUTE_MALLOC;
+extern char **buildargv PARAMS ((const char *)) ATTRIBUTE_MALLOC;
 
 /* Free a vector returned by buildargv.  */
@@ -74 +74 @@
    to find the declaration so provide a fully prototyped one.  If it
    is 1, we found it so don't provide any declaration at all.  */
-#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || (defined (HAVE_DECL_BASENAME) && !HAVE_DECL_BASENAME)
+#if !HAVE_DECL_BASENAME
+#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (HAVE_DECL_BASENAME)
 extern char *basename PARAMS ((const char *));
 #else
-# if !defined (HAVE_DECL_BASENAME)
 extern char *basename ();
-# endif
-#endif
-
-/* Concatenate an arbitrary number of strings, up to (char *) NULL.
-   Allocates memory using xmalloc.  */
+#endif
+#endif
+
+/* A well-defined basename () that is always compiled in.  */
+
+extern const char *lbasename PARAMS ((const char *));
+
+/* A well-defined realpath () that is always compiled in.  */
+
+extern char *lrealpath PARAMS ((const char *));
+
+/* Concatenate an arbitrary number of strings.  You must pass NULL as
+   the last argument of this function, to terminate the list of
+   strings.  Allocates memory using xmalloc.  */
 
 extern char *concat PARAMS ((const char *, ...)) ATTRIBUTE_MALLOC;
+
+/* Concatenate an arbitrary number of strings.  You must pass NULL as
+   the last argument of this function, to terminate the list of
+   strings.  Allocates memory using xmalloc.  The first argument is
+   not one of the strings to be concatenated, but if not NULL is a
+   pointer to be freed after the new string is created, similar to the
+   way xrealloc works.  */
+
+extern char *reconcat PARAMS ((char *, const char *, ...)) ATTRIBUTE_MALLOC;
+
+/* Determine the length of concatenating an arbitrary number of
+   strings.  You must pass NULL as the last argument of this function,
+   to terminate the list of strings.  */
+
+extern unsigned long concat_length PARAMS ((const char *, ...));
+
+/* Concatenate an arbitrary number of strings into a SUPPLIED area of
+   memory.  You must pass NULL as the last argument of this function,
+   to terminate the list of strings.  The supplied memory is assumed
+   to be large enough.  */
+
+extern char *concat_copy PARAMS ((char *, const char *, ...));
+
+/* Concatenate an arbitrary number of strings into a GLOBAL area of
+   memory.  You must pass NULL as the last argument of this function,
+   to terminate the list of strings.  The supplied memory is assumed
+   to be large enough.  */
+
+extern char *concat_copy2 PARAMS ((const char *, ...));
+
+/* This is the global area used by concat_copy2.  */
+
+extern char *libiberty_concat_ptr;
+
+/* Concatenate an arbitrary number of strings.  You must pass NULL as
+   the last argument of this function, to terminate the list of
+   strings.  Allocates memory using alloca.  The arguments are
+   evaluated twice!  */
+#define ACONCAT(ACONCAT_PARAMS) \
+  (libiberty_concat_ptr = alloca (concat_length ACONCAT_PARAMS + 1), \
+   concat_copy2 ACONCAT_PARAMS)
 
 /* Check whether two file descriptors refer to the same file.  */
@@ -99 +149 @@
 
 extern long get_run_time PARAMS ((void));
+
+/* Generate a relocated path to some installation directory.  Allocates
+   return value using malloc.  */
+
+extern char *make_relative_prefix PARAMS ((const char *, const char *,
+                                           const char *));
 
 /* Choose a temporary directory to use for scratch files.  */
@@ -191 +247 @@
 extern PTR xmemdup PARAMS ((const PTR, size_t, size_t)) ATTRIBUTE_MALLOC;
 
+/* Physical memory routines.  Return values are in BYTES.  */
+extern double physmem_total PARAMS ((void));
+extern double physmem_available PARAMS ((void));
+
 /* hex character manipulation routines */
 
 #define _hex_array_size 256
 #define _hex_bad        99
-extern char _hex_value[_hex_array_size];
+extern const char _hex_value[_hex_array_size];
 extern void hex_init PARAMS ((void));
 #define hex_p(c)        (hex_value (c) != _hex_bad)
@@ -219 +279 @@
 extern int pwait PARAMS ((int, int *, int));
 
+#if !HAVE_DECL_ASPRINTF
 /* Like sprintf but provides a pointer to malloc'd storage, which must
    be freed by the caller.  */
 
 extern int asprintf PARAMS ((char **, const char *, ...)) ATTRIBUTE_PRINTF_2;
-
+#endif
+
+#if !HAVE_DECL_VASPRINTF
 /* Like vsprintf but provides a pointer to malloc'd storage, which
    must be freed by the caller.  */
@@ -229 +292 @@
 extern int vasprintf PARAMS ((char **, const char *, va_list))
   ATTRIBUTE_PRINTF(2,0);
+#endif
 
 #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
+
+/* Drastically simplified alloca configurator.  If we're using GCC,
+   we use __builtin_alloca; otherwise we use the C alloca.  The C
+   alloca is always available.  You can override GCC by defining
+   USE_C_ALLOCA yourself.  The canonical autoconf macro C_ALLOCA is
+   also set/unset as it is often used to indicate whether code needs
+   to call alloca(0).  */
+extern PTR C_alloca PARAMS ((size_t)) ATTRIBUTE_MALLOC;
+#undef alloca
+#if GCC_VERSION >= 2000 && !defined USE_C_ALLOCA
+# define alloca(x) __builtin_alloca(x)
+# undef C_ALLOCA
+# define ASTRDUP(X) \
+  (__extension__ ({ const char *const libiberty_optr = (X); \
+   const unsigned long libiberty_len = strlen (libiberty_optr) + 1; \
+   char *const libiberty_nptr = alloca (libiberty_len); \
+   (char *) memcpy (libiberty_nptr, libiberty_optr, libiberty_len); }))
+#else
+# define alloca(x) C_alloca(x)
+# undef USE_C_ALLOCA
+# define USE_C_ALLOCA 1
+# undef C_ALLOCA
+# define C_ALLOCA 1
+extern const char *libiberty_optr;
+extern char *libiberty_nptr;
+extern unsigned long libiberty_len;
+# define ASTRDUP(X) \
+  (libiberty_optr = (X), \
+   libiberty_len = strlen (libiberty_optr) + 1, \
+   libiberty_nptr = alloca (libiberty_len), \
+   (char *) memcpy (libiberty_nptr, libiberty_optr, libiberty_len))
+#endif
 
 #ifdef __cplusplus

branches/GNU/src/binutils/include/mpw/ChangeLog

@@ -1 @@
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
-
-        * mpw.h: Update copyright notice.
-
 Tue Feb 27 12:23:04 1996  Raymond Jou  <rjou@mexican.cygnus.com>
 

branches/GNU/src/binutils/include/nlm/ChangeLog

@@ -1 @@
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
+2001-10-02  Alan Modra  <amodra@bigpond.net.au>
 
-        * Many files: Update copyright notices.
+        * common.h (NLM_CAT, NLM_CAT3): Don't define.
+        (NLM_CAT4): Update conditions under which this is defined.  Document
+        why CONCAT4 can't be used.
 
 Fri May  6 13:31:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)

branches/GNU/src/binutils/include/nlm/common.h

@@ -1 +1 @@
 /* NLM (NetWare Loadable Module) support for BFD.
-   Copyright 1993 Free Software Foundation, Inc.
+   Copyright 1993, 2001 Free Software Foundation, Inc.
 
    Written by Fred Fish @ Cygnus Support
@@ -24 +24 @@
    that are common to both the internal and external representations. */
 
-/* Semi-portable string concatenation in cpp.
-   The NLM_CAT4 hack is to avoid a problem with some strict ANSI C
-   preprocessors.  The problem is, "32_" or "64_" are not a valid
-   preprocessing tokens, and we don't want extra underscores (e.g.,
-   "nlm_32_").  The XNLM_CAT2 macro will cause the inner NLM_CAT macros
-   to be evaluated first, producing still-valid pp-tokens.  Then the
-   final concatenation can be done.  (Sigh.)  */
-
-#ifdef SABER
-#  define NLM_CAT(a,b)          a##b
-#  define NLM_CAT3(a,b,c)       a##b##c
-#  define NLM_CAT4(a,b,c,d)     a##b##c##d
-#else
-#  ifdef __STDC__
-#    define NLM_CAT(a,b)        a##b
-#    define NLM_CAT3(a,b,c)     a##b##c
-#    define XNLM_CAT2(a,b)      NLM_CAT(a,b)
-#    define NLM_CAT4(a,b,c,d)   XNLM_CAT2(NLM_CAT(a,b),NLM_CAT(c,d))
-#  else
-#    define NLM_CAT(a,b)        a/**/b
-#    define NLM_CAT3(a,b,c)     a/**/b/**/c
-#    define NLM_CAT4(a,b,c,d)   a/**/b/**/c/**/d
-#  endif
-#endif
-
 /* If NLM_ARCH_SIZE is not defined, default to 32.  NLM_ARCH_SIZE is
    optionally defined by the application. */
@@ -54 +29 @@
 #ifndef NLM_ARCH_SIZE
 #  define NLM_ARCH_SIZE                 32
+#endif
+
+/* Due to horrible details of ANSI macro expansion, we can't use CONCAT4
+   for NLM_NAME.  CONCAT2 is used in BFD_JUMP_TABLE macros, and some of
+   them will expand to tokens that themselves are macros defined in terms
+   of NLM_NAME.  If NLM_NAME were defined using CONCAT4 (which is itself
+   defined in bfd-in.h using CONCAT2), ANSI preprocessor rules say that
+   the CONCAT2 within NLM_NAME should not be expanded.
+   So use another name.  */
+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
+#ifdef SABER
+#define NLM_CAT4(a,b,c,d) a##b##c##d
+#else
+/* This hack is to avoid a problem with some strict ANSI C preprocessors.
+   The problem is, "32_" is not a valid preprocessing token, and we don't
+   want extra underscores (e.g., "nlm_32_").  The NLM_XCAT2 macro will
+   cause the inner CAT2 macros to be evaluated first, producing
+   still-valid pp-tokens.  Then the final concatenation can be done.  */
+#define NLM_CAT2(a,b)     a##b
+#define NLM_XCAT2(a,b)    NLM_CAT2(a,b)
+#define NLM_CAT4(a,b,c,d) NLM_XCAT2(NLM_CAT2(a,b),NLM_CAT2(c,d))
+#endif
+#else
+#define NLM_CAT4(a,b,c,d) a/**/b/**/c/**/d
 #endif
 

branches/GNU/src/binutils/include/objalloc.h

@@ -1 +1 @@
 /* objalloc.h -- routines to allocate memory for objects
-   Copyright 1997 Free Software Foundation, Inc.
+   Copyright 1997, 2001 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Solutions.
 
@@ -57 +57 @@
 #include <stddef.h>
 #endif
-#define OBJALLOC_ALIGN \
-  ((ptrdiff_t) ((char *) &((struct objalloc_align *) 0)->d - (char *) 0))
-#else
-#define OBJALLOC_ALIGN \
-  ((long) ((char *) &((struct objalloc_align *) 0)->d - (char *) 0))
 #endif
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+#endif
+#define OBJALLOC_ALIGN offsetof (struct objalloc_align, d)
 
 /* Create an objalloc structure.  Returns NULL if malloc fails.  */

branches/GNU/src/binutils/include/opcode/ChangeLog

@@ -1 @@
-2001-06-11  Alan Modra  <amodra@bigpond.net.au>
-
-        Merge from mainline.
-        2001-05-23  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+2003-05-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+        * m68hc11.h (M68HC12_BANK_VIRT): Define to 0x010000
+
+2003-04-07  Michael Snyder  <msnyder@redhat.com>
+
+        * h8300.h (ldc/stc): Fix up src/dst swaps.
+
+2003-04-09  J. Grant  <jg-binutils@jguk.org>
+
+        * mips.h: Correct comment typo.
+
+2003-03-21  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+        * s390.h (s390_opcode_arch_val): Rename to s390_opcode_mode_val.
+        (S390_OPCODE_ESAME): Rename to S390_OPCODE_ZARCH.
+        (s390_opcode): Remove architecture. Add modes and min_cpu.
+
+2003-03-17 D.Venkatasubramanian <dvenkat@noida.hcltech.com>
+
+        * h8300.h (O_SYS_CMDLINE): New pseudo opcode for command line
+        processing.
+
+2003-02-21  Noida D.Venkatasubramanian  <dvenkat@noida.hcltech.com>
+
+        * h8300.h (ldmac, stmac): Replace MACREG with MS32 and MD32.
+
+2003-01-23  Alan Modra  <amodra@bigpond.net.au>
+
+        * m68hc11.h (cpu6812s): Define.
+
+2003-01-07  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h: Fix missing space in comment.
+        (INSN_ISA1, INSN_ISA2, INSN_ISA3, INSN_ISA4, INSN_ISA5)
+        (INSN_ISA32, INSN_ISA32R2, INSN_ISA64): Shift values right
+        by four bits.
+
+2003-01-02  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h: Update copyright years to include 2002 (which had
+        been missed previously) and 2003.  Make comments about "+A",
+        "+B", and "+C" operand types more descriptive.
+
+2002-12-31  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h: Note that the "+D" operand type name is now used.
+
+2002-12-30  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h: Document "+" as the start of two-character operand
+        type names, and add new "K", "+A", "+B", and "+C" operand types.
+        (OP_MASK_INSMSB, OP_SH_INSMSB, OP_MASK_EXTMSB)
+        (OP_SH_EXTMSB, INSN_ISA32R2, ISA_MIPS32R2, CPU_MIPS32R2): New
+        defines.
+
+2002-12-24    Dmitry Diky <diwil@mail.ru>
+
+        * msp430.h: New file.  Defines msp430 opcodes.
+
+2002-12-30 D.Venkatasubramanian <dvenkat@noida.hcltech.com>
+
+        * h8300.h: Added some more pseudo opcodes for system call
+        processing.
+
+2002-12-19  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h (OP_OP_COP0, OP_OP_COP1, OP_OP_COP2, OP_OP_COP3)
+        (OP_OP_LWC1, OP_OP_LWC2, OP_OP_LWC3, OP_OP_LDC1, OP_OP_LDC2)
+        (OP_OP_LDC3, OP_OP_SWC1, OP_OP_SWC2, OP_OP_SWC3, OP_OP_SDC1)
+        (OP_OP_SDC2, OP_OP_SDC3): Define.
+
+2002-12-16  Alan Modra  <amodra@bigpond.net.au>
+
+        * hppa.h (completer_chars): #if 0 out.
+
+        * ns32k.h (struct ns32k_opcode): Constify "name", "operands" and
+        "default_args".
+        (struct not_wot): Constify "args".
+        (struct not): Constify "name".
+        (numopcodes): Delete.
+        (endop): Delete.
+
+2002-12-13  Alan Modra  <amodra@bigpond.net.au>
+
+        * pj.h (pj_opc_info_t): Add union.
+
+2002-12-04  David Mosberger  <davidm@hpl.hp.com>
+
+        * ia64.h: Fix copyright message.
+        (IA64_OPND_AR_CSD): New operand kind.
+
+2002-12-03  Richard Henderson  <rth@redhat.com>
+
+        * ia64.h (enum ia64_opnd): Add IA64_OPND_LDXMOV.
+
+2002-12-03  Alan Modra  <amodra@bigpond.net.au>
+
+        * cgen.h (struct cgen_maybe_multi_ifield): Add "const PTR p" to union.
+        Constify "leaf" and "multi".
+
+2002-11-19  Klee Dienes  <kdienes@apple.com>
+
+        * h8300.h (h8_opcode): Remove 'noperands', 'idx', and 'size'
+        fields.
+        (h8_opcodes). Modify initializer and initializer macros to no
+        longer initialize the removed fields.
+        
+2002-11-19  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+        * tic4x.h (c4x_insts): Fixed LDHI constraint
+
+2002-11-18  Klee Dienes  <kdienes@apple.com>
+
+        * h8300.h (h8_opcode): Remove 'length' field.
+        (h8_opcodes): Mark as 'const' (both the declaration and
+        definition).  Modify initializer and initializer macros to no
+        longer initialize the length field.
+
+2002-11-18  Klee Dienes  <kdienes@apple.com>
+
+        * arc.h (arc_ext_opcodes): Declare as extern.
+        (arc_ext_operands): Declare as extern.
+        * i860.h (i860_opcodes): Declare as const.
+
+2002-11-18  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+        * tic4x.h: File reordering. Added enhanced opcodes.
+
+2002-11-16  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+        * tic4x.h: Major rewrite of entire file. Define instruction
+          classes, and put each instruction into a class.
+
+2002-11-11  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+        * tic4x.h: Added new opcodes and corrected some bugs.  Add support
+        for new DSP types.
+
+2002-10-14  Alan Modra  <amodra@bigpond.net.au>
+
+        * cgen.h: Test __BFD_H_SEEN__ rather than BFD_VERSION_DATE.
+
+2002-09-30  Gavin Romig-Koch  <gavin@redhat.com>
+            Ken Raeburn  <raeburn@cygnus.com>
+            Aldy Hernandez  <aldyh@redhat.com>
+            Eric Christopher  <echristo@redhat.com>
+            Richard Sandiford  <rsandifo@redhat.com>
+
+        * mips.h: Update comment for new opcodes.
+        (OP_MASK_VECBYTE, OP_SH_VECBYTE): New.
+        (OP_MASK_VECALIGN, OP_SH_VECALIGN): New.
+        (INSN_4111, INSN_4120, INSN_5400, INSN_5500): New.
+        (CPU_VR4120, CPU_VR5400, CPU_VR5500): New.
+        (OPCODE_IS_MEMBER): Handle the new CPU_* values and INSN_* flags.
+        Don't match CPU_R4111 with INSN_4100.
+
+2002-08-19  Elena Zannoni <ezannoni@redhat.com>
+ 
+        From matthew green  <mrg@redhat.com>
+
+        * ppc.h (PPC_OPCODE_SPE): New opcode flag for Powerpc e500
+        instructions.
+        (PPC_OPCODE_ISEL, PPC_OPCODE_BRLOCK, PPC_OPCODE_PMR,
+        PPC_OPCODE_CACHELCK, PPC_OPCODE_RFMCI): New opcode flags for the
+        e500x2 Integer select, branch locking, performance monitor,
+        cache locking and machine check APUs, respectively.
+        (PPC_OPCODE_EFS): New opcode type for efs* instructions.
+        (PPC_OPCODE_CLASSIC): New opcode type for Classic PowerPC instructions.
+
+2002-08-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+        * m68hc11.h (M6812_OP_PAGE): Define to identify call operand.
+        (M68HC12_BANK_VIRT, M68HC12_BANK_MASK, M68HC12_BANK_BASE,
+        M68HC12_BANK_SHIFT, M68HC12_BANK_PAGE_MASK): Define for 68HC12
+        memory banks.
+        (M6811_OC1M5, M6811_OC1M4, M6811_MODF): Fix value.
+
+2002-07-09  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+        * mips.h (INSN_MIPS16): New define.
+
+2002-07-08  Alan Modra  <amodra@bigpond.net.au>
+
+        * i386.h: Remove IgnoreSize from movsx and movzx.
+
+2002-06-08  Alan Modra  <amodra@bigpond.net.au>
+
+        * a29k.h: Replace CONST with const.
+        (CONST): Don't define.
+        * convex.h: Replace CONST with const.
+        (CONST): Don't define.
+        * dlx.h: Replace CONST with const.
+        * or32.h (CONST): Don't define.
+
+2002-05-30  Chris G. Demetriou  <cgd@broadcom.com>
+
+        * mips.h (OP_SH_ALN, OP_MASK_ALN, OP_SH_VSEL, OP_MASK_VSEL)
+        (MDMX_FMTSEL_IMM_QH, MDMX_FMTSEL_IMM_OB, MDMX_FMTSEL_VEC_QH)
+        (MDMX_FMTSEL_VEC_OB, INSN_READ_MDMX_ACC, INSN_WRITE_MDMX_ACC)
+        (INSN_MDMX): New constants, for MDMX support.
+        (opcode character list): Add "O", "Q", "X", "Y", and "Z" for MDMX.
+
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+        * dlx.h: New file.
+
+2002-05-25  Alan Modra  <amodra@bigpond.net.au>
+
+        * ia64.h: Use #include "" instead of <> for local header files.
+        * sparc.h: Likewise.
+
+2002-05-22  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+        * mips.h: Add M_DROL, M_DROL_I, M_DROR, M_DROR_I macro cases.
+
+2002-05-17  Andrey Volkov  <avolkov@sources.redhat.com>
+
+        * h8300.h: Corrected defs of all control regs 
+        and eepmov instr.
+                      
+2002-04-11  Alan Modra  <amodra@bigpond.net.au>
+
+        * i386.h: Add intel mode cmpsd and movsd.
+        Put them before SSE2 insns, so that rep prefix works.
+
+2002-03-15  Chris G. Demetriou  <cgd@broadcom.com>
+
+        * mips.h (INSN_MIPS3D): New definition used to mark MIPS-3D
+        instructions.
+        (OPCODE_IS_MEMBER): Adjust comments to indicate that ASE bit masks
+        may be passed along with the ISA bitmask.
+
+2002-03-05  Paul Koning  <pkoning@equallogic.com>
+
+        * pdp11.h: Add format codes for float instruction formats.
+
+2002-02-25  Alan Modra  <amodra@bigpond.net.au>
+
+        * ppc.h (PPC_OPCODE_POWER4, PPC_OPCODE_NOPOWER4): Define.
+
+Mon Feb 18 17:31:48 CET 2002  Jan Hubicka  <jh@suse.cz>
+
+        * i386.h (push,pop): Fix Reg64 to WordReg to allow 16bit operands.
+
+Mon Feb 11 12:53:19 CET 2002  Jan Hubicka  <jh@suse.cz>
+
+        * i386.h (push,pop): Allow 16bit operands in 64bit mode.
+        (xchg): Fix.
+        (in, out): Disable 64bit operands.
+        (call, jmp): Avoid REX prefixes.
+        (jcxz): Prohibit in 64bit mode
+        (jrcxz, loop): Add 64bit variants.
+        (movq): Fix patterns.
+        (movmskps, pextrw, pinstrw): Add 64bit variants.
+
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+        * or32.h: New file.
+
+2002-01-22  Graydon Hoare  <graydon@redhat.com>
+
+        * cgen.h (CGEN_MAYBE_MULTI_IFLD): New structure.
+        (CGEN_OPERAND): Add CGEN_MAYBE_MULTI_IFLD field.
+
+2002-01-21  Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
+
+        * h8300.h: Comment typo fix.
+
+2002-01-03  matthew green  <mrg@redhat.com>
+
+        * ppc.h (PPC_OPCODE_BOOKE): BookE is not Motorola specific.
+        (PPC_OPCODE_BOOKE64): Likewise.
+
+Mon Dec 31 16:45:41 2001  Jeffrey A Law  (law@cygnus.com)
+
+        * hppa.h (call, ret): Move to end of table.
+        (addb, addib): PA2.0 variants should have been PA2.0W.
+        (ldw, ldh, ldb, stw, sth, stb, stwa): Reorder to keep disassembler
+        happy.
+        (fldw, fldd, fstw, fstd, bb): Likewise.
+        (short loads/stores): Tweak format specifier slightly to keep
+        disassembler happy.
+        (indexed loads/stores): Likewise.
+        (absolute loads/stores): Likewise.
+
+2001-12-04  Alexandre Oliva  <aoliva@redhat.com>
+
+        * d10v.h (OPERAND_NOSP): New macro.
+
+2001-11-29  Alexandre Oliva  <aoliva@redhat.com>
+
+        * d10v.h (OPERAND_SP): New macro.
+
+2001-11-15  Alan Modra  <amodra@bigpond.net.au>
+
+        * ppc.h (struct powerpc_operand <insert, extract>): Add dialect param.
+
+2001-11-11  Timothy Wall  <twall@alum.mit.edu>
+
+        * tic54x.h: Revise opcode layout; don't really need a separate
+        structure for parallel opcodes.
+
+2001-11-13  Zack Weinberg <zack@codesourcery.com>
+            Alan Modra  <amodra@bigpond.net.au>
+
+        * i386.h (i386_optab): Add entries for "sldr", "smsw" and "str" to
+        accept WordReg.
+
+2001-11-04  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h (OPCODE_IS_MEMBER): Remove extra space.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+        * mmix.h: New file.
+
+2001-10-18  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h (OPCODE_IS_MEMBER): Add a no-op term to the end
+        of the expression, to make source code merging easier.
+
+2001-10-17  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h: Sort coprocessor instruction argument characters
+        in comment, add a few more words of description for "H".
+
+2001-10-17  Chris Demetriou  <cgd@broadcom.com>
+
+        * mips.h (INSN_SB1): New cpu-specific instruction bit.
+        (OPCODE_IS_MEMBER): Allow instructions matching INSN_SB1
+        if cpu is CPU_SB1.
+
+2001-10-17  matthew green  <mrg@redhat.com>
+
+        * ppc.h (PPC_OPCODE_BOOKE64): Fix typo.
+
+2001-10-12  matthew green  <mrg@redhat.com>
+
+        * ppc.h (PPC_OPCODE_BOOKE, PPC_OPCODE_BOOKE64, PPC_OPCODE_403): New
+        opcode flags for BookE 32-bit, BookE 64-bit and PowerPC 403
+        instructions, respectively.
+
+2001-09-27  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * v850.h: Remove spurious comment.
+
+2001-09-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * h8300.h: Fix compile time warning messages
+
+2001-09-04  Richard Henderson  <rth@redhat.com>
+
+        * alpha.h (struct alpha_operand): Pack elements into bitfields.
+
+2001-08-31  Eric Christopher  <echristo@redhat.com>
+
+        * mips.h: Remove CPU_MIPS32_4K.
+
+2001-08-27  Torbjorn Granlund  <tege@swox.com>
+
+        * ppc.h (PPC_OPERAND_DS): Define.
+
+2001-08-25  Andreas Jaeger  <aj@suse.de>
+
+        * d30v.h: Fix declaration of reg_name_cnt.
+
+        * d10v.h: Fix declaration of d10v_reg_name_cnt.
+
+        * arc.h: Add prototypes from opcodes/arc-opc.c.
+
+2001-08-16  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+        * mips.h (INSN_10000): Define.
+        (OPCODE_IS_MEMBER): Check for INSN_10000.
+
+2001-08-10  Alan Modra  <amodra@one.net.au>
+
+        * ppc.h: Revert 2001-08-08.
+
+2001-08-10  Richard Sandiford  <rsandifo@redhat.com>
+
+        * mips.h (INSN_GP32): Remove.
+        (OPCODE_IS_MEMBER): Remove gp32 parameter.
+        (M_MOVE): New macro identifier.
+
+2001-08-08  Alan Modra  <amodra@one.net.au>
+
+        1999-10-25  Torbjorn Granlund  <tege@swox.com>
+        * ppc.h (struct powerpc_operand): New field `reloc'.
+
+2001-08-01  Aldy Hernandez  <aldyh@redhat.com>
+
+        * mips.h (INSN_ISA_MASK): Nuke bits 12-15.
+
+2001-07-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * cgen.h (CGEN_INSN): Add regex support.
+        (build_insn_regex): Declare.
+
+2001-07-11  Frank Ch. Eigler  <fche@redhat.com>
+
+        * cgen.h (CGEN_MACH): Add insn_chunk_bitsize field.
+        (cgen_cpu_desc): Ditto.
+
+2001-07-07  Ben Elliston  <bje@redhat.com>
+
+        * m88k.h: Clean up and reformat. Remove unused code.
+
+2001-06-14  Geoffrey Keating  <geoffk@redhat.com>
+
+        * cgen.h (cgen_keyword): Add nonalpha_chars field.
+
+2001-05-23  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
         * mips.h (CPU_R12000): Define.
 
-        2001-05-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+2001-05-23  John Healy  <jhealy@redhat.com>
+
+        * cgen.h: Increased CGEN_MAX_SYNTAX_ELEMENTS to 48.
+
+2001-05-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
         * mips.h (INSN_ISA_MASK): Define.
-
-        2001-03-21  Kazu Hirata  <kazu@hxi.com>
-        * h8300.h: Fix formatting.
-
-        2001-02-28  Igor Shevlyakov  <igor@windriver.com>
-        * m68k.h: new defines for Coldfire V4. Update mcf to know
-        about mcf5407.
-
-        2001-02-10  Nick Clifton  <nickc@redhat.com>
-        * mips.h: Remove extraneous whitespace.  Formating change to allow
-        for future contribution.
-
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
-
-        * Many files: Update copyright notices.
 
 2001-05-12  Alan Modra  <amodra@one.net.au>
@@ -34 +435 @@
         and pextrw to swap reg/rm assignments.
 
+2001-04-05  Hans-Peter Nilsson  <hp@axis.com>
+
+        * cris.h (enum cris_insn_version_usage): Correct comment for
+        cris_ver_v3p.
+
 2001-03-24  Alan Modra  <alan@linuxcare.com.au>
 
@@ -39 +445 @@
         Add InvMem to first operand of "maskmovdqu".
 
+2001-03-22  Hans-Peter Nilsson  <hp@axis.com>
+
+        * cris.h (ADD_PC_INCR_OPCODE): New macro.
+
+2001-03-21  Kazu Hirata  <kazu@hxi.com>
+
+        * h8300.h: Fix formatting.
+
 2001-03-22  Alan Modra  <alan@linuxcare.com.au>
 
@@ -47 +461 @@
         * i386.h (REGNAM_AL, REGNAM_AX, REGNAM_EAX): Define.
 
-Mon Feb 12 17:39:31 CET 2001  Jan Hubicka  <jh@suse.cz>
+2001-02-28  Igor Shevlyakov  <igor@windriver.com>
+
+        * m68k.h: new defines for Coldfire V4. Update mcf to know
+        about mcf5407.
+
+2001-02-18  lars brinkhoff  <lars@nocrew.org>
+
+        * pdp11.h: New file.
+
+2001-02-12  Jan Hubicka  <jh@suse.cz>
 
         * i386.h (i386_optab): SSE integer converison instructions have
         64bit versions on x86-64.
+
+2001-02-10  Nick Clifton  <nickc@redhat.com>
+
+        * mips.h: Remove extraneous whitespace.  Formating change to allow
+        for future contribution.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+        * s390.h: New file.
+
+2001-02-02  Patrick Macdonald  <patrickm@redhat.com>
+
+        * cgen.h (CGEN_SYNTAX_CHAR_TYPE): Typedef as unsigned short.
+        (CGEN_MAX_SYNTAX_ELEMENTS): Rename from CGEN_MAX_SYNTAX_BYTES.
+        (CGEN_SYNTAX): Define using CGEN_MAX_SYNTAX_ELEMENTS.
 
 2001-01-24  Karsten Keil  <kkeil@suse.de>
@@ -63 +501 @@
         Remove duplicate "ldw j(s,b),x".  Sort some entries.
 
-Sat Jan 13 09:56:32 MET 2001  Jan Hubicka  <jh@suse.cz>
+2001-01-13  Jan Hubicka  <jh@suse.cz>
 
         * i386.h (i386_optab): Fix pusha and ret templates.
@@ -118 +556 @@
         * i386.h (i386_optab): Replace "Imm" with "EncImm".
         (i386_regtab): Add flags field.
-        
+
 2000-12-12  Nick Clifton  <nickc@redhat.com>
 
@@ -143 +581 @@
         (ISA_MIPS1, ISA_MIPS2, ISA_MIPS3, ISA_MIPS4, ISA_MIPS5,
         ISA_MIPS32): New constants, defined to be the mask of INSN_*
-        constants available at that ISA level. 
+        constants available at that ISA level.
         (CPU_UNKNOWN): New constant to indicate unknown CPU.
         (CPU_4K, CPU_MIPS32_4K): Rename the former to the latter,
@@ -151 +589 @@
 
         * mips.h (INSN_ISA64, ISA_MIPS5, ISA_MIPS64): New
-        definitions. 
+        definitions.
 
         * mips.h (CPU_SB1): New constant.
@@ -165 +603 @@
 
 2000-09-13  Anders Norlander  <anorland@acc.umu.se>
-        
+
         * mips.h: Use defines instead of hard-coded processor numbers.
         (CPU_R2000, CPU_R3000, CPU_R3900, CPU_R4000, CPU_R4010,
-        CPU_VR4100, CPU_R4111, CPU_R4300, CPU_R4400, CPU_R4600, CPU_R4650, 
+        CPU_VR4100, CPU_R4111, CPU_R4300, CPU_R4400, CPU_R4600, CPU_R4650,
         CPU_R5000, CPU_R6000, CPU_R8000, CPU_R10000, CPU_MIPS32, CPU_4K,
         CPU_4KC, CPU_4KM, CPU_4KP): Define..
         (OPCODE_IS_MEMBER): Use new defines.
-        (OP_MASK_SEL, OP_SH_SEL): Define.
+        (OP_MASK_SEL, OP_SH_SEL): Define.
         (OP_MASK_CODE20, OP_SH_CODE20): Define.
-        Add 'P' to used characters.
-        Use 'H' for coprocessor select field.
+        Add 'P' to used characters.
+        Use 'H' for coprocessor select field.
         Use 'm' for 20 bit breakpoint code.
-        Document new arg characters and add to used characters.
-        (INSN_MIPS32): New define for MIPS32 extensions.
-        (OPCODE_IS_MEMBER): Recognize MIPS32 instructions.
+        Document new arg characters and add to used characters.
+        (INSN_MIPS32): New define for MIPS32 extensions.
+        (OPCODE_IS_MEMBER): Recognize MIPS32 instructions.
 
 2000-09-05  Alan Modra  <alan@linuxcare.com.au>
@@ -359 +797 @@
         (CGEN_CPU_TABLE): flags: new field.
         Add prototypes for new functions.
-        
+
 2000-02-24  Alan Modra  <alan@spri.levels.unisa.edu.au>
 
@@ -477 +915 @@
 
         * hppa.h (pa_opcodes): Use 'fX' for first register operand
-        in xmpyu.  
+        in xmpyu.
 
         * hppa.h (pa_opcodes): Fix mask for probe and probei.
@@ -563 +1001 @@
         * hppa.h (pa_opcodes): Mark all PA2.0 opcodes with FLAG_STRICT.
 
-        * hppa.h (pa_opcodes):  Change xmpyu, fmpyfadd, 
+        * hppa.h (pa_opcodes):  Change xmpyu, fmpyfadd,
         and fmpynfadd to use 'J' and 'K' instead of 'E' and 'X'.
 
@@ -591 +1029 @@
 
         * hppa.h (pa_opcodes): Move integer arithmetic instructions after
-        integer logical instructions.  
+        integer logical instructions.
 
 1999-05-28  Linus Nordberg  <linus.nordberg@canit.se>
@@ -608 +1046 @@
 Wed May 26 16:57:44 1999  Jeffrey A Law  (law@cygnus.com)
 
-        * hppa.h (pa_opcodes): Add second entry for "comb", "comib", 
+        * hppa.h (pa_opcodes): Add second entry for "comb", "comib",
         "addb", and "addib" to be used by the disassembler.
 
@@ -719 +1157 @@
 
 Mon Feb  1 21:09:14 1999  Catherine Moore  <clm@cygnus.com>
- 
+
         * i386.h (d_Suf, x_Suf, sld_Suf, sldx_Suf, bwld_Suf):  Define.
         (x_FP, d_FP, dls_FP, sldx_FP):  Define.
@@ -742 +1180 @@
         CGEN_MODE_UINT.
 
-Sat Jan 16 01:29:25 1999  Jeffrey A Law  (law@cygnus.com)
+1999-01-16  Jeffrey A Law  (law@cygnus.com)
 
         * hppa.h (bv): Fix mask.
@@ -760 +1198 @@
 
         The following is part of a change made by Edith Epstein
-        <eepstein@sophia.cygnus.com> as part of a project to merge in
-        changes by HP; HP did not create ChangeLog entries.
+        <eepstein@sophia.cygnus.com> as part of a project to merge in
+        changes by HP; HP did not create ChangeLog entries.
 
         * hppa.h (completer_chars): list of chars to not put a space
-        after.
+        after.
 
 Sun Dec  6 13:21:34 1998  Ian Lance Taylor  <ian@cygnus.com>
 
         * i386.h (i386_optab): Permit w suffix on processor control and
-        status word instructions.
+        status word instructions.
 
 1998-11-30  Doug Evans  <devans@casey.cygnus.com>
@@ -830 +1268 @@
 
         * hppa.h: Add "fid".
-        
+
 Sun Oct  4 21:00:00 1998  Alan Modra  <alan@spri.levels.unisa.edu.au>
 
@@ -884 +1322 @@
         * mn10300.h: Add "machine" field for instructions.
         (MN103, AM30): Define machine types.
-        
+
 Fri Jun 19 16:09:09 1998  Alan Modra  <alan@spri.levels.unisa.edu.au>
 
@@ -1489 +1927 @@
 
         * alpha.h: Don't include "bfd.h"; private relocation types are now
-        negative to minimize problems with shared libraries.  Organize
-        instruction subsets by AMASK extensions and PALcode
-        implementation.
+        negative to minimize problems with shared libraries.  Organize
+        instruction subsets by AMASK extensions and PALcode
+        implementation.
         (struct alpha_operand): Move flags slot for better packing.
 
@@ -1544 +1982 @@
 
         * v850.h (v850_operands): Add insert and extract fields, pointers
-        to functions used to handle unusual operand encoding.
+        to functions used to handle unusual operand encoding.
         (V850_OPERAND_REG, V850_OPERAND_SRG, V850_OPERAND_CC,
-        V850_OPERAND_SIGNED): Defined.
+        V850_OPERAND_SIGNED): Defined.
 
 Wed Aug 21 17:45:10 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
@@ -1560 +1998 @@
 
         * mips.h (OP_SH_LOCC, OP_SH_HICC, OP_MASK_CC, OP_SH_COP1NORM,
-        OP_MASK_COP1NORM, OP_SH_COP1SPEC, OP_MASK_COP1SPEC,
-        OP_MASK_COP1SCLR, OP_MASK_COP1CMP, OP_SH_COP1CMP, OP_SH_FORMAT,
-        OP_MASK_FORMAT, OP_SH_TRUE, OP_MASK_TRUE, OP_SH_GE, OP_MASK_GE,
-        OP_SH_UNSIGNED, OP_MASK_UNSIGNED, OP_SH_HINT, OP_MASK_HINT):
-        Defined.
+        OP_MASK_COP1NORM, OP_SH_COP1SPEC, OP_MASK_COP1SPEC,
+        OP_MASK_COP1SCLR, OP_MASK_COP1CMP, OP_SH_COP1CMP, OP_SH_FORMAT,
+        OP_MASK_FORMAT, OP_SH_TRUE, OP_MASK_TRUE, OP_SH_GE, OP_MASK_GE,
+        OP_SH_UNSIGNED, OP_MASK_UNSIGNED, OP_SH_HINT, OP_MASK_HINT):
+        Defined.
 
 Fri Aug 16 00:15:15 1996  Jeffrey A Law  (law@cygnus.com)
@@ -1574 +2012 @@
 
         * d10v.h: Add some additional defines to support the
-        assembler in determining which operations can be done in parallel.
+        assembler in determining which operations can be done in parallel.
 
 Tue Aug  6 11:13:22 1996  Jeffrey A Law  (law@cygnus.com)
@@ -1590 +2028 @@
 
         * d10v.h: Changes for divs, parallel-only instructions, and
-        signed numbers.
+        signed numbers.
 
 Mon Jul 22 11:21:15 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
@@ -1612 +2050 @@
 Wed Jul  3 14:30:12 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
 
-        * m68k.h (mcf5200): New macro.
+        * m68k.h (mcf5200): New macro.
         Document names of coldfire control registers.
 
@@ -1762 +2200 @@
 
         * mips.h: Added INSN_4100 flag to mark NEC VR4100 specific
-        instructions.
+        instructions.
 
 Mon Oct 16 10:28:15 1995  Michael Meissner  <meissner@tiktok.cygnus.com>

branches/GNU/src/binutils/include/opcode/a29k.h

@@ -1 +1 @@
 /* Table of opcodes for the AMD 29000 family.
-   Copyright 1990, 1991, 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1993, 1994, 2002 Free Software Foundation, Inc.
 
 This file is part of GDB and GAS.
@@ -63 +63 @@
 };
 
-#ifndef CONST
-#define CONST
-#endif /* CONST */
-
-static CONST struct a29k_opcode a29k_opcodes[] =
+static const struct a29k_opcode a29k_opcodes[] =
 {
 
@@ -283 +279 @@
 };
 
-CONST unsigned int num_opcodes = (((sizeof a29k_opcodes) / (sizeof a29k_opcodes[0])) - 1);
+const unsigned int num_opcodes = (((sizeof a29k_opcodes) / (sizeof a29k_opcodes[0])) - 1);

branches/GNU/src/binutils/include/opcode/alpha.h

@@ -83 +83 @@
 {
   /* The number of bits in the operand.  */
-  int bits;
+  unsigned int bits : 5;
 
   /* How far the operand is left shifted in the instruction.  */
-  int shift;
+  unsigned int shift : 5;
 
   /* The default relocation type for this operand.  */
-  int default_reloc;
+  signed int default_reloc : 16;
 
   /* One bit syntax flags.  */
-  unsigned flags;
+  unsigned int flags : 16;
 
   /* Insertion function.  This is used by the assembler.  To insert an

branches/GNU/src/binutils/include/opcode/arc.h

@@ -99 +99 @@
 /* this is an "insert at front" linked list per Metaware spec
    that new definitions override older ones.  */
-struct arc_opcode *arc_ext_opcodes;
+extern struct arc_opcode *arc_ext_opcodes;
 
 struct arc_operand_value {
@@ -118 +118 @@
   struct arc_ext_operand_value *next;
   struct arc_operand_value operand;
-} *arc_ext_operands;
+};
+
+extern struct arc_ext_operand_value *arc_ext_operands;
 
 struct arc_operand {
@@ -314 +316 @@
 int arc_opcode_supported PARAMS ((const struct arc_opcode *));
 int arc_opval_supported PARAMS ((const struct arc_operand_value *));
+int arc_limm_fixup_adjust PARAMS ((arc_insn));
+int arc_insn_is_j PARAMS ((arc_insn));
+int arc_insn_not_jl PARAMS ((arc_insn));
+int arc_operand_type PARAMS ((int));
+struct arc_operand_value *get_ext_suffix PARAMS ((char *));
+int arc_get_noshortcut_flag PARAMS ((void));

branches/GNU/src/binutils/include/opcode/avr.h

@@ -26 +26 @@
 #define AVR_ISA_MUL   0x0040 /* device has new core (MUL, MOVW, ...) */
 #define AVR_ISA_ELPM  0x0080 /* device has >64K program memory (ELPM) */
-#define AVR_ISA_ELPMX 0x0100 /* device has ELPM Rd,Z[+] (none yet) */
+#define AVR_ISA_ELPMX 0x0100 /* device has ELPM Rd,Z[+] */
 #define AVR_ISA_SPM   0x0200 /* device can program itself */
+#define AVR_ISA_BRK   0x0400 /* device has BREAK (on-chip debug) */
 #define AVR_ISA_EIND  0x0800 /* device has >128K program memory (none yet) */
 
 #define AVR_ISA_TINY1 (AVR_ISA_1200 | AVR_ISA_LPM)
 #define AVR_ISA_2xxx (AVR_ISA_TINY1 | AVR_ISA_SRAM)
-#define AVR_ISA_M83  (AVR_ISA_2xxx | AVR_ISA_MUL | AVR_ISA_LPMX | AVR_ISA_SPM)
+#define AVR_ISA_M8   (AVR_ISA_2xxx | AVR_ISA_MUL | AVR_ISA_LPMX | AVR_ISA_SPM)
 #define AVR_ISA_M603 (AVR_ISA_2xxx | AVR_ISA_MEGA)
 #define AVR_ISA_M103 (AVR_ISA_M603 | AVR_ISA_ELPM)
 #define AVR_ISA_M161 (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_LPMX | AVR_ISA_SPM)
 #define AVR_ISA_94K  (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_LPMX)
+#define AVR_ISA_M323 (AVR_ISA_M161 | AVR_ISA_BRK)
+#define AVR_ISA_M128 (AVR_ISA_M323 | AVR_ISA_ELPM | AVR_ISA_ELPMX)
 
 #define AVR_ISA_ALL   0xFFFF
@@ -87 +90 @@
    the disassembler will only see the first match.
 
-   Remaining undefined opcodes (1700 total - some of them might work
+   Remaining undefined opcodes (1699 total - some of them might work
    as normal instructions if not all of the bits are decoded):
 
@@ -101 +104 @@
    "10010101001x1000"    (2) 0x95[23]8
    "1001010101xx1000"    (4) 0x95[4-7]8
-   "1001010110x11000"    (2) 0x95[9b]8
+   "1001010110111000"    (1) 0x95b8
    "1001010111111000"    (1) 0x95f8 (`espm' removed in databook update)
    "11111xxxxxxx1xxx" (1024) 0xf[8-9a-f][0-9a-f][8-9a-f]
@@ -140 +143 @@
 AVR_INSN (reti, "",    "1001010100011000", 1, AVR_ISA_1200, 0x9518)
 AVR_INSN (sleep,"",    "1001010110001000", 1, AVR_ISA_1200, 0x9588)
+AVR_INSN (break,"",    "1001010110011000", 1, AVR_ISA_BRK,  0x9598)
 AVR_INSN (wdr,  "",    "1001010110101000", 1, AVR_ISA_1200, 0x95a8)
 AVR_INSN (spm,  "",    "1001010111101000", 1, AVR_ISA_SPM,  0x95e8)

branches/GNU/src/binutils/include/opcode/cgen.h

@@ -1 +1 @@
 /* Header file for targets using CGEN: Cpu tools GENerator.
 
-Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
 
 This file is part of GDB, the GNU debugger, and the GNU Binutils.
@@ -27 +28 @@
    Or perhaps one could duplicate its definition in another file.
    Until such time, this file conditionally compiles definitions that require
-   bfd_vma using BFD_VERSION.  */
+   bfd_vma using __BFD_H_SEEN__.  */
 
 /* Enums must be defined before they can be used.
@@ -203 +204 @@
   /* one of enum mach_attr */
   int num;
+  /* parameter from mach->cpu */
+  unsigned int insn_chunk_bitsize;
 } CGEN_MACH;
 
@@ -281 +284 @@
    The result is an error message or NULL if success.  */
 
-#ifdef BFD_VERSION
+#ifdef __BFD_H_SEEN__
 typedef const char * (cgen_insert_fn)
      PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *insn_,
@@ -302 +305 @@
    The result is the length of the insn in bits or zero if not recognized.  */
 
-#ifdef BFD_VERSION
+#ifdef __BFD_H_SEEN__
 typedef int (cgen_extract_fn)
      PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *insn_,
@@ -321 +324 @@
    LEN is the length of the insn, in bits.  */
 
-#ifdef BFD_VERSION
+#ifdef __BFD_H_SEEN__
 typedef void (cgen_print_fn)
      PARAMS ((CGEN_CPU_DESC, PTR info_, const CGEN_INSN *insn_,
@@ -387 +390 @@
 };
 
-#ifdef BFD_VERSION /* Don't require bfd.h unnecessarily.  */
+#ifdef __BFD_H_SEEN__ /* Don't require bfd.h unnecessarily.  */
 typedef const char * (cgen_parse_operand_fn)
      PARAMS ((CGEN_CPU_DESC,
@@ -522 +525 @@
   /* Pointer to null keyword "" entry if present.  */
   const CGEN_KEYWORD_ENTRY *null_entry;
+
+  /* String containing non-alphanumeric characters used
+     in keywords.  
+     At present, the highest number of entries used is 1.  */
+  char nonalpha_chars[8];
 } CGEN_KEYWORD;
 
@@ -567 +575 @@
 extern const char *cgen_parse_keyword
      PARAMS ((CGEN_CPU_DESC, const char **, CGEN_KEYWORD *, long *));
-#ifdef BFD_VERSION /* Don't require bfd.h unnecessarily.  */
+#ifdef __BFD_H_SEEN__ /* Don't require bfd.h unnecessarily.  */
 extern const char *cgen_parse_signed_integer
      PARAMS ((CGEN_CPU_DESC, const char **, int, long *));
@@ -613 +621 @@
 #define CGEN_OPERAND_NIL CGEN_OPERAND_MAX
 
+/* A tree of these structs represents the multi-ifield
+   structure of an operand's hw-index value, if it exists.  */
+
+struct cgen_ifld;
+
+typedef struct cgen_maybe_multi_ifield
+{
+  int count; /* 0: indexed by single cgen_ifld (possibly null: dead entry);
+                n: indexed by array of more cgen_maybe_multi_ifields.  */
+  union
+  {
+    const PTR p;
+    const struct cgen_maybe_multi_ifield * multi;
+    const struct cgen_ifld * leaf;
+  } val;
+}
+CGEN_MAYBE_MULTI_IFLD;
+
 /* This struct defines each entry in the operand table.  */
 
@@ -641 +667 @@
   unsigned char length;
 
+  /* The (possibly-multi) ifield used as an index for this operand, if it
+     is indexed by a field at all. This substitutes / extends the start and
+     length fields above, but unsure at this time whether they are used
+     anywhere.  */
+  CGEN_MAYBE_MULTI_IFLD index_fields;
 #if 0 /* ??? Interesting idea but relocs tend to get too complicated,
          and ABI dependent, for simple table lookups to work.  */
@@ -749 +780 @@
 
 /* This should be at least as large as necessary for any target. */
-#define CGEN_MAX_SYNTAX_BYTES 40
+#define CGEN_MAX_SYNTAX_ELEMENTS 48
 
 /* A target may know its own precise maximum.  Assert that it falls below
    the above limit. */
-#ifdef CGEN_ACTUAL_MAX_SYNTAX_BYTES
-#if CGEN_ACTUAL_MAX_SYNTAX_BYTES > CGEN_MAX_SYNTAX_BYTES
-#error "CGEN_ACTUAL_MAX_SYNTAX_BYTES too high - enlarge CGEN_MAX_SYNTAX_BYTES"
-#endif
-#endif
-
-#if !defined(MAX_OPERANDS) || MAX_OPERANDS <= 127
-typedef unsigned char CGEN_SYNTAX_CHAR_TYPE;
-#else
+#ifdef CGEN_ACTUAL_MAX_SYNTAX_ELEMENTS
+#if CGEN_ACTUAL_MAX_SYNTAX_ELEMENTS > CGEN_MAX_SYNTAX_ELEMENTS
+#error "CGEN_ACTUAL_MAX_SYNTAX_ELEMENTS too high - enlarge CGEN_MAX_SYNTAX_ELEMENTS"
+#endif
+#endif
+
 typedef unsigned short CGEN_SYNTAX_CHAR_TYPE;
-#endif
 
 typedef struct
 {
-  CGEN_SYNTAX_CHAR_TYPE syntax[CGEN_MAX_SYNTAX_BYTES];
+  CGEN_SYNTAX_CHAR_TYPE syntax[CGEN_MAX_SYNTAX_ELEMENTS];
 } CGEN_SYNTAX;
 
@@ -1021 +1048 @@
   const CGEN_OPCODE *opcode;
   const CGEN_OPINST *opinst;
+
+  /* Regex to disambiguate overloaded opcodes */
+  void *rx;
+#define CGEN_INSN_RX(insn) ((insn)->rx)
+#define CGEN_MAX_RX_ELEMENTS (CGEN_MAX_SYNTAX_ELEMENTS * 5)
 };
 
@@ -1183 +1215 @@
   unsigned int word_bitsize;
 
+  /* Instruction chunk size (in bits), for purposes of endianness
+     conversion.  */
+  unsigned int insn_chunk_bitsize;
+
   /* Indicator if sizes are unknown.
      This is used by default_insn_bitsize,base_insn_bitsize if there is a
@@ -1237 +1273 @@
      PARAMS ((CGEN_CPU_DESC, int opindex_, const char **,
               CGEN_FIELDS *fields_));
-#ifdef BFD_VERSION
+#ifdef __BFD_H_SEEN__
   const char * (*insert_operand)
      PARAMS ((CGEN_CPU_DESC, int opindex_, CGEN_FIELDS *fields_,
@@ -1270 +1306 @@
   void (*set_int_operand)
        PARAMS ((CGEN_CPU_DESC, int opindex_, CGEN_FIELDS *fields_, int value_));
-#ifdef BFD_VERSION
+#ifdef __BFD_H_SEEN__
   bfd_vma (*get_vma_operand)
        PARAMS ((CGEN_CPU_DESC, int opindex_, const CGEN_FIELDS *fields_));
@@ -1376 +1412 @@
 extern void CGEN_SYM (init_opcode_table) PARAMS ((CGEN_CPU_DESC cd_));
 
+/* build the insn selection regex.
+   called by init_opcode_table */
+
+extern char * CGEN_SYM(build_insn_regex) PARAMS ((CGEN_INSN *insn_));
+
 /* Initialize the ibld table for use.
    Called by init_asm/init_dis.  */

branches/GNU/src/binutils/include/opcode/convex.h

@@ -1 +1 @@
 /* Information for instruction disassembly on the Convex.
-   Copyright 1989, 1993 Free Software Foundation, Inc.
+   Copyright 1989, 1993, 2002 Free Software Foundation, Inc.
 
 This file is part of GDB.
@@ -17 +17 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef CONST
-#define CONST
-#endif  /* CONST */
 
 #define xxx 0
@@ -68 +64 @@
 #define TID 21
 
-CONST char *op[] = {
+const char *op[] = {
   "",
   "v0\0v1\0v2\0v3\0v4\0v5\0v6\0v7",
@@ -93 +89 @@
 };
 
-CONST struct formstr format0[] = {
+const struct formstr format0[] = {
   {0,0,rrr,V,S,S},      /* mov */
   {0,0,rrr,S,S,V},      /* mov */
@@ -160 +156 @@
 };
 
-CONST struct formstr format1[] = {
+const struct formstr format1[] = {
   {11,0,xxx,0,0,0},     /* exit */
   {12,0,a3,0,0,0},      /* jmp */
@@ -227 +223 @@
 };
 
-CONST struct formstr format2[] = {
+const struct formstr format2[] = {
   {28,5,rr,A,A,0},      /* cvtw.b */
   {28,6,rr,A,A,0},      /* cvtw.h */
@@ -358 +354 @@
 };
 
-CONST struct formstr format3[] = {
+const struct formstr format3[] = {
   {32,3,rr,V,V,0},      /* cvtd.s */
   {31,4,rr,V,V,0},      /* cvts.d */
@@ -425 +421 @@
 };
 
-CONST struct formstr format4[] = {
+const struct formstr format4[] = {
   {46,0,nops,0,0,0},    /* nop */
   {47,0,pcrel,0,0,0},   /* br */
@@ -436 +432 @@
 };
 
-CONST struct formstr format5[] = {
+const struct formstr format5[] = {
   {51,5,rr,V,V,0},      /* ldvi.b */
   {51,6,rr,V,V,0},      /* ldvi.h */
@@ -455 +451 @@
 };
 
-CONST struct formstr format6[] = {
+const struct formstr format6[] = {
   {53,0,r,A,0,0},       /* ldsdr */
   {54,0,r,A,0,0},       /* ldkdr */
@@ -522 +518 @@
 };
 
-CONST struct formstr format7[] = {
+const struct formstr format7[] = {
   {84,5,r,V,0,0},       /* sum.b */
   {84,6,r,V,0,0},       /* sum.h */
@@ -557 +553 @@
 };
 
-CONST struct formstr formatx[] = {
-  {0,0,0,0,0,0},
-};
-
-CONST struct formstr format1a[] = {
+const struct formstr formatx[] = {
+  {0,0,0,0,0,0},
+};
+
+const struct formstr format1a[] = {
   {91,0,imr,A,0,0},     /* halt */
   {92,0,a4,0,0,0},      /* sysc */
@@ -596 +592 @@
 };
 
-CONST struct formstr format1b[] = {
+const struct formstr format1b[] = {
   {18,4,imr,S,0,0},     /* ld.d */
   {18,10,imr,S,0,0},    /* ld.u */
@@ -631 +627 @@
 };
 
-CONST struct formstr e0_format0[] = {
+const struct formstr e0_format0[] = {
   {10,3,rrr,S,V,V},     /* sub.s */
   {10,4,rrr,S,V,V},     /* sub.d */
@@ -698 +694 @@
 };
 
-CONST struct formstr e0_format1[] = {
+const struct formstr e0_format1[] = {
   {0,0,0,0,0,0},
   {94,0,a3,0,0,0},      /* tst */
@@ -765 +761 @@
 };
 
-CONST struct formstr e0_format2[] = {
+const struct formstr e0_format2[] = {
   {28,5,rr,V,V,0},      /* cvtw.b */
   {28,6,rr,V,V,0},      /* cvtw.h */
@@ -896 +892 @@
 };
 
-CONST struct formstr e0_format3[] = {
+const struct formstr e0_format3[] = {
   {32,11,rr,V,V,0},     /* cvtd.s.f */
   {31,12,rr,V,V,0},     /* cvts.d.f */
@@ -963 +959 @@
 };
 
-CONST struct formstr e0_format4[] = {
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-};
-
-CONST struct formstr e0_format5[] = {
+const struct formstr e0_format4[] = {
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+};
+
+const struct formstr e0_format5[] = {
   {51,13,rr,V,V,0},     /* ldvi.b.f */
   {51,14,rr,V,V,0},     /* ldvi.h.f */
@@ -993 +989 @@
 };
 
-CONST struct formstr e0_format6[] = {
+const struct formstr e0_format6[] = {
   {0,0,rxl,S,CIR,0},    /* mov */
   {0,0,lr,CIR,S,0},     /* mov */
@@ -1060 +1056 @@
 };
 
-CONST struct formstr e0_format7[] = {
+const struct formstr e0_format7[] = {
   {84,13,r,V,0,0},      /* sum.b.f */
   {84,14,r,V,0,0},      /* sum.h.f */
@@ -1095 +1091 @@
 };
 
-CONST struct formstr e1_format0[] = {
+const struct formstr e1_format0[] = {
   {0,0,0,0,0,0},
   {0,0,0,0,0,0},
@@ -1162 +1158 @@
 };
 
-CONST struct formstr e1_format1[] = {
+const struct formstr e1_format1[] = {
   {0,0,0,0,0,0},
   {0,0,0,0,0,0},
@@ -1229 +1225 @@
 };
 
-CONST struct formstr e1_format2[] = {
+const struct formstr e1_format2[] = {
   {0,0,0,0,0,0},
   {0,0,0,0,0,0},
@@ -1360 +1356 @@
 };
 
-CONST struct formstr e1_format3[] = {
+const struct formstr e1_format3[] = {
   {32,18,rr,V,V,0},     /* cvtd.s.t */
   {31,19,rr,V,V,0},     /* cvts.d.t */
@@ -1427 +1423 @@
 };
 
-CONST struct formstr e1_format4[] = {
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-};
-
-CONST struct formstr e1_format5[] = {
+const struct formstr e1_format4[] = {
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+};
+
+const struct formstr e1_format5[] = {
   {51,20,rr,V,V,0},     /* ldvi.b.t */
   {51,21,rr,V,V,0},     /* ldvi.h.t */
@@ -1457 +1453 @@
 };
 
-CONST struct formstr e1_format6[] = {
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-  {0,0,0,0,0,0},
-};
-
-CONST struct formstr e1_format7[] = {
+const struct formstr e1_format6[] = {
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+  {0,0,0,0,0,0},
+};
+
+const struct formstr e1_format7[] = {
   {84,20,r,V,0,0},      /* sum.b.t */
   {84,21,r,V,0,0},      /* sum.h.t */

branches/GNU/src/binutils/include/opcode/cris.h

@@ -51 +51 @@
   cris_ver_v0_3,
 
-  /* Only for v3 or higher (ETRAX 1..4 and beyond).  */
+  /* Only for v3 or higher (ETRAX 4 and beyond).  */
   cris_ver_v3p,
 
@@ -161 +161 @@
 #define JUMP_PC_INCR_OPCODE \
  (JUMP_INDIR_OPCODE + AUTOINCR_BIT * 0x0100 + REG_PC)
+#define ADD_PC_INCR_OPCODE \
+ (0xfa00 + (2 << 4) + AUTOINCR_BIT * 0x0100 + REG_PC)
 
 /* Nop.  */

branches/GNU/src/binutils/include/opcode/d10v.h

@@ -1 +1 @@
 /* d10v.h -- Header file for D10V opcode table
-   Copyright 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    Written by Martin Hunt (hunt@cygnus.com), Cygnus Support
 
@@ -182 +182 @@
 #define RESTRICTED_NUM3 (0x80000)
 
+/* Pre-decrement is only supported for SP.  */
+#define OPERAND_SP      (0x100000)
+
+/* Post-decrement is not supported for SP.  Like OPERAND_EVEN, and
+   unlike OPERAND_SP, this flag doesn't prevent the instruction from
+   matching, it only fails validation later on.  */
+#define OPERAND_NOSP    (0x200000)
+
 /* Structure to hold information about predefined registers.  */
 struct pd_reg
@@ -191 +199 @@
 
 extern const struct pd_reg d10v_predefined_registers[];
-int d10v_reg_name_cnt();
+int d10v_reg_name_cnt PARAMS ((void));
 
 /* an expressionS only has one register type, so we fake it */

branches/GNU/src/binutils/include/opcode/d30v.h

@@ -33 +33 @@
 
 extern const struct pd_reg pre_defined_registers[];
-int reg_name_cnt();
+int reg_name_cnt PARAMS ((void));
 
 /* the number of control registers */

branches/GNU/src/binutils/include/opcode/h8300.h

@@ -1 +1 @@
 /* Opcode table for the H8/300
-   Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000
+   Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000, 2002, 2003
    Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>.
@@ -22 +22 @@
 
 /* Instructions are stored as a sequence of nibbles.
-   If the nibble has value 15 or less then the representation is complete.
+   If the nibble has value 15 or less than the representation is complete.
    Otherwise, we record what it contains with several flags.  */
 
@@ -49 +49 @@
 #define L_P             0x08
 #define L_24            0x10
-#define MEMRELAX        0x20                    /* move insn which may relax */ 
+#define MEMRELAX        0x20                    /* Move insn which may relax.  */ 
 #define SRC             0x40
 #define DST             0x80
@@ -67 +67 @@
 #define DISPREG         0x100000
 #define IGNORE          0x200000
-#define E               0x400000                /* FIXME: end of nibble sequence? */
+#define E               0x400000                /* FIXME: end of nibble sequence?  */
 #define L_2             0x800000
-#define B30             0x1000000               /* bit 3 must be low */
-#define B31             0x2000000               /* bit 3 must be high */
+#define B30             0x1000000               /* Bit 3 must be low.  */
+#define B31             0x2000000               /* Bit 3 must be high.  */
 #define CCR             0x4000000
 #define ABS             0x8000000
@@ -78 +78 @@
 #define MEMIND          0x80000000
 
-#define IMM3            IMM|L_3
-#define IMM2            IMM|L_2
-
-#define SIZE            (L_2|L_3|L_8|L_16|L_32|L_P|L_24)
-#define MODE            (REG|IMM|DISP|IND|INC|DEC|CCR|ABS|MEMIND|EXR)
-
-#define RD8             (DST|L_8|REG)
-#define RD16            (DST|L_16|REG)
-#define RD32            (DST|L_32|REG)
-#define RS8             (SRC|L_8|REG)
-#define RS16            (SRC|L_16|REG)
-#define RS32            (SRC|L_32|REG)
-
-#define RSP             (SRC|L_P|REG)
-#define RDP             (DST|L_P|REG)
-
-#define IMM8            (IMM|SRC|L_8)
-#define IMM16           (IMM|SRC|L_16)
-#define IMM32           (IMM|SRC|L_32)
-
-#define ABS8SRC         (SRC|ABS|L_8|ABS8MEM)
-#define ABS8DST         (DST|ABS|L_8|ABS8MEM)
-
-#define DISP8           (PCREL|L_8)
-#define DISP16          (PCREL|L_16)
-
-#define DISP8SRC        (DISP|L_8|SRC)
-#define DISP16SRC       (DISP|L_16|SRC)
-
-#define DISP8DST        (DISP|L_8|DST)
-#define DISP16DST       (DISP|L_16|DST)
-
-#define ABS16SRC        (SRC|ABS|L_16)
-#define ABS16DST        (DST|ABS|L_16)
-#define ABS24SRC        (SRC|ABS|L_24)
-#define ABS24DST        (DST|ABS|L_24)
-#define ABS32SRC        (SRC|ABS|L_32)
-#define ABS32DST        (DST|ABS|L_32)
-
-#define RDDEC           (DST|DEC)
-#define RSINC           (SRC|INC)
-#define RDINC           (DST|INC)
-
-#define RDIND           (DST|IND)
-#define RSIND           (SRC|IND)
+#define IMM3            IMM | L_3
+#define IMM2            IMM | L_2
+
+#define SIZE            (L_2 | L_3 | L_8 | L_16 | L_32 | L_P | L_24)
+#define MODE            (REG | IMM | DISP | IND | INC | DEC | CCR | ABS | MEMIND | EXR)
+
+#define RD8             (DST | L_8  | REG)
+#define RD16            (DST | L_16 | REG)
+#define RD32            (DST | L_32 | REG)
+#define RS8             (SRC | L_8  | REG)
+#define RS16            (SRC | L_16 | REG)
+#define RS32            (SRC | L_32 | REG)
+
+#define RSP             (SRC | L_P | REG)
+#define RDP             (DST | L_P | REG)
+
+#define IMM8            (IMM | SRC | L_8)
+#define IMM16           (IMM | SRC | L_16)
+#define IMM32           (IMM | SRC | L_32)
+
+#define ABS8SRC         (SRC | ABS | L_8 | ABS8MEM)
+#define ABS8DST         (DST | ABS | L_8 | ABS8MEM)
+
+#define DISP8           (PCREL | L_8)
+#define DISP16          (PCREL | L_16)
+
+#define DISP8SRC        (DISP | L_8  | SRC)
+#define DISP16SRC       (DISP | L_16 | SRC)
+
+#define DISP8DST        (DISP | L_8  | DST)
+#define DISP16DST       (DISP | L_16 | DST)
+
+#define ABS16SRC        (SRC | ABS | L_16)
+#define ABS16DST        (DST | ABS | L_16)
+#define ABS24SRC        (SRC | ABS | L_24)
+#define ABS24DST        (DST | ABS | L_24)
+#define ABS32SRC        (SRC | ABS | L_32)
+#define ABS32DST        (DST | ABS | L_32)
+
+#define RDDEC           (DST | DEC)
+#define RSINC           (SRC | INC)
+#define RDINC           (DST | INC)
+
+#define RDIND           (DST | IND)
+#define RSIND           (SRC | IND)
+
+#define MS32            (SRC | L_32 | MACREG)
+#define MD32            (DST | L_32 | MACREG)
 
 #if 1
-#define OR8 RS8         /* ??? OR as in One Register? */
+#define OR8 RS8         /* ??? OR as in One Register?  */
 #define OR16 RS16
 #define OR32 RS32
@@ -152 +155 @@
   struct arg args;
   struct code data;
-  int length;
-  int noperands;
-  int idx;
-  int size;
 };
 
@@ -161 +160 @@
 
 #define BITOP(code, imm, name, op00, op01,op10,op11, op20,op21,op30)\
-{ code, 1, 2, name,     {{imm,RD8,E}},  {{op00, op01, imm, RD8, E, 0, 0, 0, 0}}, 0, 0, 0, 0},\
-{ code, 1, 6, name,     {{imm,RDIND,E}},{{op10, op11, B30|RDIND, 0, op00,op01, imm, 0, E}}, 0, 0, 0, 0},\
-{ code, 1, 6, name,     {{imm,ABS8DST,E}},{{op20, op21, ABS8DST, IGNORE, op00,op01, imm, 0,E}}, 0, 0, 0, 0}\
-,{ code, 0, 6, name,    {{imm,ABS16DST,E}},{{0x6,0xa,0x1,op30,ABS16DST,IGNORE,IGNORE,IGNORE, op00,op01, imm, 0,E}}, 0, 0, 0, 0},\
-{ code, 0, 6, name,     {{imm,ABS32DST,E}},{{0x6,0xa,0x3,op30,ABS32DST,IGNORE,IGNORE,IGNORE,IGNORE,IGNORE,IGNORE,IGNORE, op00,op01, imm, 0,E}}, 0, 0, 0, 0}
+{ code, 1, 2, name,     {{imm,RD8,E}},  {{op00, op01, imm, RD8, E, 0, 0, 0, 0}}},\
+{ code, 1, 6, name,     {{imm,RDIND,E}},{{op10, op11, B30|RDIND, 0, op00,op01, imm, 0, E}}},\
+{ code, 1, 6, name,     {{imm,ABS8DST,E}},{{op20, op21, ABS8DST, IGNORE, op00,op01, imm, 0,E}}}\
+,{ code, 0, 6, name,    {{imm,ABS16DST,E}},{{0x6,0xa,0x1,op30,ABS16DST,IGNORE,IGNORE,IGNORE, op00,op01, imm, 0,E}}},\
+{ code, 0, 6, name,     {{imm,ABS32DST,E}},{{0x6,0xa,0x3,op30,ABS32DST,IGNORE,IGNORE,IGNORE,IGNORE,IGNORE,IGNORE,IGNORE, op00,op01, imm, 0,E}}}
 
 
@@ -173 +172 @@
 
 #define WTWOP(code,name, op1, op2) \
-{ code, 1, 2, name, {{RS16, RD16, E}}, {{ op1, op2, RS16, RD16, E, 0, 0, 0, 0}}, 0, 0, 0, 0}
+{ code, 1, 2, name, {{RS16, RD16, E}}, {{ op1, op2, RS16, RD16, E, 0, 0, 0, 0}}}
 
 #define BRANCH(code, name, op) \
-{ code, 1, 4,name,{{DISP8,E,0}}, {{ 0x4, op, DISP8, IGNORE, E, 0, 0, 0, 0}}, 0, 0, 0, 0}, \
-{ code, 0, 6,name,{{DISP16,E,0}}, {{ 0x5, 0x8, op, 0x0, DISP16, IGNORE, IGNORE, IGNORE, E,0}}, 0, 0, 0, 0} 
+{ code, 1, 4,name,{{DISP8,E,0}}, {{ 0x4, op, DISP8, IGNORE, E, 0, 0, 0, 0}}}, \
+{ code, 0, 6,name,{{DISP16,E,0}}, {{ 0x5, 0x8, op, 0x0, DISP16, IGNORE, IGNORE, IGNORE, E,0}}} 
 
 #define SOP(code, x,name) \
@@ -184 +183 @@
 #define NEW_SOP(code, in,x,name) \
 {code, in, x,  name 
-#define EOP  ,0,0,0,0 }
+#define EOP  }
 
 #define TWOOP(code, name, op1, op2,op3) \
-{ code,1, 2,name, {{IMM8, RD8, E}},     {{ op1, RD8, IMM8, IGNORE, E, 0, 0, 0, 0}}, 0, 0, 0, 0},\
-{ code, 1, 2,name, {{RS8, RD8, E}},     {{ op2, op3, RS8, RD8, E, 0, 0, 0, 0}}, 0, 0, 0, 0} 
+{ code,1, 2,name, {{IMM8, RD8, E}},     {{ op1, RD8, IMM8, IGNORE, E, 0, 0, 0, 0}}},\
+{ code, 1, 2,name, {{RS8, RD8, E}},     {{ op2, op3, RS8, RD8, E, 0, 0, 0, 0}}} 
 
 #define UNOP(code,name, op1, op2) \
-{ code, 1, 2, name, {{OR8, E, 0}}, {{ op1, op2, 0, OR8, E, 0, 0, 0, 0}}, 0, 0, 0, 0}
+{ code, 1, 2, name, {{OR8, E, 0}}, {{ op1, op2, 0, OR8, E, 0, 0, 0, 0}}}
 
 #define UNOP3(code, name, op1, op2, op3) \
-{ O(code,SB), 1, 2, name, {{OR8,  E, 0}}, {{op1, op2, op3+0, OR8,  E, 0, 0, 0, 0}}, 0, 0, 0, 0}, \
-{ O(code,SW), 0, 2, name, {{OR16, E, 0}}, {{op1, op2, op3+1, OR16, E, 0, 0, 0, 0}}, 0, 0, 0, 0}, \
-{ O(code,SL), 0, 2, name, {{OR32, E, 0}}, {{op1, op2, op3+3, OR32|B30, E, 0, 0, 0, 0}}, 0, 0, 0, 0} \
-,{ O(code,SB), 1, 2, name, {{IMM, OR8 | SRC_IN_DST,  E}}, {{op1, op2, op3+4, OR8 | SRC_IN_DST,  E, 0, 0, 0, 0}}, 0, 0, 0, 0}, \
-{ O(code,SW), 0, 2, name, {{IMM, OR16 | SRC_IN_DST, E}}, {{op1, op2, op3+5, OR16 | SRC_IN_DST, E, 0, 0, 0, 0}}, 0, 0, 0, 0}, \
-{ O(code,SL), 0, 2, name, {{IMM, OR32 | SRC_IN_DST, E}}, {{op1, op2, op3+7, OR32 | SRC_IN_DST|B30 , E, 0, 0, 0, 0}}, 0, 0, 0, 0}
+{ O(code,SB), 1, 2, name, {{OR8,  E, 0}}, {{op1, op2, op3+0, OR8,  E, 0, 0, 0, 0}}}, \
+{ O(code,SW), 0, 2, name, {{OR16, E, 0}}, {{op1, op2, op3+1, OR16, E, 0, 0, 0, 0}}}, \
+{ O(code,SL), 0, 2, name, {{OR32, E, 0}}, {{op1, op2, op3+3, OR32|B30, E, 0, 0, 0, 0}}} \
+,{ O(code,SB), 1, 2, name, {{IMM, OR8 | SRC_IN_DST,  E}}, {{op1, op2, op3+4, OR8 | SRC_IN_DST,  E, 0, 0, 0, 0}}}, \
+{ O(code,SW), 0, 2, name, {{IMM, OR16 | SRC_IN_DST, E}}, {{op1, op2, op3+5, OR16 | SRC_IN_DST, E, 0, 0, 0, 0}}}, \
+{ O(code,SL), 0, 2, name, {{IMM, OR32 | SRC_IN_DST, E}}, {{op1, op2, op3+7, OR32 | SRC_IN_DST|B30 , E, 0, 0, 0, 0}}}
 
 
@@ -216 +215 @@
 
 
-#define O(op, size) (op*4+size)
+#define O(op, size) (op * 4 + size)
 
 #define O_RECOMPILE 0
@@ -306 +305 @@
 #define O_STMAC 87
 #define O_LAST 88
+/* Change made for System Call processing.  */
+#define O_SYS_CREAT 100
+#define O_SYS_OPEN 101
+#define O_SYS_READ 102
+#define O_SYS_WRITE 103
+#define O_SYS_LSEEK 104
+#define O_SYS_CLOSE 105
+#define O_SYS_STAT 106
+#define O_SYS_FSTAT 107
+/* Space reserved for future file I/O system calls.  */
+#define O_SYS_CMDLINE 120
+/* End of System Call specific Changes.  */
 #define SB 0
 #define SW 1
@@ -311 +322 @@
 #define SN 3
 
-
 /* FIXME: Lots of insns have "E, 0, 0, 0, 0" in the nibble code sequences.
    Methinks the zeroes aren't necessary.  Once confirmed, nuke 'em.  */
 
-struct h8_opcode h8_opcodes[] = 
+const struct h8_opcode h8_opcodes[] = 
 {
   TWOOP(O(O_ADD,SB),"add.b", 0x8, 0x0,0x8),
@@ -334 +344 @@
   NEW_SOP(O(O_AND,SL),0,2,"and.l") ,{{RS32,RD32,E }},{{0x0,0x1,0xF,0x0,0x6,0x6,B30|RS32,B30|RD32,E}} EOP,
 
-  NEW_SOP(O(O_ANDC,SB),1,2,"andc"), {{IMM8,CCR,E}},{{ 0x0,0x6,IMM8,IGNORE,E,0,0,0,0}} EOP,
-  NEW_SOP(O(O_ANDC,SB),1,2,"andc"), {{IMM8,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x6,IMM8,IGNORE,E,0,0,0,0}} EOP,
+  NEW_SOP(O(O_ANDC,SB),1,2,"andc"), {{IMM8,CCR|DST,E}},{{ 0x0,0x6,IMM8,IGNORE,E,0,0,0,0}} EOP,
+  NEW_SOP(O(O_ANDC,SB),1,2,"andc"), {{IMM8,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x6,IMM8,IGNORE,E,0,0,0,0}} EOP,
 
   BITOP(O(O_BAND,SB), IMM3|B30,"band",0x7,0x6,0x7,0xC,0x7,0xE,0x0),
@@ -392 +402 @@
   NEW_SOP(O(O_DEC, SL),0,2,"dec.l") ,{{DBIT,RD32,E }},{{0x1,0xB,0x7|DBIT,RD32|B30,E}} EOP,
 
-  NEW_SOP(O(O_DIVU,SB),1,6,"divxu.b"), {{RS8,RD16,E}}, {{0x5,0x1,RS8,RD16,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_DIVU,SW),0,20,"divxu.w"),{{RS16,RD32,E}},{{0x5,0x3,RS16,B30|RD32,E}}EOP,
+  NEW_SOP(O(O_DIVU,SB),1,13,"divxu.b"), {{RS8,RD16,E}}, {{0x5,0x1,RS8,RD16,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_DIVU,SW),0,21,"divxu.w"),{{RS16,RD32,E}},{{0x5,0x3,RS16,B30|RD32,E}}EOP,
     
-  NEW_SOP(O(O_DIVS,SB),0,20,"divxs.b") ,{{RS8,RD16,E }},{{0x0,0x1,0xD,0x0,0x5,0x1,RS8,RD16,E}} EOP,
-  NEW_SOP(O(O_DIVS,SW),0,02,"divxs.w") ,{{RS16,RD32,E }},{{0x0,0x1,0xD,0x0,0x5,0x3,RS16,B30|RD32,E}} EOP,
-
-  NEW_SOP(O(O_EEPMOV,SB),1,50,"eepmov.b"),{{E,0,0}},{{0x7,0xB,0x5,0xC,0x5,0x9,0x8,0xF,E}}EOP,
-  NEW_SOP(O(O_EEPMOV,SW),0,50,"eepmov.w"),{{E,0,0}},{{0x7,0xB,0xD,0x4,0x5,0x9,0x8,0xF,E}} EOP,
+  NEW_SOP(O(O_DIVS,SB),0,13,"divxs.b") ,{{RS8,RD16,E }},{{0x0,0x1,0xD,0x0,0x5,0x1,RS8,RD16,E}} EOP,
+  NEW_SOP(O(O_DIVS,SW),0,21,"divxs.w") ,{{RS16,RD32,E }},{{0x0,0x1,0xD,0x0,0x5,0x3,RS16,B30|RD32,E}} EOP,
+
+  NEW_SOP(O(O_EEPMOV,SB),1,4,"eepmov.b"),{{E,0,0}},{{0x7,0xB,0x5,0xC,0x5,0x9,0x8,0xF,E}}EOP,
+  NEW_SOP(O(O_EEPMOV,SW),0,4,"eepmov.w"),{{E,0,0}},{{0x7,0xB,0xD,0x4,0x5,0x9,0x8,0xF,E}} EOP,
     
   NEW_SOP(O(O_EXTS,SW),0,2,"exts.w"),{{OR16,E,0}},{{0x1,0x7,0xD,OR16,E   }}EOP,
@@ -420 +430 @@
   SOP(O(O_JSR,SB),8,"jsr"),{{SRC|MEMIND,E,0}},{{0x5,0xF,SRC|MEMIND,IGNORE,E,0,0,0,0}}EOP,
 
-  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{IMM8,CCR,E}},         {{ 0x0,0x7,IMM8,IGNORE,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{OR8,CCR,E}},          {{ 0x0,0x3,0x0,OR8,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS16SRC,CCR,E}},     {{PREFIXLDC,0x6,0xB,0x0,0x0,ABS16SRC,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS32SRC,CCR,E}},     {{PREFIXLDC,0x6,0xB,0x2,0x0,SRC|ABS32LIST,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_16,CCR,E}},{{PREFIXLDC,0x6,0xF,B30|DISPREG,0,DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_32,CCR,E}},{{PREFIXLDC,0x7,0x8,B30|DISPREG,0,0x6,0xB,0x2,0x0,SRC|DISP32LIST,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSINC,CCR,E}},        {{PREFIXLDC,0x6,0xD,B30|RSINC,0x0,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSIND,CCR,E}},        {{PREFIXLDC,0x6,0x9,B30|RDIND,0x0,E}} EOP,
-
-  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{IMM8,EXR,E}},         {{ 0x0,0x1,0x4,0x1,0x0,0x7,IMM8,IGNORE,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{OR8,EXR,E}},          {{ 0x0,0x3,0x1,OR8,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS16SRC,EXR,E}},     {{ 0x0,0x1,0x4,0x1,0x6,0xb,0x0,0x0,ABS16SRC,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS32SRC,EXR,E}},     {{ 0x0,0x1,0x4,0x1,0x6,0xb,0x2,0x0,SRC|ABS32LIST,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_16,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x6,0xf,B30|DISPREG,0,DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_32,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x7,0x8,B30|DISPREG,0,0x6,0xB,0x2,0x0,SRC|DISP32LIST,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSINC,EXR,E}},        {{ 0x0,0x1,0x4,0x1,0x6,0xd,B30|RSINC,0x0,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSIND,EXR,E}},        {{ 0x0,0x1,0x4,0x1,0x6,0x9,B30|RDIND,0x0,E}} EOP,
+  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{IMM8,CCR|DST,E}},         {{ 0x0,0x7,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{OR8,CCR|DST,E}},          {{ 0x0,0x3,0x0,OR8,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS16SRC,CCR|DST,E}},     {{PREFIXLDC,0x6,0xB,0x0,0x0,ABS16SRC,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS32SRC,CCR|DST,E}},     {{PREFIXLDC,0x6,0xB,0x2,0x0,SRC|ABS32LIST,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_16,CCR|DST,E}},{{PREFIXLDC,0x6,0xF,B30|DISPREG,0,DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_32,CCR|DST,E}},{{PREFIXLDC,0x7,0x8,B30|DISPREG,0,0x6,0xB,0x2,0x0,SRC|DISP32LIST,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSINC,CCR|DST,E}},        {{PREFIXLDC,0x6,0xD,B30|RSINC,0x0,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSIND,CCR|DST,E}},        {{PREFIXLDC,0x6,0x9,B30|RSIND,0x0,E}} EOP,
+
+  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{IMM8,EXR|DST,E}},         {{ 0x0,0x1,0x4,0x1,0x0,0x7,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{OR8,EXR|DST,E}},          {{ 0x0,0x3,0x1,OR8,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS16SRC,EXR|DST,E}},     {{ 0x0,0x1,0x4,0x1,0x6,0xb,0x0,0x0,ABS16SRC,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS32SRC,EXR|DST,E}},     {{ 0x0,0x1,0x4,0x1,0x6,0xb,0x2,0x0,SRC|ABS32LIST,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_16,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x6,0xf,B30|DISPREG,0,DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_32,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x7,0x8,B30|DISPREG,0,0x6,0xB,0x2,0x0,SRC|DISP32LIST,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSINC,EXR|DST,E}},        {{ 0x0,0x1,0x4,0x1,0x6,0xd,B30|RSINC,0x0,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSIND,EXR|DST,E}},        {{ 0x0,0x1,0x4,0x1,0x6,0x9,B30|RSIND,0x0,E}} EOP,
 
   SOP(O(O_MOV_TO_REG,SB),4,"mov.b"),{{ABS|SRC|L_16|MEMRELAX,RD8,E}},  {{ 0x6,0xA,0x0,RD8,SRC|ABS|MEMRELAX|A16LIST,E}}EOP,
@@ -521 +531 @@
   NEW_SOP(O(O_OR,SL),0,2,"or.l"),{{RS32,RD32,E }},{{0x0,0x1,0xF,0x0,0x6,0x4,B30|RS32,B30|RD32,E}} EOP,
 
-  NEW_SOP(O(O_ORC,SB),1,2,"orc"),{{IMM8,CCR,E}},{{ 0x0,0x4,IMM8,IGNORE,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_ORC,SB),1,2,"orc"),{{IMM8,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x4,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_ORC,SB),1,2,"orc"),{{IMM8,CCR|DST,E}},{{ 0x0,0x4,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_ORC,SB),1,2,"orc"),{{IMM8,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x4,IMM8,IGNORE,E,0,0,0,0}}EOP,
 
   NEW_SOP(O(O_MOV_TO_REG,SW),1,6,"pop.w"),{{OR16,E,0}},{{ 0x6,0xD,0x7,OR16,E,0,0,0,0}}EOP,
@@ -545 +555 @@
   SOP(O(O_SLEEP,SN),2,"sleep"),{{E,0,0}},{{ 0x0,0x1,0x8,0x0,E,0,0,0,0}} EOP,
 
-  NEW_SOP(O(O_STC,SB), 1,2,"stc"),{{CCR,RD8,E}},{{ 0x0,0x2,0x0,RD8,E,0,0,0,0}} EOP,
-
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,RSIND,E}},        {{PREFIXLDC,0x6,0x9,B31|RDIND,0x0,E}} EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,DISP|DST|L_16,E}},{{PREFIXLDC,0x6,0xF,B31|DISPREG,0,DST|DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,DISP|DST|L_32,E}},{{PREFIXLDC,0x7,0x8,B30|DISPREG,0,0x6,0xB,0xA,0x0,DST|DISP32LIST,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,RDDEC,E}},        {{PREFIXLDC,0x6,0xD,B31|RDDEC,0x0,E}}EOP,
-
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,ABS16SRC,E}},     {{PREFIXLDC,0x6,0xB,0x8,0x0,ABS16DST,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,ABS32SRC,E}},     {{PREFIXLDC,0x6,0xB,0xA,0x0,DST|ABS32LIST,E}}EOP,
-
-  NEW_SOP(O(O_STC,SB), 1,2,"stc"),{{EXR,RD8,E}},{{ 0x0,0x2,0x1,RD8,E,0,0,0,0}} EOP,
-
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,RSIND,E}},        {{0x0,0x1,0x4,0x1,0x6,0x9,B31|RDIND,0x0,E}} EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,DISP|DST|L_16,E}},{{0x0,0x1,0x4,0x1,0x6,0xF,B31|DISPREG,0,DST|DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,DISP|DST|L_32,E}},{{0x0,0x1,0x4,0x1,0x7,0x8,B30|DISPREG,0,0x6,0xB,0xA,0x0,DST|DISP32LIST,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,RDDEC,E}},        {{0x0,0x1,0x4,0x1,0x6,0xD,B31|RDDEC,0x0,E}}EOP,
-
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,ABS16SRC,E}},     {{0x0,0x1,0x4,0x1,0x6,0xB,0x8,0x0,ABS16DST,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,ABS32SRC,E}},     {{0x0,0x1,0x4,0x1,0x6,0xB,0xA,0x0,DST|ABS32LIST,E}}EOP,
+  NEW_SOP(O(O_STC,SB), 1,2,"stc"),{{CCR|SRC,RD8,E}},{{ 0x0,0x2,0x0,RD8,E,0,0,0,0}} EOP,
+
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,RDIND,E}},        {{PREFIXLDC,0x6,0x9,B31|RDIND,0x0,E}} EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,DISP|DST|L_16,E}},{{PREFIXLDC,0x6,0xF,B31|DISPREG,0,DST|DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,DISP|DST|L_32,E}},{{PREFIXLDC,0x7,0x8,B30|DISPREG,0,0x6,0xB,0xA,0x0,DST|DISP32LIST,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,RDDEC,E}},        {{PREFIXLDC,0x6,0xD,B31|RDDEC,0x0,E}}EOP,
+
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,ABS16DST,E}},     {{PREFIXLDC,0x6,0xB,0x8,0x0,ABS16DST,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,ABS32DST,E}},     {{PREFIXLDC,0x6,0xB,0xA,0x0,DST|ABS32LIST,E}}EOP,
+
+  NEW_SOP(O(O_STC,SB), 1,2,"stc"),{{EXR|SRC,RD8,E}},{{ 0x0,0x2,0x1,RD8,E,0,0,0,0}} EOP,
+
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,RDIND,E}},        {{0x0,0x1,0x4,0x1,0x6,0x9,B31|RDIND,0x0,E}} EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,DISP|DST|L_16,E}},{{0x0,0x1,0x4,0x1,0x6,0xF,B31|DISPREG,0,DST|DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,DISP|DST|L_32,E}},{{0x0,0x1,0x4,0x1,0x7,0x8,B30|DISPREG,0,0x6,0xB,0xA,0x0,DST|DISP32LIST,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,RDDEC,E}},        {{0x0,0x1,0x4,0x1,0x6,0xD,B31|RDDEC,0x0,E}}EOP,
+
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,ABS16DST,E}},     {{0x0,0x1,0x4,0x1,0x6,0xB,0x8,0x0,ABS16DST,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,ABS32DST,E}},     {{0x0,0x1,0x4,0x1,0x6,0xB,0xA,0x0,DST|ABS32LIST,E}}EOP,
 
   SOP(O(O_SUB,SB),2,"sub.b"),{{RS8,RD8,E}},{{ 0x1,0x8,RS8,RD8,E,0,0,0,0}}EOP,
@@ -586 +596 @@
   NEW_SOP(O(O_XOR,SL),0,2,"xor.l") ,{{RS32,RD32,E }},{{0x0,0x1,0xF,0x0,0x6,0x5,B30|RS32,B30|RD32,E}} EOP,
 
-  SOP(O(O_XORC,SB),2,"xorc"),{{IMM8,CCR,E}},{{ 0x0,0x5,IMM8,IGNORE,E,0,0,0,0}}EOP,
-  SOP(O(O_XORC,SB),2,"xorc"),{{IMM8,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x5,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  SOP(O(O_XORC,SB),2,"xorc"),{{IMM8,CCR|DST,E}},{{ 0x0,0x5,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  SOP(O(O_XORC,SB),2,"xorc"),{{IMM8,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x5,IMM8,IGNORE,E,0,0,0,0}}EOP,
 
   NEW_SOP(O(O_CLRMAC,SN),1,2,"clrmac"),{{E, 0, 0}},{{0x0,0x1,0xa,0x0,E}} EOP,
   NEW_SOP(O(O_MAC,SL),1,2,"mac"),{{RSINC,RDINC,E}},{{0x0,0x1,0x6,0x0,0x6,0xd,B30|RSINC,B30|RDINC,E}} EOP,
-  NEW_SOP(O(O_LDMAC,SL),1,2,"ldmac"),{{RS32,MACREG,E}},{{0x0,0x3,MACREG,RS32,E}} EOP,
-  NEW_SOP(O(O_STMAC,SL),1,2,"stmac"),{{MACREG,RD32,E}},{{0x0,0x2,MACREG,RD32,E}} EOP,
+  NEW_SOP(O(O_LDMAC,SL),1,2,"ldmac"),{{RS32,MD32,E}},{{0x0,0x3,MD32,RS32,E}} EOP,
+  NEW_SOP(O(O_STMAC,SL),1,2,"stmac"),{{MS32,RD32,E}},{{0x0,0x2,MS32,RD32,E}} EOP,  
   NEW_SOP(O(O_LDM,SL),0,6,"ldm.l"),{{RSINC, RS32, E}},{{ 0x0,0x1,IGNORE,0x0,0x6,0xD,0x7,IGNORE,E}}EOP,
   NEW_SOP(O(O_STM,SL),0,6,"stm.l"),{{RS32, RDDEC, E}},{{0x0,0x1,IGNORE,0x0,0x6,0xD,0xF,IGNORE,E}}EOP,
-  { 0 }
+  {0, 0, 0, NULL, {{0,0,0}}, {{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}
 };
 #else
-extern struct h8_opcode h8_opcodes[];
+extern const struct h8_opcode h8_opcodes[];
 #endif

branches/GNU/src/binutils/include/opcode/hppa.h

@@ -1 +1 @@
 /* Table of opcodes for the PA-RISC.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-   2001
+   2001, 2002
    Free Software Foundation, Inc.
 
@@ -171 +171 @@
 
    cx   indexed load completer.
+   cX   indexed load completer.  Like cx, but emits a space after
+        in disassembler.
    cm   short load and store completer.
+   cM   short load and store completer.  Like cm, but emits a space
+        after in disassembler.
    cq   long load and store completer (like cm, but inserted into a
         different location in the target instruction).
    cs   store bytes short completer.
+   cA   store bytes short completer.  Like cs, but emits a space
+        after in disassembler.
    ce   long load/store completer for LDW/STW with a different encoding than the
         others
@@ -266 +272 @@
 
 
+#if 0
 /* List of characters not to put a space after.  Note that
    "," is included, as the "spopN" operations use literal
    commas in their completer sections.  */
 static const char *const completer_chars = ",CcY<>?!@+&U~FfGHINnOoZMadu|/=0123%e$m}";
+#endif
 
 /* The order of the opcodes in this table is significant:
@@ -285 +293 @@
 { "ldi",        0x34000000, 0xffe00000, "l,x", pa20w, 0},/* ldo val(r0),r */
 { "ldi",        0x34000000, 0xffe0c000, "j,x", pa10, 0},/* ldo val(r0),r */
-
-{ "call",       0xe800f000, 0xfc1ffffd, "n(b)", pa20, FLAG_STRICT},
-{ "call",       0xe800a000, 0xffe0e000, "nW", pa10, FLAG_STRICT},
-{ "ret",        0xe840d000, 0xfffffffd, "n", pa20, FLAG_STRICT},
 
 { "cmpib",      0xec000000, 0xfc000000, "?Qn5,b,w", pa20, FLAG_STRICT},
@@ -302 +306 @@
    assembler.  */
 { "comb",       0x88000000, 0xfc000000, "?nnx,b,w", pa10, 0}, /* comb{tf} */
-{ "addb",       0xa0000000, 0xf4000000, "?Wnx,b,w", pa20, FLAG_STRICT},
+{ "addb",       0xa0000000, 0xf4000000, "?Wnx,b,w", pa20w, FLAG_STRICT},
 { "addb",       0xa0000000, 0xfc000000, "?@nx,b,w", pa10, 0}, /* addb{tf} */
 /* This entry is for the disassembler only.  It will never be used by
    assembler.  */
 { "addb",       0xa8000000, 0xfc000000, "?@nx,b,w", pa10, 0},
-{ "addib",      0xa4000000, 0xf4000000, "?Wn5,b,w", pa20, FLAG_STRICT},
+{ "addib",      0xa4000000, 0xf4000000, "?Wn5,b,w", pa20w, FLAG_STRICT},
 { "addib",      0xa4000000, 0xfc000000, "?@n5,b,w", pa10, 0}, /* addib{tf}*/
 /* This entry is for the disassembler only.  It will never be used by
@@ -328 +332 @@
 { "ldw",        0x0c000080, 0xfc0013c0, "cxccx(s,b),t", pa10, FLAG_STRICT},
 { "ldw",        0x0c000080, 0xfc0013c0, "cxccx(b),t", pa10, FLAG_STRICT},
+{ "ldw",        0x0c001080, 0xfc0013c0, "cmcc5(s,b),t", pa10, FLAG_STRICT},
+{ "ldw",        0x0c001080, 0xfc0013c0, "cmcc5(b),t", pa10, FLAG_STRICT},
 { "ldw",        0x0c0010a0, 0xfc1f33e0, "cocc@(s,b),t", pa20, FLAG_STRICT},
 { "ldw",        0x0c0010a0, 0xfc1f33e0, "cocc@(b),t", pa20, FLAG_STRICT},
-{ "ldw",        0x0c001080, 0xfc0013c0, "cmcc5(s,b),t", pa10, FLAG_STRICT},
-{ "ldw",        0x0c001080, 0xfc0013c0, "cmcc5(b),t", pa10, FLAG_STRICT},
 { "ldw",        0x4c000000, 0xfc000000, "ce<(b),x", pa20w, FLAG_STRICT},
 { "ldw",        0x4c000000, 0xfc000000, "ceJ(s,b),x", pa10, FLAG_STRICT},
@@ -343 +347 @@
 { "ldh",        0x0c000040, 0xfc0013c0, "cxccx(s,b),t", pa10, FLAG_STRICT},
 { "ldh",        0x0c000040, 0xfc0013c0, "cxccx(b),t", pa10, FLAG_STRICT},
+{ "ldh",        0x0c001040, 0xfc0013c0, "cmcc5(s,b),t", pa10, FLAG_STRICT},
+{ "ldh",        0x0c001040, 0xfc0013c0, "cmcc5(b),t", pa10, FLAG_STRICT},
 { "ldh",        0x0c001060, 0xfc1f33e0, "cocc@(s,b),t", pa20, FLAG_STRICT},
 { "ldh",        0x0c001060, 0xfc1f33e0, "cocc@(b),t", pa20, FLAG_STRICT},
-{ "ldh",        0x0c001040, 0xfc0013c0, "cmcc5(s,b),t", pa10, FLAG_STRICT},
-{ "ldh",        0x0c001040, 0xfc0013c0, "cmcc5(b),t", pa10, FLAG_STRICT},
 { "ldh",        0x44000000, 0xfc000000, "l(b),x", pa20w, FLAG_STRICT},
 { "ldh",        0x44000000, 0xfc000000, "j(s,b),x", pa10, 0},
@@ -352 +356 @@
 { "ldb",        0x0c000000, 0xfc0013c0, "cxccx(s,b),t", pa10, FLAG_STRICT},
 { "ldb",        0x0c000000, 0xfc0013c0, "cxccx(b),t", pa10, FLAG_STRICT},
+{ "ldb",        0x0c001000, 0xfc0013c0, "cmcc5(s,b),t", pa10, FLAG_STRICT},
+{ "ldb",        0x0c001000, 0xfc0013c0, "cmcc5(b),t", pa10, FLAG_STRICT},
 { "ldb",        0x0c001020, 0xfc1f33e0, "cocc@(s,b),t", pa20, FLAG_STRICT},
 { "ldb",        0x0c001020, 0xfc1f33e0, "cocc@(b),t", pa20, FLAG_STRICT},
-{ "ldb",        0x0c001000, 0xfc0013c0, "cmcc5(s,b),t", pa10, FLAG_STRICT},
-{ "ldb",        0x0c001000, 0xfc0013c0, "cmcc5(b),t", pa10, FLAG_STRICT},
 { "ldb",        0x40000000, 0xfc000000, "l(b),x", pa20w, FLAG_STRICT},
 { "ldb",        0x40000000, 0xfc000000, "j(s,b),x", pa10, 0},
@@ -365 +369 @@
 { "std",        0x70000000, 0xfc000002, "cqx,&(b)", pa20w, FLAG_STRICT},
 { "std",        0x70000000, 0xfc000002, "cqx,#(b)", pa20, FLAG_STRICT},
+{ "stw",        0x0c001280, 0xfc0013c0, "cmcCx,V(s,b)", pa10, FLAG_STRICT},
+{ "stw",        0x0c001280, 0xfc0013c0, "cmcCx,V(b)", pa10, FLAG_STRICT},
 { "stw",        0x0c0012a0, 0xfc0013ff, "cocCx,@(s,b)", pa20, FLAG_STRICT},
 { "stw",        0x0c0012a0, 0xfc0013ff, "cocCx,@(b)", pa20, FLAG_STRICT},
-{ "stw",        0x0c001280, 0xfc0013c0, "cmcCx,V(s,b)", pa10, FLAG_STRICT},
-{ "stw",        0x0c001280, 0xfc0013c0, "cmcCx,V(b)", pa10, FLAG_STRICT},
 { "stw",        0x6c000000, 0xfc000000, "cex,<(b)", pa20w, FLAG_STRICT},
 { "stw",        0x6c000000, 0xfc000000, "cex,J(s,b)", pa10, FLAG_STRICT},
@@ -378 +382 @@
 { "stw",        0x68000000, 0xfc000000, "x,j(s,b)", pa10, 0},
 { "stw",        0x68000000, 0xfc000000, "x,j(b)", pa10, 0},
+{ "sth",        0x0c001240, 0xfc0013c0, "cmcCx,V(s,b)", pa10, FLAG_STRICT},
+{ "sth",        0x0c001240, 0xfc0013c0, "cmcCx,V(b)", pa10, FLAG_STRICT},
 { "sth",        0x0c001260, 0xfc0033ff, "cocCx,@(s,b)", pa20, FLAG_STRICT},
 { "sth",        0x0c001260, 0xfc0033ff, "cocCx,@(b)", pa20, FLAG_STRICT},
-{ "sth",        0x0c001240, 0xfc0013c0, "cmcCx,V(s,b)", pa10, FLAG_STRICT},
-{ "sth",        0x0c001240, 0xfc0013c0, "cmcCx,V(b)", pa10, FLAG_STRICT},
 { "sth",        0x64000000, 0xfc000000, "x,l(b)", pa20w, FLAG_STRICT},
 { "sth",        0x64000000, 0xfc000000, "x,j(s,b)", pa10, 0},
 { "sth",        0x64000000, 0xfc000000, "x,j(b)", pa10, 0},
+{ "stb",        0x0c001200, 0xfc0013c0, "cmcCx,V(s,b)", pa10, FLAG_STRICT},
+{ "stb",        0x0c001200, 0xfc0013c0, "cmcCx,V(b)", pa10, FLAG_STRICT},
 { "stb",        0x0c001220, 0xfc0033ff, "cocCx,@(s,b)", pa20, FLAG_STRICT},
 { "stb",        0x0c001220, 0xfc0033ff, "cocCx,@(b)", pa20, FLAG_STRICT},
-{ "stb",        0x0c001200, 0xfc0013c0, "cmcCx,V(s,b)", pa10, FLAG_STRICT},
-{ "stb",        0x0c001200, 0xfc0013c0, "cmcCx,V(b)", pa10, FLAG_STRICT},
 { "stb",        0x60000000, 0xfc000000, "x,l(b)", pa20w, FLAG_STRICT},
 { "stb",        0x60000000, 0xfc000000, "x,j(s,b)", pa10, 0},
@@ -396 +400 @@
 { "stwm",       0x6c000000, 0xfc000000, "x,j(s,b)", pa10, 0},
 { "stwm",       0x6c000000, 0xfc000000, "x,j(b)", pa10, 0},
-{ "ldwx",       0x0c000080, 0xfc001fc0, "cxx(s,b),t", pa10, 0},
-{ "ldwx",       0x0c000080, 0xfc001fc0, "cxx(b),t", pa10, 0},
-{ "ldhx",       0x0c000040, 0xfc001fc0, "cxx(s,b),t", pa10, 0},
-{ "ldhx",       0x0c000040, 0xfc001fc0, "cxx(b),t", pa10, 0},
-{ "ldbx",       0x0c000000, 0xfc001fc0, "cxx(s,b),t", pa10, 0},
-{ "ldbx",       0x0c000000, 0xfc001fc0, "cxx(b),t", pa10, 0},
+{ "ldwx",       0x0c000080, 0xfc001fc0, "cXx(s,b),t", pa10, 0},
+{ "ldwx",       0x0c000080, 0xfc001fc0, "cXx(b),t", pa10, 0},
+{ "ldhx",       0x0c000040, 0xfc001fc0, "cXx(s,b),t", pa10, 0},
+{ "ldhx",       0x0c000040, 0xfc001fc0, "cXx(b),t", pa10, 0},
+{ "ldbx",       0x0c000000, 0xfc001fc0, "cXx(s,b),t", pa10, 0},
+{ "ldbx",       0x0c000000, 0xfc001fc0, "cXx(b),t", pa10, 0},
 { "ldwa",       0x0c000180, 0xfc00d3c0, "cxccx(b),t", pa10, FLAG_STRICT},
 { "ldwa",       0x0c001180, 0xfc00d3c0, "cmcc5(b),t", pa10, FLAG_STRICT},
+{ "ldwa",       0x0c0011a0, 0xfc1ff3e0, "cocc@(b),t", pa20, FLAG_STRICT},
 { "ldcw",       0x0c0001c0, 0xfc0013c0, "cxcdx(s,b),t", pa10, FLAG_STRICT},
 { "ldcw",       0x0c0001c0, 0xfc0013c0, "cxcdx(b),t", pa10, FLAG_STRICT},
 { "ldcw",       0x0c0011c0, 0xfc0013c0, "cmcd5(s,b),t", pa10, FLAG_STRICT},
 { "ldcw",       0x0c0011c0, 0xfc0013c0, "cmcd5(b),t", pa10, FLAG_STRICT},
+{ "stwa",       0x0c001380, 0xfc00d3c0, "cmcCx,V(b)", pa10, FLAG_STRICT},
 { "stwa",       0x0c0013a0, 0xfc00d3ff, "cocCx,@(b)", pa20, FLAG_STRICT},
-{ "stwa",       0x0c001380, 0xfc00d3c0, "cmcCx,V(b)", pa10, FLAG_STRICT},
 { "stby",       0x0c001300, 0xfc0013c0, "cscCx,V(s,b)", pa10, FLAG_STRICT},
 { "stby",       0x0c001300, 0xfc0013c0, "cscCx,V(b)", pa10, FLAG_STRICT},
 { "ldda",       0x0c000100, 0xfc00d3c0, "cxccx(b),t", pa20, FLAG_STRICT},
 { "ldda",       0x0c001100, 0xfc00d3c0, "cmcc5(b),t", pa20, FLAG_STRICT},
+{ "ldda",       0x0c001120, 0xfc1ff3e0, "cocc@(b),t", pa20, FLAG_STRICT},
 { "ldcd",       0x0c000140, 0xfc0013c0, "cxcdx(s,b),t", pa20, FLAG_STRICT},
 { "ldcd",       0x0c000140, 0xfc0013c0, "cxcdx(b),t", pa20, FLAG_STRICT},
@@ -422 +428 @@
 { "stda",       0x0c0013c0, 0xfc0013c0, "cmcCx,V(s,b)", pa20, FLAG_STRICT},
 { "stda",       0x0c0013c0, 0xfc0013c0, "cmcCx,V(b)", pa20, FLAG_STRICT},
-{ "ldwax",      0x0c000180, 0xfc00dfc0, "cxx(b),t", pa10, 0},
-{ "ldcwx",      0x0c0001c0, 0xfc001fc0, "cxx(s,b),t", pa10, 0},
-{ "ldcwx",      0x0c0001c0, 0xfc001fc0, "cxx(b),t", pa10, 0},
-{ "ldws",       0x0c001080, 0xfc001fc0, "cm5(s,b),t", pa10, 0},
-{ "ldws",       0x0c001080, 0xfc001fc0, "cm5(b),t", pa10, 0},
-{ "ldhs",       0x0c001040, 0xfc001fc0, "cm5(s,b),t", pa10, 0},
-{ "ldhs",       0x0c001040, 0xfc001fc0, "cm5(b),t", pa10, 0},
-{ "ldbs",       0x0c001000, 0xfc001fc0, "cm5(s,b),t", pa10, 0},
-{ "ldbs",       0x0c001000, 0xfc001fc0, "cm5(b),t", pa10, 0},
-{ "ldwas",      0x0c001180, 0xfc00dfc0, "cm5(b),t", pa10, 0},
-{ "ldcws",      0x0c0011c0, 0xfc001fc0, "cm5(s,b),t", pa10, 0},
-{ "ldcws",      0x0c0011c0, 0xfc001fc0, "cm5(b),t", pa10, 0},
-{ "stws",       0x0c001280, 0xfc001fc0, "cmx,V(s,b)", pa10, 0},
-{ "stws",       0x0c001280, 0xfc001fc0, "cmx,V(b)", pa10, 0},
-{ "sths",       0x0c001240, 0xfc001fc0, "cmx,V(s,b)", pa10, 0},
-{ "sths",       0x0c001240, 0xfc001fc0, "cmx,V(b)", pa10, 0},
-{ "stbs",       0x0c001200, 0xfc001fc0, "cmx,V(s,b)", pa10, 0},
-{ "stbs",       0x0c001200, 0xfc001fc0, "cmx,V(b)", pa10, 0},
-{ "stwas",      0x0c001380, 0xfc00dfc0, "cmx,V(b)", pa10, 0},
+{ "ldwax",      0x0c000180, 0xfc00dfc0, "cXx(b),t", pa10, 0},
+{ "ldcwx",      0x0c0001c0, 0xfc001fc0, "cXx(s,b),t", pa10, 0},
+{ "ldcwx",      0x0c0001c0, 0xfc001fc0, "cXx(b),t", pa10, 0},
+{ "ldws",       0x0c001080, 0xfc001fc0, "cM5(s,b),t", pa10, 0},
+{ "ldws",       0x0c001080, 0xfc001fc0, "cM5(b),t", pa10, 0},
+{ "ldhs",       0x0c001040, 0xfc001fc0, "cM5(s,b),t", pa10, 0},
+{ "ldhs",       0x0c001040, 0xfc001fc0, "cM5(b),t", pa10, 0},
+{ "ldbs",       0x0c001000, 0xfc001fc0, "cM5(s,b),t", pa10, 0},
+{ "ldbs",       0x0c001000, 0xfc001fc0, "cM5(b),t", pa10, 0},
+{ "ldwas",      0x0c001180, 0xfc00dfc0, "cM5(b),t", pa10, 0},
+{ "ldcws",      0x0c0011c0, 0xfc001fc0, "cM5(s,b),t", pa10, 0},
+{ "ldcws",      0x0c0011c0, 0xfc001fc0, "cM5(b),t", pa10, 0},
+{ "stws",       0x0c001280, 0xfc001fc0, "cMx,V(s,b)", pa10, 0},
+{ "stws",       0x0c001280, 0xfc001fc0, "cMx,V(b)", pa10, 0},
+{ "sths",       0x0c001240, 0xfc001fc0, "cMx,V(s,b)", pa10, 0},
+{ "sths",       0x0c001240, 0xfc001fc0, "cMx,V(b)", pa10, 0},
+{ "stbs",       0x0c001200, 0xfc001fc0, "cMx,V(s,b)", pa10, 0},
+{ "stbs",       0x0c001200, 0xfc001fc0, "cMx,V(b)", pa10, 0},
+{ "stwas",      0x0c001380, 0xfc00dfc0, "cMx,V(b)", pa10, 0},
 { "stdby",      0x0c001340, 0xfc0013c0, "cscCx,V(s,b)", pa20, FLAG_STRICT},
 { "stdby",      0x0c001340, 0xfc0013c0, "cscCx,V(b)", pa20, FLAG_STRICT},
-{ "stbys",      0x0c001300, 0xfc001fc0, "csx,V(s,b)", pa10, 0},
-{ "stbys",      0x0c001300, 0xfc001fc0, "csx,V(b)", pa10, 0},
+{ "stbys",      0x0c001300, 0xfc001fc0, "cAx,V(s,b)", pa10, 0},
+{ "stbys",      0x0c001300, 0xfc001fc0, "cAx,V(b)", pa10, 0},
 
 /* Immediate instructions.  */
@@ -483 +489 @@
 { "addibt",     0xa4000000, 0xfc000000, "?dn5,b,w", pa10, 0},
 { "addibf",     0xac000000, 0xfc000000, "?dn5,b,w", pa10, 0},
+{ "bb",         0xc0004000, 0xffe06000, "?bnx,!,w", pa10, FLAG_STRICT}, 
+{ "bb",         0xc4004000, 0xfc004000, "?bnx,Q,w", pa10, 0}, 
 { "bb",         0xc0006000, 0xffe06000, "?Bnx,!,w", pa20, FLAG_STRICT}, 
 { "bb",         0xc4004000, 0xfc004000, "?Bnx,B,w", pa20, FLAG_STRICT}, 
-{ "bb",         0xc0004000, 0xffe06000, "?bnx,!,w", pa10, FLAG_STRICT}, 
-{ "bb",         0xc4004000, 0xfc004000, "?bnx,Q,w", pa10, 0}, 
 { "bvb",        0xc0004000, 0xffe04000, "?bnx,w", pa10, 0},
 { "clrbts",     0xe8004005, 0xffffffff, "", pa20, FLAG_STRICT},
@@ -702 +708 @@
 /* Floating Point Coprocessor Instructions.  */
  
-{ "fldw",       0x24001020, 0xfc1f33a0, "cocc@(s,b),fT", pa20, FLAG_STRICT},
-{ "fldw",       0x24001020, 0xfc1f33a0, "cocc@(b),fT", pa20, FLAG_STRICT},
 { "fldw",       0x24000000, 0xfc001380, "cxccx(s,b),fT", pa10, FLAG_STRICT},
 { "fldw",       0x24000000, 0xfc001380, "cxccx(b),fT", pa10, FLAG_STRICT},
 { "fldw",       0x24001000, 0xfc001380, "cmcc5(s,b),fT", pa10, FLAG_STRICT},
 { "fldw",       0x24001000, 0xfc001380, "cmcc5(b),fT", pa10, FLAG_STRICT},
+{ "fldw",       0x24001020, 0xfc1f33a0, "cocc@(s,b),fT", pa20, FLAG_STRICT},
+{ "fldw",       0x24001020, 0xfc1f33a0, "cocc@(b),fT", pa20, FLAG_STRICT},
 { "fldw",       0x5c000000, 0xfc000004, "y(b),fe", pa20w, FLAG_STRICT},
 { "fldw",       0x58000000, 0xfc000000, "cJy(b),fe", pa20w, FLAG_STRICT},
 { "fldw",       0x5c000000, 0xfc000004, "d(b),fe", pa20, FLAG_STRICT},
 { "fldw",       0x58000000, 0xfc000000, "cJd(b),fe", pa20, FLAG_STRICT},
-{ "fldd",       0x2c001020, 0xfc1f33e0, "cocc@(s,b),ft", pa20, FLAG_STRICT},
-{ "fldd",       0x2c001020, 0xfc1f33e0, "cocc@(b),ft", pa20, FLAG_STRICT},
 { "fldd",       0x2c000000, 0xfc0013c0, "cxccx(s,b),ft", pa10, FLAG_STRICT},
 { "fldd",       0x2c000000, 0xfc0013c0, "cxccx(b),ft", pa10, FLAG_STRICT},
 { "fldd",       0x2c001000, 0xfc0013c0, "cmcc5(s,b),ft", pa10, FLAG_STRICT},
 { "fldd",       0x2c001000, 0xfc0013c0, "cmcc5(b),ft", pa10, FLAG_STRICT},
+{ "fldd",       0x2c001020, 0xfc1f33e0, "cocc@(s,b),ft", pa20, FLAG_STRICT},
+{ "fldd",       0x2c001020, 0xfc1f33e0, "cocc@(b),ft", pa20, FLAG_STRICT},
 { "fldd",       0x50000002, 0xfc000002, "cq&(b),fx", pa20w, FLAG_STRICT},
 { "fldd",       0x50000002, 0xfc000002, "cq#(b),fx", pa20, FLAG_STRICT},
-{ "fstw",       0x24001220, 0xfc1f33a0, "cocCfT,@(s,b)", pa10, FLAG_STRICT},
-{ "fstw",       0x24001220, 0xfc1f33a0, "cocCfT,@(b)", pa10, FLAG_STRICT},
 { "fstw",       0x24000200, 0xfc001380, "cxcCfT,x(s,b)", pa10, FLAG_STRICT},
 { "fstw",       0x24000200, 0xfc001380, "cxcCfT,x(b)", pa10, FLAG_STRICT},
 { "fstw",       0x24001200, 0xfc001380, "cmcCfT,5(s,b)", pa10, FLAG_STRICT},
 { "fstw",       0x24001200, 0xfc001380, "cmcCfT,5(b)", pa10, FLAG_STRICT},
+{ "fstw",       0x24001220, 0xfc1f33a0, "cocCfT,@(s,b)", pa10, FLAG_STRICT},
+{ "fstw",       0x24001220, 0xfc1f33a0, "cocCfT,@(b)", pa10, FLAG_STRICT},
 { "fstw",       0x7c000000, 0xfc000004, "fE,y(b)", pa20w, FLAG_STRICT},
 { "fstw",       0x78000000, 0xfc000000, "cJfe,y(b)", pa20w, FLAG_STRICT},
 { "fstw",       0x7c000000, 0xfc000004, "fe,d(b)", pa20, FLAG_STRICT},
 { "fstw",       0x78000000, 0xfc000000, "cJfe,d(b)", pa20, FLAG_STRICT},
-{ "fstd",       0x2c001220, 0xfc1f33e0, "cocCft,@(s,b)", pa10, FLAG_STRICT},
-{ "fstd",       0x2c001220, 0xfc1f33e0, "cocCft,@(b)", pa10, FLAG_STRICT},
 { "fstd",       0x2c000200, 0xfc0013c0, "cxcCft,x(s,b)", pa10, FLAG_STRICT},
 { "fstd",       0x2c000200, 0xfc0013c0, "cxcCft,x(b)", pa10, FLAG_STRICT},
 { "fstd",       0x2c001200, 0xfc0013c0, "cmcCft,5(s,b)", pa10, FLAG_STRICT},
 { "fstd",       0x2c001200, 0xfc0013c0, "cmcCft,5(b)", pa10, FLAG_STRICT},
+{ "fstd",       0x2c001220, 0xfc1f33e0, "cocCft,@(s,b)", pa10, FLAG_STRICT},
+{ "fstd",       0x2c001220, 0xfc1f33e0, "cocCft,@(b)", pa10, FLAG_STRICT},
 { "fstd",       0x70000002, 0xfc000002, "cqfx,&(b)", pa20w, FLAG_STRICT},
 { "fstd",       0x70000002, 0xfc000002, "cqfx,#(b)", pa20, FLAG_STRICT},
-{ "fldwx",      0x24000000, 0xfc001f80, "cxx(s,b),fT", pa10, 0},
-{ "fldwx",      0x24000000, 0xfc001f80, "cxx(b),fT", pa10, 0},
-{ "flddx",      0x2c000000, 0xfc001fc0, "cxx(s,b),ft", pa10, 0},
-{ "flddx",      0x2c000000, 0xfc001fc0, "cxx(b),ft", pa10, 0},
+{ "fldwx",      0x24000000, 0xfc001f80, "cXx(s,b),fT", pa10, 0},
+{ "fldwx",      0x24000000, 0xfc001f80, "cXx(b),fT", pa10, 0},
+{ "flddx",      0x2c000000, 0xfc001fc0, "cXx(s,b),ft", pa10, 0},
+{ "flddx",      0x2c000000, 0xfc001fc0, "cXx(b),ft", pa10, 0},
 { "fstwx",      0x24000200, 0xfc001f80, "cxfT,x(s,b)", pa10, 0},
 { "fstwx",      0x24000200, 0xfc001f80, "cxfT,x(b)", pa10, 0},
@@ -816 +822 @@
 { "spop3",      0x10000600, 0xfc000600, "v,0Nx,b", pa10, 0},
 { "copr",       0x30000000, 0xfc000000, "u,2N", pa10, 0},
-{ "cldwx",      0x24000000, 0xfc001e00, "ucxx(s,b),t", pa10, 0},
-{ "cldwx",      0x24000000, 0xfc001e00, "ucxx(b),t", pa10, 0},
-{ "clddx",      0x2c000000, 0xfc001e00, "ucxx(s,b),t", pa10, 0},
-{ "clddx",      0x2c000000, 0xfc001e00, "ucxx(b),t", pa10, 0},
-{ "cstwx",      0x24000200, 0xfc001e00, "ucxt,x(s,b)", pa10, 0},
-{ "cstwx",      0x24000200, 0xfc001e00, "ucxt,x(b)", pa10, 0},
-{ "cstdx",      0x2c000200, 0xfc001e00, "ucxt,x(s,b)", pa10, 0},
-{ "cstdx",      0x2c000200, 0xfc001e00, "ucxt,x(b)", pa10, 0},
-{ "cldws",      0x24001000, 0xfc001e00, "ucm5(s,b),t", pa10, 0},
-{ "cldws",      0x24001000, 0xfc001e00, "ucm5(b),t", pa10, 0},
-{ "cldds",      0x2c001000, 0xfc001e00, "ucm5(s,b),t", pa10, 0},
-{ "cldds",      0x2c001000, 0xfc001e00, "ucm5(b),t", pa10, 0},
-{ "cstws",      0x24001200, 0xfc001e00, "ucmt,5(s,b)", pa10, 0},
-{ "cstws",      0x24001200, 0xfc001e00, "ucmt,5(b)", pa10, 0},
-{ "cstds",      0x2c001200, 0xfc001e00, "ucmt,5(s,b)", pa10, 0},
-{ "cstds",      0x2c001200, 0xfc001e00, "ucmt,5(b)", pa10, 0},
-{ "cldw",       0x24000000, 0xfc001e00, "ucxx(s,b),t", pa10, FLAG_STRICT},
-{ "cldw",       0x24000000, 0xfc001e00, "ucxx(b),t", pa10, FLAG_STRICT},
-{ "cldw",       0x24001000, 0xfc001e00, "ucm5(s,b),t", pa10, FLAG_STRICT},
-{ "cldw",       0x24001000, 0xfc001e00, "ucm5(b),t", pa10, FLAG_STRICT},
-{ "cldd",       0x2c000000, 0xfc001e00, "ucxx(s,b),t", pa10, FLAG_STRICT},
-{ "cldd",       0x2c000000, 0xfc001e00, "ucxx(b),t", pa10, FLAG_STRICT},
-{ "cldd",       0x2c001000, 0xfc001e00, "ucm5(s,b),t", pa10, FLAG_STRICT},
-{ "cldd",       0x2c001000, 0xfc001e00, "ucm5(b),t", pa20, FLAG_STRICT},
-{ "cstw",       0x24000200, 0xfc001e00, "ucxt,x(s,b)", pa10, FLAG_STRICT},
-{ "cstw",       0x24000200, 0xfc001e00, "ucxt,x(b)", pa10, FLAG_STRICT},
-{ "cstw",       0x24001200, 0xfc001e00, "ucmt,5(s,b)", pa10, FLAG_STRICT},
-{ "cstw",       0x24001200, 0xfc001e00, "ucmt,5(b)", pa10, FLAG_STRICT},
-{ "cstd",       0x2c000200, 0xfc001e00, "ucxt,x(s,b)", pa10, FLAG_STRICT},
-{ "cstd",       0x2c000200, 0xfc001e00, "ucxt,x(b)", pa10, FLAG_STRICT},
-{ "cstd",       0x2c001200, 0xfc001e00, "ucmt,5(s,b)", pa10, FLAG_STRICT},
-{ "cstd",       0x2c001200, 0xfc001e00, "ucmt,5(b)", pa10, FLAG_STRICT},
+{ "cldwx",      0x24000000, 0xfc001e00, "ucXx(s,b),t", pa10, 0},
+{ "cldwx",      0x24000000, 0xfc001e00, "ucXx(b),t", pa10, 0},
+{ "clddx",      0x2c000000, 0xfc001e00, "ucXx(s,b),t", pa10, 0},
+{ "clddx",      0x2c000000, 0xfc001e00, "ucXx(b),t", pa10, 0},
+{ "cstwx",      0x24000200, 0xfc001e00, "ucXt,x(s,b)", pa10, 0},
+{ "cstwx",      0x24000200, 0xfc001e00, "ucXt,x(b)", pa10, 0},
+{ "cstdx",      0x2c000200, 0xfc001e00, "ucXt,x(s,b)", pa10, 0},
+{ "cstdx",      0x2c000200, 0xfc001e00, "ucXt,x(b)", pa10, 0},
+{ "cldws",      0x24001000, 0xfc001e00, "ucM5(s,b),t", pa10, 0},
+{ "cldws",      0x24001000, 0xfc001e00, "ucM5(b),t", pa10, 0},
+{ "cldds",      0x2c001000, 0xfc001e00, "ucM5(s,b),t", pa10, 0},
+{ "cldds",      0x2c001000, 0xfc001e00, "ucM5(b),t", pa10, 0},
+{ "cstws",      0x24001200, 0xfc001e00, "ucMt,5(s,b)", pa10, 0},
+{ "cstws",      0x24001200, 0xfc001e00, "ucMt,5(b)", pa10, 0},
+{ "cstds",      0x2c001200, 0xfc001e00, "ucMt,5(s,b)", pa10, 0},
+{ "cstds",      0x2c001200, 0xfc001e00, "ucMt,5(b)", pa10, 0},
+{ "cldw",       0x24000000, 0xfc001e00, "ucXx(s,b),t", pa10, FLAG_STRICT},
+{ "cldw",       0x24000000, 0xfc001e00, "ucXx(b),t", pa10, FLAG_STRICT},
+{ "cldw",       0x24001000, 0xfc001e00, "ucM5(s,b),t", pa10, FLAG_STRICT},
+{ "cldw",       0x24001000, 0xfc001e00, "ucM5(b),t", pa10, FLAG_STRICT},
+{ "cldd",       0x2c000000, 0xfc001e00, "ucXx(s,b),t", pa10, FLAG_STRICT},
+{ "cldd",       0x2c000000, 0xfc001e00, "ucXx(b),t", pa10, FLAG_STRICT},
+{ "cldd",       0x2c001000, 0xfc001e00, "ucM5(s,b),t", pa10, FLAG_STRICT},
+{ "cldd",       0x2c001000, 0xfc001e00, "ucM5(b),t", pa20, FLAG_STRICT},
+{ "cstw",       0x24000200, 0xfc001e00, "ucXt,x(s,b)", pa10, FLAG_STRICT},
+{ "cstw",       0x24000200, 0xfc001e00, "ucXt,x(b)", pa10, FLAG_STRICT},
+{ "cstw",       0x24001200, 0xfc001e00, "ucMt,5(s,b)", pa10, FLAG_STRICT},
+{ "cstw",       0x24001200, 0xfc001e00, "ucMt,5(b)", pa10, FLAG_STRICT},
+{ "cstd",       0x2c000200, 0xfc001e00, "ucXt,x(s,b)", pa10, FLAG_STRICT},
+{ "cstd",       0x2c000200, 0xfc001e00, "ucXt,x(b)", pa10, FLAG_STRICT},
+{ "cstd",       0x2c001200, 0xfc001e00, "ucMt,5(s,b)", pa10, FLAG_STRICT},
+{ "cstd",       0x2c001200, 0xfc001e00, "ucMt,5(b)", pa10, FLAG_STRICT},
+
+/* More pseudo instructions which must follow the main table.  */
+{ "call",       0xe800f000, 0xfc1ffffd, "n(b)", pa20, FLAG_STRICT},
+{ "call",       0xe800a000, 0xffe0e000, "nW", pa10, FLAG_STRICT},
+{ "ret",        0xe840d000, 0xfffffffd, "n", pa20, FLAG_STRICT},
+
 };
 

branches/GNU/src/binutils/include/opcode/i386.h

@@ -63 +63 @@
 #define wlq_Suf (No_bSuf|No_sSuf|No_xSuf)
 #define lq_Suf (No_bSuf|No_wSuf|No_sSuf|No_xSuf)
+#define wq_Suf (No_bSuf|No_lSuf|No_sSuf|No_xSuf)
 #define sl_Suf (No_bSuf|No_wSuf|No_xSuf|No_qSuf)
 #define sldx_Suf (No_bSuf|No_wSuf|No_qSuf)
@@ -121 +122 @@
 /* Intel Syntax next 5 insns */
 {"movsx",  2, 0x0fbe, X, Cpu386, b_Suf|Modrm,                   { Reg8|ByteMem, WordReg, 0} },
-{"movsx",  2, 0x0fbf, X, Cpu386, w_Suf|Modrm|IgnoreSize,        { Reg16|ShortMem, Reg32, 0} },
+{"movsx",  2, 0x0fbf, X, Cpu386, w_Suf|Modrm,                   { Reg16|ShortMem, Reg32, 0} },
 {"movsx",  2, 0x0fbe, X, Cpu64,  b_Suf|Modrm|Rex64,             { Reg8|ByteMem, Reg64, 0} },
-{"movsx",  2, 0x0fbf, X, Cpu64,  w_Suf|Modrm|IgnoreSize|Rex64,  { Reg16|ShortMem, Reg64, 0} },
+{"movsx",  2, 0x0fbf, X, Cpu64,  w_Suf|Modrm|Rex64,             { Reg16|ShortMem, Reg64, 0} },
 {"movsx",  2,   0x63, X, Cpu64,  l_Suf|Modrm|Rex64,             { Reg32|WordMem, Reg64, 0} },
 
@@ -135 +136 @@
 /* Intel Syntax next 4 insns */
 {"movzx",  2, 0x0fb6, X, Cpu386, b_Suf|Modrm,                   { Reg8|ByteMem, WordReg, 0} },
-{"movzx",  2, 0x0fb7, X, Cpu386, w_Suf|Modrm|IgnoreSize,        { Reg16|ShortMem, Reg32, 0} },
+{"movzx",  2, 0x0fb7, X, Cpu386, w_Suf|Modrm,                   { Reg16|ShortMem, Reg32, 0} },
 /* These instructions are not particulary usefull, since the zero extend
    32->64 is implicit, but we can encode them.  */
 {"movzx",  2, 0x0fb6, X, Cpu386, b_Suf|Modrm|Rex64,             { Reg8|ByteMem, Reg64, 0} },
-{"movzx",  2, 0x0fb7, X, Cpu386, w_Suf|Modrm|IgnoreSize|Rex64,  { Reg16|ShortMem, Reg64, 0} },
+{"movzx",  2, 0x0fb7, X, Cpu386, w_Suf|Modrm|Rex64,             { Reg16|ShortMem, Reg64, 0} },
 
 /* Push instructions.  */
@@ -149 +150 @@
 {"push",   1, 0x0fa0, X, Cpu386|CpuNo64, wl_Suf|Seg3ShortForm|DefaultSize, { SReg3, 0, 0 } },
 /* In 64bit mode, the operand size is implicitly 64bit.  */
-{"push",   1,   0x50, X, Cpu64, q_Suf|ShortForm|DefaultSize|NoRex64, { Reg64, 0, 0 } },
-{"push",   1,   0xff, 6, Cpu64, q_Suf|Modrm|DefaultSize|NoRex64, { Reg64|WordMem, 0, 0 } },
-{"push",   1,   0x6a, X, Cpu186|Cpu64, q_Suf|DefaultSize|NoRex64, { Imm8S, 0, 0} },
-{"push",   1,   0x68, X, Cpu186|Cpu64, q_Suf|DefaultSize|NoRex64, { Imm32S, 0, 0} },
-{"push",   1,   0x06, X, Cpu64, q_Suf|Seg2ShortForm|DefaultSize|NoRex64, { SReg2, 0, 0 } },
-{"push",   1, 0x0fa0, X, Cpu386|Cpu64, q_Suf|Seg3ShortForm|DefaultSize|NoRex64, { SReg3, 0, 0 } },
+{"push",   1,   0x50, X, Cpu64, wq_Suf|ShortForm|DefaultSize|NoRex64, { WordReg, 0, 0 } },
+{"push",   1,   0xff, 6, Cpu64, wq_Suf|Modrm|DefaultSize|NoRex64, { WordReg|WordMem, 0, 0 } },
+{"push",   1,   0x6a, X, Cpu186|Cpu64, wq_Suf|DefaultSize|NoRex64, { Imm8S, 0, 0} },
+{"push",   1,   0x68, X, Cpu186|Cpu64, wq_Suf|DefaultSize|NoRex64, { Imm32S|Imm16, 0, 0} },
+{"push",   1,   0x06, X, Cpu64, wq_Suf|Seg2ShortForm|DefaultSize|NoRex64, { SReg2, 0, 0 } },
+{"push",   1, 0x0fa0, X, Cpu386|Cpu64, wq_Suf|Seg3ShortForm|DefaultSize|NoRex64, { SReg3, 0, 0 } },
 
 {"pusha",  0,   0x60, X, Cpu186|CpuNo64, wl_Suf|DefaultSize,    { 0, 0, 0 } },
@@ -165 +166 @@
 {"pop",    1, 0x0fa1, X, Cpu386|CpuNo64, wl_Suf|Seg3ShortForm|DefaultSize, { SReg3, 0, 0 } },
 /* In 64bit mode, the operand size is implicitly 64bit.  */
-{"pop",    1,   0x58, X, Cpu64,  q_Suf|ShortForm|DefaultSize|NoRex64,   { Reg64, 0, 0 } },
-{"pop",    1,   0x8f, 0, Cpu64,  q_Suf|Modrm|DefaultSize|NoRex64,       { Reg64|WordMem, 0, 0 } },
-{"pop",    1,   0x07, X, Cpu64,  q_Suf|Seg2ShortForm|DefaultSize|NoRex64, { SReg2, 0, 0 } },
-{"pop",    1, 0x0fa1, X, Cpu64,  q_Suf|Seg3ShortForm|DefaultSize|NoRex64, { SReg3, 0, 0 } },
+{"pop",    1,   0x58, X, Cpu64,  wq_Suf|ShortForm|DefaultSize|NoRex64,  { WordReg, 0, 0 } },
+{"pop",    1,   0x8f, 0, Cpu64,  wq_Suf|Modrm|DefaultSize|NoRex64,      { WordReg|WordMem, 0, 0 } },
+{"pop",    1,   0x07, X, Cpu64,  wq_Suf|Seg2ShortForm|DefaultSize|NoRex64, { SReg2, 0, 0 } },
+{"pop",    1, 0x0fa1, X, Cpu64,  wq_Suf|Seg3ShortForm|DefaultSize|NoRex64, { SReg3, 0, 0 } },
 
 {"popa",   0,   0x61, X, Cpu186|CpuNo64, wl_Suf|DefaultSize,            { 0, 0, 0 } },
@@ -177 +178 @@
    In the 64bit code, xchg eax, eax is reused for new nop instruction.
  */
-{"xchg",   2,   0x90, X, CpuNo64, wl_Suf|ShortForm,     { WordReg, Acc, 0 } },
-{"xchg",   2,   0x90, X, CpuNo64, wl_Suf|ShortForm,     { Acc, WordReg, 0 } },
+{"xchg",   2,   0x90, X, 0,      wlq_Suf|ShortForm,     { WordReg, Acc, 0 } },
+{"xchg",   2,   0x90, X, 0,      wlq_Suf|ShortForm,     { Acc, WordReg, 0 } },
 {"xchg",   2,   0x86, X, 0,      bwlq_Suf|W|Modrm,      { Reg, Reg|AnyMem, 0 } },
 {"xchg",   2,   0x86, X, 0,      bwlq_Suf|W|Modrm,      { Reg|AnyMem, Reg, 0 } },
 
 /* In/out from ports.  */
-{"in",     2,   0xe4, X, 0,      bwlq_Suf|W,            { Imm8, Acc, 0 } },
-{"in",     2,   0xec, X, 0,      bwlq_Suf|W,            { InOutPortReg, Acc, 0 } },
-{"in",     1,   0xe4, X, 0,      bwlq_Suf|W,            { Imm8, 0, 0 } },
-{"in",     1,   0xec, X, 0,      bwlq_Suf|W,            { InOutPortReg, 0, 0 } },
-{"out",    2,   0xe6, X, 0,      bwlq_Suf|W,            { Acc, Imm8, 0 } },
-{"out",    2,   0xee, X, 0,      bwlq_Suf|W,            { Acc, InOutPortReg, 0 } },
-{"out",    1,   0xe6, X, 0,      bwlq_Suf|W,            { Imm8, 0, 0 } },
-{"out",    1,   0xee, X, 0,      bwlq_Suf|W,            { InOutPortReg, 0, 0 } },
+{"in",     2,   0xe4, X, 0,      bwl_Suf|W,             { Imm8, Acc, 0 } },
+{"in",     2,   0xec, X, 0,      bwl_Suf|W,             { InOutPortReg, Acc, 0 } },
+{"in",     1,   0xe4, X, 0,      bwl_Suf|W,             { Imm8, 0, 0 } },
+{"in",     1,   0xec, X, 0,      bwl_Suf|W,             { InOutPortReg, 0, 0 } },
+{"out",    2,   0xe6, X, 0,      bwl_Suf|W,             { Acc, Imm8, 0 } },
+{"out",    2,   0xee, X, 0,      bwl_Suf|W,             { Acc, InOutPortReg, 0 } },
+{"out",    1,   0xe6, X, 0,      bwl_Suf|W,             { Imm8, 0, 0 } },
+{"out",    1,   0xee, X, 0,      bwl_Suf|W,             { InOutPortReg, 0, 0 } },
 
 /* Load effective address.  */
@@ -211 +212 @@
 {"sahf",   0,   0x9e, X, CpuNo64,NoSuf,                 { 0, 0, 0} },
 {"pushf",  0,   0x9c, X, CpuNo64,wlq_Suf|DefaultSize,   { 0, 0, 0} },
-{"pushf",  0,   0x9c, X, Cpu64,  q_Suf|DefaultSize|NoRex64,{ 0, 0, 0} },
+{"pushf",  0,   0x9c, X, Cpu64,  wq_Suf|DefaultSize|NoRex64,{ 0, 0, 0} },
 {"popf",   0,   0x9d, X, CpuNo64,wlq_Suf|DefaultSize,   { 0, 0, 0} },
-{"popf",   0,   0x9d, X, Cpu64,  q_Suf|DefaultSize|NoRex64,{ 0, 0, 0} },
+{"popf",   0,   0x9d, X, Cpu64,  wq_Suf|DefaultSize|NoRex64,{ 0, 0, 0} },
 {"stc",    0,   0xf9, X, 0,      NoSuf,                 { 0, 0, 0} },
 {"std",    0,   0xfd, X, 0,      NoSuf,                 { 0, 0, 0} },
@@ -371 +372 @@
 /* Control transfer instructions.  */
 {"call",   1,   0xe8, X, 0,      wlq_Suf|JumpDword|DefaultSize, { Disp16|Disp32, 0, 0} },
-{"call",   1,   0xff, 2, 0,      wlq_Suf|Modrm|DefaultSize,     { WordReg|WordMem|JumpAbsolute, 0, 0} },
+{"call",   1,   0xff, 2, CpuNo64, wl_Suf|Modrm|DefaultSize,     { WordReg|WordMem|JumpAbsolute, 0, 0} },
+{"call",   1,   0xff, 2, Cpu64,  wq_Suf|Modrm|DefaultSize|NoRex64,{ WordReg|WordMem|JumpAbsolute, 0, 0} },
 /* Intel Syntax */
 {"call",   2,   0x9a, X, CpuNo64,wlq_Suf|JumpInterSegment|DefaultSize, { Imm16, Imm16|Imm32, 0} },
@@ -382 +384 @@
 #define JUMP_PC_RELATIVE 0xeb
 {"jmp",    1,   0xeb, X, 0,      NoSuf|Jump,            { Disp, 0, 0} },
-{"jmp",    1,   0xff, 4, 0,      wlq_Suf|Modrm,         { WordReg|WordMem|JumpAbsolute, 0, 0} },
+{"jmp",    1,   0xff, 4, CpuNo64, wl_Suf|Modrm,         { WordReg|WordMem|JumpAbsolute, 0, 0} },
+{"jmp",    1,   0xff, 4, Cpu64,  wq_Suf|Modrm|NoRex64,  { WordReg|WordMem|JumpAbsolute, 0, 0} },
 /* Intel Syntax */
 {"jmp",    2,   0xea, X, CpuNo64,wl_Suf|JumpInterSegment, { Imm16, Imm16|Imm32, 0} },
@@ -433 +436 @@
 
 /* jcxz vs. jecxz is chosen on the basis of the address size prefix.  */
-{"jcxz",   1,   0xe3, X, 0,      NoSuf|JumpByte|Size16, { Disp, 0, 0} },
-{"jecxz",  1,   0xe3, X, 0,      NoSuf|JumpByte|Size32, { Disp, 0, 0} },
+{"jcxz",  1,    0xe3, X, CpuNo64,NoSuf|JumpByte|Size16, { Disp, 0, 0} },
+{"jecxz",  1,   0xe3, X, CpuNo64,NoSuf|JumpByte|Size32, { Disp, 0, 0} },
+{"jecxz",  1,   0x67e3, X, Cpu64,NoSuf|JumpByte|Size32, { Disp, 0, 0} },
+{"jrcxz",  1,   0xe3, X, Cpu64,  NoSuf|JumpByte|Size64|NoRex64, { Disp, 0, 0} },
 
 /* The loop instructions also use the address size prefix to select
@@ -440 +445 @@
    instructions emit an address size prefix rather than a data size
    prefix.  */
-{"loop",   1,   0xe2, X, 0,      wlq_Suf|JumpByte,      { Disp, 0, 0} },
-{"loopz",  1,   0xe1, X, 0,      wlq_Suf|JumpByte,      { Disp, 0, 0} },
-{"loope",  1,   0xe1, X, 0,      wlq_Suf|JumpByte,      { Disp, 0, 0} },
-{"loopnz", 1,   0xe0, X, 0,      wlq_Suf|JumpByte,      { Disp, 0, 0} },
-{"loopne", 1,   0xe0, X, 0,      wlq_Suf|JumpByte,      { Disp, 0, 0} },
+{"loop",   1,   0xe2, X, CpuNo64,wl_Suf|JumpByte,{ Disp, 0, 0} },
+{"loop",   1,   0xe2, X, Cpu64,  lq_Suf|JumpByte|NoRex64,{ Disp, 0, 0} },
+{"loopz",  1,   0xe1, X, CpuNo64,wl_Suf|JumpByte,{ Disp, 0, 0} },
+{"loopz",  1,   0xe1, X, Cpu64,  lq_Suf|JumpByte|NoRex64,{ Disp, 0, 0} },
+{"loope",  1,   0xe1, X, CpuNo64,wl_Suf|JumpByte,{ Disp, 0, 0} },
+{"loope",  1,   0xe1, X, Cpu64,  lq_Suf|JumpByte|NoRex64,{ Disp, 0, 0} },
+{"loopnz", 1,   0xe0, X, CpuNo64,wl_Suf|JumpByte,{ Disp, 0, 0} },
+{"loopnz", 1,   0xe0, X, Cpu64,  lq_Suf|JumpByte|NoRex64,{ Disp, 0, 0} },
+{"loopne", 1,   0xe0, X, CpuNo64,wl_Suf|JumpByte,{ Disp, 0, 0} },
+{"loopne", 1,   0xe0, X, Cpu64,  lq_Suf|JumpByte|NoRex64,{ Disp, 0, 0} },
 
 /* Set byte on flag instructions.  */
@@ -483 +493 @@
 {"scmp",   0,   0xa6, X, 0,      bwlq_Suf|W|IsString,   { 0, 0, 0} },
 {"scmp",   2,   0xa6, X, 0,      bwlq_Suf|W|IsString,   { AnyMem|EsSeg, AnyMem, 0} },
-{"ins",    0,   0x6c, X, Cpu186, bwlq_Suf|W|IsString,   { 0, 0, 0} },
-{"ins",    2,   0x6c, X, Cpu186, bwlq_Suf|W|IsString,   { InOutPortReg, AnyMem|EsSeg, 0} },
-{"outs",   0,   0x6e, X, Cpu186, bwlq_Suf|W|IsString,   { 0, 0, 0} },
-{"outs",   2,   0x6e, X, Cpu186, bwlq_Suf|W|IsString,   { AnyMem, InOutPortReg, 0} },
+{"ins",    0,   0x6c, X, Cpu186, bwl_Suf|W|IsString,    { 0, 0, 0} },
+{"ins",    2,   0x6c, X, Cpu186, bwl_Suf|W|IsString,    { InOutPortReg, AnyMem|EsSeg, 0} },
+{"outs",   0,   0x6e, X, Cpu186, bwl_Suf|W|IsString,    { 0, 0, 0} },
+{"outs",   2,   0x6e, X, Cpu186, bwl_Suf|W|IsString,    { AnyMem, InOutPortReg, 0} },
 {"lods",   0,   0xac, X, 0,      bwlq_Suf|W|IsString,   { 0, 0, 0} },
 {"lods",   1,   0xac, X, 0,      bwlq_Suf|W|IsString,   { AnyMem, 0, 0} },
@@ -554 +564 @@
 {"sgdt",   1, 0x0f01, 0, Cpu286, wlq_Suf|Modrm,         { WordMem, 0, 0} },
 {"sidt",   1, 0x0f01, 1, Cpu286, wlq_Suf|Modrm,         { WordMem, 0, 0} },
-{"sldt",   1, 0x0f00, 0, Cpu286, wlq_Suf|Modrm,         { WordReg|WordMem, 0, 0} },
-{"smsw",   1, 0x0f01, 4, Cpu286, wlq_Suf|Modrm,         { WordReg|WordMem, 0, 0} },
-{"str",    1, 0x0f00, 1, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} },
+{"sldt",   1, 0x0f00, 0, Cpu286, wlq_Suf|Modrm,         { WordReg|InvMem, 0, 0} },
+{"sldt",   1, 0x0f00, 0, Cpu286, w_Suf|Modrm|IgnoreSize,{ ShortMem, 0, 0} },
+{"smsw",   1, 0x0f01, 4, Cpu286, wlq_Suf|Modrm,         { WordReg|InvMem, 0, 0} },
+{"smsw",   1, 0x0f01, 4, Cpu286, w_Suf|Modrm|IgnoreSize,{ ShortMem, 0, 0} },
+{"str",    1, 0x0f00, 1, Cpu286, wlq_Suf|Modrm,         { WordReg|InvMem, 0, 0} },
+{"str",    1, 0x0f00, 1, Cpu286, w_Suf|Modrm|IgnoreSize,{ ShortMem, 0, 0} },
 
 {"verr",   1, 0x0f00, 4, Cpu286, w_Suf|Modrm|IgnoreSize,{ Reg16|ShortMem, 0, 0} },
@@ -969 +982 @@
 {"movd",     2, 0x660f7e,X,CpuSSE2,FP|Modrm,            { RegXMM, Reg32|LLongMem, 0 } },
 /* Real MMX instructions.  */
+{"movd",     2, 0x0f6e, X, CpuMMX, FP|Modrm,            { Reg64|LLongMem, RegMMX, 0 } },
+{"movd",     2, 0x0f7e, X, CpuMMX, FP|Modrm,            { RegMMX, Reg64|LLongMem, 0 } },
+{"movd",     2, 0x660f6e,X,CpuSSE2,FP|Modrm,            { Reg64|LLongMem, RegXMM, 0 } },
+{"movd",     2, 0x660f7e,X,CpuSSE2,FP|Modrm,            { RegXMM, Reg64|LLongMem, 0 } },
+/* In the 64bit mode the short form mov immediate is redefined to have
+   64bit displacement value.  */
 {"movq",     2, 0x0f6f, X, CpuMMX, FP|Modrm,            { RegMMX|LongMem, RegMMX, 0 } },
 {"movq",     2, 0x0f7f, X, CpuMMX, FP|Modrm,            { RegMMX, RegMMX|LongMem, 0 } },
 {"movq",     2, 0xf30f7e,X,CpuSSE2,FP|Modrm,            { RegXMM|LLongMem, RegXMM, 0 } },
 {"movq",     2, 0x660fd6,X,CpuSSE2,FP|Modrm,            { RegXMM, RegXMM|LLongMem, 0 } },
-/* In the 64bit mode the short form mov immediate is redefined to have
-   64bit displacement value.  */
 {"movq",   2,   0x88, X, Cpu64,  NoSuf|D|W|Modrm|Size64,{ Reg64, Reg64|AnyMem, 0 } },
 {"movq",   2,   0xc6, 0, Cpu64,  NoSuf|W|Modrm|Size64,  { Imm32S, Reg64|WordMem, 0 } },
@@ -1138 +1155 @@
 {"movlps",    2, 0x0f12,    X, CpuSSE, FP|Modrm,        { LLongMem, RegXMM, 0 } },
 {"movlps",    2, 0x0f13,    X, CpuSSE, FP|Modrm,        { RegXMM, LLongMem, 0 } },
-{"movmskps",  2, 0x0f50,    X, CpuSSE, FP|Modrm,        { RegXMM|InvMem, Reg32, 0 } },
+{"movmskps",  2, 0x0f50,    X, CpuSSE, lq_Suf|IgnoreSize|Modrm, { RegXMM|InvMem, Reg32|Reg64, 0 } },
 {"movntps",   2, 0x0f2b,    X, CpuSSE, FP|Modrm,        { RegXMM, LLongMem, 0 } },
 {"movntq",    2, 0x0fe7,    X, CpuSSE, FP|Modrm,        { RegMMX, LLongMem, 0 } },
@@ -1153 +1170 @@
 {"pavgw",     2, 0x0fe3,    X, CpuSSE, FP|Modrm,        { RegMMX|LLongMem, RegMMX, 0 } },
 {"pavgw",     2, 0x660fe3,  X, CpuSSE2,FP|Modrm,        { RegXMM|LLongMem, RegXMM, 0 } },
-{"pextrw",    3, 0x0fc5,    X, CpuSSE, FP|Modrm,        { Imm8, RegMMX|InvMem, Reg32 } },
-{"pextrw",    3, 0x660fc5,  X, CpuSSE2,FP|Modrm,        { Imm8, RegXMM|InvMem, Reg32 } },
-{"pinsrw",    3, 0x0fc4,    X, CpuSSE, FP|Modrm,        { Imm8, Reg32|ShortMem, RegMMX } },
-{"pinsrw",    3, 0x660fc4,  X, CpuSSE2, FP|Modrm,       { Imm8, Reg32|ShortMem, RegXMM } },
+{"pextrw",    3, 0x0fc5,    X, CpuSSE, lq_Suf|IgnoreSize|Modrm, { Imm8, RegMMX|InvMem, Reg32|Reg64 } },
+{"pextrw",    3, 0x660fc5,  X, CpuSSE2,lq_Suf|IgnoreSize|Modrm, { Imm8, RegXMM|InvMem, Reg32|Reg64 } },
+{"pinsrw",    3, 0x0fc4,    X, CpuSSE, lq_Suf|IgnoreSize|Modrm, { Imm8, Reg32|Reg64|ShortMem, RegMMX } },
+{"pinsrw",    3, 0x660fc4,  X, CpuSSE2, lq_Suf|IgnoreSize|Modrm, { Imm8, Reg32|Reg64|ShortMem, RegXMM } },
 {"pmaxsw",    2, 0x0fee,    X, CpuSSE, FP|Modrm,        { RegMMX|LLongMem, RegMMX, 0 } },
 {"pmaxsw",    2, 0x660fee,  X, CpuSSE2,FP|Modrm,        { RegXMM|LLongMem, RegXMM, 0 } },
@@ -1165 +1182 @@
 {"pminub",    2, 0x0fda,    X, CpuSSE, FP|Modrm,        { RegMMX|LLongMem, RegMMX, 0 } },
 {"pminub",    2, 0x660fda,  X, CpuSSE2,FP|Modrm,        { RegXMM|LLongMem, RegXMM, 0 } },
-{"pmovmskb",  2, 0x0fd7,    X, CpuSSE, FP|Modrm,        { RegMMX|InvMem, Reg32, 0 } },
-{"pmovmskb",  2, 0x660fd7,  X, CpuSSE2,FP|Modrm,        { RegXMM|InvMem, Reg32, 0 } },
+{"pmovmskb",  2, 0x0fd7,    X, CpuSSE, lq_Suf|IgnoreSize|Modrm, { RegMMX|InvMem, Reg32|Reg64, 0 } },
+{"pmovmskb",  2, 0x660fd7,  X, CpuSSE2,lq_Suf|IgnoreSize|Modrm, { RegXMM|InvMem, Reg32|Reg64, 0 } },
 {"pmulhuw",   2, 0x0fe4,    X, CpuSSE, FP|Modrm,        { RegMMX|LLongMem, RegMMX, 0 } },
 {"pmulhuw",   2, 0x660fe4,  X, CpuSSE2,FP|Modrm,        { RegXMM|LLongMem, RegXMM, 0 } },
@@ -1215 +1232 @@
 {"cmpunordsd",2, 0xf20fc2,  3, CpuSSE2, FP|Modrm|ImmExt,{ RegXMM|LongMem, RegXMM, 0 } },
 {"cmppd",     3, 0x660fc2,  X, CpuSSE2, FP|Modrm,       { Imm8, RegXMM|LLongMem, RegXMM } },
+/* Intel mode string compare.  */
+{"cmpsd",     0, 0xa7,      X, 0, NoSuf|Size32|IsString, { 0, 0, 0} },
+{"cmpsd",     2, 0xa7,      X, 0, NoSuf|Size32|IsString, { AnyMem, AnyMem|EsSeg, 0} },
 {"cmpsd",     3, 0xf20fc2,  X, CpuSSE2, FP|Modrm,       { Imm8, RegXMM|LongMem, RegXMM } },
 {"comisd",    2, 0x660f2f,  X, CpuSSE2, FP|Modrm,       { RegXMM|LongMem, RegXMM, 0 } },
@@ -1231 +1251 @@
 {"movlpd",    2, 0x660f12,  X, CpuSSE2, FP|Modrm,       { LLongMem, RegXMM, 0 } },
 {"movlpd",    2, 0x660f13,  X, CpuSSE2, FP|Modrm,       { RegXMM, LLongMem, 0 } },
-{"movmskpd",  2, 0x660f50,  X, CpuSSE2, FP|Modrm,       { RegXMM|InvMem, Reg32, 0 } },
+{"movmskpd",  2, 0x660f50,  X, CpuSSE2, lq_Suf|IgnoreSize|Modrm, { RegXMM|InvMem, Reg32|Reg64, 0 } },
 {"movntpd",   2, 0x660f2b,  X, CpuSSE2, FP|Modrm,       { RegXMM, LLongMem, 0 } },
+/* Intel mode string move.  */
+{"movsd",     0, 0xa5,      X, 0, NoSuf|Size32|IsString, { 0, 0, 0} },
+{"movsd",     2, 0xa5,      X, 0, NoSuf|Size32|IsString, { AnyMem, AnyMem|EsSeg, 0} },
 {"movsd",     2, 0xf20f10,  X, CpuSSE2, FP|Modrm,       { RegXMM|LongMem, RegXMM, 0 } },
 {"movsd",     2, 0xf20f11,  X, CpuSSE2, FP|Modrm,       { RegXMM, RegXMM|LongMem, 0 } },

branches/GNU/src/binutils/include/opcode/i860.h

@@ -97 +97 @@
    The order of opcodes does not affect the disassembler.  */
 
-static struct i860_opcode i860_opcodes[] =
+static const struct i860_opcode i860_opcodes[] =
 {
 /* REG-Format Instructions.  */

branches/GNU/src/binutils/include/opcode/ia64.h

@@ -1 +1 @@
 /* ia64.h -- Header file for ia64 opcode table
-   Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com>
-
-   See the file HP-COPYRIGHT for additional information.  */
+   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com> */
 
 #ifndef opcode_ia64_h
@@ -9 +8 @@
 #include <sys/types.h>
 
-#include <bfd.h>
+#include "bfd.h"
 
 
@@ -40 +39 @@
 
 /* Changes to this enumeration must be propagated to the operand table in
-   bfd/cpu-ia64-opc.c 
- */ 
+   bfd/cpu-ia64-opc.c
+ */
 enum ia64_opnd
   {
@@ -47 +46 @@
 
     /* constants */
+    IA64_OPND_AR_CSD,   /* application register csd (ar.csd) */
     IA64_OPND_AR_CCV,   /* application register ccv (ar.ccv) */
     IA64_OPND_AR_PFS,   /* application register pfs (ar.pfs) */
@@ -134 +134 @@
     IA64_OPND_TGT25c,   /* signed 25-bit (ip + 16*bits 13-32, 36) */
     IA64_OPND_TGT64,    /* 64-bit (ip + 16*bits 13-32, 36, 2-40(L)) */
+    IA64_OPND_LDXMOV,   /* any symbol, generates R_IA64_LDXMOV.  */
 
     IA64_OPND_COUNT     /* # of operand types (MUST BE LAST!) */
@@ -288 +289 @@
     short ent_index;
 
-    /* Opcode dependencies. */ 
+    /* Opcode dependencies. */
     const struct ia64_opcode_dependency *dependencies;
   };

branches/GNU/src/binutils/include/opcode/m68hc11.h

@@ -1 +1 @@
 /* m68hc11.h -- Header file for Motorola 68HC11 & 68HC12 opcode table
-   Copyright 1999, 2000 Free Software Foundation, Inc.
-   Written by Stephane Carrez (stcarrez@worldnet.fr)
+   Copyright 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Written by Stephane Carrez (stcarrez@nerim.fr)
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -192 +192 @@
 #define M6811_SPIF      0x80    /* SPI Transfer Complete flag */
 #define M6811_WCOL      0x40    /* Write Collision */
-#define M6811_MODF      0x20    /* Mode Fault */
+#define M6811_MODF      0x10    /* Mode Fault */
 
 /* Flags of the ADCTL register.  */
@@ -213 +213 @@
 #define M6811_OC1M7     0x80    /* Output Compare 7 */
 #define M6811_OC1M6     0x40    /*                6 */
-#define M6811_OC1M5     0x40    /*                5 */
-#define M6811_OC1M4     0x40    /*                4 */
+#define M6811_OC1M5     0x20    /*                5 */
+#define M6811_OC1M4     0x10    /*                4 */
 #define M6811_OC1M3     0x08    /*                3 */
 
@@ -342 +342 @@
 #define M6812_OP_D_IDX        0x1000   /* Indirect indexed: [D,r] */
 #define M6812_OP_D_IDX_2      0x2000   /* [N,r] N:16-bits */
-#define M6811_OP_MASK         0x0FFFF
+#define M6812_OP_PAGE         0x4000   /* Page number */
+#define M6811_OP_MASK         0x07FFF
+#define M6811_OP_BRANCH       0x00008000 /* Branch, jsr, call */
 #define M6811_OP_BITMASK      0x00010000 /* Bitmask:             #<val-8>    */
 #define M6811_OP_JUMP_REL     0x00020000 /* Pc-Relative:         <val-8>     */
@@ -377 +379 @@
 #define M6811_OP_LOW_ADDR     0x02000000
 
+#define M68HC12_BANK_VIRT 0x010000
+#define M68HC12_BANK_MASK 0x00003fff
+#define M68HC12_BANK_BASE 0x00008000
+#define M68HC12_BANK_SHIFT 14
+#define M68HC12_BANK_PAGE_MASK 0x0ff
+
+
 /* CPU identification.  */
 #define cpu6811 0x01
 #define cpu6812 0x02
+#define cpu6812s 0x04
 
 /* The opcode table is an array of struct m68hc11_opcode.  */
@@ -416 +426 @@
 
 #endif /* _OPCODE_M68HC11_H */
-

branches/GNU/src/binutils/include/opcode/m88k.h

@@ -1 @@
-/* Table of opcodes for the motorola 88k family.
-   Copyright 1989, 1990, 1991, 1993 Free Software Foundation, Inc.
+/* Table of opcodes for the Motorola M88k family.
+   Copyright 1989, 1990, 1991, 1993, 2001 Free Software Foundation, Inc.
 
 This file is part of GDB and GAS.
@@ -35 +35 @@
  *      are initialized by init_disasm().
  *
- *                              Structure Format
- *
- *       struct INSTAB {
- *          UPINT opcode;
- *          char *mnemonic;
- *          struct OPSPEC op1,op2,op3;
- *          struct SIM_FLAGS flgs;
- *          struct INSTAB *next;
- *       }
- *
- *       struct OPSPEC {
- *          UPINT offset:5;
- *          UPINT width:6;
- *          UPINT type:5;
- *       }
- *
  *                              Revision History
  *
@@ -62 +46 @@
 #include <stdio.h>
 
-
-/*
- * This file contains the structures and constants needed to build the M88000
- * simulator.  It is the main include file, containing all the
- * structures, macros and definitions except for the floating point
- * instruction set.
- */
-
-/*
- * The following flag informs the Simulator as to what type of byte ordering
- * will be used. For instance, a BOFLAG = 1 indicates a DEC VAX and IBM type
- * of ordering shall be used.
-*/
-
-/* # define     BOFLAG   1 */                       /* BYTE ORDERING FLAG */
-
-/* define the number of bits in the primary opcode field of the instruction,
- * the destination field, the source 1 and source 2 fields.
- */
-# define    OP       8                        /* size of opcode field */
-# define    DEST     6                        /* size of destination  */
-# define    SOURCE1  6                        /* size of source1      */
-# define    SOURCE2  6                        /* size of source2      */
-
-# define    REGs    32                        /* number of registers  */
-
-# define    WORD    long
-# define    FLAG    unsigned
-# define    STATE   short
-
-# define    TRUE     1
-# define    FALSE    0
-
-# define    READ     0
-# define    WRITE    1
+/* Define the number of bits in the primary opcode field of the instruction,
+   the destination field, the source 1 and source 2 fields.  */
+
+/* Size of opcode field.  */
+#define OP 8
+
+/* Size of destination.  */
+#define DEST 6
+
+/* Size of source1.  */
+#define SOURCE1 6
+
+/* Size of source2.  */
+#define SOURCE2 6
+
+/* Number of registers.  */
+#define REGs 32
+
+/* Type definitions.  */
+
+typedef unsigned int UINT;
+#define    WORD    long
+#define    FLAG    unsigned
+#define    STATE   short
 
 /* The next four equates define the priorities that the various classes
  * of instructions have regarding writing results back into registers and
- * signalling exceptions.
- */
+ * signalling exceptions.  */
+
 /* PMEM is also defined in <sys/param.h> on Delta 88's.  Sigh!  */
 #undef PMEM
 
-# define    PINT  0   /* Integer Priority */
-# define    PFLT  1   /* Floating Point Priority */
-# define    PMEM  2   /* Memory Priority */
-# define    NA    3   /* Not Applicable, instruction doesnt write to regs */
-# define    HIPRI 3   /* highest of these priorities */
+/* Integer priority.  */
+#define    PINT  0
+
+/* Floating point priority.  */
+#define    PFLT  1
+
+/* Memory priority.  */
+#define    PMEM  2
+
+/* Not applicable, instruction doesn't write to regs.  */
+#define    NA    3
+
+/* Highest of these priorities.  */
+#define    HIPRI 3
 
 /* The instruction registers are an artificial mechanism to speed up
@@ -123 +105 @@
  */
 
-struct IR_FIELDS {
-                    unsigned        op:OP,
-                                    dest: DEST,
-                                    src1: SOURCE1,
-                                    src2: SOURCE2;
-                              int   ltncy,
-                                    extime,
-                                    wb_pri;     /* writeback priority     */
-                    unsigned        imm_flags:2,/* immediate size         */
-                                    rs1_used:1, /* register source 1 used */
-                                    rs2_used:1, /* register source 2 used */
-                                    rsd_used:1, /* register source/dest. used */
-                                    c_flag:1,   /* complement      */
-                                    u_flag:1,   /* upper half word */
-                                    n_flag:1,   /* execute next    */
-                                    wb_flag:1,  /* uses writeback slot */
-                                    dest_64:1,  /* dest size       */
-                                    s1_64:1,    /* source 1 size   */
-                                    s2_64:1,    /* source 2 size   */
-                                    scale_flag:1, /* scaled register */
-                                    brk_flg:1;
-                 };
-
-struct  mem_segs {
-        struct mem_wrd *seg;                    /* pointer (returned by calloc) to segment */
-        unsigned long baseaddr;                 /* base load address from file headers */
-        unsigned long endaddr;                  /* Ending address of segment */
-        int           flags;                    /* segment control flags (none defined 12/5/86) */
+struct IR_FIELDS
+{
+  unsigned op:OP,
+    dest: DEST,
+    src1: SOURCE1,
+    src2: SOURCE2;
+  int ltncy,
+    extime,
+    /* Writeback priority.  */
+    wb_pri;
+  /* Immediate size.  */
+  unsigned        imm_flags:2,
+    /* Register source 1 used.  */
+    rs1_used:1,
+    /* Register source 2 used. */
+    rs2_used:1,
+    /* Register source/dest. used.  */
+    rsd_used:1,
+    /* Complement.  */
+    c_flag:1,
+    /* Upper half word.  */
+    u_flag:1,
+    /* Execute next.  */
+    n_flag:1,
+    /* Uses writeback slot.  */
+    wb_flag:1,
+    /* Dest size.  */
+    dest_64:1,
+    /* Source 1 size.  */
+    s1_64:1,
+    /* Source 2 size.  */
+    s2_64:1,
+    scale_flag:1,
+    /* Scaled register.  */
+    brk_flg:1;
+};
+
+struct  mem_segs
+{
+  /* Pointer (returned by calloc) to segment.  */
+  struct mem_wrd *seg;                  
+
+  /* Base load address from file headers.  */
+  unsigned long baseaddr;                       
+
+  /* Ending address of segment.  */
+  unsigned long endaddr;                
+
+  /* Segment control flags (none defined).  */  
+  int         flags;                    
 };
 
@@ -156 +160 @@
 #define MEMSEGSIZE      (sizeof(struct mem_segs))/* size of mem_segs structure */
 
-
+#if 0
 #define BRK_RD          (0x01)                  /* break on memory read */
 #define BRK_WR          (0x02)                  /* break on memory write */
 #define BRK_EXEC        (0x04)                  /* break on execution */
 #define BRK_CNT         (0x08)                  /* break on terminal count */
-
-
-struct  mem_wrd {
-        struct IR_FIELDS opcode;                /* simulator instruction break down */
-        union {
-                unsigned long  l;               /* memory element break down */
-                unsigned short s[2];
-                unsigned char  c[4];
-        } mem;
-};
-
-#define MEMWRDSIZE      (sizeof(struct mem_wrd))        /* size of each 32 bit memory model */
-
-/* External declarations */
-
-extern  struct mem_segs memory[];
-extern  struct PROCESSOR m78000;
-
-struct  PROCESSOR   {
-             unsigned WORD
-                            ip,          /* execute instruction pointer */
-                            vbr,         /* vector base register */
-                            psr;         /* processor status register */
-
-                    WORD    S1bus, /* source 1 */
-                            S2bus, /* source 2 */
-                            Dbus,  /* destination */
-                            DAbus, /* data address bus */
-                            ALU,
-                            Regs[REGs],       /* data registers */
-                            time_left[REGs],  /* max clocks before reg is available */
-                            wb_pri[REGs],     /* writeback priority of reg */
-                            SFU0_regs[REGs],  /* integer unit control regs */
-                            SFU1_regs[REGs],  /* floating point control regs */
-                            Scoreboard[REGs],
-                            Vbr;
-            unsigned WORD   scoreboard,
-                            Psw,
-                            Tpsw;
-                    FLAG   jump_pending:1;   /* waiting for a jump instr. */
-                    };
-
-# define    i26bit      1    /* size of immediate field */
-# define    i16bit      2
-# define    i10bit      3
-
-/* Definitions for fields in psr */
-
-# define mode  31
-# define rbo   30
-# define ser   29
-# define carry 28
-# define sf7m  11
-# define sf6m  10
-# define sf5m   9
-# define sf4m   8
-# define sf3m   7
-# define sf2m   6
-# define sf1m   5
-# define mam    4
-# define inm    3
-# define exm    2
-# define trm    1
-# define ovfm   0
-
-#define     MODEMASK   (1<<(mode-1))
-# define    SILENT     0   /* simulate without output to crt */
-# define    VERBOSE    1   /* simulate in verbose mode */
-# define    PR_INSTR   2   /* only print instructions */
-
-# define    RESET      16 /* reset phase */
-
-# define    PHASE1     0  /* data path phases */
-# define    PHASE2     1
-
-/* the 1 clock operations */
-
-# define    ADDU        1
-# define    ADDC        2
-# define    ADDUC       3
-# define    ADD         4
-
-# define    SUBU    ADD+1
-# define    SUBB    ADD+2
-# define    SUBUB   ADD+3
-# define    SUB     ADD+4
-
-# define    AND_    ADD+5
-# define    OR      ADD+6
-# define    XOR     ADD+7
-# define    CMP     ADD+8
-
-/* the LOADS */
-
-# define    LDAB    CMP+1
-# define    LDAH    CMP+2
-# define    LDA     CMP+3
-# define    LDAD    CMP+4
-
-# define    LDB   LDAD+1
-# define    LDH   LDAD+2
-# define    LD    LDAD+3
-# define    LDD   LDAD+4
-# define    LDBU  LDAD+5
-# define    LDHU  LDAD+6
-
-/* the STORES */
-
-# define    STB    LDHU+1
-# define    STH    LDHU+2
-# define    ST     LDHU+3
-# define    STD    LDHU+4
-
-/* the exchange */
-
-# define    XMEMBU LDHU+5
-# define    XMEM   LDHU+6
-
-/* the branches */
-# define    JSR    STD+1
-# define    BSR    STD+2
-# define    BR     STD+3
-# define    JMP    STD+4
-# define    BB1    STD+5
-# define    BB0    STD+6
-# define    RTN    STD+7
-# define    BCND   STD+8
-
-/* the TRAPS */
-# define    TB1    BCND+1
-# define    TB0    BCND+2
-# define    TCND   BCND+3
-# define    RTE    BCND+4
-# define    TBND   BCND+5
-
-/* the MISC instructions */
-# define    MUL     TBND + 1
-# define    DIV     MUL  +2
-# define    DIVU    MUL  +3
-# define    MASK    MUL  +4
-# define    FF0     MUL  +5
-# define    FF1     MUL  +6
-# define    CLR     MUL  +7
-# define    SET     MUL  +8
-# define    EXT     MUL  +9
-# define    EXTU    MUL  +10
-# define    MAK     MUL  +11
-# define    ROT     MUL  +12
-
-/* control register manipulations */
-
-# define    LDCR    ROT  +1
-# define    STCR    ROT  +2
-# define    XCR     ROT  +3
-
-# define    FLDCR    ROT  +4
-# define    FSTCR    ROT  +5
-# define    FXCR     ROT  +6
-
-
-# define    NOP     XCR +1
-
-/* floating point instructions */
-
-# define    FADD    NOP +1
-# define    FSUB    NOP +2
-# define    FMUL    NOP +3
-# define    FDIV    NOP +4
-# define    FSQRT   NOP +5
-# define    FCMP    NOP +6
-# define    FIP     NOP +7
-# define    FLT     NOP +8
-# define    INT     NOP +9
-# define    NINT    NOP +10
-# define    TRNC    NOP +11
-# define    FLDC   NOP +12
-# define    FSTC   NOP +13
-# define    FXC    NOP +14
-
-# define UEXT(src,off,wid) ((((unsigned int)(src))>>(off)) & ((1<<(wid)) - 1))
-# define SEXT(src,off,wid) (((((int)(src))<<(32-((off)+(wid)))) >>(32-(wid))) )
-# define MAKE(src,off,wid) \
-  ((((unsigned int)(src)) & ((1<<(wid)) - 1)) << (off))
-
-# define opword(n) (unsigned long) (memaddr->mem.l)
-
-/*  Constants and Masks */
+#endif
+
+struct mem_wrd
+{
+  /* Simulator instruction break down.  */
+  struct IR_FIELDS opcode;
+  union {
+    /* Memory element break down.  */
+    unsigned long  l;
+    unsigned short s[2];
+    unsigned char  c[4];
+  } mem;
+};
+
+/* Size of each 32 bit memory model.  */
+#define MEMWRDSIZE      (sizeof (struct mem_wrd))
+
+extern struct mem_segs memory[];
+extern struct PROCESSOR m78000;
+
+struct PROCESSOR
+{
+  unsigned WORD
+  /* Execute instruction pointer.  */
+  ip, 
+    /* Vector base register.  */
+    vbr,
+    /* Processor status register.  */
+    psr;
+  
+  /* Source 1.  */
+  WORD    S1bus,
+    /* Source 2.  */
+    S2bus,
+    /* Destination.  */
+    Dbus,
+    /* Data address bus.  */
+    DAbus,
+    ALU,
+    /* Data registers.  */
+    Regs[REGs],
+    /* Max clocks before reg is available.  */
+    time_left[REGs],
+    /* Writeback priority of reg.  */
+    wb_pri[REGs], 
+    /* Integer unit control regs.  */
+    SFU0_regs[REGs],
+    /* Floating point control regs.  */
+    SFU1_regs[REGs], 
+    Scoreboard[REGs],
+    Vbr;
+  unsigned WORD   scoreboard,
+    Psw,
+    Tpsw;
+  /* Waiting for a jump instruction.  */
+  FLAG   jump_pending:1;
+};
+
+/* Size of immediate field.  */
+
+#define    i26bit      1
+#define    i16bit      2
+#define    i10bit      3
+
+/* Definitions for fields in psr.  */
+
+#define mode  31
+#define rbo   30
+#define ser   29
+#define carry 28
+#define sf7m  11
+#define sf6m  10
+#define sf5m   9
+#define sf4m   8
+#define sf3m   7
+#define sf2m   6
+#define sf1m   5
+#define mam    4
+#define inm    3
+#define exm    2
+#define trm    1
+#define ovfm   0
+
+/* The 1 clock operations.  */
+
+#define    ADDU        1
+#define    ADDC        2
+#define    ADDUC       3
+#define    ADD         4
+
+#define    SUBU    ADD+1
+#define    SUBB    ADD+2
+#define    SUBUB   ADD+3
+#define    SUB     ADD+4
+
+#define    AND_    ADD+5
+#define    OR      ADD+6
+#define    XOR     ADD+7
+#define    CMP     ADD+8
+
+/* Loads.  */
+
+#define    LDAB    CMP+1
+#define    LDAH    CMP+2
+#define    LDA     CMP+3
+#define    LDAD    CMP+4
+
+#define    LDB   LDAD+1
+#define    LDH   LDAD+2
+#define    LD    LDAD+3
+#define    LDD   LDAD+4
+#define    LDBU  LDAD+5
+#define    LDHU  LDAD+6
+
+/* Stores.  */
+
+#define    STB    LDHU+1
+#define    STH    LDHU+2
+#define    ST     LDHU+3
+#define    STD    LDHU+4
+
+/* Exchange.  */
+
+#define    XMEMBU LDHU+5
+#define    XMEM   LDHU+6
+
+/* Branches.  */
+
+#define    JSR    STD+1
+#define    BSR    STD+2
+#define    BR     STD+3
+#define    JMP    STD+4
+#define    BB1    STD+5
+#define    BB0    STD+6
+#define    RTN    STD+7
+#define    BCND   STD+8
+
+/* Traps.  */
+
+#define    TB1    BCND+1
+#define    TB0    BCND+2
+#define    TCND   BCND+3
+#define    RTE    BCND+4
+#define    TBND   BCND+5
+
+/* Misc.  */
+
+#define    MUL     TBND + 1
+#define    DIV     MUL  +2
+#define    DIVU    MUL  +3
+#define    MASK    MUL  +4
+#define    FF0     MUL  +5
+#define    FF1     MUL  +6
+#define    CLR     MUL  +7
+#define    SET     MUL  +8
+#define    EXT     MUL  +9
+#define    EXTU    MUL  +10
+#define    MAK     MUL  +11
+#define    ROT     MUL  +12
+
+/* Control register manipulations.  */
+
+#define    LDCR    ROT  +1
+#define    STCR    ROT  +2
+#define    XCR     ROT  +3
+
+#define    FLDCR    ROT  +4
+#define    FSTCR    ROT  +5
+#define    FXCR     ROT  +6
+
+#define    NOP     XCR +1
+
+/* Floating point instructions.  */
+
+#define    FADD    NOP +1
+#define    FSUB    NOP +2
+#define    FMUL    NOP +3
+#define    FDIV    NOP +4
+#define    FSQRT   NOP +5
+#define    FCMP    NOP +6
+#define    FIP     NOP +7
+#define    FLT     NOP +8
+#define    INT     NOP +9
+#define    NINT    NOP +10
+#define    TRNC    NOP +11
+#define    FLDC   NOP +12
+#define    FSTC   NOP +13
+#define    FXC    NOP +14
+
+#define UEXT(src,off,wid) \
+  ((((unsigned int)(src)) >> (off)) & ((1 << (wid)) - 1))
+
+#define SEXT(src,off,wid) \
+  (((((int)(src))<<(32 - ((off) + (wid)))) >>(32 - (wid))) )
+
+#define MAKE(src,off,wid) \
+  ((((unsigned int)(src)) & ((1 << (wid)) - 1)) << (off))
+
+#define opword(n) (unsigned long) (memaddr->mem.l)
+
+/* Constants and masks.  */
 
 #define SFU0       0x80000000
@@ -361 +379 @@
 #define CTRLMASK   0xfc00f800
 
-/* Operands types */
-
-enum operand_type {
+/* Operands types.  */
+
+enum operand_type
+{
   HEX = 1,
   REG = 2,
@@ -369 +388 @@
   IND = 3,
   BF = 4,
-  REGSC = 5    /* scaled register */,
-  CRREG = 6    /* control register */,
-  FCRREG = 7    /* floating point control register */,
+  /* Scaled register.  */
+  REGSC = 5,
+  /* Control register.  */
+  CRREG = 6,
+  /* Floating point control register.  */
+  FCRREG = 7,
   PCREL = 8,
   CONDMASK = 9,
-  XREG = 10, /* extended register */
-  DEC = 11, /* decimal */
-};
-
-/* Hashing Specification */
+  /* Extended register.  */
+  XREG = 10,
+  /* Decimal.  */
+  DEC = 11
+};
+
+/* Hashing specification.  */
 
 #define HASHVAL     79
 
-/* Type definitions */
-
-typedef unsigned int UINT;
-
-/* Structure templates */
-
-#if never
-typedef struct {
-   unsigned int offset:5;
-   unsigned int width:6;
-   unsigned int type:5;
+/* Structure templates.  */
+
+typedef struct
+{
+  unsigned int offset;
+  unsigned int width;
+  enum operand_type type;
 } OPSPEC;
-#endif
-
-typedef struct {
-   unsigned int offset;
-   unsigned int width;
-   enum operand_type type;
-} OPSPEC;
-
-        struct SIM_FLAGS {
-              int  ltncy,   /* latency (max number of clocks needed to execute) */
-                  extime,   /* execution time (min number of clocks needed to execute) */
-                  wb_pri;   /* writeback slot priority */
-   unsigned         op:OP,   /* simulator version of opcode */
-             imm_flags:2,   /* 10,16 or 26 bit immediate flags */
-              rs1_used:1,   /* register source 1 used */
-              rs2_used:1,   /* register source 2 used */
-              rsd_used:1,   /* register source/dest used */
-                c_flag:1,   /* complement */
-                u_flag:1,   /* upper half word */
-                n_flag:1,   /* execute next */
-               wb_flag:1,   /* uses writeback slot */
-               dest_64:1,   /* double precision dest */
-                 s1_64:1,   /* double precision source 1 */
-                 s2_64:1,   /* double precision source 2 */
-            scale_flag:1;   /* register is scaled */
+
+struct SIM_FLAGS
+{
+  int  ltncy,   /* latency (max number of clocks needed to execute).  */
+    extime,   /* execution time (min number of clocks needed to execute).  */
+    wb_pri;   /* writeback slot priority.  */
+  unsigned         op:OP,   /* simulator version of opcode.  */
+    imm_flags:2,   /* 10,16 or 26 bit immediate flags.  */
+    rs1_used:1,   /* register source 1 used.  */
+    rs2_used:1,   /* register source 2 used.  */
+    rsd_used:1,   /* register source/dest used.  */
+    c_flag:1,   /* complement.  */
+    u_flag:1,   /* upper half word.  */
+    n_flag:1,   /* execute next.  */
+    wb_flag:1,   /* uses writeback slot.  */
+    dest_64:1,   /* double precision dest.  */
+    s1_64:1,   /* double precision source 1.  */
+    s2_64:1,   /* double precision source 2.  */
+    scale_flag:1;   /* register is scaled.  */
 };
 
 typedef struct INSTRUCTAB {
-   unsigned int  opcode;
-   char          *mnemonic;
-   OPSPEC        op1,op2,op3;
-   struct SIM_FLAGS flgs;
-   struct INSTRUCTAB    *next;
+  unsigned int  opcode;
+  char          *mnemonic;
+  OPSPEC        op1,op2,op3;
+  struct SIM_FLAGS flgs;
 } INSTAB;
 
@@ -433 +446 @@
 #define NO_OPERAND {0,0,0}
 
-/* Opcode     Mnemonic       Op 1 Spec     Op 2 Spec    Op 3 Spec         Simflags             Next  */
-
-static INSTAB  instructions[] = {
-  {0xf400c800,"jsr         ",{0,5,REG}   ,NO_OPERAND      ,NO_OPERAND   , {2,2,NA,JSR ,          0,0,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xf400cc00,"jsr.n       ",{0,5,REG}   ,NO_OPERAND      ,NO_OPERAND   , {1,1,NA,JSR ,          0,0,1,0,0,0,1,1,0,0,0,0}, NULL },
-  {0xf400c000,"jmp         ",{0,5,REG}   ,NO_OPERAND      ,NO_OPERAND   , {2,2,NA,JMP ,          0,0,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xf400c400,"jmp.n       ",{0,5,REG}   ,NO_OPERAND      ,NO_OPERAND   , {1,1,NA,JMP ,          0,0,1,0,0,0,1,1,0,0,0,0}, NULL },
-  {0xc8000000,"bsr         ",{0,26,PCREL},NO_OPERAND      ,NO_OPERAND   , {2,2,NA,BSR ,     i26bit,0,0,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xcc000000,"bsr.n       ",{0,26,PCREL},NO_OPERAND      ,NO_OPERAND   , {1,1,NA,BSR ,     i26bit,0,0,0,0,0,1,1,0,0,0,0}, NULL },
-  {0xc0000000,"br          ",{0,26,PCREL},NO_OPERAND      ,NO_OPERAND   , {2,2,NA,BR  ,     i26bit,0,0,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xc4000000,"br.n        ",{0,26,PCREL},NO_OPERAND      ,NO_OPERAND   , {1,1,NA,BR  ,     i26bit,0,0,0,0,0,1,1,0,0,0,0}, NULL },
-  {0xd0000000,"bb0         ",{21,5,HEX}  ,{16,5,REG}   ,{0,16,PCREL},{2,2,NA,BB0,     i16bit,0,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xd4000000,"bb0.n       ",{21,5,HEX}  ,{16,5,REG}   ,{0,16,PCREL},{1,1,NA,BB0,     i16bit,0,1,0,0,0,1,1,0,0,0,0}, NULL },
-  {0xd8000000,"bb1         ",{21,5,HEX},{16,5,REG}     ,{0,16,PCREL},{2,2,NA,BB1,     i16bit,0,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xdc000000,"bb1.n       ",{21,5,HEX},{16,5,REG}     ,{0,16,PCREL},{1,1,NA,BB1,     i16bit,0,1,0,0,0,1,1,0,0,0,0}, NULL },
-  {0xf000d000,"tb0         ",{21,5,HEX}  ,{16,5,REG}   ,{0,10,HEX}, {2,2,NA,TB0 ,     i10bit,0,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xf000d800,"tb1         ",{21,5,HEX}  ,{16,5,REG}   ,{0,10,HEX}, {2,2,NA,TB1 ,     i10bit,0,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xe8000000,"bcnd        ",{21,5,CONDMASK},{16,5,REG},{0,16,PCREL},{2,2,NA,BCND,    i16bit,0,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xec000000,"bcnd.n      ",{21,5,CONDMASK},{16,5,REG},{0,16,PCREL},{1,1,NA,BCND,    i16bit,0,1,0,0,0,1,1,0,0,0,0}, NULL },
-  {0xf000e800,"tcnd        ",{21,5,CONDMASK},{16,5,REG},{0,10,HEX}, {2,2,NA,TCND,     i10bit,0,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xf8000000,"tbnd        ",{16,5,REG}  ,{0,16,HEX}   ,NO_OPERAND   , {2,2,NA,TBND,     i10bit,1,0,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xf400f800,"tbnd        ",{16,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {2,2,NA,TBND,          0,1,1,0,0,0,0,1,0,0,0,0}, NULL },
-  {0xf400fc00,"rte         ",NO_OPERAND     ,NO_OPERAND      ,NO_OPERAND   , {2,2,NA,RTE ,          0,0,0,0,0,0,0,1,0,0,0,0}, NULL },
-  {0x1c000000,"ld.b        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {3,1,PMEM,LDB    ,i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4001c00,"ld.b        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,LDB     ,    0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0x0c000000,"ld.bu       ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {3,1,PMEM,LDBU,   i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4000c00,"ld.bu       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,LDBU        ,0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0x18000000,"ld.h        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {3,1,PMEM,LDH    ,i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4001800,"ld.h        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,LDH         ,0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4001a00,"ld.h        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{3,1,PMEM,LDH         ,0,1,1,1,0,0,0,1,0,0,0,1}, NULL },
-  {0x08000000,"ld.hu       ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {3,1,PMEM,LDHU,   i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4000800,"ld.hu       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,LDHU        ,0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4000a00,"ld.hu       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{3,1,PMEM,LDHU        ,0,1,1,1,0,0,0,1,0,0,0,1}, NULL },
-  {0x14000000,"ld          ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {3,1,PMEM,LD     ,i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4001400,"ld          ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,LD          ,0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4001600,"ld          ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{3,1,PMEM,LD          ,0,1,1,1,0,0,0,1,0,0,0,1}, NULL },
-  {0x10000000,"ld.d        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {3,1,PMEM,LDD    ,i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4001000,"ld.d        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,LDD         ,0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4001200,"ld.d        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{3,1,PMEM,LDD         ,0,1,1,1,0,0,0,1,0,0,0,1}, NULL },
-  {0xf4001500,"ld.usr      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,LD          ,0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4001700,"ld.usr      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{3,1,PMEM,LD          ,0,1,1,1,0,0,0,1,0,0,0,1}, NULL },
-  {0x2c000000,"st.b        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,NA,STB      ,i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4002c00,"st.b        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,NA,STB           ,0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0x28000000,"st.h        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,NA,STH      ,i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4002800,"st.h        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,NA,STH           ,0,1,1,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4002a00,"st.h        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,NA,STH           ,0,1,1,1,0,0,0,1,0,0,0,1}, NULL },
-  {0x24000000,"st          ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,NA,ST       ,i16bit,1,0,1,0,0,0,1,0,0,0,0}, NULL },
-  {0xf4002400,"st          ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,NA,ST            ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0xf4002600,"st          ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,NA,ST            ,0,1,1,1,0,0,0,1,0,0,0,1}   ,NULL },
-  {0x20000000,"st.d        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,NA,STD      ,i16bit,0,1,0,0,0,0,1,0,0,0,0}   ,NULL },
-  {0xf4002000,"st.d        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,NA,STD           ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0xf4002200,"st.d        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,NA,STD           ,0,1,1,1,0,0,0,1,0,0,0,1}   ,NULL },
-  {0xf4002500,"st.usr      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,NA,ST            ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0xf4002700,"st.usr      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,NA,ST            ,0,1,1,1,0,0,0,1,0,0,0,1}   ,NULL },
-/*  m88100 only:
-  {0x00000000,"xmem.bu     ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {3,1,PMEM,XMEMBU ,i16bit,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
- */
-  {0xf4000000,"xmem.bu     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,XMEM        ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-/*  m88100 only:
-  {0x04000000,"xmem        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {3,1,PMEM,XMEM   ,i16bit,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
- */
-  {0xf4000400,"xmem        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,XMEM        ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0xf4000600,"xmem        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{3,1,PMEM,XMEM        ,0,1,1,1,0,0,0,1,0,0,0,1}   ,NULL },
-  {0xf4000500,"xmem.usr    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {3,1,PMEM,XMEM        ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0xf4000700,"xmem.usr    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{3,1,PMEM,XMEM        ,0,1,1,1,0,0,0,1,0,0,0,1}   ,NULL },
-/* m88100 only:
-  {0xf4003e00,"lda.b       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,PINT,LDAH,        0,1,1,1,0,0,0,0,0,0,0,1}   ,NULL },
- */
-  {0xf4003e00,"lda.x       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,PINT,LDAH,        0,1,1,1,0,0,0,0,0,0,0,1}   ,NULL },
-  {0xf4003a00,"lda.h       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,PINT,LDAH,        0,1,1,1,0,0,0,0,0,0,0,1}   ,NULL },
-  {0xf4003600,"lda         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,PINT,LDA ,        0,1,1,1,0,0,0,0,0,0,0,1}   ,NULL },
-  {0xf4003200,"lda.d       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REGSC},{1,1,PINT,LDAD,        0,1,1,1,0,0,0,0,0,0,0,1}   ,NULL },
-
-  {0x80004000,"ldcr        ",{21,5,REG}  ,{5,6,CRREG}  ,NO_OPERAND    ,{1,1,PINT,LDCR,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x80008000,"stcr        ",{16,5,REG}  ,{5,6,CRREG}  ,NO_OPERAND    ,{1,1,PINT,STCR,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x8000c000,"xcr         ",{21,5,REG}  ,{16,5,REG}   ,{5,6,CRREG},{1,1,PINT,XCR,         0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-
-  {0xf4006000,"addu        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ADDU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006200,"addu.ci     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ADDU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006100,"addu.co     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ADDU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006300,"addu.cio    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ADDU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006400,"subu        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SUBU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006600,"subu.ci     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SUBU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006500,"subu.co     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SUBU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006700,"subu.cio    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SUBU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006800,"divu        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {32,32,PINT,DIVU,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4006900,"divu.d      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,}, NULL },
-  {0xf4006e00,"muls        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,}, NULL },
-  {0xf4006c00,"mulu        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,4,PINT,MUL,      0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007000,"add         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ADD ,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007200,"add.ci      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ADD ,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007100,"add.co      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ADD ,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007300,"add.cio     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ADD ,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007400,"sub         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SUB ,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007600,"sub.ci      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SUB ,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007500,"sub.co      ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SUB ,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007700,"sub.cio     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SUB ,        0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007800,"divs        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {32,32,PINT,DIV ,      0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4007c00,"cmp         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,CMP,         0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-
-  {0x60000000,"addu        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,ADDU,   i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x64000000,"subu        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,SUBU,   i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-
-  {0x68000000,"divu        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {32,32,PINT,DIVU, i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x6c000000,"mulu        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {4,1,PINT,MUL,    i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x70000000,"add         ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,ADD,    i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x74000000,"sub         ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,SUB,    i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x78000000,"divs        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {32,32,PINT,DIV,  i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x7c000000,"cmp         ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,CMP,    i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-
-  {0xf4004000,"and         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,AND_        ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4004400,"and.c       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,AND_        ,0,1,1,1,1,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4005800,"or          ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,OR          ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4005c00,"or.c        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,OR          ,0,1,1,1,1,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4005000,"xor         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,XOR         ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4005400,"xor.c       ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,XOR         ,0,1,1,1,1,0,0,0,0,0,0,0}   ,NULL },
-  {0x40000000,"and         ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,AND_   ,i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x44000000,"and.u       ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,AND_   ,i16bit,1,0,1,0,1,0,0,0,0,0,0}   ,NULL },
-  {0x58000000,"or          ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,OR     ,i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x5c000000,"or.u        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,OR     ,i16bit,1,0,1,0,1,0,0,0,0,0,0}   ,NULL },
-  {0x50000000,"xor         ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,XOR    ,i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x54000000,"xor.u       ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,XOR    ,i16bit,1,0,1,0,1,0,0,0,0,0,0}   ,NULL },
-  {0x48000000,"mask        ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,MASK   ,i16bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0x4c000000,"mask.u      ",{21,5,REG}  ,{16,5,REG}   ,{0,16,HEX}, {1,1,PINT,MASK   ,i16bit,1,0,1,0,1,0,0,0,0,0,0}   ,NULL },
-  {0xf400ec00,"ff0         ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {1,1,PINT,FF0         ,0,0,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf400e800,"ff1         ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {1,1,PINT,FF1         ,0,0,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf0008000,"clr         ",{21,5,REG}  ,{16,5,REG}   ,{0,10,BF} , {1,1,PINT,CLR    ,i10bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf0008800,"set         ",{21,5,REG}  ,{16,5,REG}   ,{0,10,BF} , {1,1,PINT,SET    ,i10bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf0009000,"ext         ",{21,5,REG}  ,{16,5,REG}   ,{0,10,BF} , {1,1,PINT,EXT    ,i10bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf0009800,"extu        ",{21,5,REG}  ,{16,5,REG}   ,{0,10,BF} , {1,1,PINT,EXTU   ,i10bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf000a000,"mak         ",{21,5,REG}  ,{16,5,REG}   ,{0,10,BF} , {1,1,PINT,MAK    ,i10bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf000a800,"rot         ",{21,5,REG}  ,{16,5,REG}   ,{0,10,BF} , {1,1,PINT,ROT    ,i10bit,1,0,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4008000,"clr         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,CLR         ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4008800,"set         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,SET         ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4009000,"ext         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,EXT         ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf4009800,"extu        ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,EXTU        ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf400a000,"mak         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,MAK         ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-  {0xf400a800,"rot         ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {1,1,PINT,ROT         ,0,1,1,1,0,0,0,0,0,0,0,0}   ,NULL },
-
-  {0x84002800,"fadd.sss    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {5,1,PFLT,FADD        ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84002880,"fadd.ssd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FADD        ,0,1,1,1,0,0,0,1,0,0,1,0}   ,NULL },
-  {0x84002a00,"fadd.sds    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FADD        ,0,1,1,1,0,0,0,1,0,1,0,0}   ,NULL },
-  {0x84002a80,"fadd.sdd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FADD        ,0,1,1,1,0,0,0,1,0,1,1,0}   ,NULL },
-  {0x84002820,"fadd.dss    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FADD        ,0,1,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x840028a0,"fadd.dsd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FADD        ,0,1,1,1,0,0,0,1,1,0,1,0}   ,NULL },
-  {0x84002a20,"fadd.dds    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FADD        ,0,1,1,1,0,0,0,1,1,1,0,0}   ,NULL },
-  {0x84002aa0,"fadd.ddd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FADD        ,0,1,1,1,0,0,0,1,1,1,1,0}   ,NULL },
-  {0x84003000,"fsub.sss    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {5,1,PFLT,FSUB        ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84003080,"fsub.ssd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FSUB        ,0,1,1,1,0,0,0,1,0,0,1,0}   ,NULL },
-  {0x84003200,"fsub.sds    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FSUB        ,0,1,1,1,0,0,0,1,0,1,0,0}   ,NULL },
-  {0x84003280,"fsub.sdd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FSUB        ,0,1,1,1,0,0,0,1,0,1,1,0}   ,NULL },
-  {0x84003020,"fsub.dss    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FSUB        ,0,1,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x840030a0,"fsub.dsd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FSUB        ,0,1,1,1,0,0,0,1,1,0,1,0}   ,NULL },
-  {0x84003220,"fsub.dds    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FSUB        ,0,1,1,1,0,0,0,1,1,1,0,0}   ,NULL },
-  {0x840032a0,"fsub.ddd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,2,PFLT,FSUB        ,0,1,1,1,0,0,0,1,1,1,1,0}   ,NULL },
-  {0x84000000,"fmul.sss    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,1,PFLT,FMUL        ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84000080,"fmul.ssd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {9,2,PFLT,FMUL        ,0,1,1,1,0,0,0,1,0,0,1,0}   ,NULL },
-  {0x84000200,"fmul.sds    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {9,2,PFLT,FMUL        ,0,1,1,1,0,0,0,1,0,1,0,0}   ,NULL },
-  {0x84000280,"fmul.sdd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {9,2,PFLT,FMUL        ,0,1,1,1,0,0,0,1,0,1,1,0}   ,NULL },
-  {0x84000020,"fmul.dss    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {9,2,PFLT,FMUL        ,0,1,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x840000a0,"fmul.dsd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {9,2,PFLT,FMUL        ,0,1,1,1,0,0,0,1,1,0,1,0}   ,NULL },
-  {0x84000220,"fmul.dds    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {9,2,PFLT,FMUL        ,0,1,1,1,0,0,0,1,1,1,0,0}   ,NULL },
-  {0x840002a0,"fmul.ddd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {9,2,PFLT,FMUL        ,0,1,1,1,0,0,0,1,1,1,1,0}   ,NULL },
-  {0x84007000,"fdiv.sss    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {30,30,PFLT,FDIV      ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84007080,"fdiv.ssd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {60,60,PFLT,FDIV      ,0,1,1,1,0,0,0,1,0,0,1,0}   ,NULL },
-  {0x84007200,"fdiv.sds    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {60,60,PFLT,FDIV      ,0,1,1,1,0,0,0,1,0,1,0,0}   ,NULL },
-  {0x84007280,"fdiv.sdd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {60,60,PFLT,FDIV      ,0,1,1,1,0,0,0,1,0,1,1,0}   ,NULL },
-  {0x84007020,"fdiv.dss    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {60,60,PFLT,FDIV      ,0,1,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x840070a0,"fdiv.dsd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {60,60,PFLT,FDIV      ,0,1,1,1,0,0,0,1,1,0,1,0}   ,NULL },
-  {0x84007220,"fdiv.dds    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {60,60,PFLT,FDIV      ,0,1,1,1,0,0,0,1,1,1,0,0}   ,NULL },
-  {0x840072a0,"fdiv.ddd    ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {60,60,PFLT,FDIV      ,0,1,1,1,0,0,0,1,1,1,1,0}   ,NULL },
-  {0x84007800,"fsqrt.ss    ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {5,1,PFLT,FLT         ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84007820,"fsqrt.sd    ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {5,1,PFLT,FLT         ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84007880,"fsqrt.ds    ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {5,1,PFLT,FLT         ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x840078a0,"fsqrt.dd    ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {6,1,PFLT,FLT         ,0,0,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x84003800,"fcmp.ss     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {5,1,PFLT,FCMP        ,0,1,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84003880,"fcmp.sd     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,1,PFLT,FCMP        ,0,1,1,1,0,0,0,1,0,1,0,0}   ,NULL },
-  {0x84003a00,"fcmp.ds     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,1,PFLT,FCMP        ,0,1,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x84003a80,"fcmp.dd     ",{21,5,REG}  ,{16,5,REG}   ,{0,5,REG} , {6,1,PFLT,FCMP        ,0,1,1,1,0,0,0,1,1,1,0,0}   ,NULL },
-  {0x84002000,"flt.s       ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {5,1,PFLT,FLT         ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84002020,"flt.d       ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {6,1,PFLT,FLT         ,0,0,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x84004800,"int.s       ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {5,1,PFLT,INT         ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84004880,"int.d       ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {6,1,PFLT,INT         ,0,0,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x84005000,"nint.s      ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {5,1,PFLT,INT         ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84005080,"nint.d      ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {6,1,PFLT,INT         ,0,0,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-  {0x84005800,"trnc.s      ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {5,1,PFLT,TRNC        ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x84005880,"trnc.d      ",{21,5,REG}  ,{0,5,REG}    ,NO_OPERAND   , {6,1,PFLT,TRNC        ,0,0,1,1,0,0,0,1,1,0,0,0}   ,NULL },
-
-  {0x80004800,"fldcr       ",{21,5,REG}  ,{5,6,FCRREG} ,NO_OPERAND   , {1,1,PFLT,FLDC        ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x80008800,"fstcr       ",{16,5,REG}  ,{5,6,FCRREG} ,NO_OPERAND   , {1,1,PFLT,FSTC        ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-  {0x8000c800,"fxcr        ",{21,5,REG}  ,{16,5,REG}   ,{5,6,FCRREG} , {1,1,PFLT,FXC         ,0,0,1,1,0,0,0,1,0,0,0,0}   ,NULL },
-
-/* The following are new for the 88110. */
-
-  {0x8400aaa0,"fadd.ddd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400aa80,"fadd.dds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400aac0,"fadd.ddx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400aa20,"fadd.dsd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400aa00,"fadd.dss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400aa40,"fadd.dsx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ab20,"fadd.dxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ab00,"fadd.dxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ab40,"fadd.dxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a8a0,"fadd.sdd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a880,"fadd.sds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a8c0,"fadd.sdx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a820,"fadd.ssd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a800,"fadd.sss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a840,"fadd.ssx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a920,"fadd.sxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a900,"fadd.sxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400a940,"fadd.sxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400aca0,"fadd.xdd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ac80,"fadd.xds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400acc0,"fadd.xdx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ac20,"fadd.xsd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ac00,"fadd.xss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ac40,"fadd.xsx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ad20,"fadd.xxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ad00,"fadd.xxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ad40,"fadd.xxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400ba80,"fcmp.sdd    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ba00,"fcmp.sds    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400bb00,"fcmp.sdx    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b880,"fcmp.ssd    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b800,"fcmp.sss    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b900,"fcmp.ssx    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400bc80,"fcmp.sxd    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400bc00,"fcmp.sxs    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400bd00,"fcmp.sxx    ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400baa0,"fcmpu.sdd   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400ba20,"fcmpu.sds   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400bb20,"fcmpu.sdx   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b8a0,"fcmpu.ssd   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b820,"fcmpu.sss   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b920,"fcmpu.ssx   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400bca0,"fcmpu.sxd   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400bc20,"fcmpu.sxs   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400bd20,"fcmpu.sxx   ",{21,5,REG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x84000820,"fcvt.sd     ",{21,5,REG} ,{0,5,REG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84000880,"fcvt.ds     ",{21,5,REG} ,{0,5,REG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x84008880,"fcvt.ds     ",{21,5,XREG} ,{0,5,XREG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x840088c0,"fcvt.dx     ",{21,5,XREG} ,{0,5,XREG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008820,"fcvt.sd     ",{21,5,XREG} ,{0,5,XREG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008840,"fcvt.sx     ",{21,5,XREG} ,{0,5,XREG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008920,"fcvt.xd     ",{21,5,XREG} ,{0,5,XREG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008900,"fcvt.xs     ",{21,5,XREG} ,{0,5,XREG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400f2a0,"fdiv.ddd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f280,"fdiv.dds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f2c0,"fdiv.ddx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f220,"fdiv.dsd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f200,"fdiv.dss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f240,"fdiv.dsx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f320,"fdiv.dxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f300,"fdiv.dxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f340,"fdiv.dxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f0a0,"fdiv.sdd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f080,"fdiv.sds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f0c0,"fdiv.sdx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f020,"fdiv.ssd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f000,"fdiv.sss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f040,"fdiv.ssx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f120,"fdiv.sxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f100,"fdiv.sxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f140,"fdiv.sxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f4a0,"fdiv.xdd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f480,"fdiv.xds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f4c0,"fdiv.xdx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f420,"fdiv.xsd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f400,"fdiv.xss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f440,"fdiv.xsx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f520,"fdiv.xxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f500,"fdiv.xxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f540,"fdiv.xxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x84002220,"flt.ds      ",{21,5,XREG} ,{0,5,REG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84002200,"flt.ss      ",{21,5,XREG} ,{0,5,REG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84002240,"flt.xs      ",{21,5,XREG} ,{0,5,REG}  ,NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x840082a0,"fmul.ddd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008280,"fmul.dds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x840082c0,"fmul.ddx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008220,"fmul.dsd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008200,"fmul.dss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008240,"fmul.dsx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008320,"fmul.dxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008300,"fmul.dxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008340,"fmul.dxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x840080a0,"fmul.sdd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008080,"fmul.sds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x840080c0,"fmul.sdx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008020,"fmul.ssd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008000,"fmul.sss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008040,"fmul.ssx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008120,"fmul.sxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008100,"fmul.sxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008140,"fmul.sxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x840084a0,"fmul.xdd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008480,"fmul.xds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x840084c0,"fmul.xdx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008420,"fmul.xsd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008400,"fmul.xss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008440,"fmul.xsx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008520,"fmul.xxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008500,"fmul.xxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84008540,"fmul.xxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400f8a0,"fsqrt.dd    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f880,"fsqrt.ds    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f8c0,"fsqrt.dx    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f820,"fsqrt.sd    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f800,"fsqrt.ss    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f840,"fsqrt.sx    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f920,"fsqrt.xd    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f900,"fsqrt.xs    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400f940,"fsqrt.xx    ",{21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400b2a0,"fsub.ddd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b280,"fsub.dds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b2c0,"fsub.ddx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b220,"fsub.dsd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b200,"fsub.dss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b240,"fsub.dsx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b320,"fsub.dxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b300,"fsub.dxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b340,"fsub.dxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b0a0,"fsub.sdd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b080,"fsub.sds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b0c0,"fsub.sdx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b020,"fsub.ssd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b000,"fsub.sss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b040,"fsub.ssx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b120,"fsub.sxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b100,"fsub.sxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b140,"fsub.sxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b4a0,"fsub.xdd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b480,"fsub.xds    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b4c0,"fsub.xdx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b420,"fsub.xsd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b400,"fsub.xss    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b440,"fsub.xsx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b520,"fsub.xxd    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b500,"fsub.xxs    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400b540,"fsub.xxx    ",{21,5,XREG} ,{16,5,XREG}  ,{0,5,XREG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400fc00,"illop", {0,2,DEC}, NO_OPERAND, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400c800,"int.ss      ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400c880,"int.sd      ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400c900,"int.sx      ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x04000000,"ld          ", {21,5,XREG}, {16,5,REG}, {0,16,HEX}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x00000000,"ld.d        ", {21,5,XREG}, {16,5,REG}, {0,16,HEX}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x3c000000,"ld.x        ", {21,5,XREG}, {16,5,REG}, {0,16,HEX}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0xf0001400,"ld          ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001000,"ld.d        ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001800,"ld.x        ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001500,"ld.usr      ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001100,"ld.d.usr    ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001900,"ld.x.usr    ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0xf0001600,"ld          ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001200,"ld.d        ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001a00,"ld.x        ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001700,"ld.usr      ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001300,"ld.d.usr    ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0001b00,"ld.x.usr    ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400c000,"mov.s       ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400c080,"mov.d       ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84004200,"mov.s       ", {21,5,XREG}, {0,5,REG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x84004280,"mov.d       ", {21,5,XREG}, {0,5,REG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400c300,"mov         ", {21,5,XREG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0xf4006d00,"mulu.d      ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400d080,"nint.sd     ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400d000,"nint.ss     ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400d100,"nint.sx     ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x88002020,"padd.b      ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88002040,"padd.h      ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88002060,"padd        ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x880021e0,"padds.s     ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880021a0,"padds.s.b   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880021c0,"padds.s.h   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880020e0,"padds.u     ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880020a0,"padds.u.b   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880020c0,"padds.u.h   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88002160,"padds.us    ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88002120,"padds.us.b  ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88002140,"padds.us.h  ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x88003860,"pcmp        ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x88000000,"pmul        ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x88006260,"ppack.16    ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88006240,"ppack.16.h  ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88006460,"ppack.32    ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88006420,"ppack.32.b  ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88006440,"ppack.32.h  ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88006160,"ppack.8     ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x88007200,"prot        ", {21,5,REG}, {16,5,REG}, {5,6,HEX}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88007800,"prot        ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x88003020,"psub.b      ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88003040,"psub.h      ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88003060,"psub        ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x880031e0,"psubs.s     ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880031a0,"psubs.s.b   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880031c0,"psubs.s.h   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880030e0,"psubs.u     ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880030a0,"psubs.u.b   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x880030c0,"psubs.u.h   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88003160,"psubs.us    ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88003120,"psubs.us.b  ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88003140,"psubs.us.h  ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x88006800,"punpk.n     ", {21,5,REG}, {16,5,REG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x88006820,"punpk.b     ", {21,5,REG}, {16,5,REG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x34000000,"st          ", {21,5,XREG}, {16,5,REG}, {0,16,HEX}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x30000000,"st.d        ", {21,5,XREG}, {16,5,REG}, {0,16,HEX}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x38000000,"st.x        ", {21,5,XREG}, {16,5,REG}, {0,16,HEX}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0xf4002c80,"st.b.wt     ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002880,"st.h.wt     ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002480,"st.wt       ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002080,"st.d.wt     ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002d80,"st.b.usr.wt ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002980,"st.h.usr.wt ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002580,"st.usr.wt   ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002180,"st.d.usr.wt ", {21,5,REG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0xf0002400,"st          ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002000,"st.d        ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002100,"st.d.usr    ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002180,"st.d.usr.wt ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002080,"st.d.wt     ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002500,"st.usr      ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002580,"st.usr.wt   ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002480,"st.wt       ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002800,"st.x        ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002900,"st.x.usr    ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002980,"st.x.usr.wt ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002880,"st.x.wt     ", {21,5,XREG}, {16,5,REG}, {0,5,REG}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0xf4002f80,"st.b.usr.wt ", {21,5,REG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002e80,"st.b.wt     ", {21,5,REG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002380,"st.d.usr.wt ", {21,5,REG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002280,"st.d.wt     ", {21,5,REG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002b80,"st.h.usr.wt ", {21,5,REG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002a80,"st.h.wt     ", {21,5,REG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002780,"st.usr.wt   ", {21,5,REG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf4002680,"st.wt       ", {21,5,REG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0xf0002600,"st          ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002200,"st.d        ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002300,"st.d.usr    ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002380,"st.d.usr.wt ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002280,"st.d.wt     ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002700,"st.usr      ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002780,"st.usr.wt   ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002680,"st.wt       ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002a00,"st.x        ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002b00,"st.x.usr    ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002b80,"st.x.usr.wt ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0xf0002a80,"st.x.wt     ", {21,5,XREG}, {16,5,REG}, {0,5,REGSC}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-  {0x8400d880,"trnc.sd     ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400d800,"trnc.ss     ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-  {0x8400d900,"trnc.sx     ", {21,5,REG}, {0,5,XREG}, NO_OPERAND, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, NULL },
-
-};
+extern const INSTAB  instructions[];
 
 /*

branches/GNU/src/binutils/include/opcode/mips.h

@@ -1 +1 @@
 /* mips.h.  Mips opcode list for GDB, the GNU debugger.
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
    Contributed by Ralph Campbell and OSF
@@ -134 +134 @@
 #define OP_SH_CODE19            6       /* 19 bit wait code.  */
 #define OP_MASK_CODE19          0x7ffff
+#define OP_SH_ALN               21
+#define OP_MASK_ALN             0x7
+#define OP_SH_VSEL              21
+#define OP_MASK_VSEL            0x1f
+#define OP_MASK_VECBYTE         0x7     /* Selector field is really 4 bits,
+                                           but 0x8-0xf don't select bytes.  */
+#define OP_SH_VECBYTE           22
+#define OP_MASK_VECALIGN        0x7     /* Vector byte-align (alni.ob) op.  */
+#define OP_SH_VECALIGN          21
+#define OP_MASK_INSMSB          0x1f    /* "ins" MSB.  */
+#define OP_SH_INSMSB            11
+#define OP_MASK_EXTMSBD         0x1f    /* "ext" MSBD.  */
+#define OP_SH_EXTMSBD           11
+
+#define OP_OP_COP0              0x10
+#define OP_OP_COP1              0x11
+#define OP_OP_COP2              0x12
+#define OP_OP_COP3              0x13
+#define OP_OP_LWC1              0x31
+#define OP_OP_LWC2              0x32
+#define OP_OP_LWC3              0x33    /* a.k.a. pref */
+#define OP_OP_LDC1              0x35
+#define OP_OP_LDC2              0x36
+#define OP_OP_LDC3              0x37    /* a.k.a. ld */
+#define OP_OP_SWC1              0x39
+#define OP_OP_SWC2              0x3a
+#define OP_OP_SWC3              0x3b
+#define OP_OP_SDC1              0x3d
+#define OP_OP_SDC2              0x3e
+#define OP_OP_SDC3              0x3f    /* a.k.a. sd */
+
+/* Values in the 'VSEL' field.  */
+#define MDMX_FMTSEL_IMM_QH      0x1d
+#define MDMX_FMTSEL_IMM_OB      0x1e
+#define MDMX_FMTSEL_VEC_QH      0x15
+#define MDMX_FMTSEL_VEC_OB      0x16
 
 /* This structure holds information for a particular instruction.  */
@@ -162 +198 @@
 };
 
-/* These are the characters which may appears in the args field of an
+/* These are the characters which may appear in the args field of an
    instruction.  They appear in the order in which the fields appear
    when the instruction is used.  Commas and parentheses in the args
@@ -180 +216 @@
    "j" 16 bit signed immediate (OP_*_DELTA)
    "k" 5 bit cache opcode in target register position (OP_*_CACHE)
+       Also used for immediate operands in vr5400 vector insns.
    "o" 16 bit signed offset (OP_*_DELTA)
    "p" 16 bit PC relative branch target address (OP_*_DELTA)
@@ -196 +233 @@
    "x" accept and ignore register name
    "z" must be zero register
+   "K" 5 bit Hardware Register (rdhwr instruction) (OP_*_RD)
+   "+A" 5 bit ins/ext position, which becomes LSB (OP_*_SHAMT).
+        Enforces: 0 <= pos < 32.
+   "+B" 5 bit ins size, which becomes MSB (OP_*_INSMSB).
+        Requires that "+A" occur first to set position.
+        Enforces: 0 < (pos+size) <= 32.
+   "+C" 5 bit ext size, which becomes MSBD (OP_*_EXTMSBD).
+        Requires that "+A" occur first to set position.
+        Enforces: 0 < (pos+size) <= 32.
 
    Floating point instructions:
@@ -210 +256 @@
    "E" 5 bit target register (OP_*_RT)
    "G" 5 bit destination register (OP_*_RD)
+   "H" 3 bit sel field for (d)mtc* and (d)mfc* (OP_*_SEL)
    "P" 5 bit performance-monitor register (OP_*_PERFREG)
-   "H" 3 bit sel field (OP_*_SEL)
+   "e" 5 bit vector register byte specifier (OP_*_VECBYTE)
+   "%" 3 bit immediate vr5400 vector alignment operand (OP_*_VECALIGN)
+   see also "k" above
+   "+D" Combined destination register ("G") and sel ("H") for CP0 ops,
+        for pretty-printing in disassembly only.
 
    Macro instructions:
@@ -221 +272 @@
    "l" 32 bit floating point constant in .lit4
 
+   MDMX instruction operands (note that while these use the FP register
+   fields, they accept both $fN and $vN names for the registers):  
+   "O"  MDMX alignment offset (OP_*_ALN)
+   "Q"  MDMX vector/scalar/immediate source (OP_*_VSEL and OP_*_FT)
+   "X"  MDMX destination register (OP_*_FD) 
+   "Y"  MDMX source register (OP_*_FS)
+   "Z"  MDMX source register (OP_*_FT)
+
    Other:
    "()" parens surrounding optional value
    ","  separates operands
+   "[]" brackets around index for vector-op scalar operand specifier (vr5400)
+   "+"  Start of extension sequence.
 
    Characters used so far, for quick reference when adding more:
-   "<>(),"
-   "ABCDEFGHIJLMNPRSTUVW"
-   "abcdfhijklopqrstuvwxz"
+   "%[]<>(),+"
+   "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+   "abcdefhijklopqrstuvwxz"
+
+   Extension character sequences used so far ("+" followed by the
+   following), for quick reference when adding more:
+   "ABCD"
 */
 
@@ -298 +363 @@
 /* Instruction synchronize shared memory.  */
 #define INSN_SYNC                   0x80000000
+/* Instruction reads MDMX accumulator.  XXX FIXME: No bits left!  */
+#define INSN_READ_MDMX_ACC          0
+/* Instruction writes MDMX accumulator.  XXX FIXME: No bits left!  */
+#define INSN_WRITE_MDMX_ACC         0
 
 /* Instruction is actually a macro.  It should be ignored by the
@@ -305 +374 @@
 /* Masks used to mark instructions to indicate which MIPS ISA level
    they were introduced in.  ISAs, as defined below, are logical
-   ORs of these bits, indicatingthat they support the instructions
+   ORs of these bits, indicating that they support the instructions
    defined at the given level.  */
 
-#define INSN_ISA_MASK             0x0000ffff
-#define INSN_ISA1                 0x00000010
-#define INSN_ISA2                 0x00000020
-#define INSN_ISA3                 0x00000040
-#define INSN_ISA4                 0x00000080
-#define INSN_ISA5                 0x00000100
-#define INSN_ISA32                0x00000200
-#define INSN_ISA64                0x00000400
+#define INSN_ISA_MASK             0x00000fff
+#define INSN_ISA1                 0x00000001
+#define INSN_ISA2                 0x00000002
+#define INSN_ISA3                 0x00000004
+#define INSN_ISA4                 0x00000008
+#define INSN_ISA5                 0x00000010
+#define INSN_ISA32                0x00000020
+#define INSN_ISA64                0x00000040
+#define INSN_ISA32R2              0x00000080
+
+/* Masks used for MIPS-defined ASEs.  */
+#define INSN_ASE_MASK             0x0000f000
+
+/* MIPS 16 ASE */
+#define INSN_MIPS16               0x00002000
+/* MIPS-3D ASE */
+#define INSN_MIPS3D               0x00004000
+/* MDMX ASE */ 
+#define INSN_MDMX                 0x00008000
 
 /* Chip specific instructions.  These are bitmasks.  */
@@ -327 +407 @@
 /* Toshiba R3900 instruction.  */
 #define INSN_3900                 0x00080000
-/* 32-bit code running on a ISA3+ CPU.  */
-#define INSN_GP32                 0x00100000
+/* MIPS R10000 instruction.  */
+#define INSN_10000                0x00100000
+/* Broadcom SB-1 instruction.  */
+#define INSN_SB1                  0x00200000
+/* NEC VR4111/VR4181 instruction.  */
+#define INSN_4111                 0x00400000
+/* NEC VR4120 instruction.  */
+#define INSN_4120                 0x00800000
+/* NEC VR5400 instruction.  */
+#define INSN_5400                 0x01000000
+/* NEC VR5500 instruction.  */
+#define INSN_5500                 0x02000000
 
 /* MIPS ISA defines, use instead of hardcoding ISA level.  */
@@ -338 +428 @@
 #define       ISA_MIPS4       (ISA_MIPS3 | INSN_ISA4)
 #define       ISA_MIPS5       (ISA_MIPS4 | INSN_ISA5)
+
 #define       ISA_MIPS32      (ISA_MIPS2 | INSN_ISA32)
 #define       ISA_MIPS64      (ISA_MIPS5 | INSN_ISA32 | INSN_ISA64)
+
+#define       ISA_MIPS32R2    (ISA_MIPS32 | INSN_ISA32R2)
 
 /* CPU defines, use instead of hardcoding processor number. Keep this
    in sync with bfd/archures.c in order for machine selection to work.  */
 #define CPU_UNKNOWN     0               /* Gas internal use.  */
-#define CPU_R2000       2000
 #define CPU_R3000       3000
 #define CPU_R3900       3900
@@ -351 +443 @@
 #define CPU_VR4100      4100
 #define CPU_R4111       4111
+#define CPU_VR4120      4120
 #define CPU_R4300       4300
 #define CPU_R4400       4400
@@ -356 +449 @@
 #define CPU_R4650       4650
 #define CPU_R5000       5000
+#define CPU_VR5400      5400
+#define CPU_VR5500      5500
 #define CPU_R6000       6000
 #define CPU_R8000       8000
@@ -362 +457 @@
 #define CPU_MIPS16      16
 #define CPU_MIPS32      32
-#define CPU_MIPS32_4K   3204113         /* 32, 04, octal 'K'.  */
+#define CPU_MIPS32R2    33
 #define CPU_MIPS5       5
 #define CPU_MIPS64      64
 #define CPU_SB1         12310201        /* octal 'SB', 01.  */
 
-/* Test for membership in an ISA including chip specific ISAs.
-   INSN is pointer to an element of the opcode table; ISA is the
-   specified ISA to test against; and CPU is the CPU specific ISA
-   to test, or zero if no CPU specific ISA test is desired.
-   The gp32 arg is set when you need to force 32-bit register usage on
-   a machine with 64-bit registers; see the documentation under -mgp32
-   in the MIPS gas docs.  */
-
-#define OPCODE_IS_MEMBER(insn, isa, cpu, gp32)                          \
-    ((((insn)->membership & isa) != 0                                   \
-      && ((insn)->membership & INSN_GP32 ? gp32 : 1)                    \
-     )                                                                  \
+/* Test for membership in an ISA including chip specific ISAs.  INSN
+   is pointer to an element of the opcode table; ISA is the specified
+   ISA/ASE bitmask to test against; and CPU is the CPU specific ISA to
+   test, or zero if no CPU specific ISA test is desired.  */
+
+#define OPCODE_IS_MEMBER(insn, isa, cpu)                                \
+    (((insn)->membership & isa) != 0                                    \
      || (cpu == CPU_R4650 && ((insn)->membership & INSN_4650) != 0)     \
      || (cpu == CPU_R4010 && ((insn)->membership & INSN_4010) != 0)     \
-     || ((cpu == CPU_VR4100 || cpu == CPU_R4111)                        \
-         && ((insn)->membership & INSN_4100) != 0)                      \
-     || (cpu == CPU_R3900  && ((insn)->membership & INSN_3900) != 0))
+     || (cpu == CPU_VR4100 && ((insn)->membership & INSN_4100) != 0)    \
+     || (cpu == CPU_R3900 && ((insn)->membership & INSN_3900) != 0)     \
+     || ((cpu == CPU_R10000 || cpu == CPU_R12000)                       \
+         && ((insn)->membership & INSN_10000) != 0)                     \
+     || (cpu == CPU_SB1 && ((insn)->membership & INSN_SB1) != 0)        \
+     || (cpu == CPU_R4111 && ((insn)->membership & INSN_4111) != 0)     \
+     || (cpu == CPU_VR4120 && ((insn)->membership & INSN_4120) != 0)    \
+     || (cpu == CPU_VR5400 && ((insn)->membership & INSN_5400) != 0)    \
+     || (cpu == CPU_VR5500 && ((insn)->membership & INSN_5500) != 0)    \
+     || 0)      /* Please keep this term for easier source merging.  */
 
 /* This is a list of macro expanded instructions.
@@ -509 +606 @@
   M_LWR_AB,
   M_LWU_AB,
+  M_MOVE,
   M_MUL,
   M_MUL_I,
@@ -521 +619 @@
   M_REMU_3,
   M_REMU_3I,
+  M_DROL,
   M_ROL,
+  M_DROL_I,
   M_ROL_I,
+  M_DROR,
   M_ROR,
+  M_DROR_I,
   M_ROR_I,
   M_S_DA,

branches/GNU/src/binutils/include/opcode/ns32k.h

@@ -1 +1 @@
 /* ns32k-opcode.h -- Opcode table for National Semi 32k processor
-   Copyright 1987, 1991, 1994 Free Software Foundation, Inc.
+   Copyright 1987, 1991, 1994, 2002 Free Software Foundation, Inc.
 
 This file is part of GAS, the GNU Assembler.
@@ -38 +38 @@
    The operands in the source instruction are checked for inconsistent
    semantics.
- 
+
         F : 32 bit float        general form
         L : 64 bit float            "
@@ -81 +81 @@
 */
 struct ns32k_opcode {
-  char *name;
+  const char *name;
   unsigned char opcode_id_size; /* not used by the assembler */
   unsigned char opcode_size;
   unsigned long opcode_seed;
-  char *operands;
+  const char *operands;
   unsigned char im_size;        /* not used by dissassembler */
-  char *default_args;           /* default to those args when none given */
+  const char *default_args;     /* default to those args when none given */
   char default_modec;           /* default to this addr-mode when ambigous
                                    ie when the argument of a general addr-mode
@@ -104 +104 @@
                                 /* particular opcode */
 {
-  int obits;            /* number of opcode bits */
-  int ibits;            /* number of instruction bits */
-  ns32k_opcodeT code;   /* op-code (may be > 8 bits!) */
-  char *args;           /* how to compile said opcode */
+  int obits;                    /* number of opcode bits */
+  int ibits;                    /* number of instruction bits */
+  ns32k_opcodeT code;           /* op-code (may be > 8 bits!) */
+  const char *args;             /* how to compile said opcode */
 };
 
 struct not                      /* ns32k opcode text */
 {
-  char *            name;       /* opcode name: lowercase string  [key]  */
-  struct not_wot    detail;     /* rest of opcode table          [datum] */
+  const char *name;             /* opcode name: lowercase string  [key]  */
+  struct not_wot detail;        /* rest of opcode table          [datum] */
 };
 
 /* Instructions look like this:
-    
+
    basic instruction--1, 2, or 3 bytes
    index byte for operand A, if operand A is indexed--1 byte
@@ -131 +131 @@
 
    Each operand has a digit and a letter.
-   
+
    The digit gives the position in the assembly language.  The letter,
    one of the following, tells us what kind of operand it is.  */
@@ -483 +483 @@
 };
 
-static const int numopcodes=sizeof(ns32k_opcodes)/sizeof(ns32k_opcodes[0]);
-
-static const struct ns32k_opcode *const endop = ns32k_opcodes+sizeof(ns32k_opcodes)/sizeof(ns32k_opcodes[0]);
-
 #define MAX_ARGS 4
 #define ARG_LEN 50

branches/GNU/src/binutils/include/opcode/pj.h

@@ -37 +37 @@
 
                   
-typedef struct 
+typedef struct pj_opc_info_t
 {
   short opcode;
@@ -43 +43 @@
   char len;
   unsigned char arg[2];
-  const char *name;
+  union {
+    const char *name;
+    void (*func) PARAMS ((struct pj_opc_info_t *, char *));
+  } u;
 } pj_opc_info_t;

branches/GNU/src/binutils/include/opcode/ppc.h

@@ -1 +1 @@
 /* ppc.h -- Header file for PowerPC opcode table
-   Copyright 1994, 1995, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
@@ -90 +91 @@
 
 /* Opcode is supported by Altivec Vector Unit */
-#define PPC_OPCODE_ALTIVEC   (01000)
+#define PPC_OPCODE_ALTIVEC (01000)
+
+/* Opcode is supported by PowerPC 403 processor.  */
+#define PPC_OPCODE_403 (02000)
+
+/* Opcode is supported by PowerPC BookE processor.  */
+#define PPC_OPCODE_BOOKE (04000)
+
+/* Opcode is only supported by 64-bit PowerPC BookE processor.  */
+#define PPC_OPCODE_BOOKE64 (010000)
+
+/* Opcode is only supported by Power4 architecture.  */
+#define PPC_OPCODE_POWER4 (020000)
+
+/* Opcode isn't supported by Power4 architecture.  */
+#define PPC_OPCODE_NOPOWER4 (040000)
+
+/* Opcode is only supported by POWERPC Classic architecture.  */
+#define PPC_OPCODE_CLASSIC (0100000)
+
+/* Opcode is only supported by e500x2 Core.  */
+#define PPC_OPCODE_SPE     (0200000)
+
+/* Opcode is supported by e500x2 Integer select APU.  */
+#define PPC_OPCODE_ISEL     (0400000)
+
+/* Opcode is an e500 SPE floating point instruction.  */
+#define PPC_OPCODE_EFS      (01000000)
+
+/* Opcode is supported by branch locking APU.  */
+#define PPC_OPCODE_BRLOCK   (02000000)
+
+/* Opcode is supported by performance monitor APU.  */
+#define PPC_OPCODE_PMR      (04000000)
+
+/* Opcode is supported by cache locking APU.  */
+#define PPC_OPCODE_CACHELCK (010000000)
+
+/* Opcode is supported by machine check APU.  */
+#define PPC_OPCODE_RFMCI    (020000000)
 
 /* A macro to extract the major opcode from an instruction.  */
@@ -123 +163 @@
      can accept any value).  */
   unsigned long (*insert) PARAMS ((unsigned long instruction, long op,
+                                   int dialect,
                                    const char **errmsg));
 
@@ -142 +183 @@
      this operand (i.e., the instruction does not match).  If the
      operand is valid, *INVALID will not be changed.  */
-  long (*extract) PARAMS ((unsigned long instruction, int *invalid));
+  long (*extract) PARAMS ((unsigned long instruction, int dialect,
+                           int *invalid));
 
   /* One bit syntax flags.  */
@@ -231 +273 @@
 #define PPC_OPERAND_VR (010000)
 
+/* This operand is for the DS field in a DS form instruction.  */
+#define PPC_OPERAND_DS (020000)
 
 

branches/GNU/src/binutils/include/opcode/sparc.h

@@ -1 +1 @@
 /* Definitions for opcode table for the sparc.
-   Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
+   Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2002
    Free Software Foundation, Inc.
 
@@ -21 +21 @@
 Boston, MA 02111-1307, USA.  */
 
-#include <ansidecl.h>
+#include "ansidecl.h"
 
 /* The SPARC opcode table (and other related data) is defined in

branches/GNU/src/binutils/include/opcode/tic54x.h

@@ -20 +20 @@
 02111-1307, USA.  */
 
-#ifndef _TIC54X_H_
-#define _TIC54X_H_
+#ifndef _opcode_tic54x_h_
+#define _opcode_tic54x_h_
 
 typedef struct _symbol
@@ -87 +87 @@
   /* The opcode mnemonic */
   const char *name;
-
   unsigned int words; /* insn size in words */
   int minops, maxops; /* min/max operand count */
@@ -142 +141 @@
 #define FL_SMR      0x200 /* Smem read (for flagging write-only *+ARx */
 
+#define FL_PAR      0x400 /* Parallel instruction. */
+
   unsigned short opcode2, mask2;   /* some insns have an extended opcode */
+
+  const char* parname;
+  enum optype paroperand_types[MAX_OPERANDS];
 
 } template;
 
-typedef struct _partemplate {
-  char *name;
-  char *parname;
-  unsigned int words; /* length in words */
-  int minops, maxops; /* min/max operand count for 2nd part of insn */
-  unsigned short opcode;
-  unsigned short mask;
-  enum optype operand_types[MAX_OPERANDS];
-  enum optype paroperand_types[MAX_OPERANDS];
-} partemplate;
-
 extern const template tic54x_unknown_opcode;
 extern const template tic54x_optab[];
-extern const partemplate tic54x_paroptab[];
+extern const template tic54x_paroptab[];
 extern const symbol mmregs[], regs[];
 extern const symbol condition_codes[], cc2_codes[], status_bits[];
 extern const symbol cc3_codes[];
 extern const char *misc_symbols[];
+struct disassemble_info;
+extern const template* tic54x_get_insn (struct disassemble_info *, 
+                                        bfd_vma, unsigned short, int *);
 
-#endif /* TIC54X_H */
+#endif /* _opcode_tic54x_h_ */

branches/GNU/src/binutils/include/opcode/v850.h

@@ -1 +1 @@
 /* v850.h -- Header file for NEC V850 opcode table
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2001 Free Software Foundation, Inc.
    Written by J.T. Conklin, Cygnus Support
 
@@ -155 +155 @@
 #define V850_NOT_R0             0x80
 
-/* CYGNUS LOCAL v850e */
 /* push/pop type instruction, V850E specific.  */
 #define V850E_PUSH_POP          0x100

branches/GNU/src/binutils/include/partition.h

@@ -1 +1 @@
 /* List implementation of a partition of consecutive integers.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by CodeSourcery, LLC.
 
-   This file is part of GNU CC.
+   This file is part of GCC.
 
-   GNU CC is free software; you can redistribute it and/or modify
+   GCC is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   GNU CC is distributed in the hope that it will be useful,
+   GCC is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
    You should have received a copy of the GNU General Public License
-   along with GNU CC; see the file COPYING.  If not, write to
+   along with GCC; see the file COPYING.  If not, write to
    the Free Software Foundation, 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
@@ -41 +41 @@
 #endif /* __cplusplus */
 
-#include <ansidecl.h>
+#include "ansidecl.h"
 #include <stdio.h>
 
@@ -79 +79 @@
     ((partition__)->elements[(element__)].class_element)
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* _PARTITION_H */

branches/GNU/src/binutils/include/safe-ctype.h

@@ -64 +64 @@
   _sch_isidnum  = _sch_isidst|_sch_isdigit,     /* A-Za-z0-9_ */
   _sch_isgraph  = _sch_isalnum|_sch_ispunct,    /* isprint and not space */
-  _sch_iscppsp  = _sch_isvsp|_sch_isnvsp        /* isspace + \0 */
+  _sch_iscppsp  = _sch_isvsp|_sch_isnvsp,       /* isspace + \0 */
+  _sch_isbasic  = _sch_isprint|_sch_iscppsp     /* basic charset of ISO C
+                                                   (plus ` and @)  */
 };
 
@@ -70 +72 @@
 extern const unsigned short _sch_istable[256];
 
-#define _sch_test(c, bit) (_sch_istable[(c) & 0xff] & (bit))
+#define _sch_test(c, bit) (_sch_istable[(c) & 0xff] & (unsigned short)(bit))
 
 #define ISALPHA(c)  _sch_test(c, _sch_isalpha)
@@ -87 +89 @@
 #define ISIDNUM(c)      _sch_test(c, _sch_isidnum)
 #define ISIDST(c)       _sch_test(c, _sch_isidst)
+#define IS_ISOBASIC(c)  _sch_test(c, _sch_isbasic)
 #define IS_VSPACE(c)    _sch_test(c, _sch_isvsp)
 #define IS_NVSPACE(c)   _sch_test(c, _sch_isnvsp)

branches/GNU/src/binutils/include/sort.h

@@ -1 +1 @@
 /* Sorting algorithms.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
    Contributed by Mark Mitchell <mark@codesourcery.com>.
 
-This file is part of GNU CC.
+This file is part of GCC.
    
-GNU CC is free software; you can redistribute it and/or modify it
+GCC is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful, but
+GCC is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
+along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
@@ -32 +32 @@
 #endif /* __cplusplus */
 
-#include <ansidecl.h>
+#include "ansidecl.h"
 
 /* Sort an array of pointers.  */

branches/GNU/src/binutils/include/splay-tree.h

@@ -1 +1 @@
 /* A splay-tree datatype.  
-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
-This file is part of GNU CC.
+This file is part of GCC.
    
-GNU CC is free software; you can redistribute it and/or modify it
+GCC is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful, but
+GCC is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
+along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
@@ -35 +35 @@
 #endif /* __cplusplus */
 
-#include <ansidecl.h>
+#include "ansidecl.h"
+
+#ifndef GTY
+#define GTY(X)
+#endif
 
 /* Use typedefs for the key and data types to facilitate changing
@@ -62 +66 @@
 typedef int (*splay_tree_foreach_fn) PARAMS((splay_tree_node, void*));
 
+/* The type of a function used to allocate memory for tree root and
+   node structures.  The first argument is the number of bytes needed;
+   the second is a data pointer the splay tree functions pass through
+   to the allocator.  This function must never return zero.  */
+typedef PTR (*splay_tree_allocate_fn) PARAMS((int, void *));
+
+/* The type of a function used to free memory allocated using the
+   corresponding splay_tree_allocate_fn.  The first argument is the
+   memory to be freed; the latter is a data pointer the splay tree
+   functions pass through to the freer.  */
+typedef void (*splay_tree_deallocate_fn) PARAMS((void *, void *));
+
 /* The nodes in the splay tree.  */
-struct splay_tree_node_s
+struct splay_tree_node_s GTY(())
 {
   /* The key.  */
-  splay_tree_key key;
+  splay_tree_key GTY ((use_param1 (""))) key;
 
   /* The value.  */
-  splay_tree_value value;
+  splay_tree_value GTY ((use_param2 (""))) value;
 
   /* The left and right children, respectively.  */
-  splay_tree_node left;
-  splay_tree_node right;
+  splay_tree_node GTY ((use_params (""))) left;
+  splay_tree_node GTY ((use_params (""))) right;
 };
 
 /* The splay tree itself.  */
-typedef struct splay_tree_s
+struct splay_tree_s GTY(())
 {
   /* The root of the tree.  */
-  splay_tree_node root;
+  splay_tree_node GTY ((use_params (""))) root;
 
   /* The comparision function.  */
@@ -90 +106 @@
   /* The deallocate-value function.  NULL if no cleanup is necessary.  */
   splay_tree_delete_value_fn delete_value;
-} *splay_tree;
+
+  /* Allocate/free functions, and a data pointer to pass to them.  */
+  splay_tree_allocate_fn allocate;
+  splay_tree_deallocate_fn deallocate;
+  PTR GTY((skip (""))) allocate_data;
+
+};
+typedef struct splay_tree_s *splay_tree;
 
 extern splay_tree splay_tree_new        PARAMS((splay_tree_compare_fn,
                                                 splay_tree_delete_key_fn,
                                                 splay_tree_delete_value_fn));
+extern splay_tree splay_tree_new_with_allocator
+                                        PARAMS((splay_tree_compare_fn,
+                                                splay_tree_delete_key_fn,
+                                                splay_tree_delete_value_fn,
+                                                splay_tree_allocate_fn,
+                                                splay_tree_deallocate_fn,
+                                                void *));
 extern void splay_tree_delete           PARAMS((splay_tree));
 extern splay_tree_node splay_tree_insert          
@@ -111 +141 @@
                                         PARAMS((splay_tree,
                                                 splay_tree_key));
+extern splay_tree_node splay_tree_max
+                                        PARAMS((splay_tree));
+extern splay_tree_node splay_tree_min
+                                        PARAMS((splay_tree));
 extern int splay_tree_foreach           PARAMS((splay_tree,
                                                 splay_tree_foreach_fn,