X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=ppc-dis.c;h=f9ae53e1d1a661aa13517dd9c10089158c7b0abb;hb=d66846a14e191c75f4aa373623dd9a7aaa843ade;hp=0da1be99e00324a5a9f9ec1a0dfc482208793f93;hpb=43ef9eb267fc0daade111c35ae945dc95427e3ef;p=qemu

diff --git a/ppc-dis.c b/ppc-dis.c
index 0da1be9..f9ae53e 100644
--- a/ppc-dis.c
+++ b/ppc-dis.c
@@ -646,7 +646,7 @@ const struct powerpc_operand powerpc_operands[] =
    same.  */
 
 /*ARGSUSED*/
-static unsigned long 
+static unsigned long
 insert_bat (insn, value, errmsg)
      uint32_t insn;
      int32_t value;
@@ -1122,7 +1122,7 @@ insert_ras (insn, value, errmsg)
    extraction function just checks that the fields are the same.  */
 
 /*ARGSUSED*/
-static unsigned long 
+static unsigned long
 insert_rbs (insn, value, errmsg)
      uint32_t insn;
      int32_t value;
@@ -3073,7 +3073,6 @@ print_insn_powerpc (disassemble_info *info, uint32_t insn, unsigned memaddr,
 
 /* Print a big endian PowerPC instruction.  For convenience, also
    disassemble instructions supported by the Motorola PowerPC 601.  */
-#include "cpu.h"
 
 int print_insn_ppc (bfd_vma pc, disassemble_info *info)
 {
@@ -3085,8 +3084,13 @@ int print_insn_ppc (bfd_vma pc, disassemble_info *info)
         opc = bfd_getb32(buf);
     else
         opc = bfd_getl32(buf);
-    return print_insn_powerpc (info, opc, pc,
-                               PPC | B32 | M601);
+    if (info->mach == bfd_mach_ppc64) {
+        return print_insn_powerpc (info, opc, pc,
+                                   PPC | B64);
+    } else {
+        return print_insn_powerpc (info, opc, pc,
+                                   PPC | B32 | M601);
+    }
 }
 
 /* Print a PowerPC or POWER instruction.  */