Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/bfdlink.h4
-rw-r--r--include/elf/ChangeLog10
-rw-r--r--include/elf/sparc.h30
-rw-r--r--include/elf/x86-64.h1
-rw-r--r--include/mach-o/ChangeLog15
-rw-r--r--include/mach-o/external.h273
-rw-r--r--include/mach-o/loader.h264
-rw-r--r--include/mach-o/reloc.h53
-rw-r--r--include/mach-o/x86-64.h37
-rw-r--r--include/opcode/ChangeLog47
-rw-r--r--include/opcode/mips.h101
-rw-r--r--include/opcode/sparc.h45
13 files changed, 176 insertions, 709 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 1a4680ed2..53984e1c0 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,8 +1,3 @@
-2011-09-15 H.J. Lu <hongjiu.lu@intel.com>
-
- PR ld/12975
- * bfdlink.h (bfd_link_info): Add version_info.
-
2011-07-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* xregex.h (regoff_t): Define.
diff --git a/include/bfdlink.h b/include/bfdlink.h
index c9e127c5c..71b1e253c 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -245,7 +245,6 @@ struct flag_info
};
struct bfd_elf_dynamic_list;
-struct bfd_elf_version_tree;
/* This structure holds all the information needed to communicate
between BFD and the linker when doing a link. */
@@ -497,9 +496,6 @@ struct bfd_link_info
/* List of symbols should be dynamic. */
struct bfd_elf_dynamic_list *dynamic_list;
-
- /* The version information. */
- struct bfd_elf_version_tree *version_info;
};
/* This structures holds a set of callback functions. These are called
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index e04b26d5d..39152ac6d 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,13 +1,3 @@
-2011-09-21 David S. Miller <davem@davemloft.net>
-
- * sparc.h (Tag_GNU_Sparc_HWCAPS): New object attribute.
- (ELF_SPARC_HWCAP_*): New HWCAPS bitmask values.
-
-2011-08-12 H.J. Lu <hongjiu.lu@intel.com>
-
- PR ld/13082
- * x86-64.h (R_X86_64_RELATIVE64): New.
-
2011-07-24 Chao-ying Fu <fu@mips.com>
Maciej W. Rozycki <macro@codesourcery.com>
diff --git a/include/elf/sparc.h b/include/elf/sparc.h
index fc8a765a6..424715134 100644
--- a/include/elf/sparc.h
+++ b/include/elf/sparc.h
@@ -1,6 +1,5 @@
/* SPARC ELF support for BFD.
- Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2008, 2010,
- 2011
+ Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2008, 2010
Free Software Foundation, Inc.
By Doug Evans, Cygnus Support, <dje@cygnus.com>.
@@ -186,31 +185,4 @@ END_RELOC_NUMBERS (R_SPARC_max)
#define DT_SPARC_REGISTER 0x70000001
-/* Object attribute tags. */
-enum
-{
- /* 0-3 are generic. */
- Tag_GNU_Sparc_HWCAPS = 4,
-};
-
-/* These values match the AV_SPARC_* hwcap bits defined under Solaris. */
-#define ELF_SPARC_HWCAP_MUL32 0x00000001 /* umul/umulcc/smul/smulcc insns */
-#define ELF_SPARC_HWCAP_DIV32 0x00000002 /* udiv/udivcc/sdiv/sdivcc insns */
-#define ELF_SPARC_HWCAP_FSMULD 0x00000004 /* 'fsmuld' insn */
-#define ELF_SPARC_HWCAP_V8PLUS 0x00000008 /* v9 insns available to 32bit */
-#define ELF_SPARC_HWCAP_POPC 0x00000010 /* 'popc' insn */
-#define ELF_SPARC_HWCAP_VIS 0x00000020 /* VIS insns */
-#define ELF_SPARC_HWCAP_VIS2 0x00000040 /* VIS2 insns */
-#define ELF_SPARC_HWCAP_ASI_BLK_INIT \
- 0x00000080 /* block init ASIs */
-#define ELF_SPARC_HWCAP_FMAF 0x00000100 /* fused multiply-add */
-#define ELF_SPARC_HWCAP_VIS3 0x00000400 /* VIS3 insns */
-#define ELF_SPARC_HWCAP_HPC 0x00000800 /* HPC insns */
-#define ELF_SPARC_HWCAP_RANDOM 0x00001000 /* 'random' insn */
-#define ELF_SPARC_HWCAP_TRANS 0x00002000 /* transaction insns */
-#define ELF_SPARC_HWCAP_FJFMAU 0x00004000 /* unfused multiply-add */
-#define ELF_SPARC_HWCAP_IMA 0x00008000 /* integer multiply-add */
-#define ELF_SPARC_HWCAP_ASI_CACHE_SPARING \
- 0x00010000 /* cache sparing ASIs */
-
#endif /* _ELF_SPARC_H */
diff --git a/include/elf/x86-64.h b/include/elf/x86-64.h
index 9022f8482..56254d25f 100644
--- a/include/elf/x86-64.h
+++ b/include/elf/x86-64.h
@@ -72,7 +72,6 @@ START_RELOC_NUMBERS (elf_x86_64_reloc_type)
descriptor. */
RELOC_NUMBER (R_X86_64_TLSDESC, 36) /* 2x64-bit TLS descriptor. */
RELOC_NUMBER (R_X86_64_IRELATIVE, 37) /* Adjust indirectly by program base */
- RELOC_NUMBER (R_X86_64_RELATIVE64, 38) /* 64bit adjust by program base */
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)
diff --git a/include/mach-o/ChangeLog b/include/mach-o/ChangeLog
index 2276d0145..923f20349 100644
--- a/include/mach-o/ChangeLog
+++ b/include/mach-o/ChangeLog
@@ -1,18 +1,3 @@
-2011-08-08 Tristan Gingold <gingold@adacore.com>
-
- * loader.h (bfd_mach_o_load_command_type): Add
- BFD_MACH_O_LC_LOAD_UPWARD_DYLIB, BFD_MACH_O_LC_VERSION_MIN_MACOSX,
- BFD_MACH_O_LC_VERSION_MIN_IPHONEOS, BFD_MACH_O_LC_FUNCTION_STARTS,
- and BFD_MACH_O_LC_DYLD_ENVIRONMENT.
- * external.h (mach_o_version_min_command_external): New structure.
-
-2011-08-08 Tristan Gingold <gingold@adacore.com>
-
- * loader.h: Reorder declarations.
- * x86-64.h: New file.
- * external.h: New file.
- * reloc.h: New file.
-
2011-07-06 Tristan Gingold <gingold@adacore.com>
* loader.h: New file.
diff --git a/include/mach-o/external.h b/include/mach-o/external.h
deleted file mode 100644
index ebb09a776..000000000
--- a/include/mach-o/external.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Mach-O support for BFD.
- Copyright 2011
- Free Software Foundation, Inc.
-
- 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 3 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., 51 Franklin Street - Fifth Floor, Boston,
- MA 02110-1301, USA. */
-
-#ifndef _MACH_O_EXTERNAL_H
-#define _MACH_O_EXTERNAL_H
-
-struct mach_o_header_external
-{
- unsigned char magic[4]; /* Magic number. */
- unsigned char cputype[4]; /* CPU that this object is for. */
- unsigned char cpusubtype[4]; /* CPU subtype. */
- unsigned char filetype[4]; /* Type of file. */
- unsigned char ncmds[4]; /* Number of load commands. */
- unsigned char sizeofcmds[4]; /* Total size of load commands. */
- unsigned char flags[4]; /* Flags. */
- unsigned char reserved[4]; /* Reserved (on 64-bit version only). */
-};
-
-#define BFD_MACH_O_HEADER_SIZE 28
-#define BFD_MACH_O_HEADER_64_SIZE 32
-
-/* 32-bit section header. */
-
-struct mach_o_section_32_external
-{
- unsigned char sectname[16]; /* Section name. */
- unsigned char segname[16]; /* Segment that the section belongs to. */
- unsigned char addr[4]; /* Address of this section in memory. */
- unsigned char size[4]; /* Size in bytes of this section. */
- unsigned char offset[4]; /* File offset of this section. */
- unsigned char align[4]; /* log2 of this section's alignment. */
- unsigned char reloff[4]; /* File offset of this section's relocs. */
- unsigned char nreloc[4]; /* Number of relocs for this section. */
- unsigned char flags[4]; /* Section flags/attributes. */
- unsigned char reserved1[4];
- unsigned char reserved2[4];
-};
-#define BFD_MACH_O_SECTION_SIZE 68
-
-/* 64-bit section header. */
-
-struct mach_o_section_64_external
-{
- unsigned char sectname[16]; /* Section name. */
- unsigned char segname[16]; /* Segment that the section belongs to. */
- unsigned char addr[8]; /* Address of this section in memory. */
- unsigned char size[8]; /* Size in bytes of this section. */
- unsigned char offset[4]; /* File offset of this section. */
- unsigned char align[4]; /* log2 of this section's alignment. */
- unsigned char reloff[4]; /* File offset of this section's relocs. */
- unsigned char nreloc[4]; /* Number of relocs for this section. */
- unsigned char flags[4]; /* Section flags/attributes. */
- unsigned char reserved1[4];
- unsigned char reserved2[4];
- unsigned char reserved3[4];
-};
-#define BFD_MACH_O_SECTION_64_SIZE 80
-
-struct mach_o_load_command_external
-{
- unsigned char cmd[4]; /* The type of load command. */
- unsigned char cmdsize[4]; /* Size in bytes of entire command. */
-};
-#define BFD_MACH_O_LC_SIZE 8
-
-struct mach_o_segment_command_32_external
-{
- unsigned char segname[16]; /* Name of this segment. */
- unsigned char vmaddr[4]; /* Virtual memory address of this segment. */
- unsigned char vmsize[4]; /* Size there, in bytes. */
- unsigned char fileoff[4]; /* Offset in bytes of the data to be mapped. */
- unsigned char filesize[4]; /* Size in bytes on disk. */
- unsigned char maxprot[4]; /* Maximum permitted vm protection. */
- unsigned char initprot[4]; /* Initial vm protection. */
- unsigned char nsects[4]; /* Number of sections in this segment. */
- unsigned char flags[4]; /* Flags that affect the loading. */
-};
-#define BFD_MACH_O_LC_SEGMENT_SIZE 56 /* Include the header. */
-
-struct mach_o_segment_command_64_external
-{
- unsigned char segname[16]; /* Name of this segment. */
- unsigned char vmaddr[8]; /* Virtual memory address of this segment. */
- unsigned char vmsize[8]; /* Size there, in bytes. */
- unsigned char fileoff[8]; /* Offset in bytes of the data to be mapped. */
- unsigned char filesize[8]; /* Size in bytes on disk. */
- unsigned char maxprot[4]; /* Maximum permitted vm protection. */
- unsigned char initprot[4]; /* Initial vm protection. */
- unsigned char nsects[4]; /* Number of sections in this segment. */
- unsigned char flags[4]; /* Flags that affect the loading. */
-};
-#define BFD_MACH_O_LC_SEGMENT_64_SIZE 72 /* Include the header. */
-
-struct mach_o_reloc_info_external
-{
- unsigned char r_address[4];
- unsigned char r_symbolnum[4];
-};
-#define BFD_MACH_O_RELENT_SIZE 8
-
-struct mach_o_symtab_command_external
-{
- unsigned char symoff[4];
- unsigned char nsyms[4];
- unsigned char stroff[4];
- unsigned char strsize[4];
-};
-
-struct mach_o_nlist_external
-{
- unsigned char n_strx[4];
- unsigned char n_type[1];
- unsigned char n_sect[1];
- unsigned char n_desc[2];
- unsigned char n_value[4];
-};
-#define BFD_MACH_O_NLIST_SIZE 12
-
-struct mach_o_nlist_64_external
-{
- unsigned char n_strx[4];
- unsigned char n_type[1];
- unsigned char n_sect[1];
- unsigned char n_desc[2];
- unsigned char n_value[8];
-};
-#define BFD_MACH_O_NLIST_64_SIZE 16
-
-struct mach_o_thread_command_external
-{
- unsigned char flavour[4];
- unsigned char count[4];
-};
-
-/* For commands that just have a string or a path. */
-struct mach_o_str_command_external
-{
- unsigned char str[4];
-};
-
-struct mach_o_dylib_command_external
-{
- unsigned char name[4];
- unsigned char timestamp[4];
- unsigned char current_version[4];
- unsigned char compatibility_version[4];
-};
-
-struct mach_o_dysymtab_command_external
-{
- unsigned char ilocalsym[4]; /* Index of. */
- unsigned char nlocalsym[4]; /* Number of. */
- unsigned char iextdefsym[4];
- unsigned char nextdefsym[4];
- unsigned char iundefsym[4];
- unsigned char nundefsym[4];
- unsigned char tocoff[4];
- unsigned char ntoc[4];
- unsigned char modtaboff[4];
- unsigned char nmodtab[4];
- unsigned char extrefsymoff[4];
- unsigned char nextrefsyms[4];
- unsigned char indirectsymoff[4];
- unsigned char nindirectsyms[4];
- unsigned char extreloff[4];
- unsigned char nextrel[4];
- unsigned char locreloff[4];
- unsigned char nlocrel[4];
-};
-
-struct mach_o_dylib_module_external
-{
- unsigned char module_name[4];
- unsigned char iextdefsym[4];
- unsigned char nextdefsym[4];
- unsigned char irefsym[4];
- unsigned char nrefsym[4];
- unsigned char ilocalsym[4];
- unsigned char nlocalsym[4];
- unsigned char iextrel[4];
- unsigned char nextrel[4];
- unsigned char iinit_iterm[4];
- unsigned char ninit_nterm[4];
- unsigned char objc_module_info_addr[4];
- unsigned char objc_module_info_size[4];
-};
-#define BFD_MACH_O_DYLIB_MODULE_SIZE 52
-
-struct mach_o_dylib_module_64_external
-{
- unsigned char module_name[4];
- unsigned char iextdefsym[4];
- unsigned char nextdefsym[4];
- unsigned char irefsym[4];
- unsigned char nrefsym[4];
- unsigned char ilocalsym[4];
- unsigned char nlocalsym[4];
- unsigned char iextrel[4];
- unsigned char nextrel[4];
- unsigned char iinit_iterm[4];
- unsigned char ninit_nterm[4];
- unsigned char objc_module_info_size[4];
- unsigned char objc_module_info_addr[8];
-};
-#define BFD_MACH_O_DYLIB_MODULE_64_SIZE 56
-
-struct mach_o_dylib_table_of_contents_external
-{
- unsigned char symbol_index[4];
- unsigned char module_index[4];
-};
-#define BFD_MACH_O_TABLE_OF_CONTENT_SIZE 8
-
-struct mach_o_linkedit_data_command_external
-{
- unsigned char dataoff[4];
- unsigned char datasize[4];
-};
-
-struct mach_o_dyld_info_command_external
-{
- unsigned char rebase_off[4];
- unsigned char rebase_size[4];
- unsigned char bind_off[4];
- unsigned char bind_size[4];
- unsigned char weak_bind_off[4];
- unsigned char weak_bind_size[4];
- unsigned char lazy_bind_off[4];
- unsigned char lazy_bind_size[4];
- unsigned char export_off[4];
- unsigned char export_size[4];
-};
-
-struct mach_o_version_min_command_external
-{
- unsigned char version[4];
- unsigned char reserved[4];
-};
-
-struct mach_o_fat_header_external
-{
- unsigned char magic[4];
- unsigned char nfat_arch[4]; /* Number of components. */
-};
-
-struct mach_o_fat_arch_external
-{
- unsigned char cputype[4];
- unsigned char cpusubtype[4];
- unsigned char offset[4]; /* File offset of the member. */
- unsigned char size[4]; /* Size of the member. */
- unsigned char align[4]; /* Power of 2. */
-};
-
-#endif /* _MACH_O_EXTERNAL_H */
diff --git a/include/mach-o/loader.h b/include/mach-o/loader.h
index 357f65e54..8ddf8e037 100644
--- a/include/mach-o/loader.h
+++ b/include/mach-o/loader.h
@@ -22,7 +22,33 @@
#ifndef _MACH_O_LOADER_H
#define _MACH_O_LOADER_H
-/* Constants for header. */
+/* Symbol n_type values. */
+#define BFD_MACH_O_N_STAB 0xe0 /* If any of these bits set, a symbolic debugging entry. */
+#define BFD_MACH_O_N_PEXT 0x10 /* Private external symbol bit. */
+#define BFD_MACH_O_N_TYPE 0x0e /* Mask for the type bits. */
+#define BFD_MACH_O_N_EXT 0x01 /* External symbol bit, set for external symbols. */
+#define BFD_MACH_O_N_UNDF 0x00 /* Undefined, n_sect == NO_SECT. */
+#define BFD_MACH_O_N_ABS 0x02 /* Absolute, n_sect == NO_SECT. */
+#define BFD_MACH_O_N_INDR 0x0a /* Indirect. */
+#define BFD_MACH_O_N_PBUD 0x0c /* Prebound undefined (defined in a dylib). */
+#define BFD_MACH_O_N_SECT 0x0e /* Defined in section number n_sect. */
+
+#define BFD_MACH_O_NO_SECT 0 /* Symbol not in any section of the image. */
+
+/* Symbol n_desc reference flags. */
+#define BFD_MACH_O_REFERENCE_MASK 0x0f
+#define BFD_MACH_O_REFERENCE_FLAG_UNDEFINED_NON_LAZY 0x00
+#define BFD_MACH_O_REFERENCE_FLAG_UNDEFINED_LAZY 0x01
+#define BFD_MACH_O_REFERENCE_FLAG_DEFINED 0x02
+#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_DEFINED 0x03
+#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY 0x04
+#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY 0x05
+
+#define BFD_MACH_O_REFERENCED_DYNAMICALLY 0x10
+#define BFD_MACH_O_N_DESC_DISCARDED 0x20
+#define BFD_MACH_O_N_NO_DEAD_STRIP 0x20
+#define BFD_MACH_O_N_WEAK_REF 0x40
+#define BFD_MACH_O_N_WEAK_DEF 0x80
typedef enum bfd_mach_o_mach_header_magic
{
@@ -33,80 +59,37 @@ typedef enum bfd_mach_o_mach_header_magic
}
bfd_mach_o_mach_header_magic;
-#define BFD_MACH_O_CPU_IS64BIT 0x1000000
-
-typedef enum bfd_mach_o_cpu_type
-{
- BFD_MACH_O_CPU_TYPE_VAX = 1,
- BFD_MACH_O_CPU_TYPE_MC680x0 = 6,
- BFD_MACH_O_CPU_TYPE_I386 = 7,
- BFD_MACH_O_CPU_TYPE_MIPS = 8,
- BFD_MACH_O_CPU_TYPE_MC98000 = 10,
- BFD_MACH_O_CPU_TYPE_HPPA = 11,
- BFD_MACH_O_CPU_TYPE_ARM = 12,
- BFD_MACH_O_CPU_TYPE_MC88000 = 13,
- BFD_MACH_O_CPU_TYPE_SPARC = 14,
- BFD_MACH_O_CPU_TYPE_I860 = 15,
- BFD_MACH_O_CPU_TYPE_ALPHA = 16,
- BFD_MACH_O_CPU_TYPE_POWERPC = 18,
- BFD_MACH_O_CPU_TYPE_POWERPC_64 = (BFD_MACH_O_CPU_TYPE_POWERPC | BFD_MACH_O_CPU_IS64BIT),
- BFD_MACH_O_CPU_TYPE_X86_64 = (BFD_MACH_O_CPU_TYPE_I386 | BFD_MACH_O_CPU_IS64BIT)
-}
-bfd_mach_o_cpu_type;
-
-typedef enum bfd_mach_o_cpu_subtype
+typedef enum bfd_mach_o_ppc_thread_flavour
{
- BFD_MACH_O_CPU_SUBTYPE_X86_ALL = 3
+ BFD_MACH_O_PPC_THREAD_STATE = 1,
+ BFD_MACH_O_PPC_FLOAT_STATE = 2,
+ BFD_MACH_O_PPC_EXCEPTION_STATE = 3,
+ BFD_MACH_O_PPC_VECTOR_STATE = 4,
+ BFD_MACH_O_PPC_THREAD_STATE64 = 5,
+ BFD_MACH_O_PPC_EXCEPTION_STATE64 = 6,
+ BFD_MACH_O_PPC_THREAD_STATE_NONE = 7
}
-bfd_mach_o_cpu_subtype;
+bfd_mach_o_ppc_thread_flavour;
-typedef enum bfd_mach_o_filetype
+/* Defined in <mach/i386/thread_status.h> */
+typedef enum bfd_mach_o_i386_thread_flavour
{
- BFD_MACH_O_MH_OBJECT = 0x01,
- BFD_MACH_O_MH_EXECUTE = 0x02,
- BFD_MACH_O_MH_FVMLIB = 0x03,
- BFD_MACH_O_MH_CORE = 0x04,
- BFD_MACH_O_MH_PRELOAD = 0x05,
- BFD_MACH_O_MH_DYLIB = 0x06,
- BFD_MACH_O_MH_DYLINKER = 0x07,
- BFD_MACH_O_MH_BUNDLE = 0x08,
- BFD_MACH_O_MH_DYLIB_STUB = 0x09,
- BFD_MACH_O_MH_DSYM = 0x0a,
- BFD_MACH_O_MH_KEXT_BUNDLE = 0x0b
+ BFD_MACH_O_x86_THREAD_STATE32 = 1,
+ BFD_MACH_O_x86_FLOAT_STATE32 = 2,
+ BFD_MACH_O_x86_EXCEPTION_STATE32 = 3,
+ BFD_MACH_O_x86_THREAD_STATE64 = 4,
+ BFD_MACH_O_x86_FLOAT_STATE64 = 5,
+ BFD_MACH_O_x86_EXCEPTION_STATE64 = 6,
+ BFD_MACH_O_x86_THREAD_STATE = 7,
+ BFD_MACH_O_x86_FLOAT_STATE = 8,
+ BFD_MACH_O_x86_EXCEPTION_STATE = 9,
+ BFD_MACH_O_x86_DEBUG_STATE32 = 10,
+ BFD_MACH_O_x86_DEBUG_STATE64 = 11,
+ BFD_MACH_O_x86_DEBUG_STATE = 12,
+ BFD_MACH_O_x86_THREAD_STATE_NONE = 13
}
-bfd_mach_o_filetype;
+bfd_mach_o_i386_thread_flavour;
-typedef enum bfd_mach_o_header_flags
-{
- BFD_MACH_O_MH_NOUNDEFS = 0x0000001,
- BFD_MACH_O_MH_INCRLINK = 0x0000002,
- BFD_MACH_O_MH_DYLDLINK = 0x0000004,
- BFD_MACH_O_MH_BINDATLOAD = 0x0000008,
- BFD_MACH_O_MH_PREBOUND = 0x0000010,
- BFD_MACH_O_MH_SPLIT_SEGS = 0x0000020,
- BFD_MACH_O_MH_LAZY_INIT = 0x0000040,
- BFD_MACH_O_MH_TWOLEVEL = 0x0000080,
- BFD_MACH_O_MH_FORCE_FLAT = 0x0000100,
- BFD_MACH_O_MH_NOMULTIDEFS = 0x0000200,
- BFD_MACH_O_MH_NOFIXPREBINDING = 0x0000400,
- BFD_MACH_O_MH_PREBINDABLE = 0x0000800,
- BFD_MACH_O_MH_ALLMODSBOUND = 0x0001000,
- BFD_MACH_O_MH_SUBSECTIONS_VIA_SYMBOLS = 0x0002000,
- BFD_MACH_O_MH_CANONICAL = 0x0004000,
- BFD_MACH_O_MH_WEAK_DEFINES = 0x0008000,
- BFD_MACH_O_MH_BINDS_TO_WEAK = 0x0010000,
- BFD_MACH_O_MH_ALLOW_STACK_EXECUTION = 0x0020000,
- BFD_MACH_O_MH_ROOT_SAFE = 0x0040000,
- BFD_MACH_O_MH_SETUID_SAFE = 0x0080000,
- BFD_MACH_O_MH_NO_REEXPORTED_DYLIBS = 0x0100000,
- BFD_MACH_O_MH_PIE = 0x0200000,
- BFD_MACH_O_MH_DEAD_STRIPPABLE_DYLIB = 0x0400000,
- BFD_MACH_O_MH_HAS_TLV_DESCRIPTORS = 0x0800000,
- BFD_MACH_O_MH_NO_HEAP_EXECUTION = 0x1000000
-}
-bfd_mach_o_header_flags;
-
-/* Load command constants. */
#define BFD_MACH_O_LC_REQ_DYLD 0x80000000
typedef enum bfd_mach_o_load_command_type
@@ -148,16 +131,80 @@ typedef enum bfd_mach_o_load_command_type
BFD_MACH_O_LC_REEXPORT_DYLIB = 0x1f, /* Load and re-export lib. */
BFD_MACH_O_LC_LAZY_LOAD_DYLIB = 0x20, /* Delay load of lib until use. */
BFD_MACH_O_LC_ENCRYPTION_INFO = 0x21, /* Encrypted segment info. */
- BFD_MACH_O_LC_DYLD_INFO = 0x22, /* Compressed dyld information. */
- BFD_MACH_O_LC_LOAD_UPWARD_DYLIB = 0x23, /* Load upward dylib. */
- BFD_MACH_O_LC_VERSION_MIN_MACOSX = 0x24, /* Minimal MacOSX version. */
- BFD_MACH_O_LC_VERSION_MIN_IPHONEOS = 0x25, /* Minimal IOS version. */
- BFD_MACH_O_LC_FUNCTION_STARTS = 0x26, /* Compressed table of func start. */
- BFD_MACH_O_LC_DYLD_ENVIRONMENT = 0x27 /* Env variable string for dyld. */
+ BFD_MACH_O_LC_DYLD_INFO = 0x22 /* Compressed dyld information. */
}
bfd_mach_o_load_command_type;
-
-/* Section constants. */
+
+#define BFD_MACH_O_CPU_IS64BIT 0x1000000
+
+typedef enum bfd_mach_o_cpu_type
+{
+ BFD_MACH_O_CPU_TYPE_VAX = 1,
+ BFD_MACH_O_CPU_TYPE_MC680x0 = 6,
+ BFD_MACH_O_CPU_TYPE_I386 = 7,
+ BFD_MACH_O_CPU_TYPE_MIPS = 8,
+ BFD_MACH_O_CPU_TYPE_MC98000 = 10,
+ BFD_MACH_O_CPU_TYPE_HPPA = 11,
+ BFD_MACH_O_CPU_TYPE_ARM = 12,
+ BFD_MACH_O_CPU_TYPE_MC88000 = 13,
+ BFD_MACH_O_CPU_TYPE_SPARC = 14,
+ BFD_MACH_O_CPU_TYPE_I860 = 15,
+ BFD_MACH_O_CPU_TYPE_ALPHA = 16,
+ BFD_MACH_O_CPU_TYPE_POWERPC = 18,
+ BFD_MACH_O_CPU_TYPE_POWERPC_64 = (BFD_MACH_O_CPU_TYPE_POWERPC | BFD_MACH_O_CPU_IS64BIT),
+ BFD_MACH_O_CPU_TYPE_X86_64 = (BFD_MACH_O_CPU_TYPE_I386 | BFD_MACH_O_CPU_IS64BIT)
+}
+bfd_mach_o_cpu_type;
+
+typedef enum bfd_mach_o_cpu_subtype
+{
+ BFD_MACH_O_CPU_SUBTYPE_X86_ALL = 3
+}
+bfd_mach_o_cpu_subtype;
+
+typedef enum bfd_mach_o_filetype
+{
+ BFD_MACH_O_MH_OBJECT = 0x01,
+ BFD_MACH_O_MH_EXECUTE = 0x02,
+ BFD_MACH_O_MH_FVMLIB = 0x03,
+ BFD_MACH_O_MH_CORE = 0x04,
+ BFD_MACH_O_MH_PRELOAD = 0x05,
+ BFD_MACH_O_MH_DYLIB = 0x06,
+ BFD_MACH_O_MH_DYLINKER = 0x07,
+ BFD_MACH_O_MH_BUNDLE = 0x08,
+ BFD_MACH_O_MH_DYLIB_STUB = 0x09,
+ BFD_MACH_O_MH_DSYM = 0x0a,
+ BFD_MACH_O_MH_KEXT_BUNDLE = 0x0b
+}
+bfd_mach_o_filetype;
+
+typedef enum bfd_mach_o_header_flags
+{
+ BFD_MACH_O_MH_NOUNDEFS = 0x000001,
+ BFD_MACH_O_MH_INCRLINK = 0x000002,
+ BFD_MACH_O_MH_DYLDLINK = 0x000004,
+ BFD_MACH_O_MH_BINDATLOAD = 0x000008,
+ BFD_MACH_O_MH_PREBOUND = 0x000010,
+ BFD_MACH_O_MH_SPLIT_SEGS = 0x000020,
+ BFD_MACH_O_MH_LAZY_INIT = 0x000040,
+ BFD_MACH_O_MH_TWOLEVEL = 0x000080,
+ BFD_MACH_O_MH_FORCE_FLAT = 0x000100,
+ BFD_MACH_O_MH_NOMULTIDEFS = 0x000200,
+ BFD_MACH_O_MH_NOFIXPREBINDING = 0x000400,
+ BFD_MACH_O_MH_PREBINDABLE = 0x000800,
+ BFD_MACH_O_MH_ALLMODSBOUND = 0x001000,
+ BFD_MACH_O_MH_SUBSECTIONS_VIA_SYMBOLS = 0x002000,
+ BFD_MACH_O_MH_CANONICAL = 0x004000,
+ BFD_MACH_O_MH_WEAK_DEFINES = 0x008000,
+ BFD_MACH_O_MH_BINDS_TO_WEAK = 0x010000,
+ BFD_MACH_O_MH_ALLOW_STACK_EXECUTION = 0x020000,
+ BFD_MACH_O_MH_ROOT_SAFE = 0x040000,
+ BFD_MACH_O_MH_SETUID_SAFE = 0x080000,
+ BFD_MACH_O_MH_NO_REEXPORTED_DYLIBS = 0x100000,
+ BFD_MACH_O_MH_PIE = 0x200000
+}
+bfd_mach_o_header_flags;
+
/* Constants for the type of a section. */
typedef enum bfd_mach_o_section_type
@@ -278,68 +325,5 @@ typedef enum bfd_mach_o_section_attribute
BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS = 0x80000000
}
bfd_mach_o_section_attribute;
-
-/* Symbol constants. */
-
-/* Symbol n_type values. */
-#define BFD_MACH_O_N_STAB 0xe0 /* If any of these bits set, a symbolic debugging entry. */
-#define BFD_MACH_O_N_PEXT 0x10 /* Private external symbol bit. */
-#define BFD_MACH_O_N_TYPE 0x0e /* Mask for the type bits. */
-#define BFD_MACH_O_N_EXT 0x01 /* External symbol bit, set for external symbols. */
-#define BFD_MACH_O_N_UNDF 0x00 /* Undefined, n_sect == NO_SECT. */
-#define BFD_MACH_O_N_ABS 0x02 /* Absolute, n_sect == NO_SECT. */
-#define BFD_MACH_O_N_INDR 0x0a /* Indirect. */
-#define BFD_MACH_O_N_PBUD 0x0c /* Prebound undefined (defined in a dylib). */
-#define BFD_MACH_O_N_SECT 0x0e /* Defined in section number n_sect. */
-
-#define BFD_MACH_O_NO_SECT 0 /* Symbol not in any section of the image. */
-
-/* Symbol n_desc reference flags. */
-#define BFD_MACH_O_REFERENCE_MASK 0x0f
-#define BFD_MACH_O_REFERENCE_FLAG_UNDEFINED_NON_LAZY 0x00
-#define BFD_MACH_O_REFERENCE_FLAG_UNDEFINED_LAZY 0x01
-#define BFD_MACH_O_REFERENCE_FLAG_DEFINED 0x02
-#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_DEFINED 0x03
-#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY 0x04
-#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY 0x05
-
-#define BFD_MACH_O_REFERENCED_DYNAMICALLY 0x10
-#define BFD_MACH_O_N_DESC_DISCARDED 0x20
-#define BFD_MACH_O_N_NO_DEAD_STRIP 0x20
-#define BFD_MACH_O_N_WEAK_REF 0x40
-#define BFD_MACH_O_N_WEAK_DEF 0x80
-
-/* Thread constants. */
-
-typedef enum bfd_mach_o_ppc_thread_flavour
-{
- BFD_MACH_O_PPC_THREAD_STATE = 1,
- BFD_MACH_O_PPC_FLOAT_STATE = 2,
- BFD_MACH_O_PPC_EXCEPTION_STATE = 3,
- BFD_MACH_O_PPC_VECTOR_STATE = 4,
- BFD_MACH_O_PPC_THREAD_STATE64 = 5,
- BFD_MACH_O_PPC_EXCEPTION_STATE64 = 6,
- BFD_MACH_O_PPC_THREAD_STATE_NONE = 7
-}
-bfd_mach_o_ppc_thread_flavour;
-
-/* Defined in <mach/i386/thread_status.h> */
-typedef enum bfd_mach_o_i386_thread_flavour
-{
- BFD_MACH_O_x86_THREAD_STATE32 = 1,
- BFD_MACH_O_x86_FLOAT_STATE32 = 2,
- BFD_MACH_O_x86_EXCEPTION_STATE32 = 3,
- BFD_MACH_O_x86_THREAD_STATE64 = 4,
- BFD_MACH_O_x86_FLOAT_STATE64 = 5,
- BFD_MACH_O_x86_EXCEPTION_STATE64 = 6,
- BFD_MACH_O_x86_THREAD_STATE = 7,
- BFD_MACH_O_x86_FLOAT_STATE = 8,
- BFD_MACH_O_x86_EXCEPTION_STATE = 9,
- BFD_MACH_O_x86_DEBUG_STATE32 = 10,
- BFD_MACH_O_x86_DEBUG_STATE64 = 11,
- BFD_MACH_O_x86_DEBUG_STATE = 12,
- BFD_MACH_O_x86_THREAD_STATE_NONE = 13
-}
-bfd_mach_o_i386_thread_flavour;
#endif /* _MACH_O_LOADER_H */
diff --git a/include/mach-o/reloc.h b/include/mach-o/reloc.h
deleted file mode 100644
index 93ebb8b5f..000000000
--- a/include/mach-o/reloc.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Mach-O support for BFD.
- Copyright 2011
- Free Software Foundation, Inc.
-
- 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 3 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., 51 Franklin Street - Fifth Floor, Boston,
- MA 02110-1301, USA. */
-
-#ifndef _MACH_O_RELOC_H
-#define _MACH_O_RELOC_H
-
-/* Fields for a normal (non-scattered) entry. */
-#define BFD_MACH_O_R_PCREL 0x01000000
-#define BFD_MACH_O_GET_R_LENGTH(s) (((s) >> 25) & 0x3)
-#define BFD_MACH_O_R_EXTERN 0x08000000
-#define BFD_MACH_O_GET_R_TYPE(s) (((s) >> 28) & 0x0f)
-#define BFD_MACH_O_GET_R_SYMBOLNUM(s) ((s) & 0x00ffffff)
-#define BFD_MACH_O_SET_R_LENGTH(l) (((l) & 0x3) << 25)
-#define BFD_MACH_O_SET_R_TYPE(t) (((t) & 0xf) << 28)
-#define BFD_MACH_O_SET_R_SYMBOLNUM(s) ((s) & 0x00ffffff)
-
-/* Fields for a scattered entry. */
-#define BFD_MACH_O_SR_SCATTERED 0x80000000
-#define BFD_MACH_O_SR_PCREL 0x40000000
-#define BFD_MACH_O_GET_SR_LENGTH(s) (((s) >> 28) & 0x3)
-#define BFD_MACH_O_GET_SR_TYPE(s) (((s) >> 24) & 0x0f)
-#define BFD_MACH_O_GET_SR_ADDRESS(s) ((s) & 0x00ffffff)
-#define BFD_MACH_O_SET_SR_LENGTH(l) (((l) & 0x3) << 28)
-#define BFD_MACH_O_SET_SR_TYPE(t) (((t) & 0xf) << 24)
-#define BFD_MACH_O_SET_SR_ADDRESS(s) ((s) & 0x00ffffff)
-
-/* Generic relocation types (used by i386). */
-#define BFD_MACH_O_GENERIC_RELOC_VANILLA 0
-#define BFD_MACH_O_GENERIC_RELOC_PAIR 1
-#define BFD_MACH_O_GENERIC_RELOC_SECTDIFF 2
-#define BFD_MACH_O_GENERIC_RELOC_PB_LA_PTR 3
-#define BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF 4
-#define BFD_MACH_O_GENERIC_RELOC_TLV 5
-
-#endif /* _MACH_O_RELOC_H */
diff --git a/include/mach-o/x86-64.h b/include/mach-o/x86-64.h
deleted file mode 100644
index d06bc26a7..000000000
--- a/include/mach-o/x86-64.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Mach-O support for BFD.
- Copyright 2011
- Free Software Foundation, Inc.
-
- 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 3 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., 51 Franklin Street - Fifth Floor, Boston,
- MA 02110-1301, USA. */
-
-#ifndef _MACH_O_X86_64_H
-#define _MACH_O_X86_64_H
-
-/* X86-64 relocations. */
-#define BFD_MACH_O_X86_64_RELOC_UNSIGNED 0 /* Absolute addresses. */
-#define BFD_MACH_O_X86_64_RELOC_SIGNED 1 /* 32-bit disp. */
-#define BFD_MACH_O_X86_64_RELOC_BRANCH 2 /* 32-bit pcrel disp. */
-#define BFD_MACH_O_X86_64_RELOC_GOT_LOAD 3 /* Movq load of a GOT entry. */
-#define BFD_MACH_O_X86_64_RELOC_GOT 4 /* GOT reference. */
-#define BFD_MACH_O_X86_64_RELOC_SUBTRACTOR 5 /* Symbol difference. */
-#define BFD_MACH_O_X86_64_RELOC_SIGNED_1 6 /* 32-bit signed disp -1. */
-#define BFD_MACH_O_X86_64_RELOC_SIGNED_2 7 /* 32-bit signed disp -2. */
-#define BFD_MACH_O_X86_64_RELOC_SIGNED_4 8 /* 32-bit signed disp -4. */
-#define BFD_MACH_O_X86_64_RELOC_TLV 9 /* Thread local variables. */
-
-#endif /* _MACH_O_X86_64_H */
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 8f070a10d..e7bfecdec 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,50 +1,3 @@
-2011-09-21 David S. Miller <davem@davemloft.net>
-
- * sparc.h (struct sparc_opcode): Expand 'flags' to unsigned int.
- (F_MUL32, F_DIV32, F_FSMULD, F_V8PLUS, F_POPC, F_VIS, F_VIS2,
- F_ASI_BLK_INIT, F_FMAF, F_VIS3, F_HPC, F_RANDOM, F_TRANS,
- F_FJFMAU, F_IMA, F_ASI_CACHE_SPARING): New flag bits.
-
-2011-08-09 Chao-ying Fu <fu@mips.com>
- Maciej W. Rozycki <macro@codesourcery.com>
-
- * mips.h (OP_MASK_3BITPOS, OP_SH_3BITPOS): New macros.
- (OP_MASK_OFFSET12, OP_SH_OFFSET12): Redefine.
- (INSN_ASE_MASK): Add the MCU bit.
- (INSN_MCU): New macro.
- (M_ACLR_AB, M_ACLR_OB, M_ASET_AB, M_ASET_OB): New enum values.
- (MICROMIPSOP_MASK_3BITPOS, MICROMIPSOP_SH_3BITPOS): New macros.
-
-2011-08-09 Maciej W. Rozycki <macro@codesourcery.com>
-
- * mips.h (INSN_WRITE_GPR_S, INSN2_WRITE_GPR_MB): New macros.
- (INSN2_READ_GPR_MC, INSN2_READ_GPR_ME): Likewise.
- (INSN2_WRITE_GPR_MF, INSN2_READ_GPR_MG): Likewise.
- (INSN2_READ_GPR_MJ, INSN2_WRITE_GPR_MJ): Likewise.
- (INSN2_READ_GPR_MP, INSN2_WRITE_GPR_MP): Likewise.
- (INSN2_READ_GPR_MQ, INSN2_WRITE_GPR_MHI): Likewise.
- (INSN2_READ_GPR_MMN): Likewise.
- (INSN2_READ_FPR_D): Change the bit used.
- (INSN2_MOD_GPR_MD, INSN2_MOD_GPR_MF): Likewise.
- (INSN2_MOD_SP, INSN2_READ_GPR_31, INSN2_READ_GP): Likewise.
- (INSN2_READ_PC, INSN2_UNCOND_BRANCH): Likewise.
- (INSN2_COND_BRANCH): Likewise.
- (INSN2_WRITE_GPR_S, INSN2_MOD_GPR_MB): Remove macros.
- (INSN2_MOD_GPR_MC, INSN2_MOD_GPR_ME, INSN2_MOD_GPR_MG): Likewise.
- (INSN2_MOD_GPR_MJ, INSN2_MOD_GPR_MP, INSN2_MOD_GPR_MQ): Likewise.
- (INSN2_MOD_GPR_MHI, INSN2_MOD_GPR_MM): Likewise.
- (INSN2_MOD_GPR_MN): Likewise.
-
-2011-08-05 David S. Miller <davem@davemloft.net>
-
- * sparc.h: Document new format codes '4', '5', and '('.
- (OPF_LOW4, RS3): New macros.
-
-2011-08-03 Maciej W. Rozycki <macro@codesourcery.com>
-
- * mips.h: Document the use of FP_D in MIPS16 mode. Adjust the
- order of flags documented.
-
2011-07-29 Maciej W. Rozycki <macro@codesourcery.com>
* mips.h: Clarify the description of microMIPS instruction
diff --git a/include/opcode/mips.h b/include/opcode/mips.h
index e6703f81a..609a4af53 100644
--- a/include/opcode/mips.h
+++ b/include/opcode/mips.h
@@ -187,12 +187,6 @@
#define OP_SH_MTACC_D 13
#define OP_MASK_MTACC_D 0x3
-/* MIPS MCU ASE */
-#define OP_MASK_3BITPOS 0x7
-#define OP_SH_3BITPOS 12
-#define OP_MASK_OFFSET12 0xfff
-#define OP_SH_OFFSET12 0
-
#define OP_OP_COP0 0x10
#define OP_OP_COP1 0x11
#define OP_OP_COP2 0x12
@@ -257,6 +251,8 @@
#define OP_SH_CODE10 0
#define OP_MASK_TRAP 0
#define OP_SH_TRAP 0
+#define OP_MASK_OFFSET12 0
+#define OP_SH_OFFSET12 0
#define OP_MASK_OFFSET10 0
#define OP_SH_OFFSET10 0
#define OP_MASK_RS3 0
@@ -477,10 +473,6 @@ struct mips_opcode
"+t" 5 bit coprocessor 0 destination register (OP_*_RT)
"+T" 5 bit coprocessor 0 destination register (OP_*_RT) - disassembly only
- MCU ASE usage:
- "~" 12 bit offset (OP_*_OFFSET12)
- "\" 3 bit position for aset and aclr (OP_*_3BITPOS)
-
UDI immediates:
"+1" UDI immediate bits 6-10
"+2" UDI immediate bits 6-15
@@ -516,7 +508,7 @@ struct mips_opcode
Characters used so far, for quick reference when adding more:
"1234567890"
- "%[]<>(),+:'@!$*&\~"
+ "%[]<>(),+:'@!$*&"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklopqrstuvwxz"
@@ -593,8 +585,6 @@ struct mips_opcode
#define FP_D 0x20000000
/* Instruction is part of the tx39's integer multiply family. */
#define INSN_MULT 0x40000000
-/* Modifies the general purpose register in MICROMIPSOP_*_RS. */
-#define INSN_WRITE_GPR_S 0x80000000
/* Instruction is actually a macro. It should be ignored by the
disassembler, and requires special treatment by the assembler. */
#define INSN_MACRO 0xffffffff
@@ -632,46 +622,46 @@ struct mips_opcode
#define INSN2_BRANCH_DELAY_16BIT 0x00000400
/* Instruction has a branch delay slot that requires a 32-bit instruction. */
#define INSN2_BRANCH_DELAY_32BIT 0x00000800
+/* Modifies the general purpose register in MICROMIPSOP_*_RS. */
+#define INSN2_WRITE_GPR_S 0x00001000
/* Reads the floating point register in MICROMIPSOP_*_FD. */
-#define INSN2_READ_FPR_D 0x00001000
-/* Modifies the general purpose register in MICROMIPSOP_*_MB. */
-#define INSN2_WRITE_GPR_MB 0x00002000
-/* Reads the general purpose register in MICROMIPSOP_*_MC. */
-#define INSN2_READ_GPR_MC 0x00004000
-/* Reads/writes the general purpose register in MICROMIPSOP_*_MD. */
-#define INSN2_MOD_GPR_MD 0x00008000
-/* Reads the general purpose register in MICROMIPSOP_*_ME. */
-#define INSN2_READ_GPR_ME 0x00010000
-/* Reads/writes the general purpose register in MICROMIPSOP_*_MF. */
-#define INSN2_MOD_GPR_MF 0x00020000
-/* Reads the general purpose register in MICROMIPSOP_*_MG. */
-#define INSN2_READ_GPR_MG 0x00040000
-/* Reads the general purpose register in MICROMIPSOP_*_MJ. */
-#define INSN2_READ_GPR_MJ 0x00080000
-/* Modifies the general purpose register in MICROMIPSOP_*_MJ. */
-#define INSN2_WRITE_GPR_MJ 0x00100000
-/* Reads the general purpose register in MICROMIPSOP_*_MP. */
-#define INSN2_READ_GPR_MP 0x00200000
-/* Modifies the general purpose register in MICROMIPSOP_*_MP. */
-#define INSN2_WRITE_GPR_MP 0x00400000
-/* Reads the general purpose register in MICROMIPSOP_*_MQ. */
-#define INSN2_READ_GPR_MQ 0x00800000
+#define INSN2_READ_FPR_D 0x00002000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MB. */
+#define INSN2_MOD_GPR_MB 0x00004000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MC. */
+#define INSN2_MOD_GPR_MC 0x00008000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MD. */
+#define INSN2_MOD_GPR_MD 0x00010000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_ME. */
+#define INSN2_MOD_GPR_ME 0x00020000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MF. */
+#define INSN2_MOD_GPR_MF 0x00040000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MG. */
+#define INSN2_MOD_GPR_MG 0x00080000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MJ. */
+#define INSN2_MOD_GPR_MJ 0x00100000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MP. */
+#define INSN2_MOD_GPR_MP 0x00200000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MQ. */
+#define INSN2_MOD_GPR_MQ 0x00400000
/* Reads/Writes the stack pointer ($29). */
-#define INSN2_MOD_SP 0x01000000
+#define INSN2_MOD_SP 0x00800000
/* Reads the RA ($31) register. */
-#define INSN2_READ_GPR_31 0x02000000
+#define INSN2_READ_GPR_31 0x01000000
/* Reads the global pointer ($28). */
-#define INSN2_READ_GP 0x04000000
+#define INSN2_READ_GP 0x02000000
/* Reads the program counter ($pc). */
-#define INSN2_READ_PC 0x08000000
+#define INSN2_READ_PC 0x04000000
/* Is an unconditional branch insn. */
-#define INSN2_UNCOND_BRANCH 0x10000000
+#define INSN2_UNCOND_BRANCH 0x08000000
/* Is a conditional branch insn. */
-#define INSN2_COND_BRANCH 0x20000000
-/* Modifies the general purpose registers in MICROMIPSOP_*_MH/I. */
-#define INSN2_WRITE_GPR_MHI 0x40000000
-/* Reads the general purpose registers in MICROMIPSOP_*_MM/N. */
-#define INSN2_READ_GPR_MMN 0x80000000
+#define INSN2_COND_BRANCH 0x10000000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MH/I. */
+#define INSN2_MOD_GPR_MHI 0x20000000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MM. */
+#define INSN2_MOD_GPR_MM 0x40000000
+/* Reads/Writes the general purpose registers in MICROMIPSOP_*_MN. */
+#define INSN2_MOD_GPR_MN 0x80000000
/* Masks used to mark instructions to indicate which MIPS ISA level
they were introduced in. INSN_ISA_MASK masks an enumeration that
@@ -719,7 +709,7 @@ static const unsigned int mips_isa_table[] =
#define INSN_OCTEON 0x00000800
/* Masks used for MIPS-defined ASEs. */
-#define INSN_ASE_MASK 0x3c00f010
+#define INSN_ASE_MASK 0x3c00f000
/* DSP ASE */
#define INSN_DSP 0x00001000
@@ -768,9 +758,6 @@ static const unsigned int mips_isa_table[] =
/* RMI Xlr instruction */
#define INSN_XLR 0x00000020
-/* MCU (MicroController) ASE */
-#define INSN_MCU 0x00000010
-
/* MIPS ISA defines, use instead of hardcoding ISA level. */
#define ISA_UNKNOWN 0 /* Gas internal use. */
@@ -873,13 +860,9 @@ static const unsigned int mips_isa_table[] =
enum
{
M_ABS,
- M_ACLR_AB,
- M_ACLR_OB,
M_ADD_I,
M_ADDU_I,
M_AND_I,
- M_ASET_AB,
- M_ASET_OB,
M_BALIGN,
M_BC1FL,
M_BC1TL,
@@ -1332,9 +1315,6 @@ extern int bfd_mips_num_opcodes;
/* The following flags have the same value for the mips16 opcode
table:
-
- INSN_ISA3
-
INSN_UNCOND_BRANCH_DELAY
INSN_COND_BRANCH_DELAY
INSN_COND_BRANCH_LIKELY (never used)
@@ -1343,7 +1323,7 @@ extern int bfd_mips_num_opcodes;
INSN_WRITE_HI
INSN_WRITE_LO
INSN_TRAP
- FP_D (never used)
+ INSN_ISA3
*/
extern const struct mips_opcode mips16_opcodes[];
@@ -1381,8 +1361,6 @@ extern const int bfd_mips16_num_opcodes;
#define MICROMIPSOP_SH_SEL 11
#define MICROMIPSOP_MASK_OFFSET12 0xfff
#define MICROMIPSOP_SH_OFFSET12 0
-#define MICROMIPSOP_MASK_3BITPOS 0x7
-#define MICROMIPSOP_SH_3BITPOS 21
#define MICROMIPSOP_MASK_STYPE 0x1f
#define MICROMIPSOP_SH_STYPE 16
#define MICROMIPSOP_MASK_OFFSET10 0x3ff
@@ -1608,7 +1586,6 @@ extern const int bfd_mips16_num_opcodes;
"<" 5-bit shift amount (MICROMIPSOP_*_SHAMT)
">" shift amount between 32 and 63, stored after subtracting 32
(MICROMIPSOP_*_SHAMT)
- "\" 3-bit position for ASET and ACLR (MICROMIPSOP_*_3BITPOS)
"|" 4-bit trap code (MICROMIPSOP_*_TRAP)
"~" 12-bit signed offset (MICROMIPSOP_*_OFFSET12)
"a" 26-bit target address (MICROMIPSOP_*_TARGET)
@@ -1698,7 +1675,7 @@ extern const int bfd_mips16_num_opcodes;
Characters used so far, for quick reference when adding more:
"1234567890"
- "<>(),+.\|~"
+ "<>(),+.|~"
"ABCDEFGHI KLMN RST V "
"abcd f hijklmnopqrstuvw yz"
diff --git a/include/opcode/sparc.h b/include/opcode/sparc.h
index 7ae3641cf..0d6511c2a 100644
--- a/include/opcode/sparc.h
+++ b/include/opcode/sparc.h
@@ -1,6 +1,6 @@
/* Definitions for opcode table for the sparc.
Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2002,
- 2003, 2005, 2010, 2011 Free Software Foundation, Inc.
+ 2003, 2005, 2010 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler, GDB, the GNU debugger, and
the GNU Binutils.
@@ -98,37 +98,18 @@ typedef struct sparc_opcode
unsigned long lose; /* Bits that must not be set. */
const char *args;
/* This was called "delayed" in versions before the flags. */
- unsigned int flags;
+ char flags;
short architecture; /* Bitmask of sparc_opcode_arch_val's. */
} sparc_opcode;
+#define F_DELAYED 1 /* Delayed branch. */
+#define F_ALIAS 2 /* Alias for a "real" instruction. */
+#define F_UNBR 4 /* Unconditional branch. */
+#define F_CONDBR 8 /* Conditional branch. */
+#define F_JSR 16 /* Subroutine call. */
+#define F_FLOAT 32 /* Floating point instruction (not a branch). */
+#define F_FBR 64 /* Floating point branch. */
/* FIXME: Add F_ANACHRONISTIC flag for v9. */
-#define F_DELAYED 0x00000001 /* Delayed branch. */
-#define F_ALIAS 0x00000002 /* Alias for a "real" instruction. */
-#define F_UNBR 0x00000004 /* Unconditional branch. */
-#define F_CONDBR 0x00000008 /* Conditional branch. */
-#define F_JSR 0x00000010 /* Subroutine call. */
-#define F_FLOAT 0x00000020 /* Floating point instruction (not a branch). */
-#define F_FBR 0x00000040 /* Floating point branch. */
-#define F_MUL32 0x00000100 /* umul/umulcc/smul/smulcc insns */
-#define F_DIV32 0x00000200 /* udiv/udivcc/sdiv/sdivcc insns */
-#define F_FSMULD 0x00000400 /* 'fsmuld' insn */
-#define F_V8PLUS 0x00000800 /* v9 insns available to 32bit */
-#define F_POPC 0x00001000 /* 'popc' insn */
-#define F_VIS 0x00002000 /* VIS insns */
-#define F_VIS2 0x00004000 /* VIS2 insns */
-#define F_ASI_BLK_INIT 0x00008000 /* block init ASIs */
-#define F_FMAF 0x00010000 /* fused multiply-add */
-#define F_VIS3 0x00020000 /* VIS3 insns */
-#define F_HPC 0x00040000 /* HPC insns */
-#define F_RANDOM 0x00080000 /* 'random' insn */
-#define F_TRANS 0x00100000 /* transaction insns */
-#define F_FJFMAU 0x00200000 /* unfused multiply-add */
-#define F_IMA 0x00400000 /* integer multiply-add */
-#define F_ASI_CACHE_SPARING \
- 0x00800000 /* cache sparing ASIs */
-
-#define F_HWCAP_MASK 0x00ffff00
/* All sparc opcodes are 32 bits, except for the `set' instruction (really a
macro), which is 64 bits. It is handled as a special case.
@@ -150,8 +131,6 @@ typedef struct sparc_opcode
f frs2 floating point register.
B frs2 floating point register (double/even).
R frs2 floating point register (quad/multiple of 4).
- 4 frs3 floating point register.
- 5 frs3 floating point register (doube/even).
g frsd floating point register.
H frsd floating point register (double/even).
J frsd floating point register (quad/multiple of 4).
@@ -208,14 +187,15 @@ typedef struct sparc_opcode
0 32/64 bit immediate for set or setx (v9) insns
_ Ancillary state register in rd (v9a)
/ Ancillary state register in rs1 (v9a)
- ( entire floating point state register (%efsr). */
+
+ The following chars are unused: (note: ,[] are used as punctuation)
+ [45]. */
#define OP2(x) (((x) & 0x7) << 22) /* Op2 field of format2 insns. */
#define OP3(x) (((x) & 0x3f) << 19) /* Op3 field of format3 insns. */
#define OP(x) ((unsigned) ((x) & 0x3) << 30) /* Op field of all insns. */
#define OPF(x) (((x) & 0x1ff) << 5) /* Opf field of float insns. */
#define OPF_LOW5(x) OPF ((x) & 0x1f) /* V9. */
-#define OPF_LOW4(x) OPF ((x) & 0xf) /* V9. */
#define F3F(x, y, z) (OP (x) | OP3 (y) | OPF (z)) /* Format3 float insns. */
#define F3I(x) (((x) & 0x1) << 13) /* Immediate field of format 3 insns. */
#define F2(x, y) (OP (x) | OP2(y)) /* Format 2 insns. */
@@ -227,7 +207,6 @@ typedef struct sparc_opcode
#define SIMM13(x) ((x) & 0x1fff) /* Simm13 field. */
#define RD(x) (((x) & 0x1f) << 25) /* Destination register field. */
#define RS1(x) (((x) & 0x1f) << 14) /* Rs1 field. */
-#define RS3(x) (((x) & 0x1f) << 9) /* Rs3 field. */
#define ASI_RS2(x) (SIMM13 (x))
#define MEMBAR(x) ((x) & 0x7f)
#define SLCPOP(x) (((x) & 0x7f) << 6) /* Sparclet cpop. */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 03:04:50 +0300