diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
| commit | 5d8f37ad78fc66901af50c762029a501561f3b23 (patch) | |
| tree | 206790f8f21000850a98c4f9590a79e779106278 /dis-asm.h | |
| parent | cd059b15f2c7df69f4a087bd66900eb172e41d1c (diff) | |
| download | external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.zip external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.gz external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.bz2 | |
Merge upstream QEMU 10.0.50 into the Android source tree.
This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.
Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:
net.c net-android.c
qemu-char.c qemu-char-android.c
slirp/ slirp-android/
etc...
Tested on linux-x86, darwin-x86 and windows host machines.
Diffstat (limited to 'dis-asm.h')
| -rw-r--r-- | dis-asm.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -142,6 +142,7 @@ enum bfd_architecture #define bfd_mach_ppc64 1 #define bfd_mach_ppc_403 403 #define bfd_mach_ppc_403gc 4030 +#define bfd_mach_ppc_e500 500 #define bfd_mach_ppc_505 505 #define bfd_mach_ppc_601 601 #define bfd_mach_ppc_602 602 @@ -217,6 +218,7 @@ enum bfd_architecture #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 }; #define bfd_mach_s390_31 31 @@ -399,6 +401,7 @@ extern int print_insn_tic30 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 /* Fetch the disassembler for a given BFD, if that support is available. */ |