Diff for /qemu/dis-asm.h between versions 1.1.1.1 and 1.1.1.6

version 1.1.1.1, 2018/04/24 16:37:52 version 1.1.1.6, 2018/04/24 17:20:38
Line 20  typedef uint64_t bfd_vma; Line 20  typedef uint64_t bfd_vma;
 typedef int64_t bfd_signed_vma;  typedef int64_t bfd_signed_vma;
 typedef uint8_t bfd_byte;  typedef uint8_t bfd_byte;
 #define sprintf_vma(s,x) sprintf (s, "%0" PRIx64, x)  #define sprintf_vma(s,x) sprintf (s, "%0" PRIx64, x)
   #define snprintf_vma(s,ss,x) snprintf (s, ss, "%0" PRIx64, x)
   
 #define BFD64  #define BFD64
   
Line 44  enum bfd_flavour { Line 45  enum bfd_flavour {
   
 enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };  enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
   
 enum bfd_architecture   enum bfd_architecture
 {  {
   bfd_arch_unknown,    /* File arch not known */    bfd_arch_unknown,    /* File arch not known */
   bfd_arch_obscure,    /* Arch known, not one of these */    bfd_arch_obscure,    /* Arch known, not one of these */
Line 56  enum bfd_architecture  Line 57  enum bfd_architecture 
 #define bfd_mach_m68030 5  #define bfd_mach_m68030 5
 #define bfd_mach_m68040 6  #define bfd_mach_m68040 6
 #define bfd_mach_m68060 7  #define bfd_mach_m68060 7
   bfd_arch_vax,        /* DEC Vax */     #define bfd_mach_cpu32  8
   #define bfd_mach_mcf5200  9
   #define bfd_mach_mcf5206e 10
   #define bfd_mach_mcf5307  11
   #define bfd_mach_mcf5407  12
   #define bfd_mach_mcf528x  13
   #define bfd_mach_mcfv4e   14
   #define bfd_mach_mcf521x   15
   #define bfd_mach_mcf5249   16
   #define bfd_mach_mcf547x   17
   #define bfd_mach_mcf548x   18
     bfd_arch_vax,        /* DEC Vax */
   bfd_arch_i960,       /* Intel 960 */    bfd_arch_i960,       /* Intel 960 */
      /* The order of the following is important.       /* The order of the following is important.
        lower number indicates a machine type that          lower number indicates a machine type that
        only accepts a subset of the instructions         only accepts a subset of the instructions
        available to machines with higher numbers.         available to machines with higher numbers.
        The exception is the "ca", which is         The exception is the "ca", which is
        incompatible with all other machines except          incompatible with all other machines except
        "core". */         "core". */
   
 #define bfd_mach_i960_core      1  #define bfd_mach_i960_core      1
Line 130  enum bfd_architecture  Line 142  enum bfd_architecture 
 #define bfd_mach_ppc64         1  #define bfd_mach_ppc64         1
 #define bfd_mach_ppc_403       403  #define bfd_mach_ppc_403       403
 #define bfd_mach_ppc_403gc     4030  #define bfd_mach_ppc_403gc     4030
   #define bfd_mach_ppc_e500      500
 #define bfd_mach_ppc_505       505  #define bfd_mach_ppc_505       505
 #define bfd_mach_ppc_601       601  #define bfd_mach_ppc_601       601
 #define bfd_mach_ppc_602       602  #define bfd_mach_ppc_602       602
Line 146  enum bfd_architecture  Line 159  enum bfd_architecture 
 #define bfd_mach_ppc_7400      7400  #define bfd_mach_ppc_7400      7400
   bfd_arch_rs6000,     /* IBM RS/6000 */    bfd_arch_rs6000,     /* IBM RS/6000 */
   bfd_arch_hppa,       /* HP PA RISC */    bfd_arch_hppa,       /* HP PA RISC */
   #define bfd_mach_hppa10        10
   #define bfd_mach_hppa11        11
   #define bfd_mach_hppa20        20
   #define bfd_mach_hppa20w       25
   bfd_arch_d10v,       /* Mitsubishi D10V */    bfd_arch_d10v,       /* Mitsubishi D10V */
   bfd_arch_z8k,        /* Zilog Z8000 */    bfd_arch_z8k,        /* Zilog Z8000 */
 #define bfd_mach_z8001         1  #define bfd_mach_z8001         1
 #define bfd_mach_z8002         2  #define bfd_mach_z8002         2
   bfd_arch_h8500,      /* Hitachi H8/500 */    bfd_arch_h8500,      /* Hitachi H8/500 */
   bfd_arch_sh,         /* Hitachi SH */    bfd_arch_sh,         /* Hitachi SH */
 #define bfd_mach_sh            0  #define bfd_mach_sh            1
   #define bfd_mach_sh2        0x20
   #define bfd_mach_sh_dsp     0x2d
   #define bfd_mach_sh2a       0x2a
   #define bfd_mach_sh2a_nofpu 0x2b
   #define bfd_mach_sh2e       0x2e
 #define bfd_mach_sh3        0x30  #define bfd_mach_sh3        0x30
   #define bfd_mach_sh3_nommu  0x31
   #define bfd_mach_sh3_dsp    0x3d
 #define bfd_mach_sh3e       0x3e  #define bfd_mach_sh3e       0x3e
 #define bfd_mach_sh4        0x40  #define bfd_mach_sh4        0x40
   #define bfd_mach_sh4_nofpu  0x41
   #define bfd_mach_sh4_nommu_nofpu  0x42
   #define bfd_mach_sh4a       0x4a
   #define bfd_mach_sh4a_nofpu 0x4b
   #define bfd_mach_sh4al_dsp  0x4d
   #define bfd_mach_sh5        0x50
   bfd_arch_alpha,      /* Dec Alpha */    bfd_arch_alpha,      /* Dec Alpha */
   #define bfd_mach_alpha 1
   bfd_arch_arm,        /* Advanced Risc Machines ARM */    bfd_arch_arm,        /* Advanced Risc Machines ARM */
 #define bfd_mach_arm_2         1  #define bfd_mach_arm_unknown    0
 #define bfd_mach_arm_2a                2  #define bfd_mach_arm_2          1
 #define bfd_mach_arm_3         3  #define bfd_mach_arm_2a         2
 #define bfd_mach_arm_3M        4  #define bfd_mach_arm_3          3
 #define bfd_mach_arm_4                 5  #define bfd_mach_arm_3M         4
 #define bfd_mach_arm_4T        6  #define bfd_mach_arm_4          5
   #define bfd_mach_arm_4T         6
   #define bfd_mach_arm_5          7
   #define bfd_mach_arm_5T         8
   #define bfd_mach_arm_5TE        9
   #define bfd_mach_arm_XScale     10
   #define bfd_mach_arm_ep9312     11
   #define bfd_mach_arm_iWMMXt     12
   #define bfd_mach_arm_iWMMXt2    13
   bfd_arch_ns32k,      /* National Semiconductors ns32000 */    bfd_arch_ns32k,      /* National Semiconductors ns32000 */
   bfd_arch_w65,        /* WDC 65816 */    bfd_arch_w65,        /* WDC 65816 */
   bfd_arch_tic30,      /* Texas Instruments TMS320C30 */    bfd_arch_tic30,      /* Texas Instruments TMS320C30 */
Line 175  enum bfd_architecture  Line 214  enum bfd_architecture 
 #define bfd_mach_m32r          0  /* backwards compatibility */  #define bfd_mach_m32r          0  /* backwards compatibility */
   bfd_arch_mn10200,    /* Matsushita MN10200 */    bfd_arch_mn10200,    /* Matsushita MN10200 */
   bfd_arch_mn10300,    /* Matsushita MN10300 */    bfd_arch_mn10300,    /* Matsushita MN10300 */
     bfd_arch_cris,       /* Axis CRIS */
   #define bfd_mach_cris_v0_v10   255
   #define bfd_mach_cris_v32      32
   #define bfd_mach_cris_v10_v32  1032
     bfd_arch_microblaze, /* Xilinx MicroBlaze.  */
   bfd_arch_last    bfd_arch_last
   };    };
   #define bfd_mach_s390_31 31
   #define bfd_mach_s390_64 64
   
 typedef struct symbol_cache_entry  typedef struct symbol_cache_entry
 {  {
Line 201  enum dis_insn_type { Line 247  enum dis_insn_type {
   dis_dref2                     /* Two data references in instruction */    dis_dref2                     /* Two data references in instruction */
 };  };
   
 /* This struct is passed into the instruction decoding routine,   /* This struct is passed into the instruction decoding routine,
    and is passed back out into each callback.  The various fields are used     and is passed back out into each callback.  The various fields are used
    for conveying information from your main routine into your callbacks,     for conveying information from your main routine into your callbacks,
    for passing information into the instruction decoders (such as the     for passing information into the instruction decoders (such as the
Line 353  extern int print_insn_d10v  PARAMS ((bfd Line 399  extern int print_insn_d10v  PARAMS ((bfd
 extern int print_insn_v850              PARAMS ((bfd_vma, disassemble_info*));  extern int print_insn_v850              PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_tic30             PARAMS ((bfd_vma, disassemble_info*));  extern int print_insn_tic30             PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_ppc               PARAMS ((bfd_vma, disassemble_info*));  extern int print_insn_ppc               PARAMS ((bfd_vma, disassemble_info*));
   extern int print_insn_s390              PARAMS ((bfd_vma, disassemble_info*));
   extern int print_insn_crisv32           PARAMS ((bfd_vma, disassemble_info*));
   extern int print_insn_microblaze        PARAMS ((bfd_vma, disassemble_info*));
   
 #if 0  #if 0
 /* Fetch the disassembler for a given BFD, if that support is available.  */  /* Fetch the disassembler for a given BFD, if that support is available.  */
Line 395  extern int generic_symbol_at_address Line 444  extern int generic_symbol_at_address
 /* Call this macro to initialize only the internal variables for the  /* Call this macro to initialize only the internal variables for the
    disassembler.  Architecture dependent things such as byte order, or machine     disassembler.  Architecture dependent things such as byte order, or machine
    variant are not touched by this macro.  This makes things much easier for     variant are not touched by this macro.  This makes things much easier for
    GDB which must initialize these things seperatly.  */     GDB which must initialize these things separately.  */
   
 #define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \  #define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \
   (INFO).fprintf_func = (FPRINTF_FUNC), \    (INFO).fprintf_func = (FPRINTF_FUNC), \
   (INFO).stream = (STREAM), \    (INFO).stream = (STREAM), \
   (INFO).symbols = NULL, \    (INFO).symbols = NULL, \
   (INFO).num_symbols = 0, \    (INFO).num_symbols = 0, \
     (INFO).private_data = NULL, \
   (INFO).buffer = NULL, \    (INFO).buffer = NULL, \
   (INFO).buffer_vma = 0, \    (INFO).buffer_vma = 0, \
   (INFO).buffer_length = 0, \    (INFO).buffer_length = 0, \
Line 417  extern int generic_symbol_at_address Line 467  extern int generic_symbol_at_address
   (INFO).insn_info_valid = 0    (INFO).insn_info_valid = 0
   
 #define _(x) x  #define _(x) x
   #define ATTRIBUTE_UNUSED __attribute__((unused))
   
 /* from libbfd */  /* from libbfd */
   
Line 425  bfd_vma bfd_getb32 (const bfd_byte *addr Line 476  bfd_vma bfd_getb32 (const bfd_byte *addr
 bfd_vma bfd_getl16 (const bfd_byte *addr);  bfd_vma bfd_getl16 (const bfd_byte *addr);
 bfd_vma bfd_getb16 (const bfd_byte *addr);  bfd_vma bfd_getb16 (const bfd_byte *addr);
 typedef enum bfd_boolean {false, true} boolean;  typedef enum bfd_boolean {false, true} boolean;
   typedef boolean bfd_boolean;
   
 #endif /* ! defined (DIS_ASM_H) */  #endif /* ! defined (DIS_ASM_H) */

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.6


unix.superglobalmegacorp.com