64 bit disas fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1260 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
1ef3868708
commit
fa15e030bf
16
disas.c
16
disas.c
|
@ -148,11 +148,7 @@ void target_disas(FILE *out, target_ulong code, target_ulong size, int flags)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (pc = code; pc < code + size; pc += count) {
|
for (pc = code; pc < code + size; pc += count) {
|
||||||
#if TARGET_LONG_BITS == 64
|
fprintf(out, "0x" TARGET_FMT_lx ": ", pc);
|
||||||
fprintf(out, "0x%016llx: ", pc);
|
|
||||||
#else
|
|
||||||
fprintf(out, "0x%08x: ", pc);
|
|
||||||
#endif
|
|
||||||
count = print_insn(pc, &disasm_info);
|
count = print_insn(pc, &disasm_info);
|
||||||
#if 0
|
#if 0
|
||||||
{
|
{
|
||||||
|
@ -301,10 +297,12 @@ void monitor_disas(target_ulong pc, int nb_insn, int is_physical, int flags)
|
||||||
disasm_info.endian = BFD_ENDIAN_LITTLE;
|
disasm_info.endian = BFD_ENDIAN_LITTLE;
|
||||||
#endif
|
#endif
|
||||||
#if defined(TARGET_I386)
|
#if defined(TARGET_I386)
|
||||||
if (!flags)
|
if (flags == 2)
|
||||||
disasm_info.mach = bfd_mach_i386_i386;
|
disasm_info.mach = bfd_mach_x86_64;
|
||||||
else
|
else if (flags == 1)
|
||||||
disasm_info.mach = bfd_mach_i386_i8086;
|
disasm_info.mach = bfd_mach_i386_i8086;
|
||||||
|
else
|
||||||
|
disasm_info.mach = bfd_mach_i386_i386;
|
||||||
print_insn = print_insn_i386;
|
print_insn = print_insn_i386;
|
||||||
#elif defined(TARGET_ARM)
|
#elif defined(TARGET_ARM)
|
||||||
print_insn = print_insn_arm;
|
print_insn = print_insn_arm;
|
||||||
|
@ -318,7 +316,7 @@ void monitor_disas(target_ulong pc, int nb_insn, int is_physical, int flags)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for(i = 0; i < nb_insn; i++) {
|
for(i = 0; i < nb_insn; i++) {
|
||||||
term_printf("0x%08lx: ", (unsigned long)pc);
|
term_printf("0x" TARGET_FMT_lx ": ", pc);
|
||||||
count = print_insn(pc, &disasm_info);
|
count = print_insn(pc, &disasm_info);
|
||||||
term_printf("\n");
|
term_printf("\n");
|
||||||
if (count < 0)
|
if (count < 0)
|
||||||
|
|
Loading…
Reference in New Issue