Sparc: fix FPU and AM enable checks for translation

[qemu.git] / dis-asm.h

diff --git a/dis-asm.h b/dis-asm.h
index 5f6f06cf69b4264a4cd968f70ce660ce5d8cdeea..5b07d7f3a04ebd99cfe5d142a2c0f7a512b78441 100644 (file)
--- a/dis-asm.h
+++ b/dis-asm.h
@@ -9,11 +9,7 @@
 #ifndef DIS_ASM_H
 #define DIS_ASM_H
 
 #ifndef DIS_ASM_H
 #define DIS_ASM_H
 

-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu-common.h"

 
 typedef void *PTR;
 typedef uint64_t bfd_vma;
 
 typedef void *PTR;
 typedef uint64_t bfd_vma;


@@ -188,6 +184,9 @@ enum bfd_architecture
 #define bfd_mach_sh5        0x50
   bfd_arch_alpha,      /* Dec Alpha */
 #define bfd_mach_alpha 1
 #define bfd_mach_sh5        0x50
   bfd_arch_alpha,      /* Dec Alpha */
 #define bfd_mach_alpha 1

+#define bfd_mach_alpha_ev4  0x10
+#define bfd_mach_alpha_ev5  0x20
+#define bfd_mach_alpha_ev6  0x30

   bfd_arch_arm,        /* Advanced Risc Machines ARM */
 #define bfd_mach_arm_unknown   0
 #define bfd_mach_arm_2         1
   bfd_arch_arm,        /* Advanced Risc Machines ARM */
 #define bfd_mach_arm_unknown   0
 #define bfd_mach_arm_2         1


@@ -219,6 +218,9 @@ enum bfd_architecture
 #define bfd_mach_cris_v32      32
 #define bfd_mach_cris_v10_v32  1032
   bfd_arch_microblaze, /* Xilinx MicroBlaze.  */
 #define bfd_mach_cris_v32      32
 #define bfd_mach_cris_v10_v32  1032
   bfd_arch_microblaze, /* Xilinx MicroBlaze.  */

+  bfd_arch_ia64,      /* HP/Intel ia64 */
+#define bfd_mach_ia64_elf64    64
+#define bfd_mach_ia64_elf32    32

   bfd_arch_last
   };
 #define bfd_mach_s390_31 31
   bfd_arch_last
   };
 #define bfd_mach_s390_31 31


@@ -234,8 +236,6 @@ typedef struct symbol_cache_entry
     } udata;
 } asymbol;
 
     } udata;
 } asymbol;
 

