diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-01-12 17:39:36 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-01-12 17:39:36 +0200 |
| commit | c2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0 (patch) | |
| tree | 9ee42d082f17ebb559a69e90a3e7c3f0fa6cad54 /disas.c | |
| parent | b36e391441906c36ed0856b69de84001860402bf (diff) | |
| parent | 05bf441eb69a813d3893174d54faa6afa8c0d39b (diff) | |
| download | focaccia-qemu-c2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0.tar.gz focaccia-qemu-c2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0.zip | |
Merge remote branch 'origin/master' into pci
Diffstat (limited to 'disas.c')
| -rw-r--r-- | disas.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/disas.c b/disas.c index afe331fdb9..dd2db142d7 100644 --- a/disas.c +++ b/disas.c @@ -208,8 +208,13 @@ void target_disas(FILE *out, target_ulong code, target_ulong size, int flags) disasm_info.mach = bfd_mach_alpha; print_insn = print_insn_alpha; #elif defined(TARGET_CRIS) - disasm_info.mach = bfd_mach_cris_v32; - print_insn = print_insn_crisv32; + if (flags != 32) { + disasm_info.mach = bfd_mach_cris_v0_v10; + print_insn = print_insn_crisv10; + } else { + disasm_info.mach = bfd_mach_cris_v32; + print_insn = print_insn_crisv32; + } #elif defined(TARGET_MICROBLAZE) disasm_info.mach = bfd_arch_microblaze; print_insn = print_insn_microblaze; |