01917d
commit 4f6ffcd38d90eef0e0afc2fd32d7086c706b9bb0
01917d
Author: Peter Bergner <bergner@vnet.ibm.com>
01917d
Date:   Tue Jul 30 02:26:09 2013 +0000
01917d
01917d
    opcodes/
01917d
            * ppc-dis.c (powerpc_init_dialect): Use ppc_parse_cpu() to set dialect.
01917d
01917d
### a/opcodes/ChangeLog
01917d
### b/opcodes/ChangeLog
01917d
## -1,3 +1,7 @@
01917d
+2013-07-29  Peter Bergner <bergner@vnet.ibm.com>
01917d
+
01917d
+	* ppc-dis.c (powerpc_init_dialect): Use ppc_parse_cpu() to set dialect.
01917d
+
01917d
 2013-07-26  Sergey Guriev  <sergey.s.guriev@intel.com>
01917d
 	    Alexander Ivchenko  <alexander.ivchenko@intel.com>
01917d
 	    Maxim Kuznetsov  <maxim.kuznetsov@intel.com>
01917d
--- a/opcodes/ppc-dis.c
01917d
+++ b/opcodes/ppc-dis.c
01917d
@@ -263,56 +263,39 @@ powerpc_init_dialect (struct disassemble_info *info)
01917d
     {
01917d
     case bfd_mach_ppc_403:
01917d
     case bfd_mach_ppc_403gc:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_403);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "403");
01917d
       break;
01917d
     case bfd_mach_ppc_405:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_403 | PPC_OPCODE_405);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "405");
01917d
       break;
01917d
     case bfd_mach_ppc_601:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_601);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "601");
01917d
       break;
01917d
     case bfd_mach_ppc_a35:
01917d
     case bfd_mach_ppc_rs64ii:
01917d
     case bfd_mach_ppc_rs64iii:
01917d
-      dialect = (PPC_OPCODE_POWER | PPC_OPCODE_POWER2 | PPC_OPCODE_64);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "pwr2") | PPC_OPCODE_64;
01917d
       break;
01917d
     case bfd_mach_ppc_e500:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_SPE
01917d
-		 | PPC_OPCODE_ISEL | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK
01917d
-		 | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
01917d
-		 | PPC_OPCODE_E500);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "e500");
01917d
       break;
01917d
     case bfd_mach_ppc_e500mc:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
01917d
-		 | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
01917d
-		 | PPC_OPCODE_E500MC);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "e500mc");
01917d
       break;
01917d
     case bfd_mach_ppc_e500mc64:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
01917d
-		 | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
01917d
-		 | PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_POWER5
01917d
-		 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "e500mc64");
01917d
       break;
01917d
     case bfd_mach_ppc_e5500:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
01917d
-		 | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
01917d
-		 | PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_POWER4
01917d
-		 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
01917d
-		 | PPC_OPCODE_POWER7);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "e5500");
01917d
       break;
01917d
     case bfd_mach_ppc_e6500:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
01917d
-		 | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
01917d
-		 | PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_ALTIVEC
01917d
-		 | PPC_OPCODE_ALTIVEC2 | PPC_OPCODE_E6500 | PPC_OPCODE_POWER4
01917d
-		 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "e6500");
01917d
       break;
01917d
     case bfd_mach_ppc_titan:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_PMR
01917d
-		 | PPC_OPCODE_RFMCI | PPC_OPCODE_TITAN);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "titan");
01917d
       break;
01917d
     case bfd_mach_ppc_vle:
01917d
-      dialect = (PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_VLE);
01917d
+      dialect = ppc_parse_cpu (dialect, &sticky, "vle");
01917d
       break;
01917d
     default:
01917d
       dialect = ppc_parse_cpu (dialect, &sticky, "power8") | PPC_OPCODE_ANY;