-typedef int (*fprintf_ftype) (FILE*, const char*, ...);
-

 enum dis_insn_type {
   dis_noninsn,                 /* Not a valid instruction */
   dis_nonbranch,               /* Not a branch instruction */
 enum dis_insn_type {
   dis_noninsn,                 /* Not a valid instruction */
   dis_nonbranch,               /* Not a branch instruction */


@@ -258,7 +258,7 @@ enum dis_insn_type {
    by hand, or using one of the initialization macros below.  */
 
 typedef struct disassemble_info {
    by hand, or using one of the initialization macros below.  */
 
 typedef struct disassemble_info {

-  fprintf_ftype fprintf_func;
+  fprintf_function fprintf_func;

   FILE *stream;
   PTR application_data;
 
   FILE *stream;
   PTR application_data;
 


@@ -365,46 +365,48 @@ typedef struct disassemble_info {
    target address.  Return number of bytes processed.  */
 typedef int (*disassembler_ftype) (bfd_vma, disassemble_info *);
 
    target address.  Return number of bytes processed.  */
 typedef int (*disassembler_ftype) (bfd_vma, disassemble_info *);
 

-extern int print_insn_big_mips         (bfd_vma, disassemble_info*);
-extern int print_insn_little_mips      (bfd_vma, disassemble_info*);
-extern int print_insn_i386             (bfd_vma, disassemble_info*);
-extern int print_insn_m68k             (bfd_vma, disassemble_info*);
-extern int print_insn_z8001            (bfd_vma, disassemble_info*);
-extern int print_insn_z8002            (bfd_vma, disassemble_info*);
-extern int print_insn_h8300            (bfd_vma, disassemble_info*);
-extern int print_insn_h8300h           (bfd_vma, disassemble_info*);
-extern int print_insn_h8300s           (bfd_vma, disassemble_info*);
-extern int print_insn_h8500            (bfd_vma, disassemble_info*);
-extern int print_insn_alpha            (bfd_vma, disassemble_info*);
-extern disassembler_ftype arc_get_disassembler (int, int);
-extern int print_insn_arm              (bfd_vma, disassemble_info*);
-extern int print_insn_sparc            (bfd_vma, disassemble_info*);
-extern int print_insn_big_a29k         (bfd_vma, disassemble_info*);
-extern int print_insn_little_a29k      (bfd_vma, disassemble_info*);
-extern int print_insn_i960             (bfd_vma, disassemble_info*);
-extern int print_insn_sh               (bfd_vma, disassemble_info*);
-extern int print_insn_shl              (bfd_vma, disassemble_info*);
-extern int print_insn_hppa             (bfd_vma, disassemble_info*);
-extern int print_insn_m32r             (bfd_vma, disassemble_info*);
-extern int print_insn_m88k             (bfd_vma, disassemble_info*);
-extern int print_insn_mn10200          (bfd_vma, disassemble_info*);
-extern int print_insn_mn10300          (bfd_vma, disassemble_info*);
-extern int print_insn_ns32k            (bfd_vma, disassemble_info*);
-extern int print_insn_big_powerpc      (bfd_vma, disassemble_info*);
-extern int print_insn_little_powerpc   (bfd_vma, disassemble_info*);
-extern int print_insn_rs6000           (bfd_vma, disassemble_info*);
-extern int print_insn_w65              (bfd_vma, disassemble_info*);
-extern int print_insn_d10v             (bfd_vma, disassemble_info*);
-extern int print_insn_v850             (bfd_vma, disassemble_info*);
-extern int print_insn_tic30            (bfd_vma, disassemble_info*);
-extern int print_insn_ppc              (bfd_vma, disassemble_info*);
-extern int print_insn_s390             (bfd_vma, disassemble_info*);
-extern int print_insn_crisv32           (bfd_vma, disassemble_info*);
-extern int print_insn_microblaze        (bfd_vma, disassemble_info*);
+int print_insn_big_mips         (bfd_vma, disassemble_info*);
+int print_insn_little_mips      (bfd_vma, disassemble_info*);
+int print_insn_i386             (bfd_vma, disassemble_info*);
+int print_insn_m68k             (bfd_vma, disassemble_info*);
+int print_insn_z8001            (bfd_vma, disassemble_info*);
+int print_insn_z8002            (bfd_vma, disassemble_info*);
+int print_insn_h8300            (bfd_vma, disassemble_info*);
+int print_insn_h8300h           (bfd_vma, disassemble_info*);
+int print_insn_h8300s           (bfd_vma, disassemble_info*);
+int print_insn_h8500            (bfd_vma, disassemble_info*);
+int print_insn_alpha            (bfd_vma, disassemble_info*);
+disassembler_ftype arc_get_disassembler (int, int);
+int print_insn_arm              (bfd_vma, disassemble_info*);
+int print_insn_sparc            (bfd_vma, disassemble_info*);
+int print_insn_big_a29k         (bfd_vma, disassemble_info*);
+int print_insn_little_a29k      (bfd_vma, disassemble_info*);
+int print_insn_i960             (bfd_vma, disassemble_info*);
+int print_insn_sh               (bfd_vma, disassemble_info*);
+int print_insn_shl              (bfd_vma, disassemble_info*);
+int print_insn_hppa             (bfd_vma, disassemble_info*);
+int print_insn_m32r             (bfd_vma, disassemble_info*);
+int print_insn_m88k             (bfd_vma, disassemble_info*);
+int print_insn_mn10200          (bfd_vma, disassemble_info*);
+int print_insn_mn10300          (bfd_vma, disassemble_info*);
+int print_insn_ns32k            (bfd_vma, disassemble_info*);
+int print_insn_big_powerpc      (bfd_vma, disassemble_info*);
+int print_insn_little_powerpc   (bfd_vma, disassemble_info*);
+int print_insn_rs6000           (bfd_vma, disassemble_info*);
+int print_insn_w65              (bfd_vma, disassemble_info*);
+int print_insn_d10v             (bfd_vma, disassemble_info*);
+int print_insn_v850             (bfd_vma, disassemble_info*);
+int print_insn_tic30            (bfd_vma, disassemble_info*);
+int print_insn_ppc              (bfd_vma, disassemble_info*);
+int print_insn_s390             (bfd_vma, disassemble_info*);
+int print_insn_crisv32          (bfd_vma, disassemble_info*);
+int print_insn_crisv10          (bfd_vma, disassemble_info*);
+int print_insn_microblaze       (bfd_vma, disassemble_info*);
+int print_insn_ia64             (bfd_vma, disassemble_info*);

 
 #if 0
 /* Fetch the disassembler for a given BFD, if that support is available.  */
 
 #if 0
 /* Fetch the disassembler for a given BFD, if that support is available.  */

-extern disassembler_ftype disassembler (bfd *);
+disassembler_ftype disassembler(bfd *);

 #endif
 
 \f
 #endif
 
 \f


@@ -413,21 +415,20 @@ extern disassembler_ftype disassembler    (bfd *);
 
 /* Here is a function which callers may wish to use for read_memory_func.
    It gets bytes from a buffer.  */
 
 /* Here is a function which callers may wish to use for read_memory_func.
    It gets bytes from a buffer.  */

-extern int buffer_read_memory
-  (bfd_vma, bfd_byte *, int, struct disassemble_info *);
+int buffer_read_memory(bfd_vma, bfd_byte *, int, struct disassemble_info *);

 
 /* This function goes with buffer_read_memory.
    It prints a message using info->fprintf_func and info->stream.  */
 
 /* This function goes with buffer_read_memory.
    It prints a message using info->fprintf_func and info->stream.  */

-extern void perror_memory (int, bfd_vma, struct disassemble_info *);
+void perror_memory(int, bfd_vma, struct disassemble_info *);

 
 
 /* Just print the address in hex.  This is included for completeness even
    though both GDB and objdump provide their own (to print symbolic
    addresses).  */
 
 
 /* Just print the address in hex.  This is included for completeness even
    though both GDB and objdump provide their own (to print symbolic
    addresses).  */

-extern void generic_print_address (bfd_vma, struct disassemble_info *);
+void generic_print_address(bfd_vma, struct disassemble_info *);

 
 /* Always true.  */
 
 /* Always true.  */

-extern int generic_symbol_at_address (bfd_vma, struct disassemble_info *);
+int generic_symbol_at_address(bfd_vma, struct disassemble_info *);

 
 /* Macro to initialize a disassemble_info struct.  This should be called
    by all applications creating such a struct.  */
 
 /* Macro to initialize a disassemble_info struct.  This should be called
    by all applications creating such a struct.  */


@@ -468,6 +469,7 @@ extern int generic_symbol_at_address (bfd_vma, struct disassemble_info *);
 
 /* from libbfd */
 
 
 /* from libbfd */
 

+bfd_vma bfd_getl64 (const bfd_byte *addr);

 bfd_vma bfd_getl32 (const bfd_byte *addr);
 bfd_vma bfd_getb32 (const bfd_byte *addr);
 bfd_vma bfd_getl16 (const bfd_byte *addr);
 bfd_vma bfd_getl32 (const bfd_byte *addr);
 bfd_vma bfd_getb32 (const bfd_byte *addr);
 bfd_vma bfd_getl16 (const bfd_byte *addr);