All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH for-2.11 0/6] ppc: cpu_model handling cleanups
@ 2017-08-24  8:21 Igor Mammedov
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal Igor Mammedov
                   ` (5 more replies)
  0 siblings, 6 replies; 31+ messages in thread
From: Igor Mammedov @ 2017-08-24  8:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: David Gibson, Alexander Graf, qemu-ppc

While removing cpu_init() tree-wide, I've stumbled uppon
PPC way of parsing cpu_model which looked way too complex
compared to other targets.

So here goes cleanups that instead of current inconsistent
way of dealing with cpu models
 - mix of case-(in)sensetive lookups and cpu model names
 - aliases pointing to another aliases
normalize cpu model names to upper-case and make aliases
point to cpu moldel names. These changes allow to simplify
cpu model handling quite a bit and make it look/behave
a bit more in line with other targets.
 
Patches are not must have for cpu_init() removal but make
it a little bit easier without need to deal with way of
conversion of cpu model to cpu type, so pls consider
merging it early once 2.11 merge window is open if
patches make any sense.

loosly (to avoid conflicts) depends on:
  https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg03364.html

repo for testing:
  https://github.com/imammedo/qemu.git ppc_cpu_model_cleanups_V1

CC: David Gibson <david@gibson.dropbear.id.au>
CC: Alexander Graf <agraf@suse.de>
CC: qemu-ppc@nongnu.org


Igor Mammedov (6):
  ppc: use macros to make cpu type name from string literal
  ppc: make cpu_model translation to type consistent
  ppc: make cpu alias point only to real cpu models
  ppc: replace inter-function cyclic dependency/recurssion with 2 simple
    lookups
  ppc: simplify cpu model lookup by PVR
  ppc: drop caching ObjectClass from PowerPCCPUAlias

 target/ppc/cpu-models.h     |   3 +-
 target/ppc/cpu.h            |   3 +
 target/ppc/kvm_ppc.h        |   2 +-
 hw/ppc/spapr_cpu_core.c     |  30 +-
 target/ppc/cpu-models.c     | 876 ++++++++++++++++++++++----------------------
 target/ppc/kvm.c            |   5 +-
 target/ppc/translate_init.c | 100 ++---
 7 files changed, 490 insertions(+), 529 deletions(-)

-- 
2.7.4

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal
  2017-08-24  8:21 [Qemu-devel] [PATCH for-2.11 0/6] ppc: cpu_model handling cleanups Igor Mammedov
@ 2017-08-24  8:21 ` Igor Mammedov
  2017-08-25  1:30   ` David Gibson
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent Igor Mammedov
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-24  8:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: David Gibson, Alexander Graf, qemu-ppc

Replace
  "-" TYPE_POWERPC_CPU
when composing cpu type name from cpu model string literal
and the same pattern in format strings with
 POWERPC_CPU_TYPE_SUFFIX and POWERPC_CPU_TYPE_NAME(model)
macroses like we do in x86.

Later POWERPC_CPU_TYPE_NAME() will be used to define default
cpu type per machine type and as bonus it will be consistent
and easy grep-able pattern across all other targets that I'm
plannig to treat the same way.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 target/ppc/cpu.h            | 3 +++
 target/ppc/kvm_ppc.h        | 2 +-
 target/ppc/cpu-models.c     | 2 +-
 target/ppc/kvm.c            | 2 +-
 target/ppc/translate_init.c | 6 +++---
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 12f0949..0512393 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1354,6 +1354,9 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val);
 
 #define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)
 
+#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU
+#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX
+
 #define cpu_signal_handler cpu_ppc_signal_handler
 #define cpu_list ppc_cpu_list
 
diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index 6bc6fb3..bcb40f2 100644
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@ -9,7 +9,7 @@
 #ifndef KVM_PPC_H
 #define KVM_PPC_H
 
-#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
+#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host")
 
 #ifdef CONFIG_KVM
 
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index 4d3e635..8b27962 100644
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -51,7 +51,7 @@
                                                                             \
     static const TypeInfo                                                   \
     glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_type_info) = {         \
-        .name       = _name "-" TYPE_POWERPC_CPU,                           \
+        .name       = POWERPC_CPU_TYPE_NAME(_name),                           \
         .parent     = stringify(_type) "-family-" TYPE_POWERPC_CPU,         \
         .class_init =                                                       \
             glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_class_init),   \
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 8571379..8590809 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -2484,7 +2484,7 @@ static int kvm_ppc_register_host_cpu_type(void)
             char *suffix;
 
             ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));
-            suffix = strstr(ppc_cpu_aliases[i].model, "-"TYPE_POWERPC_CPU);
+            suffix = strstr(ppc_cpu_aliases[i].model, POWERPC_CPU_TYPE_SUFFIX);
             if (suffix) {
                 *suffix = 0;
             }
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index 43be9a8..f377cf2 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -10185,7 +10185,7 @@ static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
     if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
         ppc_cpu_is_valid(pcc) &&
         strcmp(object_class_get_name(oc) + strlen(name),
-               "-" TYPE_POWERPC_CPU) == 0) {
+               POWERPC_CPU_TYPE_SUFFIX) == 0) {
         return 0;
     }
     return -1;
@@ -10327,7 +10327,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
     }
 
     name = g_strndup(typename,
-                     strlen(typename) - strlen("-" TYPE_POWERPC_CPU));
+                     strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));
     (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n",
                       name, pcc->pvr);
     for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
@@ -10388,7 +10388,7 @@ static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)
     typename = object_class_get_name(oc);
     info = g_malloc0(sizeof(*info));
     info->name = g_strndup(typename,
-                           strlen(typename) - strlen("-" TYPE_POWERPC_CPU));
+                           strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));
 
     entry = g_malloc0(sizeof(*entry));
     entry->value = info;
-- 
2.7.4

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent
  2017-08-24  8:21 [Qemu-devel] [PATCH for-2.11 0/6] ppc: cpu_model handling cleanups Igor Mammedov
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal Igor Mammedov
@ 2017-08-24  8:21 ` Igor Mammedov
  2017-08-25  1:38   ` David Gibson
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 3/6] ppc: make cpu alias point only to real cpu models Igor Mammedov
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-24  8:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: David Gibson, Alexander Graf, qemu-ppc

PPC handles -cpu FOO rather incosistently,
i.e. it does case-insensitive matching of FOO to
a CPU type (see: ppc_cpu_compare_class_name) but
handles alias names as case-sensitive, as result:

 # qemu-system-ppc64 -M mac99 -cpu g3
 qemu-system-ppc64: unable to find CPU model ' kN�U'

 # qemu-system-ppc64 -cpu 970MP_V1.1
 qemu-system-ppc64: Unable to find sPAPR CPU Core definition

while

 # qemu-system-ppc64 -M mac99 -cpu G3
 # qemu-system-ppc64 -cpu 970MP_v1.1

start up just fine.

Considering we can't take case-insensitive matching away,
make it case-insensitive for  all alias/type/core_type
lookups.

As side effect it allows to remove duplicate core types
which are the same but use lower-case letters in name.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
PS:
 consistent naming will be used by follow up patch to
 simplify cpu_model translation code and drop ~50LOC.
---
 hw/ppc/spapr_cpu_core.c     |  30 +-
 target/ppc/cpu-models.c     | 866 ++++++++++++++++++++++----------------------
 target/ppc/kvm.c            |   2 +-
 target/ppc/translate_init.c |   2 +-
 4 files changed, 450 insertions(+), 450 deletions(-)

diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index ea278ce..40936b4 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -130,8 +130,10 @@ char *spapr_get_cpu_core_type(const char *model)
 {
     char *core_type;
     gchar **model_pieces = g_strsplit(model, ",", 2);
+    gchar *cpu_model = g_ascii_strup(model_pieces[0], -1);
+    g_strfreev(model_pieces);
 
-    core_type = g_strdup_printf("%s-%s", model_pieces[0], TYPE_SPAPR_CPU_CORE);
+    core_type = g_strdup_printf("%s-" TYPE_SPAPR_CPU_CORE, cpu_model);
 
     /* Check whether it exists or whether we have to look up an alias name */
     if (!object_class_by_name(core_type)) {
@@ -139,13 +141,13 @@ char *spapr_get_cpu_core_type(const char *model)
 
         g_free(core_type);
         core_type = NULL;
-        realmodel = ppc_cpu_lookup_alias(model_pieces[0]);
+        realmodel = ppc_cpu_lookup_alias(cpu_model);
         if (realmodel) {
             core_type = spapr_get_cpu_core_type(realmodel);
         }
     }
+    g_free(cpu_model);
 
-    g_strfreev(model_pieces);
     return core_type;
 }
 
@@ -265,34 +267,32 @@ err:
 
 static const char *spapr_core_models[] = {
     /* 970 */
-    "970_v2.2",
+    "970_V2.2",
 
     /* 970MP variants */
-    "970MP_v1.0",
-    "970mp_v1.0",
-    "970MP_v1.1",
-    "970mp_v1.1",
+    "970MP_V1.0",
+    "970MP_V1.1",
 
     /* POWER5+ */
-    "POWER5+_v2.1",
+    "POWER5+_V2.1",
 
     /* POWER7 */
-    "POWER7_v2.3",
+    "POWER7_V2.3",
 
     /* POWER7+ */
-    "POWER7+_v2.1",
+    "POWER7+_V2.1",
 
     /* POWER8 */
-    "POWER8_v2.0",
+    "POWER8_V2.0",
 
     /* POWER8E */
-    "POWER8E_v2.1",
+    "POWER8E_V2.1",
 
     /* POWER8NVL */
-    "POWER8NVL_v1.0",
+    "POWER8NVL_V1.0",
 
     /* POWER9 */
-    "POWER9_v1.0",
+    "POWER9_V1.0",
 };
 
 static Property spapr_cpu_core_properties[] = {
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index 8b27962..346b6b1 100644
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -101,10 +101,10 @@
 #endif
     POWERPC_DEF("IOP480",        CPU_POWERPC_IOP480,                 IOP480,
                 "IOP480 (401 microcontroller)")
-    POWERPC_DEF("Cobra",         CPU_POWERPC_COBRA,                  401,
+    POWERPC_DEF("COBRA",         CPU_POWERPC_COBRA,                  401,
                 "IBM Processor for Network Resources")
 #if defined(TODO)
-    POWERPC_DEF("Xipchip",       CPU_POWERPC_XIPCHIP,                401,
+    POWERPC_DEF("XIPCHIP",       CPU_POWERPC_XIPCHIP,                401,
                 NULL)
 #endif
     /* PowerPC 403 family                                                    */
@@ -176,16 +176,16 @@
                 "PowerPC 405 F6")
 #endif
     /* PowerPC 405 microcontrollers                                          */
-    POWERPC_DEF("405CRa",        CPU_POWERPC_405CRa,                 405,
+    POWERPC_DEF("405CRA",        CPU_POWERPC_405CRa,                 405,
                 "PowerPC 405 CRa")
-    POWERPC_DEF("405CRb",        CPU_POWERPC_405CRb,                 405,
+    POWERPC_DEF("405CRB",        CPU_POWERPC_405CRb,                 405,
                 "PowerPC 405 CRb")
-    POWERPC_DEF("405CRc",        CPU_POWERPC_405CRc,                 405,
+    POWERPC_DEF("405CRC",        CPU_POWERPC_405CRc,                 405,
                 "PowerPC 405 CRc")
     POWERPC_DEF("405EP",         CPU_POWERPC_405EP,                  405,
                 "PowerPC 405 EP")
 #if defined(TODO)
-    POWERPC_DEF("405EXr",        CPU_POWERPC_405EXr,                 405,
+    POWERPC_DEF("405EXR",        CPU_POWERPC_405EXr,                 405,
                 "PowerPC 405 EXr")
 #endif
     POWERPC_DEF("405EZ",         CPU_POWERPC_405EZ,                  405,
@@ -194,13 +194,13 @@
     POWERPC_DEF("405FX",         CPU_POWERPC_405FX,                  405,
                 "PowerPC 405 FX")
 #endif
-    POWERPC_DEF("405GPa",        CPU_POWERPC_405GPa,                 405,
+    POWERPC_DEF("405GPA",        CPU_POWERPC_405GPa,                 405,
                 "PowerPC 405 GPa")
-    POWERPC_DEF("405GPb",        CPU_POWERPC_405GPb,                 405,
+    POWERPC_DEF("405GPB",        CPU_POWERPC_405GPb,                 405,
                 "PowerPC 405 GPb")
-    POWERPC_DEF("405GPc",        CPU_POWERPC_405GPc,                 405,
+    POWERPC_DEF("405GPC",        CPU_POWERPC_405GPc,                 405,
                 "PowerPC 405 GPc")
-    POWERPC_DEF("405GPd",        CPU_POWERPC_405GPd,                 405,
+    POWERPC_DEF("405GPD",        CPU_POWERPC_405GPd,                 405,
                 "PowerPC 405 GPd")
     POWERPC_DEF("405GPR",        CPU_POWERPC_405GPR,                 405,
                 "PowerPC 405 GPR")
@@ -226,20 +226,20 @@
     POWERPC_DEF("405S",          CPU_POWERPC_405S,                   405,
                 "PowerPC 405 S")
 #endif
-    POWERPC_DEF("Npe405H",       CPU_POWERPC_NPE405H,                405,
+    POWERPC_DEF("NPE405H",       CPU_POWERPC_NPE405H,                405,
                 "Npe405 H")
-    POWERPC_DEF("Npe405H2",      CPU_POWERPC_NPE405H2,               405,
+    POWERPC_DEF("NPE405H2",      CPU_POWERPC_NPE405H2,               405,
                 "Npe405 H2")
-    POWERPC_DEF("Npe405L",       CPU_POWERPC_NPE405L,                405,
+    POWERPC_DEF("NPE405L",       CPU_POWERPC_NPE405L,                405,
                 "Npe405 L")
-    POWERPC_DEF("Npe4GS3",       CPU_POWERPC_NPE4GS3,                405,
+    POWERPC_DEF("NPE4GS3",       CPU_POWERPC_NPE4GS3,                405,
                 "Npe4GS3")
 #if defined(TODO)
-    POWERPC_DEF("Npcxx1",        CPU_POWERPC_NPCxx1,                 405,
+    POWERPC_DEF("NPCXX1",        CPU_POWERPC_NPCxx1,                 405,
                 NULL)
 #endif
 #if defined(TODO)
-    POWERPC_DEF("Npr161",        CPU_POWERPC_NPR161,                 405,
+    POWERPC_DEF("NPR161",        CPU_POWERPC_NPR161,                 405,
                 NULL)
 #endif
 #if defined(TODO)
@@ -278,24 +278,24 @@
                 "STB130")
 #endif
     /* Xilinx PowerPC 405 cores                                              */
-    POWERPC_DEF("x2vp4",         CPU_POWERPC_X2VP4,                  405,
+    POWERPC_DEF("X2VP4",         CPU_POWERPC_X2VP4,                  405,
                 NULL)
-    POWERPC_DEF("x2vp20",        CPU_POWERPC_X2VP20,                 405,
+    POWERPC_DEF("X2VP20",        CPU_POWERPC_X2VP20,                 405,
                 NULL)
 #if defined(TODO)
-    POWERPC_DEF("zl10310",       CPU_POWERPC_ZL10310,                405,
+    POWERPC_DEF("ZL10310",       CPU_POWERPC_ZL10310,                405,
                 "Zarlink ZL10310")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("zl10311",       CPU_POWERPC_ZL10311,                405,
+    POWERPC_DEF("ZL10311",       CPU_POWERPC_ZL10311,                405,
                 "Zarlink ZL10311")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("zl10320",       CPU_POWERPC_ZL10320,                405,
+    POWERPC_DEF("ZL10320",       CPU_POWERPC_ZL10320,                405,
                 "Zarlink ZL10320")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("zl10321",       CPU_POWERPC_ZL10321,                405,
+    POWERPC_DEF("ZL10321",       CPU_POWERPC_ZL10321,                405,
                 "Zarlink ZL10321")
 #endif
     /* PowerPC 440 family                                                    */
@@ -308,10 +308,10 @@
     POWERPC_DEF("440A4",         CPU_POWERPC_440A4,                  440x4,
                 "PowerPC 440 A4")
 #endif
-    POWERPC_DEF("440-Xilinx",    CPU_POWERPC_440_XILINX,             440x5,
+    POWERPC_DEF("440-XILINX",    CPU_POWERPC_440_XILINX,             440x5,
                 "PowerPC 440 Xilinx 5")
 
-    POWERPC_DEF("440-Xilinx-w-dfpu",    CPU_POWERPC_440_XILINX, 440x5wDFPU,
+    POWERPC_DEF("440-XILINX-W-DFPU",    CPU_POWERPC_440_XILINX, 440x5wDFPU,
                 "PowerPC 440 Xilinx 5 With a Double Prec. FPU")
 #if defined(TODO)
     POWERPC_DEF("440A5",         CPU_POWERPC_440A5,                  440x5,
@@ -342,22 +342,22 @@
                 "PowerPC 440H6")
 #endif
     /* PowerPC 440 microcontrollers                                          */
-    POWERPC_DEF("440EPa",        CPU_POWERPC_440EPa,                 440EP,
+    POWERPC_DEF("440EPA",        CPU_POWERPC_440EPa,                 440EP,
                 "PowerPC 440 EPa")
-    POWERPC_DEF("440EPb",        CPU_POWERPC_440EPb,                 440EP,
+    POWERPC_DEF("440EPB",        CPU_POWERPC_440EPb,                 440EP,
                 "PowerPC 440 EPb")
     POWERPC_DEF("440EPX",        CPU_POWERPC_440EPX,                 440EP,
                 "PowerPC 440 EPX")
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("440GPb",        CPU_POWERPC_440GPb,                 440GP,
+    POWERPC_DEF("440GPB",        CPU_POWERPC_440GPb,                 440GP,
                 "PowerPC 440 GPb")
 #endif
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("440GPc",        CPU_POWERPC_440GPc,                 440GP,
+    POWERPC_DEF("440GPC",        CPU_POWERPC_440GPc,                 440GP,
                 "PowerPC 440 GPc")
 #endif
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("440GRa",        CPU_POWERPC_440GRa,                 440x5,
+    POWERPC_DEF("440GRA",        CPU_POWERPC_440GRa,                 440x5,
                 "PowerPC 440 GRa")
 #endif
 #if defined(TODO_USER_ONLY)
@@ -365,19 +365,19 @@
                 "PowerPC 440 GRX")
 #endif
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("440GXa",        CPU_POWERPC_440GXa,                 440EP,
+    POWERPC_DEF("440GXA",        CPU_POWERPC_440GXa,                 440EP,
                 "PowerPC 440 GXa")
 #endif
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("440GXb",        CPU_POWERPC_440GXb,                 440EP,
+    POWERPC_DEF("440GXB",        CPU_POWERPC_440GXb,                 440EP,
                 "PowerPC 440 GXb")
 #endif
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("440GXc",        CPU_POWERPC_440GXc,                 440EP,
+    POWERPC_DEF("440GXC",        CPU_POWERPC_440GXc,                 440EP,
                 "PowerPC 440 GXc")
 #endif
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("440GXf",        CPU_POWERPC_440GXf,                 440EP,
+    POWERPC_DEF("440GXF",        CPU_POWERPC_440GXf,                 440EP,
                 "PowerPC 440 GXf")
 #endif
 #if defined(TODO)
@@ -413,12 +413,12 @@
     /* Freescale embedded PowerPC cores                                      */
     /* MPC5xx family (aka RCPU)                                              */
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("MPC5xx",        CPU_POWERPC_MPC5xx,                 MPC5xx,
+    POWERPC_DEF("MPC5XX",        CPU_POWERPC_MPC5xx,                 MPC5xx,
                 "Generic MPC5xx core")
 #endif
     /* MPC8xx family (aka PowerQUICC)                                        */
 #if defined(TODO_USER_ONLY)
-    POWERPC_DEF("MPC8xx",        CPU_POWERPC_MPC8xx,                 MPC8xx,
+    POWERPC_DEF("MPC8XX",        CPU_POWERPC_MPC8xx,                 MPC8xx,
                 "Generic MPC8xx core")
 #endif
     /* MPC82xx family (aka PowerQUICC-II)                                    */
@@ -430,57 +430,57 @@
                 "PowerPC G2 GP core")
     POWERPC_DEF("G2LS",          CPU_POWERPC_G2ls,                   G2,
                 "PowerPC G2 LS core")
-    POWERPC_DEF("G2HiP3",        CPU_POWERPC_G2_HIP3,                G2,
+    POWERPC_DEF("G2HIP3",        CPU_POWERPC_G2_HIP3,                G2,
                 "PowerPC G2 HiP3 core")
-    POWERPC_DEF("G2HiP4",        CPU_POWERPC_G2_HIP4,                G2,
+    POWERPC_DEF("G2HIP4",        CPU_POWERPC_G2_HIP4,                G2,
                 "PowerPC G2 HiP4 core")
     POWERPC_DEF("MPC603",        CPU_POWERPC_MPC603,                 603E,
                 "PowerPC MPC603 core")
-    POWERPC_DEF("G2le",          CPU_POWERPC_G2LE,                   G2LE,
+    POWERPC_DEF("G2LE",          CPU_POWERPC_G2LE,                   G2LE,
         "PowerPC G2le core (same as G2 plus little-endian mode support)")
-    POWERPC_DEF("G2leGP",        CPU_POWERPC_G2LEgp,                 G2LE,
+    POWERPC_DEF("G2LEGP",        CPU_POWERPC_G2LEgp,                 G2LE,
                 "PowerPC G2LE GP core")
-    POWERPC_DEF("G2leLS",        CPU_POWERPC_G2LEls,                 G2LE,
+    POWERPC_DEF("G2LELS",        CPU_POWERPC_G2LEls,                 G2LE,
                 "PowerPC G2LE LS core")
-    POWERPC_DEF("G2leGP1",       CPU_POWERPC_G2LEgp1,                G2LE,
+    POWERPC_DEF("G2LEGP1",       CPU_POWERPC_G2LEgp1,                G2LE,
                 "PowerPC G2LE GP1 core")
-    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp3,                G2LE,
+    POWERPC_DEF("G2LEGP3",       CPU_POWERPC_G2LEgp3,                G2LE,
                 "PowerPC G2LE GP3 core")
     /* PowerPC G2 microcontrollers                                           */
 #if defined(TODO)
     POWERPC_DEF_SVR("MPC5121", "MPC5121",
                     CPU_POWERPC_MPC5121,      POWERPC_SVR_5121,      G2LE)
 #endif
-    POWERPC_DEF_SVR("MPC5200_v10", "MPC5200 v1.0",
+    POWERPC_DEF_SVR("MPC5200_V10", "MPC5200 v1.0",
                     CPU_POWERPC_MPC5200_v10,  POWERPC_SVR_5200_v10,  G2LE)
-    POWERPC_DEF_SVR("MPC5200_v11", "MPC5200 v1.1",
+    POWERPC_DEF_SVR("MPC5200_V11", "MPC5200 v1.1",
                     CPU_POWERPC_MPC5200_v11,  POWERPC_SVR_5200_v11,  G2LE)
-    POWERPC_DEF_SVR("MPC5200_v12", "MPC5200 v1.2",
+    POWERPC_DEF_SVR("MPC5200_V12", "MPC5200 v1.2",
                     CPU_POWERPC_MPC5200_v12,  POWERPC_SVR_5200_v12,  G2LE)
-    POWERPC_DEF_SVR("MPC5200B_v20", "MPC5200B v2.0",
+    POWERPC_DEF_SVR("MPC5200B_V20", "MPC5200B v2.0",
                     CPU_POWERPC_MPC5200B_v20, POWERPC_SVR_5200B_v20, G2LE)
-    POWERPC_DEF_SVR("MPC5200B_v21", "MPC5200B v2.1",
+    POWERPC_DEF_SVR("MPC5200B_V21", "MPC5200B v2.1",
                     CPU_POWERPC_MPC5200B_v21, POWERPC_SVR_5200B_v21, G2LE)
     /* e200 family                                                           */
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC55xx", "Generic MPC55xx core",
+    POWERPC_DEF_SVR("MPC55XX", "Generic MPC55xx core",
                     CPU_POWERPC_MPC55xx,      POWERPC_SVR_55xx,      e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF("e200z0",        CPU_POWERPC_e200z0,                 e200,
+    POWERPC_DEF("E200Z0",        CPU_POWERPC_e200z0,                 e200,
                 "PowerPC e200z0 core")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("e200z1",        CPU_POWERPC_e200z1,                 e200,
+    POWERPC_DEF("E200Z1",        CPU_POWERPC_e200z1,                 e200,
                 "PowerPC e200z1 core")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("e200z3",        CPU_POWERPC_e200z3,                 e200,
+    POWERPC_DEF("E200Z3",        CPU_POWERPC_e200z3,                 e200,
                 "PowerPC e200z3 core")
 #endif
-    POWERPC_DEF("e200z5",        CPU_POWERPC_e200z5,                 e200,
+    POWERPC_DEF("E200Z5",        CPU_POWERPC_e200z5,                 e200,
                 "PowerPC e200z5 core")
-    POWERPC_DEF("e200z6",        CPU_POWERPC_e200z6,                 e200,
+    POWERPC_DEF("E200Z6",        CPU_POWERPC_e200z6,                 e200,
                 "PowerPC e200z6 core")
     /* PowerPC e200 microcontrollers                                         */
 #if defined(TODO)
@@ -488,11 +488,11 @@
                     CPU_POWERPC_MPC5514E,     POWERPC_SVR_5514E,     e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC5514E_v0", "MPC5514E v0",
+    POWERPC_DEF_SVR("MPC5514E_V0", "MPC5514E v0",
                     CPU_POWERPC_MPC5514E_v0,  POWERPC_SVR_5514E_v0,  e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC5514E_v1", "MPC5514E v1",
+    POWERPC_DEF_SVR("MPC5514E_V1", "MPC5514E v1",
                     CPU_POWERPC_MPC5514E_v1,  POWERPC_SVR_5514E_v1,  e200)
 #endif
 #if defined(TODO)
@@ -500,11 +500,11 @@
                     CPU_POWERPC_MPC5514G,     POWERPC_SVR_5514G,     e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC5514G_v0", "MPC5514G v0",
+    POWERPC_DEF_SVR("MPC5514G_V0", "MPC5514G v0",
                     CPU_POWERPC_MPC5514G_v0,  POWERPC_SVR_5514G_v0,  e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC5514G_v1", "MPC5514G v1",
+    POWERPC_DEF_SVR("MPC5514G_V1", "MPC5514G v1",
                     CPU_POWERPC_MPC5514G_v1,  POWERPC_SVR_5514G_v1,  e200)
 #endif
 #if defined(TODO)
@@ -516,11 +516,11 @@
                     CPU_POWERPC_MPC5516E,     POWERPC_SVR_5516E,     e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC5516E_v0", "MPC5516E v0",
+    POWERPC_DEF_SVR("MPC5516E_V0", "MPC5516E v0",
                     CPU_POWERPC_MPC5516E_v0,  POWERPC_SVR_5516E_v0,  e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC5516E_v1", "MPC5516E v1",
+    POWERPC_DEF_SVR("MPC5516E_V1", "MPC5516E v1",
                     CPU_POWERPC_MPC5516E_v1,  POWERPC_SVR_5516E_v1,  e200)
 #endif
 #if defined(TODO)
@@ -528,11 +528,11 @@
                     CPU_POWERPC_MPC5516G,     POWERPC_SVR_5516G,     e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC5516G_v0", "MPC5516G v0",
+    POWERPC_DEF_SVR("MPC5516G_V0", "MPC5516G v0",
                     CPU_POWERPC_MPC5516G_v0,  POWERPC_SVR_5516G_v0,  e200)
 #endif
 #if defined(TODO)
-    POWERPC_DEF_SVR("MPC5516G_v1", "MPC5516G v1",
+    POWERPC_DEF_SVR("MPC5516G_V1", "MPC5516G v1",
                     CPU_POWERPC_MPC5516G_v1,  POWERPC_SVR_5516G_v1,  e200)
 #endif
 #if defined(TODO)
@@ -572,13 +572,13 @@
                     CPU_POWERPC_MPC5567,      POWERPC_SVR_5567,      e200)
 #endif
     /* e300 family                                                           */
-    POWERPC_DEF("e300c1",        CPU_POWERPC_e300c1,                 e300,
+    POWERPC_DEF("E300C1",        CPU_POWERPC_e300c1,                 e300,
                 "PowerPC e300c1 core")
-    POWERPC_DEF("e300c2",        CPU_POWERPC_e300c2,                 e300,
+    POWERPC_DEF("E300C2",        CPU_POWERPC_e300c2,                 e300,
                 "PowerPC e300c2 core")
-    POWERPC_DEF("e300c3",        CPU_POWERPC_e300c3,                 e300,
+    POWERPC_DEF("E300C3",        CPU_POWERPC_e300c3,                 e300,
                 "PowerPC e300c3 core")
-    POWERPC_DEF("e300c4",        CPU_POWERPC_e300c4,                 e300,
+    POWERPC_DEF("E300C4",        CPU_POWERPC_e300c4,                 e300,
                 "PowerPC e300c4 core")
     /* PowerPC e300 microcontrollers                                         */
 #if defined(TODO)
@@ -674,114 +674,114 @@
     POWERPC_DEF_SVR("MPC8379E", "MPC8379E",
                     CPU_POWERPC_MPC837x,      POWERPC_SVR_8379E,     e300)
     /* e500 family                                                           */
-    POWERPC_DEF_SVR("e500_v10", "PowerPC e500 v1.0 core",
+    POWERPC_DEF_SVR("E500_V10", "PowerPC e500 v1.0 core",
                     CPU_POWERPC_e500v1_v10,   POWERPC_SVR_E500,      e500v1);
-    POWERPC_DEF_SVR("e500_v20", "PowerPC e500 v2.0 core",
+    POWERPC_DEF_SVR("E500_V20", "PowerPC e500 v2.0 core",
                     CPU_POWERPC_e500v1_v20,   POWERPC_SVR_E500,      e500v1);
-    POWERPC_DEF_SVR("e500v2_v10", "PowerPC e500v2 v1.0 core",
+    POWERPC_DEF_SVR("E500V2_V10", "PowerPC e500v2 v1.0 core",
                     CPU_POWERPC_e500v2_v10,   POWERPC_SVR_E500,      e500v2);
-    POWERPC_DEF_SVR("e500v2_v20", "PowerPC e500v2 v2.0 core",
+    POWERPC_DEF_SVR("E500V2_V20", "PowerPC e500v2 v2.0 core",
                     CPU_POWERPC_e500v2_v20,   POWERPC_SVR_E500,      e500v2);
-    POWERPC_DEF_SVR("e500v2_v21", "PowerPC e500v2 v2.1 core",
+    POWERPC_DEF_SVR("E500V2_V21", "PowerPC e500v2 v2.1 core",
                     CPU_POWERPC_e500v2_v21,   POWERPC_SVR_E500,      e500v2);
-    POWERPC_DEF_SVR("e500v2_v22", "PowerPC e500v2 v2.2 core",
+    POWERPC_DEF_SVR("E500V2_V22", "PowerPC e500v2 v2.2 core",
                     CPU_POWERPC_e500v2_v22,   POWERPC_SVR_E500,      e500v2);
-    POWERPC_DEF_SVR("e500v2_v30", "PowerPC e500v2 v3.0 core",
+    POWERPC_DEF_SVR("E500V2_V30", "PowerPC e500v2 v3.0 core",
                     CPU_POWERPC_e500v2_v30,   POWERPC_SVR_E500,      e500v2);
-    POWERPC_DEF_SVR("e500mc", "e500mc",
+    POWERPC_DEF_SVR("E500MC", "e500mc",
                     CPU_POWERPC_e500mc,       POWERPC_SVR_E500,      e500mc)
 #ifdef TARGET_PPC64
-    POWERPC_DEF_SVR("e5500", "e5500",
+    POWERPC_DEF_SVR("E5500", "e5500",
                     CPU_POWERPC_e5500,        POWERPC_SVR_E500,      e5500)
 #endif
     /* PowerPC e500 microcontrollers                                         */
-    POWERPC_DEF_SVR("MPC8533_v10", "MPC8533 v1.0",
+    POWERPC_DEF_SVR("MPC8533_V10", "MPC8533 v1.0",
                     CPU_POWERPC_MPC8533_v10,  POWERPC_SVR_8533_v10,  e500v2)
-    POWERPC_DEF_SVR("MPC8533_v11", "MPC8533 v1.1",
+    POWERPC_DEF_SVR("MPC8533_V11", "MPC8533 v1.1",
                     CPU_POWERPC_MPC8533_v11,  POWERPC_SVR_8533_v11,  e500v2)
-    POWERPC_DEF_SVR("MPC8533E_v10", "MPC8533E v1.0",
+    POWERPC_DEF_SVR("MPC8533E_V10", "MPC8533E v1.0",
                     CPU_POWERPC_MPC8533E_v10, POWERPC_SVR_8533E_v10, e500v2)
-    POWERPC_DEF_SVR("MPC8533E_v11", "MPC8533E v1.1",
+    POWERPC_DEF_SVR("MPC8533E_V11", "MPC8533E v1.1",
                     CPU_POWERPC_MPC8533E_v11, POWERPC_SVR_8533E_v11, e500v2)
-    POWERPC_DEF_SVR("MPC8540_v10", "MPC8540 v1.0",
+    POWERPC_DEF_SVR("MPC8540_V10", "MPC8540 v1.0",
                     CPU_POWERPC_MPC8540_v10,  POWERPC_SVR_8540_v10,  e500v1)
-    POWERPC_DEF_SVR("MPC8540_v20", "MPC8540 v2.0",
+    POWERPC_DEF_SVR("MPC8540_V20", "MPC8540 v2.0",
                     CPU_POWERPC_MPC8540_v20,  POWERPC_SVR_8540_v20,  e500v1)
-    POWERPC_DEF_SVR("MPC8540_v21", "MPC8540 v2.1",
+    POWERPC_DEF_SVR("MPC8540_V21", "MPC8540 v2.1",
                     CPU_POWERPC_MPC8540_v21,  POWERPC_SVR_8540_v21,  e500v1)
-    POWERPC_DEF_SVR("MPC8541_v10", "MPC8541 v1.0",
+    POWERPC_DEF_SVR("MPC8541_V10", "MPC8541 v1.0",
                     CPU_POWERPC_MPC8541_v10,  POWERPC_SVR_8541_v10,  e500v1)
-    POWERPC_DEF_SVR("MPC8541_v11", "MPC8541 v1.1",
+    POWERPC_DEF_SVR("MPC8541_V11", "MPC8541 v1.1",
                     CPU_POWERPC_MPC8541_v11,  POWERPC_SVR_8541_v11,  e500v1)
-    POWERPC_DEF_SVR("MPC8541E_v10", "MPC8541E v1.0",
+    POWERPC_DEF_SVR("MPC8541E_V10", "MPC8541E v1.0",
                     CPU_POWERPC_MPC8541E_v10, POWERPC_SVR_8541E_v10, e500v1)
-    POWERPC_DEF_SVR("MPC8541E_v11", "MPC8541E v1.1",
+    POWERPC_DEF_SVR("MPC8541E_V11", "MPC8541E v1.1",
                     CPU_POWERPC_MPC8541E_v11, POWERPC_SVR_8541E_v11, e500v1)
-    POWERPC_DEF_SVR("MPC8543_v10", "MPC8543 v1.0",
+    POWERPC_DEF_SVR("MPC8543_V10", "MPC8543 v1.0",
                     CPU_POWERPC_MPC8543_v10,  POWERPC_SVR_8543_v10,  e500v2)
-    POWERPC_DEF_SVR("MPC8543_v11", "MPC8543 v1.1",
+    POWERPC_DEF_SVR("MPC8543_V11", "MPC8543 v1.1",
                     CPU_POWERPC_MPC8543_v11,  POWERPC_SVR_8543_v11,  e500v2)
-    POWERPC_DEF_SVR("MPC8543_v20", "MPC8543 v2.0",
+    POWERPC_DEF_SVR("MPC8543_V20", "MPC8543 v2.0",
                     CPU_POWERPC_MPC8543_v20,  POWERPC_SVR_8543_v20,  e500v2)
-    POWERPC_DEF_SVR("MPC8543_v21", "MPC8543 v2.1",
+    POWERPC_DEF_SVR("MPC8543_V21", "MPC8543 v2.1",
                     CPU_POWERPC_MPC8543_v21,  POWERPC_SVR_8543_v21,  e500v2)
-    POWERPC_DEF_SVR("MPC8543E_v10", "MPC8543E v1.0",
+    POWERPC_DEF_SVR("MPC8543E_V10", "MPC8543E v1.0",
                     CPU_POWERPC_MPC8543E_v10, POWERPC_SVR_8543E_v10, e500v2)
-    POWERPC_DEF_SVR("MPC8543E_v11", "MPC8543E v1.1",
+    POWERPC_DEF_SVR("MPC8543E_V11", "MPC8543E v1.1",
                     CPU_POWERPC_MPC8543E_v11, POWERPC_SVR_8543E_v11, e500v2)
-    POWERPC_DEF_SVR("MPC8543E_v20", "MPC8543E v2.0",
+    POWERPC_DEF_SVR("MPC8543E_V20", "MPC8543E v2.0",
                     CPU_POWERPC_MPC8543E_v20, POWERPC_SVR_8543E_v20, e500v2)
-    POWERPC_DEF_SVR("MPC8543E_v21", "MPC8543E v2.1",
+    POWERPC_DEF_SVR("MPC8543E_V21", "MPC8543E v2.1",
                     CPU_POWERPC_MPC8543E_v21, POWERPC_SVR_8543E_v21, e500v2)
-    POWERPC_DEF_SVR("MPC8544_v10", "MPC8544 v1.0",
+    POWERPC_DEF_SVR("MPC8544_V10", "MPC8544 v1.0",
                     CPU_POWERPC_MPC8544_v10,  POWERPC_SVR_8544_v10,  e500v2)
-    POWERPC_DEF_SVR("MPC8544_v11", "MPC8544 v1.1",
+    POWERPC_DEF_SVR("MPC8544_V11", "MPC8544 v1.1",
                     CPU_POWERPC_MPC8544_v11,  POWERPC_SVR_8544_v11,  e500v2)
-    POWERPC_DEF_SVR("MPC8544E_v10", "MPC8544E v1.0",
+    POWERPC_DEF_SVR("MPC8544E_V10", "MPC8544E v1.0",
                     CPU_POWERPC_MPC8544E_v10, POWERPC_SVR_8544E_v10, e500v2)
-    POWERPC_DEF_SVR("MPC8544E_v11", "MPC8544E v1.1",
+    POWERPC_DEF_SVR("MPC8544E_V11", "MPC8544E v1.1",
                     CPU_POWERPC_MPC8544E_v11, POWERPC_SVR_8544E_v11, e500v2)
-    POWERPC_DEF_SVR("MPC8545_v20", "MPC8545 v2.0",
+    POWERPC_DEF_SVR("MPC8545_V20", "MPC8545 v2.0",
                     CPU_POWERPC_MPC8545_v20,  POWERPC_SVR_8545_v20,  e500v2)
-    POWERPC_DEF_SVR("MPC8545_v21", "MPC8545 v2.1",
+    POWERPC_DEF_SVR("MPC8545_V21", "MPC8545 v2.1",
                     CPU_POWERPC_MPC8545_v21,  POWERPC_SVR_8545_v21,  e500v2)
-    POWERPC_DEF_SVR("MPC8545E_v20", "MPC8545E v2.0",
+    POWERPC_DEF_SVR("MPC8545E_V20", "MPC8545E v2.0",
                     CPU_POWERPC_MPC8545E_v20, POWERPC_SVR_8545E_v20, e500v2)
-    POWERPC_DEF_SVR("MPC8545E_v21", "MPC8545E v2.1",
+    POWERPC_DEF_SVR("MPC8545E_V21", "MPC8545E v2.1",
                     CPU_POWERPC_MPC8545E_v21, POWERPC_SVR_8545E_v21, e500v2)
-    POWERPC_DEF_SVR("MPC8547E_v20", "MPC8547E v2.0",
+    POWERPC_DEF_SVR("MPC8547E_V20", "MPC8547E v2.0",
                     CPU_POWERPC_MPC8547E_v20, POWERPC_SVR_8547E_v20, e500v2)
-    POWERPC_DEF_SVR("MPC8547E_v21", "MPC8547E v2.1",
+    POWERPC_DEF_SVR("MPC8547E_V21", "MPC8547E v2.1",
                     CPU_POWERPC_MPC8547E_v21, POWERPC_SVR_8547E_v21, e500v2)
-    POWERPC_DEF_SVR("MPC8548_v10", "MPC8548 v1.0",
+    POWERPC_DEF_SVR("MPC8548_V10", "MPC8548 v1.0",
                     CPU_POWERPC_MPC8548_v10,  POWERPC_SVR_8548_v10,  e500v2)
-    POWERPC_DEF_SVR("MPC8548_v11", "MPC8548 v1.1",
+    POWERPC_DEF_SVR("MPC8548_V11", "MPC8548 v1.1",
                     CPU_POWERPC_MPC8548_v11,  POWERPC_SVR_8548_v11,  e500v2)
-    POWERPC_DEF_SVR("MPC8548_v20", "MPC8548 v2.0",
+    POWERPC_DEF_SVR("MPC8548_V20", "MPC8548 v2.0",
                     CPU_POWERPC_MPC8548_v20,  POWERPC_SVR_8548_v20,  e500v2)
-    POWERPC_DEF_SVR("MPC8548_v21", "MPC8548 v2.1",
+    POWERPC_DEF_SVR("MPC8548_V21", "MPC8548 v2.1",
                     CPU_POWERPC_MPC8548_v21,  POWERPC_SVR_8548_v21,  e500v2)
-    POWERPC_DEF_SVR("MPC8548E_v10", "MPC8548E v1.0",
+    POWERPC_DEF_SVR("MPC8548E_V10", "MPC8548E v1.0",
                     CPU_POWERPC_MPC8548E_v10, POWERPC_SVR_8548E_v10, e500v2)
-    POWERPC_DEF_SVR("MPC8548E_v11", "MPC8548E v1.1",
+    POWERPC_DEF_SVR("MPC8548E_V11", "MPC8548E v1.1",
                     CPU_POWERPC_MPC8548E_v11, POWERPC_SVR_8548E_v11, e500v2)
-    POWERPC_DEF_SVR("MPC8548E_v20", "MPC8548E v2.0",
+    POWERPC_DEF_SVR("MPC8548E_V20", "MPC8548E v2.0",
                     CPU_POWERPC_MPC8548E_v20, POWERPC_SVR_8548E_v20, e500v2)
-    POWERPC_DEF_SVR("MPC8548E_v21", "MPC8548E v2.1",
+    POWERPC_DEF_SVR("MPC8548E_V21", "MPC8548E v2.1",
                     CPU_POWERPC_MPC8548E_v21, POWERPC_SVR_8548E_v21, e500v2)
-    POWERPC_DEF_SVR("MPC8555_v10", "MPC8555 v1.0",
+    POWERPC_DEF_SVR("MPC8555_V10", "MPC8555 v1.0",
                     CPU_POWERPC_MPC8555_v10,  POWERPC_SVR_8555_v10,  e500v2)
-    POWERPC_DEF_SVR("MPC8555_v11", "MPC8555 v1.1",
+    POWERPC_DEF_SVR("MPC8555_V11", "MPC8555 v1.1",
                     CPU_POWERPC_MPC8555_v11,  POWERPC_SVR_8555_v11,  e500v2)
-    POWERPC_DEF_SVR("MPC8555E_v10", "MPC8555E v1.0",
+    POWERPC_DEF_SVR("MPC8555E_V10", "MPC8555E v1.0",
                     CPU_POWERPC_MPC8555E_v10, POWERPC_SVR_8555E_v10, e500v2)
-    POWERPC_DEF_SVR("MPC8555E_v11", "MPC8555E v1.1",
+    POWERPC_DEF_SVR("MPC8555E_V11", "MPC8555E v1.1",
                     CPU_POWERPC_MPC8555E_v11, POWERPC_SVR_8555E_v11, e500v2)
-    POWERPC_DEF_SVR("MPC8560_v10", "MPC8560 v1.0",
+    POWERPC_DEF_SVR("MPC8560_V10", "MPC8560 v1.0",
                     CPU_POWERPC_MPC8560_v10,  POWERPC_SVR_8560_v10,  e500v2)
-    POWERPC_DEF_SVR("MPC8560_v20", "MPC8560 v2.0",
+    POWERPC_DEF_SVR("MPC8560_V20", "MPC8560 v2.0",
                     CPU_POWERPC_MPC8560_v20,  POWERPC_SVR_8560_v20,  e500v2)
-    POWERPC_DEF_SVR("MPC8560_v21", "MPC8560 v2.1",
+    POWERPC_DEF_SVR("MPC8560_V21", "MPC8560 v2.1",
                     CPU_POWERPC_MPC8560_v21,  POWERPC_SVR_8560_v21,  e500v2)
     POWERPC_DEF_SVR("MPC8567", "MPC8567",
                     CPU_POWERPC_MPC8567,      POWERPC_SVR_8567,      e500v2)
@@ -796,7 +796,7 @@
     POWERPC_DEF_SVR("MPC8572E", "MPC8572E",
                     CPU_POWERPC_MPC8572E,     POWERPC_SVR_8572E,     e500v2)
     /* e600 family                                                           */
-    POWERPC_DEF("e600",          CPU_POWERPC_e600,                   e600,
+    POWERPC_DEF("E600",          CPU_POWERPC_e600,                   e600,
                 "PowerPC e600 core")
     /* PowerPC e600 microcontrollers                                         */
     POWERPC_DEF_SVR("MPC8610", "MPC8610",
@@ -807,299 +807,299 @@
                     CPU_POWERPC_MPC8641D,     POWERPC_SVR_8641D,     e600)
     /* 32 bits "classic" PowerPC                                             */
     /* PowerPC 6xx family                                                    */
-    POWERPC_DEF("601_v0",        CPU_POWERPC_601_v0,                 601,
+    POWERPC_DEF("601_V0",        CPU_POWERPC_601_v0,                 601,
                 "PowerPC 601v0")
-    POWERPC_DEF("601_v1",        CPU_POWERPC_601_v1,                 601,
+    POWERPC_DEF("601_V1",        CPU_POWERPC_601_v1,                 601,
                 "PowerPC 601v1")
-    POWERPC_DEF("601_v2",        CPU_POWERPC_601_v2,                 601v,
+    POWERPC_DEF("601_V2",        CPU_POWERPC_601_v2,                 601v,
                 "PowerPC 601v2")
     POWERPC_DEF("602",           CPU_POWERPC_602,                    602,
                 "PowerPC 602")
     POWERPC_DEF("603",           CPU_POWERPC_603,                    603,
                 "PowerPC 603")
-    POWERPC_DEF("603e_v1.1",     CPU_POWERPC_603E_v11,               603E,
+    POWERPC_DEF("603E_V1.1",     CPU_POWERPC_603E_v11,               603E,
                 "PowerPC 603e v1.1")
-    POWERPC_DEF("603e_v1.2",     CPU_POWERPC_603E_v12,               603E,
+    POWERPC_DEF("603E_V1.2",     CPU_POWERPC_603E_v12,               603E,
                 "PowerPC 603e v1.2")
-    POWERPC_DEF("603e_v1.3",     CPU_POWERPC_603E_v13,               603E,
+    POWERPC_DEF("603E_V1.3",     CPU_POWERPC_603E_v13,               603E,
                 "PowerPC 603e v1.3")
-    POWERPC_DEF("603e_v1.4",     CPU_POWERPC_603E_v14,               603E,
+    POWERPC_DEF("603E_V1.4",     CPU_POWERPC_603E_v14,               603E,
                 "PowerPC 603e v1.4")
-    POWERPC_DEF("603e_v2.2",     CPU_POWERPC_603E_v22,               603E,
+    POWERPC_DEF("603E_V2.2",     CPU_POWERPC_603E_v22,               603E,
                 "PowerPC 603e v2.2")
-    POWERPC_DEF("603e_v3",       CPU_POWERPC_603E_v3,                603E,
+    POWERPC_DEF("603E_V3",       CPU_POWERPC_603E_v3,                603E,
                 "PowerPC 603e v3")
-    POWERPC_DEF("603e_v4",       CPU_POWERPC_603E_v4,                603E,
+    POWERPC_DEF("603E_V4",       CPU_POWERPC_603E_v4,                603E,
                 "PowerPC 603e v4")
-    POWERPC_DEF("603e_v4.1",     CPU_POWERPC_603E_v41,               603E,
+    POWERPC_DEF("603E_V4.1",     CPU_POWERPC_603E_v41,               603E,
                 "PowerPC 603e v4.1")
-    POWERPC_DEF("603e7",         CPU_POWERPC_603E7,                  603E,
+    POWERPC_DEF("603E7",         CPU_POWERPC_603E7,                  603E,
                 "PowerPC 603e (aka PID7)")
-    POWERPC_DEF("603e7t",        CPU_POWERPC_603E7t,                 603E,
+    POWERPC_DEF("603E7T",        CPU_POWERPC_603E7t,                 603E,
                 "PowerPC 603e7t")
-    POWERPC_DEF("603e7v",        CPU_POWERPC_603E7v,                 603E,
+    POWERPC_DEF("603E7V",        CPU_POWERPC_603E7v,                 603E,
                 "PowerPC 603e7v")
-    POWERPC_DEF("603e7v1",       CPU_POWERPC_603E7v1,                603E,
+    POWERPC_DEF("603E7V1",       CPU_POWERPC_603E7v1,                603E,
                 "PowerPC 603e7v1")
-    POWERPC_DEF("603e7v2",       CPU_POWERPC_603E7v2,                603E,
+    POWERPC_DEF("603E7V2",       CPU_POWERPC_603E7v2,                603E,
                 "PowerPC 603e7v2")
-    POWERPC_DEF("603p",          CPU_POWERPC_603P,                   603E,
+    POWERPC_DEF("603P",          CPU_POWERPC_603P,                   603E,
                 "PowerPC 603p (aka PID7v)")
     POWERPC_DEF("604",           CPU_POWERPC_604,                    604,
                 "PowerPC 604")
-    POWERPC_DEF("604e_v1.0",     CPU_POWERPC_604E_v10,               604E,
+    POWERPC_DEF("604E_V1.0",     CPU_POWERPC_604E_v10,               604E,
                 "PowerPC 604e v1.0")
-    POWERPC_DEF("604e_v2.2",     CPU_POWERPC_604E_v22,               604E,
+    POWERPC_DEF("604E_V2.2",     CPU_POWERPC_604E_v22,               604E,
                 "PowerPC 604e v2.2")
-    POWERPC_DEF("604e_v2.4",     CPU_POWERPC_604E_v24,               604E,
+    POWERPC_DEF("604E_V2.4",     CPU_POWERPC_604E_v24,               604E,
                 "PowerPC 604e v2.4")
-    POWERPC_DEF("604r",          CPU_POWERPC_604R,                   604E,
+    POWERPC_DEF("604R",          CPU_POWERPC_604R,                   604E,
                 "PowerPC 604r (aka PIDA)")
 #if defined(TODO)
-    POWERPC_DEF("604ev",         CPU_POWERPC_604EV,                  604E,
+    POWERPC_DEF("604EV",         CPU_POWERPC_604EV,                  604E,
                 "PowerPC 604ev")
 #endif
     /* PowerPC 7xx family                                                    */
-    POWERPC_DEF("740_v1.0",      CPU_POWERPC_7x0_v10,                740,
+    POWERPC_DEF("740_V1.0",      CPU_POWERPC_7x0_v10,                740,
                 "PowerPC 740 v1.0 (G3)")
-    POWERPC_DEF("750_v1.0",      CPU_POWERPC_7x0_v10,                750,
+    POWERPC_DEF("750_V1.0",      CPU_POWERPC_7x0_v10,                750,
                 "PowerPC 750 v1.0 (G3)")
-    POWERPC_DEF("740_v2.0",      CPU_POWERPC_7x0_v20,                740,
+    POWERPC_DEF("740_V2.0",      CPU_POWERPC_7x0_v20,                740,
                 "PowerPC 740 v2.0 (G3)")
-    POWERPC_DEF("750_v2.0",      CPU_POWERPC_7x0_v20,                750,
+    POWERPC_DEF("750_V2.0",      CPU_POWERPC_7x0_v20,                750,
                 "PowerPC 750 v2.0 (G3)")
-    POWERPC_DEF("740_v2.1",      CPU_POWERPC_7x0_v21,                740,
+    POWERPC_DEF("740_V2.1",      CPU_POWERPC_7x0_v21,                740,
                 "PowerPC 740 v2.1 (G3)")
-    POWERPC_DEF("750_v2.1",      CPU_POWERPC_7x0_v21,                750,
+    POWERPC_DEF("750_V2.1",      CPU_POWERPC_7x0_v21,                750,
                 "PowerPC 750 v2.1 (G3)")
-    POWERPC_DEF("740_v2.2",      CPU_POWERPC_7x0_v22,                740,
+    POWERPC_DEF("740_V2.2",      CPU_POWERPC_7x0_v22,                740,
                 "PowerPC 740 v2.2 (G3)")
-    POWERPC_DEF("750_v2.2",      CPU_POWERPC_7x0_v22,                750,
+    POWERPC_DEF("750_V2.2",      CPU_POWERPC_7x0_v22,                750,
                 "PowerPC 750 v2.2 (G3)")
-    POWERPC_DEF("740_v3.0",      CPU_POWERPC_7x0_v30,                740,
+    POWERPC_DEF("740_V3.0",      CPU_POWERPC_7x0_v30,                740,
                 "PowerPC 740 v3.0 (G3)")
-    POWERPC_DEF("750_v3.0",      CPU_POWERPC_7x0_v30,                750,
+    POWERPC_DEF("750_V3.0",      CPU_POWERPC_7x0_v30,                750,
                 "PowerPC 750 v3.0 (G3)")
-    POWERPC_DEF("740_v3.1",      CPU_POWERPC_7x0_v31,                740,
+    POWERPC_DEF("740_V3.1",      CPU_POWERPC_7x0_v31,                740,
                 "PowerPC 740 v3.1 (G3)")
-    POWERPC_DEF("750_v3.1",      CPU_POWERPC_7x0_v31,                750,
+    POWERPC_DEF("750_V3.1",      CPU_POWERPC_7x0_v31,                750,
                 "PowerPC 750 v3.1 (G3)")
-    POWERPC_DEF("740e",          CPU_POWERPC_740E,                   740,
+    POWERPC_DEF("740E",          CPU_POWERPC_740E,                   740,
                 "PowerPC 740E (G3)")
-    POWERPC_DEF("750e",          CPU_POWERPC_750E,                   750,
+    POWERPC_DEF("750E",          CPU_POWERPC_750E,                   750,
                 "PowerPC 750E (G3)")
-    POWERPC_DEF("740p",          CPU_POWERPC_7x0P,                   740,
+    POWERPC_DEF("740P",          CPU_POWERPC_7x0P,                   740,
                 "PowerPC 740P (G3)")
-    POWERPC_DEF("750p",          CPU_POWERPC_7x0P,                   750,
+    POWERPC_DEF("750P",          CPU_POWERPC_7x0P,                   750,
                 "PowerPC 750P (G3)")
-    POWERPC_DEF("750cl_v1.0",    CPU_POWERPC_750CL_v10,              750cl,
+    POWERPC_DEF("750CL_V1.0",    CPU_POWERPC_750CL_v10,              750cl,
                 "PowerPC 750CL v1.0")
-    POWERPC_DEF("750cl_v2.0",    CPU_POWERPC_750CL_v20,              750cl,
+    POWERPC_DEF("750CL_V2.0",    CPU_POWERPC_750CL_v20,              750cl,
                 "PowerPC 750CL v2.0")
-    POWERPC_DEF("750cx_v1.0",    CPU_POWERPC_750CX_v10,              750cx,
+    POWERPC_DEF("750CX_V1.0",    CPU_POWERPC_750CX_v10,              750cx,
                 "PowerPC 750CX v1.0 (G3 embedded)")
-    POWERPC_DEF("750cx_v2.0",    CPU_POWERPC_750CX_v20,              750cx,
+    POWERPC_DEF("750CX_V2.0",    CPU_POWERPC_750CX_v20,              750cx,
                 "PowerPC 750CX v2.1 (G3 embedded)")
-    POWERPC_DEF("750cx_v2.1",    CPU_POWERPC_750CX_v21,              750cx,
+    POWERPC_DEF("750CX_V2.1",    CPU_POWERPC_750CX_v21,              750cx,
                 "PowerPC 750CX v2.1 (G3 embedded)")
-    POWERPC_DEF("750cx_v2.2",    CPU_POWERPC_750CX_v22,              750cx,
+    POWERPC_DEF("750CX_V2.2",    CPU_POWERPC_750CX_v22,              750cx,
                 "PowerPC 750CX v2.2 (G3 embedded)")
-    POWERPC_DEF("750cxe_v2.1",   CPU_POWERPC_750CXE_v21,             750cx,
+    POWERPC_DEF("750CXE_V2.1",   CPU_POWERPC_750CXE_v21,             750cx,
                 "PowerPC 750CXe v2.1 (G3 embedded)")
-    POWERPC_DEF("750cxe_v2.2",   CPU_POWERPC_750CXE_v22,             750cx,
+    POWERPC_DEF("750CXE_V2.2",   CPU_POWERPC_750CXE_v22,             750cx,
                 "PowerPC 750CXe v2.2 (G3 embedded)")
-    POWERPC_DEF("750cxe_v2.3",   CPU_POWERPC_750CXE_v23,             750cx,
+    POWERPC_DEF("750CXE_V2.3",   CPU_POWERPC_750CXE_v23,             750cx,
                 "PowerPC 750CXe v2.3 (G3 embedded)")
-    POWERPC_DEF("750cxe_v2.4",   CPU_POWERPC_750CXE_v24,             750cx,
+    POWERPC_DEF("750CXE_V2.4",   CPU_POWERPC_750CXE_v24,             750cx,
                 "PowerPC 750CXe v2.4 (G3 embedded)")
-    POWERPC_DEF("750cxe_v2.4b",  CPU_POWERPC_750CXE_v24b,            750cx,
+    POWERPC_DEF("750CXE_V2.4B",  CPU_POWERPC_750CXE_v24b,            750cx,
                 "PowerPC 750CXe v2.4b (G3 embedded)")
-    POWERPC_DEF("750cxe_v3.0",   CPU_POWERPC_750CXE_v30,             750cx,
+    POWERPC_DEF("750CXE_V3.0",   CPU_POWERPC_750CXE_v30,             750cx,
                 "PowerPC 750CXe v3.0 (G3 embedded)")
-    POWERPC_DEF("750cxe_v3.1",   CPU_POWERPC_750CXE_v31,             750cx,
+    POWERPC_DEF("750CXE_V3.1",   CPU_POWERPC_750CXE_v31,             750cx,
                 "PowerPC 750CXe v3.1 (G3 embedded)")
-    POWERPC_DEF("750cxe_v3.1b",  CPU_POWERPC_750CXE_v31b,            750cx,
+    POWERPC_DEF("750CXE_V3.1B",  CPU_POWERPC_750CXE_v31b,            750cx,
                 "PowerPC 750CXe v3.1b (G3 embedded)")
-    POWERPC_DEF("750cxr",        CPU_POWERPC_750CXR,                 750cx,
+    POWERPC_DEF("750CXR",        CPU_POWERPC_750CXR,                 750cx,
                 "PowerPC 750CXr (G3 embedded)")
-    POWERPC_DEF("750fl",         CPU_POWERPC_750FL,                  750fx,
+    POWERPC_DEF("750FL",         CPU_POWERPC_750FL,                  750fx,
                 "PowerPC 750FL (G3 embedded)")
-    POWERPC_DEF("750fx_v1.0",    CPU_POWERPC_750FX_v10,              750fx,
+    POWERPC_DEF("750FX_V1.0",    CPU_POWERPC_750FX_v10,              750fx,
                 "PowerPC 750FX v1.0 (G3 embedded)")
-    POWERPC_DEF("750fx_v2.0",    CPU_POWERPC_750FX_v20,              750fx,
+    POWERPC_DEF("750FX_V2.0",    CPU_POWERPC_750FX_v20,              750fx,
                 "PowerPC 750FX v2.0 (G3 embedded)")
-    POWERPC_DEF("750fx_v2.1",    CPU_POWERPC_750FX_v21,              750fx,
+    POWERPC_DEF("750FX_V2.1",    CPU_POWERPC_750FX_v21,              750fx,
                 "PowerPC 750FX v2.1 (G3 embedded)")
-    POWERPC_DEF("750fx_v2.2",    CPU_POWERPC_750FX_v22,              750fx,
+    POWERPC_DEF("750FX_V2.2",    CPU_POWERPC_750FX_v22,              750fx,
                 "PowerPC 750FX v2.2 (G3 embedded)")
-    POWERPC_DEF("750fx_v2.3",    CPU_POWERPC_750FX_v23,              750fx,
+    POWERPC_DEF("750FX_V2.3",    CPU_POWERPC_750FX_v23,              750fx,
                 "PowerPC 750FX v2.3 (G3 embedded)")
-    POWERPC_DEF("750gl",         CPU_POWERPC_750GL,                  750gx,
+    POWERPC_DEF("750GL",         CPU_POWERPC_750GL,                  750gx,
                 "PowerPC 750GL (G3 embedded)")
-    POWERPC_DEF("750gx_v1.0",    CPU_POWERPC_750GX_v10,              750gx,
+    POWERPC_DEF("750GX_V1.0",    CPU_POWERPC_750GX_v10,              750gx,
                 "PowerPC 750GX v1.0 (G3 embedded)")
-    POWERPC_DEF("750gx_v1.1",    CPU_POWERPC_750GX_v11,              750gx,
+    POWERPC_DEF("750GX_V1.1",    CPU_POWERPC_750GX_v11,              750gx,
                 "PowerPC 750GX v1.1 (G3 embedded)")
-    POWERPC_DEF("750gx_v1.2",    CPU_POWERPC_750GX_v12,              750gx,
+    POWERPC_DEF("750GX_V1.2",    CPU_POWERPC_750GX_v12,              750gx,
                 "PowerPC 750GX v1.2 (G3 embedded)")
-    POWERPC_DEF("750l_v2.0",     CPU_POWERPC_750L_v20,               750,
+    POWERPC_DEF("750L_V2.0",     CPU_POWERPC_750L_v20,               750,
                 "PowerPC 750L v2.0 (G3 embedded)")
-    POWERPC_DEF("750l_v2.1",     CPU_POWERPC_750L_v21,               750,
+    POWERPC_DEF("750L_V2.1",     CPU_POWERPC_750L_v21,               750,
                 "PowerPC 750L v2.1 (G3 embedded)")
-    POWERPC_DEF("750l_v2.2",     CPU_POWERPC_750L_v22,               750,
+    POWERPC_DEF("750L_V2.2",     CPU_POWERPC_750L_v22,               750,
                 "PowerPC 750L v2.2 (G3 embedded)")
-    POWERPC_DEF("750l_v3.0",     CPU_POWERPC_750L_v30,               750,
+    POWERPC_DEF("750L_V3.0",     CPU_POWERPC_750L_v30,               750,
                 "PowerPC 750L v3.0 (G3 embedded)")
-    POWERPC_DEF("750l_v3.2",     CPU_POWERPC_750L_v32,               750,
+    POWERPC_DEF("750L_V3.2",     CPU_POWERPC_750L_v32,               750,
                 "PowerPC 750L v3.2 (G3 embedded)")
-    POWERPC_DEF("745_v1.0",      CPU_POWERPC_7x5_v10,                745,
+    POWERPC_DEF("745_V1.0",      CPU_POWERPC_7x5_v10,                745,
                 "PowerPC 745 v1.0")
-    POWERPC_DEF("755_v1.0",      CPU_POWERPC_7x5_v10,                755,
+    POWERPC_DEF("755_V1.0",      CPU_POWERPC_7x5_v10,                755,
                 "PowerPC 755 v1.0")
-    POWERPC_DEF("745_v1.1",      CPU_POWERPC_7x5_v11,                745,
+    POWERPC_DEF("745_V1.1",      CPU_POWERPC_7x5_v11,                745,
                 "PowerPC 745 v1.1")
-    POWERPC_DEF("755_v1.1",      CPU_POWERPC_7x5_v11,                755,
+    POWERPC_DEF("755_V1.1",      CPU_POWERPC_7x5_v11,                755,
                 "PowerPC 755 v1.1")
-    POWERPC_DEF("745_v2.0",      CPU_POWERPC_7x5_v20,                745,
+    POWERPC_DEF("745_V2.0",      CPU_POWERPC_7x5_v20,                745,
                 "PowerPC 745 v2.0")
-    POWERPC_DEF("755_v2.0",      CPU_POWERPC_7x5_v20,                755,
+    POWERPC_DEF("755_V2.0",      CPU_POWERPC_7x5_v20,                755,
                 "PowerPC 755 v2.0")
-    POWERPC_DEF("745_v2.1",      CPU_POWERPC_7x5_v21,                745,
+    POWERPC_DEF("745_V2.1",      CPU_POWERPC_7x5_v21,                745,
                 "PowerPC 745 v2.1")
-    POWERPC_DEF("755_v2.1",      CPU_POWERPC_7x5_v21,                755,
+    POWERPC_DEF("755_V2.1",      CPU_POWERPC_7x5_v21,                755,
                 "PowerPC 755 v2.1")
-    POWERPC_DEF("745_v2.2",      CPU_POWERPC_7x5_v22,                745,
+    POWERPC_DEF("745_V2.2",      CPU_POWERPC_7x5_v22,                745,
                 "PowerPC 745 v2.2")
-    POWERPC_DEF("755_v2.2",      CPU_POWERPC_7x5_v22,                755,
+    POWERPC_DEF("755_V2.2",      CPU_POWERPC_7x5_v22,                755,
                 "PowerPC 755 v2.2")
-    POWERPC_DEF("745_v2.3",      CPU_POWERPC_7x5_v23,                745,
+    POWERPC_DEF("745_V2.3",      CPU_POWERPC_7x5_v23,                745,
                 "PowerPC 745 v2.3")
-    POWERPC_DEF("755_v2.3",      CPU_POWERPC_7x5_v23,                755,
+    POWERPC_DEF("755_V2.3",      CPU_POWERPC_7x5_v23,                755,
                 "PowerPC 755 v2.3")
-    POWERPC_DEF("745_v2.4",      CPU_POWERPC_7x5_v24,                745,
+    POWERPC_DEF("745_V2.4",      CPU_POWERPC_7x5_v24,                745,
                 "PowerPC 745 v2.4")
-    POWERPC_DEF("755_v2.4",      CPU_POWERPC_7x5_v24,                755,
+    POWERPC_DEF("755_V2.4",      CPU_POWERPC_7x5_v24,                755,
                 "PowerPC 755 v2.4")
-    POWERPC_DEF("745_v2.5",      CPU_POWERPC_7x5_v25,                745,
+    POWERPC_DEF("745_V2.5",      CPU_POWERPC_7x5_v25,                745,
                 "PowerPC 745 v2.5")
-    POWERPC_DEF("755_v2.5",      CPU_POWERPC_7x5_v25,                755,
+    POWERPC_DEF("755_V2.5",      CPU_POWERPC_7x5_v25,                755,
                 "PowerPC 755 v2.5")
-    POWERPC_DEF("745_v2.6",      CPU_POWERPC_7x5_v26,                745,
+    POWERPC_DEF("745_V2.6",      CPU_POWERPC_7x5_v26,                745,
                 "PowerPC 745 v2.6")
-    POWERPC_DEF("755_v2.6",      CPU_POWERPC_7x5_v26,                755,
+    POWERPC_DEF("755_V2.6",      CPU_POWERPC_7x5_v26,                755,
                 "PowerPC 755 v2.6")
-    POWERPC_DEF("745_v2.7",      CPU_POWERPC_7x5_v27,                745,
+    POWERPC_DEF("745_V2.7",      CPU_POWERPC_7x5_v27,                745,
                 "PowerPC 745 v2.7")
-    POWERPC_DEF("755_v2.7",      CPU_POWERPC_7x5_v27,                755,
+    POWERPC_DEF("755_V2.7",      CPU_POWERPC_7x5_v27,                755,
                 "PowerPC 755 v2.7")
-    POWERPC_DEF("745_v2.8",      CPU_POWERPC_7x5_v28,                745,
+    POWERPC_DEF("745_V2.8",      CPU_POWERPC_7x5_v28,                745,
                 "PowerPC 745 v2.8")
-    POWERPC_DEF("755_v2.8",      CPU_POWERPC_7x5_v28,                755,
+    POWERPC_DEF("755_V2.8",      CPU_POWERPC_7x5_v28,                755,
                 "PowerPC 755 v2.8")
 #if defined(TODO)
-    POWERPC_DEF("745p",          CPU_POWERPC_7x5P,                   745,
+    POWERPC_DEF("745P",          CPU_POWERPC_7x5P,                   745,
                 "PowerPC 745P (G3)")
-    POWERPC_DEF("755p",          CPU_POWERPC_7x5P,                   755,
+    POWERPC_DEF("755P",          CPU_POWERPC_7x5P,                   755,
                 "PowerPC 755P (G3)")
 #endif
     /* PowerPC 74xx family                                                   */
-    POWERPC_DEF("7400_v1.0",     CPU_POWERPC_7400_v10,               7400,
+    POWERPC_DEF("7400_V1.0",     CPU_POWERPC_7400_v10,               7400,
                 "PowerPC 7400 v1.0 (G4)")
-    POWERPC_DEF("7400_v1.1",     CPU_POWERPC_7400_v11,               7400,
+    POWERPC_DEF("7400_V1.1",     CPU_POWERPC_7400_v11,               7400,
                 "PowerPC 7400 v1.1 (G4)")
-    POWERPC_DEF("7400_v2.0",     CPU_POWERPC_7400_v20,               7400,
+    POWERPC_DEF("7400_V2.0",     CPU_POWERPC_7400_v20,               7400,
                 "PowerPC 7400 v2.0 (G4)")
-    POWERPC_DEF("7400_v2.1",     CPU_POWERPC_7400_v21,               7400,
+    POWERPC_DEF("7400_V2.1",     CPU_POWERPC_7400_v21,               7400,
                 "PowerPC 7400 v2.1 (G4)")
-    POWERPC_DEF("7400_v2.2",     CPU_POWERPC_7400_v22,               7400,
+    POWERPC_DEF("7400_V2.2",     CPU_POWERPC_7400_v22,               7400,
                 "PowerPC 7400 v2.2 (G4)")
-    POWERPC_DEF("7400_v2.6",     CPU_POWERPC_7400_v26,               7400,
+    POWERPC_DEF("7400_V2.6",     CPU_POWERPC_7400_v26,               7400,
                 "PowerPC 7400 v2.6 (G4)")
-    POWERPC_DEF("7400_v2.7",     CPU_POWERPC_7400_v27,               7400,
+    POWERPC_DEF("7400_V2.7",     CPU_POWERPC_7400_v27,               7400,
                 "PowerPC 7400 v2.7 (G4)")
-    POWERPC_DEF("7400_v2.8",     CPU_POWERPC_7400_v28,               7400,
+    POWERPC_DEF("7400_V2.8",     CPU_POWERPC_7400_v28,               7400,
                 "PowerPC 7400 v2.8 (G4)")
-    POWERPC_DEF("7400_v2.9",     CPU_POWERPC_7400_v29,               7400,
+    POWERPC_DEF("7400_V2.9",     CPU_POWERPC_7400_v29,               7400,
                 "PowerPC 7400 v2.9 (G4)")
-    POWERPC_DEF("7410_v1.0",     CPU_POWERPC_7410_v10,               7410,
+    POWERPC_DEF("7410_V1.0",     CPU_POWERPC_7410_v10,               7410,
                 "PowerPC 7410 v1.0 (G4)")
-    POWERPC_DEF("7410_v1.1",     CPU_POWERPC_7410_v11,               7410,
+    POWERPC_DEF("7410_V1.1",     CPU_POWERPC_7410_v11,               7410,
                 "PowerPC 7410 v1.1 (G4)")
-    POWERPC_DEF("7410_v1.2",     CPU_POWERPC_7410_v12,               7410,
+    POWERPC_DEF("7410_V1.2",     CPU_POWERPC_7410_v12,               7410,
                 "PowerPC 7410 v1.2 (G4)")
-    POWERPC_DEF("7410_v1.3",     CPU_POWERPC_7410_v13,               7410,
+    POWERPC_DEF("7410_V1.3",     CPU_POWERPC_7410_v13,               7410,
                 "PowerPC 7410 v1.3 (G4)")
-    POWERPC_DEF("7410_v1.4",     CPU_POWERPC_7410_v14,               7410,
+    POWERPC_DEF("7410_V1.4",     CPU_POWERPC_7410_v14,               7410,
                 "PowerPC 7410 v1.4 (G4)")
-    POWERPC_DEF("7448_v1.0",     CPU_POWERPC_7448_v10,               7400,
+    POWERPC_DEF("7448_V1.0",     CPU_POWERPC_7448_v10,               7400,
                 "PowerPC 7448 v1.0 (G4)")
-    POWERPC_DEF("7448_v1.1",     CPU_POWERPC_7448_v11,               7400,
+    POWERPC_DEF("7448_V1.1",     CPU_POWERPC_7448_v11,               7400,
                 "PowerPC 7448 v1.1 (G4)")
-    POWERPC_DEF("7448_v2.0",     CPU_POWERPC_7448_v20,               7400,
+    POWERPC_DEF("7448_V2.0",     CPU_POWERPC_7448_v20,               7400,
                 "PowerPC 7448 v2.0 (G4)")
-    POWERPC_DEF("7448_v2.1",     CPU_POWERPC_7448_v21,               7400,
+    POWERPC_DEF("7448_V2.1",     CPU_POWERPC_7448_v21,               7400,
                 "PowerPC 7448 v2.1 (G4)")
-    POWERPC_DEF("7450_v1.0",     CPU_POWERPC_7450_v10,               7450,
+    POWERPC_DEF("7450_V1.0",     CPU_POWERPC_7450_v10,               7450,
                 "PowerPC 7450 v1.0 (G4)")
-    POWERPC_DEF("7450_v1.1",     CPU_POWERPC_7450_v11,               7450,
+    POWERPC_DEF("7450_V1.1",     CPU_POWERPC_7450_v11,               7450,
                 "PowerPC 7450 v1.1 (G4)")
-    POWERPC_DEF("7450_v1.2",     CPU_POWERPC_7450_v12,               7450,
+    POWERPC_DEF("7450_V1.2",     CPU_POWERPC_7450_v12,               7450,
                 "PowerPC 7450 v1.2 (G4)")
-    POWERPC_DEF("7450_v2.0",     CPU_POWERPC_7450_v20,               7450,
+    POWERPC_DEF("7450_V2.0",     CPU_POWERPC_7450_v20,               7450,
                 "PowerPC 7450 v2.0 (G4)")
-    POWERPC_DEF("7450_v2.1",     CPU_POWERPC_7450_v21,               7450,
+    POWERPC_DEF("7450_V2.1",     CPU_POWERPC_7450_v21,               7450,
                 "PowerPC 7450 v2.1 (G4)")
-    POWERPC_DEF("7441_v2.1",     CPU_POWERPC_7450_v21,               7440,
+    POWERPC_DEF("7441_V2.1",     CPU_POWERPC_7450_v21,               7440,
                 "PowerPC 7441 v2.1 (G4)")
-    POWERPC_DEF("7441_v2.3",     CPU_POWERPC_74x1_v23,               7440,
+    POWERPC_DEF("7441_V2.3",     CPU_POWERPC_74x1_v23,               7440,
                 "PowerPC 7441 v2.3 (G4)")
-    POWERPC_DEF("7451_v2.3",     CPU_POWERPC_74x1_v23,               7450,
+    POWERPC_DEF("7451_V2.3",     CPU_POWERPC_74x1_v23,               7450,
                 "PowerPC 7451 v2.3 (G4)")
-    POWERPC_DEF("7441_v2.10",    CPU_POWERPC_74x1_v210,              7440,
+    POWERPC_DEF("7441_V2.10",    CPU_POWERPC_74x1_v210,              7440,
                 "PowerPC 7441 v2.10 (G4)")
-    POWERPC_DEF("7451_v2.10",    CPU_POWERPC_74x1_v210,              7450,
+    POWERPC_DEF("7451_V2.10",    CPU_POWERPC_74x1_v210,              7450,
                 "PowerPC 7451 v2.10 (G4)")
-    POWERPC_DEF("7445_v1.0",     CPU_POWERPC_74x5_v10,               7445,
+    POWERPC_DEF("7445_V1.0",     CPU_POWERPC_74x5_v10,               7445,
                 "PowerPC 7445 v1.0 (G4)")
-    POWERPC_DEF("7455_v1.0",     CPU_POWERPC_74x5_v10,               7455,
+    POWERPC_DEF("7455_V1.0",     CPU_POWERPC_74x5_v10,               7455,
                 "PowerPC 7455 v1.0 (G4)")
-    POWERPC_DEF("7445_v2.1",     CPU_POWERPC_74x5_v21,               7445,
+    POWERPC_DEF("7445_V2.1",     CPU_POWERPC_74x5_v21,               7445,
                 "PowerPC 7445 v2.1 (G4)")
-    POWERPC_DEF("7455_v2.1",     CPU_POWERPC_74x5_v21,               7455,
+    POWERPC_DEF("7455_V2.1",     CPU_POWERPC_74x5_v21,               7455,
                 "PowerPC 7455 v2.1 (G4)")
-    POWERPC_DEF("7445_v3.2",     CPU_POWERPC_74x5_v32,               7445,
+    POWERPC_DEF("7445_V3.2",     CPU_POWERPC_74x5_v32,               7445,
                 "PowerPC 7445 v3.2 (G4)")
-    POWERPC_DEF("7455_v3.2",     CPU_POWERPC_74x5_v32,               7455,
+    POWERPC_DEF("7455_V3.2",     CPU_POWERPC_74x5_v32,               7455,
                 "PowerPC 7455 v3.2 (G4)")
-    POWERPC_DEF("7445_v3.3",     CPU_POWERPC_74x5_v33,               7445,
+    POWERPC_DEF("7445_V3.3",     CPU_POWERPC_74x5_v33,               7445,
                 "PowerPC 7445 v3.3 (G4)")
-    POWERPC_DEF("7455_v3.3",     CPU_POWERPC_74x5_v33,               7455,
+    POWERPC_DEF("7455_V3.3",     CPU_POWERPC_74x5_v33,               7455,
                 "PowerPC 7455 v3.3 (G4)")
-    POWERPC_DEF("7445_v3.4",     CPU_POWERPC_74x5_v34,               7445,
+    POWERPC_DEF("7445_V3.4",     CPU_POWERPC_74x5_v34,               7445,
                 "PowerPC 7445 v3.4 (G4)")
-    POWERPC_DEF("7455_v3.4",     CPU_POWERPC_74x5_v34,               7455,
+    POWERPC_DEF("7455_V3.4",     CPU_POWERPC_74x5_v34,               7455,
                 "PowerPC 7455 v3.4 (G4)")
-    POWERPC_DEF("7447_v1.0",     CPU_POWERPC_74x7_v10,               7445,
+    POWERPC_DEF("7447_V1.0",     CPU_POWERPC_74x7_v10,               7445,
                 "PowerPC 7447 v1.0 (G4)")
-    POWERPC_DEF("7457_v1.0",     CPU_POWERPC_74x7_v10,               7455,
+    POWERPC_DEF("7457_V1.0",     CPU_POWERPC_74x7_v10,               7455,
                 "PowerPC 7457 v1.0 (G4)")
-    POWERPC_DEF("7447_v1.1",     CPU_POWERPC_74x7_v11,               7445,
+    POWERPC_DEF("7447_V1.1",     CPU_POWERPC_74x7_v11,               7445,
                 "PowerPC 7447 v1.1 (G4)")
-    POWERPC_DEF("7457_v1.1",     CPU_POWERPC_74x7_v11,               7455,
+    POWERPC_DEF("7457_V1.1",     CPU_POWERPC_74x7_v11,               7455,
                 "PowerPC 7457 v1.1 (G4)")
-    POWERPC_DEF("7457_v1.2",     CPU_POWERPC_74x7_v12,               7455,
+    POWERPC_DEF("7457_V1.2",     CPU_POWERPC_74x7_v12,               7455,
                 "PowerPC 7457 v1.2 (G4)")
-    POWERPC_DEF("7447A_v1.0",    CPU_POWERPC_74x7A_v10,              7445,
+    POWERPC_DEF("7447A_V1.0",    CPU_POWERPC_74x7A_v10,              7445,
                 "PowerPC 7447A v1.0 (G4)")
-    POWERPC_DEF("7457A_v1.0",    CPU_POWERPC_74x7A_v10,              7455,
+    POWERPC_DEF("7457A_V1.0",    CPU_POWERPC_74x7A_v10,              7455,
                 "PowerPC 7457A v1.0 (G4)")
-    POWERPC_DEF("7447A_v1.1",    CPU_POWERPC_74x7A_v11,              7445,
+    POWERPC_DEF("7447A_V1.1",    CPU_POWERPC_74x7A_v11,              7445,
                 "PowerPC 7447A v1.1 (G4)")
-    POWERPC_DEF("7457A_v1.1",    CPU_POWERPC_74x7A_v11,              7455,
+    POWERPC_DEF("7457A_V1.1",    CPU_POWERPC_74x7A_v11,              7455,
                 "PowerPC 7457A v1.1 (G4)")
-    POWERPC_DEF("7447A_v1.2",    CPU_POWERPC_74x7A_v12,              7445,
+    POWERPC_DEF("7447A_V1.2",    CPU_POWERPC_74x7A_v12,              7445,
                 "PowerPC 7447A v1.2 (G4)")
-    POWERPC_DEF("7457A_v1.2",    CPU_POWERPC_74x7A_v12,              7455,
+    POWERPC_DEF("7457A_V1.2",    CPU_POWERPC_74x7A_v12,              7455,
                 "PowerPC 7457A v1.2 (G4)")
     /* 64 bits PowerPC                                                       */
 #if defined (TARGET_PPC64)
@@ -1125,64 +1125,64 @@
     POWERPC_DEF("POWER5",        CPU_POWERPC_POWER5,                 POWER5,
                 "POWER5")
 #endif
-    POWERPC_DEF("POWER5+_v2.1",  CPU_POWERPC_POWER5P_v21,            POWER5P,
+    POWERPC_DEF("POWER5+_V2.1",  CPU_POWERPC_POWER5P_v21,            POWER5P,
                 "POWER5+ v2.1")
 #if defined(TODO)
     POWERPC_DEF("POWER6",        CPU_POWERPC_POWER6,                 POWER6,
                 "POWER6")
 #endif
-    POWERPC_DEF("POWER7_v2.3",   CPU_POWERPC_POWER7_v23,             POWER7,
+    POWERPC_DEF("POWER7_V2.3",   CPU_POWERPC_POWER7_v23,             POWER7,
                 "POWER7 v2.3")
-    POWERPC_DEF("POWER7+_v2.1",  CPU_POWERPC_POWER7P_v21,            POWER7,
+    POWERPC_DEF("POWER7+_V2.1",  CPU_POWERPC_POWER7P_v21,            POWER7,
                 "POWER7+ v2.1")
-    POWERPC_DEF("POWER8E_v2.1",  CPU_POWERPC_POWER8E_v21,            POWER8,
+    POWERPC_DEF("POWER8E_V2.1",  CPU_POWERPC_POWER8E_v21,            POWER8,
                 "POWER8E v2.1")
-    POWERPC_DEF("POWER8_v2.0",   CPU_POWERPC_POWER8_v20,             POWER8,
+    POWERPC_DEF("POWER8_V2.0",   CPU_POWERPC_POWER8_v20,             POWER8,
                 "POWER8 v2.0")
-    POWERPC_DEF("POWER8NVL_v1.0",CPU_POWERPC_POWER8NVL_v10,          POWER8,
+    POWERPC_DEF("POWER8NVL_V1.0", CPU_POWERPC_POWER8NVL_v10,         POWER8,
                 "POWER8NVL v1.0")
-    POWERPC_DEF("970_v2.2",      CPU_POWERPC_970_v22,                970,
+    POWERPC_DEF("970_V2.2",      CPU_POWERPC_970_v22,                970,
                 "PowerPC 970 v2.2")
 
-    POWERPC_DEF("POWER9_v1.0",   CPU_POWERPC_POWER9_BASE,            POWER9,
+    POWERPC_DEF("POWER9_V1.0",   CPU_POWERPC_POWER9_BASE,            POWER9,
                 "POWER9 v1.0")
 
-    POWERPC_DEF("970fx_v1.0",    CPU_POWERPC_970FX_v10,              970,
+    POWERPC_DEF("970FX_V1.0",    CPU_POWERPC_970FX_v10,              970,
                 "PowerPC 970FX v1.0 (G5)")
-    POWERPC_DEF("970fx_v2.0",    CPU_POWERPC_970FX_v20,              970,
+    POWERPC_DEF("970FX_V2.0",    CPU_POWERPC_970FX_v20,              970,
                 "PowerPC 970FX v2.0 (G5)")
-    POWERPC_DEF("970fx_v2.1",    CPU_POWERPC_970FX_v21,              970,
+    POWERPC_DEF("970FX_V2.1",    CPU_POWERPC_970FX_v21,              970,
                 "PowerPC 970FX v2.1 (G5)")
-    POWERPC_DEF("970fx_v3.0",    CPU_POWERPC_970FX_v30,              970,
+    POWERPC_DEF("970FX_V3.0",    CPU_POWERPC_970FX_v30,              970,
                 "PowerPC 970FX v3.0 (G5)")
-    POWERPC_DEF("970fx_v3.1",    CPU_POWERPC_970FX_v31,              970,
+    POWERPC_DEF("970FX_V3.1",    CPU_POWERPC_970FX_v31,              970,
                 "PowerPC 970FX v3.1 (G5)")
-    POWERPC_DEF("970mp_v1.0",    CPU_POWERPC_970MP_v10,              970,
+    POWERPC_DEF("970MP_V1.0",    CPU_POWERPC_970MP_v10,              970,
                 "PowerPC 970MP v1.0")
-    POWERPC_DEF("970mp_v1.1",    CPU_POWERPC_970MP_v11,              970,
+    POWERPC_DEF("970MP_V1.1",    CPU_POWERPC_970MP_v11,              970,
                 "PowerPC 970MP v1.1")
 #if defined(TODO)
-    POWERPC_DEF("Cell",          CPU_POWERPC_CELL,                   970,
+    POWERPC_DEF("CELL",          CPU_POWERPC_CELL,                   970,
                 "PowerPC Cell")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("Cell_v1.0",     CPU_POWERPC_CELL_v10,               970,
+    POWERPC_DEF("CELL_V1.0",     CPU_POWERPC_CELL_v10,               970,
                 "PowerPC Cell v1.0")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("Cell_v2.0",     CPU_POWERPC_CELL_v20,               970,
+    POWERPC_DEF("CELL_V2.0",     CPU_POWERPC_CELL_v20,               970,
                 "PowerPC Cell v2.0")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("Cell_v3.0",     CPU_POWERPC_CELL_v30,               970,
+    POWERPC_DEF("CELL_V3.0",     CPU_POWERPC_CELL_v30,               970,
                 "PowerPC Cell v3.0")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("Cell_v3.1",     CPU_POWERPC_CELL_v31,               970,
+    POWERPC_DEF("CELL_V3.1",     CPU_POWERPC_CELL_v31,               970,
                 "PowerPC Cell v3.1")
 #endif
 #if defined(TODO)
-    POWERPC_DEF("Cell_v3.2",     CPU_POWERPC_CELL_v32,               970,
+    POWERPC_DEF("CELL_V3.2",     CPU_POWERPC_CELL_v32,               970,
                 "PowerPC Cell v3.2")
 #endif
 #if defined(TODO)
@@ -1228,181 +1228,181 @@
 PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "403", "403GC" },
     { "405", "405D4" },
-    { "405CR", "405CRc" },
-    { "405GP", "405GPd" },
-    { "405GPe", "405CRc" },
-    { "x2vp7", "x2vp4" },
-    { "x2vp50", "x2vp20" },
+    { "405CR", "405CRC" },
+    { "405GP", "405GPD" },
+    { "405GPE", "405CRC" },
+    { "X2VP7", "X2VP4" },
+    { "X2VP50", "X2VP20" },
 
-    { "440EP", "440EPb" },
-    { "440GP", "440GPc" },
-    { "440GR", "440GRa" },
-    { "440GX", "440GXf" },
+    { "440EP", "440EPB" },
+    { "440GP", "440GPC" },
+    { "440GR", "440GRA" },
+    { "440GX", "440GXF" },
 
-    { "RCPU", "MPC5xx" },
+    { "RCPU", "MPC5XX" },
     /* MPC5xx microcontrollers */
-    { "MGT560", "MPC5xx" },
-    { "MPC509", "MPC5xx" },
-    { "MPC533", "MPC5xx" },
-    { "MPC534", "MPC5xx" },
-    { "MPC555", "MPC5xx" },
-    { "MPC556", "MPC5xx" },
-    { "MPC560", "MPC5xx" },
-    { "MPC561", "MPC5xx" },
-    { "MPC562", "MPC5xx" },
-    { "MPC563", "MPC5xx" },
-    { "MPC564", "MPC5xx" },
-    { "MPC565", "MPC5xx" },
-    { "MPC566", "MPC5xx" },
+    { "MGT560", "MPC5XX" },
+    { "MPC509", "MPC5XX" },
+    { "MPC533", "MPC5XX" },
+    { "MPC534", "MPC5XX" },
+    { "MPC555", "MPC5XX" },
+    { "MPC556", "MPC5XX" },
+    { "MPC560", "MPC5XX" },
+    { "MPC561", "MPC5XX" },
+    { "MPC562", "MPC5XX" },
+    { "MPC563", "MPC5XX" },
+    { "MPC564", "MPC5XX" },
+    { "MPC565", "MPC5XX" },
+    { "MPC566", "MPC5XX" },
 
-    { "PowerQUICC", "MPC8xx" },
+    { "POWERQUICC", "MPC8XX" },
     /* MPC8xx microcontrollers */
-    { "MGT823", "MPC8xx" },
-    { "MPC821", "MPC8xx" },
-    { "MPC823", "MPC8xx" },
-    { "MPC850", "MPC8xx" },
-    { "MPC852T", "MPC8xx" },
-    { "MPC855T", "MPC8xx" },
-    { "MPC857", "MPC8xx" },
-    { "MPC859", "MPC8xx" },
-    { "MPC860", "MPC8xx" },
-    { "MPC862", "MPC8xx" },
-    { "MPC866", "MPC8xx" },
-    { "MPC870", "MPC8xx" },
-    { "MPC875", "MPC8xx" },
-    { "MPC880", "MPC8xx" },
-    { "MPC885", "MPC8xx" },
+    { "MGT823", "MPC8XX" },
+    { "MPC821", "MPC8XX" },
+    { "MPC823", "MPC8XX" },
+    { "MPC850", "MPC8XX" },
+    { "MPC852T", "MPC8XX" },
+    { "MPC855T", "MPC8XX" },
+    { "MPC857", "MPC8XX" },
+    { "MPC859", "MPC8XX" },
+    { "MPC860", "MPC8XX" },
+    { "MPC862", "MPC8XX" },
+    { "MPC866", "MPC8XX" },
+    { "MPC870", "MPC8XX" },
+    { "MPC875", "MPC8XX" },
+    { "MPC880", "MPC8XX" },
+    { "MPC885", "MPC8XX" },
 
     /* PowerPC MPC603 microcontrollers */
     { "MPC8240", "603" },
 
-    { "MPC52xx", "MPC5200" },
-    { "MPC5200", "MPC5200_v12" },
-    { "MPC5200B", "MPC5200B_v21" },
+    { "MPC52XX", "MPC5200" },
+    { "MPC5200", "MPC5200_V12" },
+    { "MPC5200B", "MPC5200B_V21" },
 
-    { "MPC82xx", "MPC8280" },
-    { "PowerQUICC-II", "MPC82xx" },
-    { "MPC8241", "G2HiP4" },
-    { "MPC8245", "G2HiP4" },
-    { "MPC8247", "G2leGP3" },
-    { "MPC8248", "G2leGP3" },
-    { "MPC8250", "MPC8250_HiP4" },
-    { "MPC8250_HiP3", "G2HiP3" },
-    { "MPC8250_HiP4", "G2HiP4" },
-    { "MPC8255", "MPC8255_HiP4" },
-    { "MPC8255_HiP3", "G2HiP3" },
-    { "MPC8255_HiP4", "G2HiP4" },
-    { "MPC8260", "MPC8260_HiP4" },
-    { "MPC8260_HiP3", "G2HiP3" },
-    { "MPC8260_HiP4", "G2HiP4" },
-    { "MPC8264", "MPC8264_HiP4" },
-    { "MPC8264_HiP3", "G2HiP3" },
-    { "MPC8264_HiP4", "G2HiP4" },
-    { "MPC8265", "MPC8265_HiP4" },
-    { "MPC8265_HiP3", "G2HiP3" },
-    { "MPC8265_HiP4", "G2HiP4" },
-    { "MPC8266", "MPC8266_HiP4" },
-    { "MPC8266_HiP3", "G2HiP3" },
-    { "MPC8266_HiP4", "G2HiP4" },
-    { "MPC8270", "G2leGP3" },
-    { "MPC8271", "G2leGP3" },
-    { "MPC8272", "G2leGP3" },
-    { "MPC8275", "G2leGP3" },
-    { "MPC8280", "G2leGP3" },
-    { "e200", "e200z6" },
-    { "e300", "e300c3" },
+    { "MPC82XX", "MPC8280" },
+    { "POWERQUICC-II", "MPC82XX" },
+    { "MPC8241", "G2HIP4" },
+    { "MPC8245", "G2HIP4" },
+    { "MPC8247", "G2LEGP3" },
+    { "MPC8248", "G2LEGP3" },
+    { "MPC8250", "MPC8250_HIP4" },
+    { "MPC8250_HIP3", "G2HIP3" },
+    { "MPC8250_HIP4", "G2HIP4" },
+    { "MPC8255", "MPC8255_HIP4" },
+    { "MPC8255_HIP3", "G2HIP3" },
+    { "MPC8255_HIP4", "G2HIP4" },
+    { "MPC8260", "MPC8260_HIP4" },
+    { "MPC8260_HIP3", "G2HIP3" },
+    { "MPC8260_HIP4", "G2HIP4" },
+    { "MPC8264", "MPC8264_HIP4" },
+    { "MPC8264_HIP3", "G2HIP3" },
+    { "MPC8264_HIP4", "G2HIP4" },
+    { "MPC8265", "MPC8265_HIP4" },
+    { "MPC8265_HIP3", "G2HIP3" },
+    { "MPC8265_HIP4", "G2HIP4" },
+    { "MPC8266", "MPC8266_HIP4" },
+    { "MPC8266_HIP3", "G2HIP3" },
+    { "MPC8266_HIP4", "G2HIP4" },
+    { "MPC8270", "G2LEGP3" },
+    { "MPC8271", "G2LEGP3" },
+    { "MPC8272", "G2LEGP3" },
+    { "MPC8275", "G2LEGP3" },
+    { "MPC8280", "G2LEGP3" },
+    { "E200", "E200Z6" },
+    { "E300", "E300C3" },
     { "MPC8347", "MPC8347T" },
     { "MPC8347A", "MPC8347AT" },
     { "MPC8347E", "MPC8347ET" },
     { "MPC8347EA", "MPC8347EAT" },
-    { "e500", "e500v2_v22" },
-    { "e500v1", "e500_v20" },
-    { "e500v2", "e500v2_v22" },
-    { "MPC8533", "MPC8533_v11" },
-    { "MPC8533E", "MPC8533E_v11" },
-    { "MPC8540", "MPC8540_v21" },
-    { "MPC8541", "MPC8541_v11" },
-    { "MPC8541E", "MPC8541E_v11" },
-    { "MPC8543", "MPC8543_v21" },
-    { "MPC8543E", "MPC8543E_v21" },
-    { "MPC8544", "MPC8544_v11" },
-    { "MPC8544E", "MPC8544E_v11" },
-    { "MPC8545", "MPC8545_v21" },
-    { "MPC8545E", "MPC8545E_v21" },
-    { "MPC8547E", "MPC8547E_v21" },
-    { "MPC8548", "MPC8548_v21" },
-    { "MPC8548E", "MPC8548E_v21" },
-    { "MPC8555", "MPC8555_v11" },
-    { "MPC8555E", "MPC8555E_v11" },
-    { "MPC8560", "MPC8560_v21" },
-    { "601",  "601_v2" },
-    { "601v", "601_v2" },
-    { "Vanilla", "603" },
-    { "603e", "603e_v4.1" },
-    { "Stretch", "603e" },
-    { "Vaillant", "603e7v" },
-    { "603r", "603e7t" },
-    { "Goldeneye", "603r" },
-    { "604e", "604e_v2.4" },
-    { "Sirocco", "604e" },
-    { "Mach5", "604r" },
-    { "740", "740_v3.1" },
-    { "Arthur", "740" },
-    { "750", "750_v3.1" },
-    { "Typhoon", "750" },
+    { "E500", "E500V2_V22" },
+    { "E500V1", "E500_V20" },
+    { "E500V2", "E500V2_V22" },
+    { "MPC8533", "MPC8533_V11" },
+    { "MPC8533E", "MPC8533E_V11" },
+    { "MPC8540", "MPC8540_V21" },
+    { "MPC8541", "MPC8541_V11" },
+    { "MPC8541E", "MPC8541E_V11" },
+    { "MPC8543", "MPC8543_V21" },
+    { "MPC8543E", "MPC8543E_V21" },
+    { "MPC8544", "MPC8544_V11" },
+    { "MPC8544E", "MPC8544E_V11" },
+    { "MPC8545", "MPC8545_V21" },
+    { "MPC8545E", "MPC8545E_V21" },
+    { "MPC8547E", "MPC8547E_V21" },
+    { "MPC8548", "MPC8548_V21" },
+    { "MPC8548E", "MPC8548E_V21" },
+    { "MPC8555", "MPC8555_V11" },
+    { "MPC8555E", "MPC8555E_V11" },
+    { "MPC8560", "MPC8560_V21" },
+    { "601",  "601_V2" },
+    { "601V", "601_V2" },
+    { "VANILLA", "603" },
+    { "603E", "603E_V4.1" },
+    { "STRETCH", "603E" },
+    { "VAILLANT", "603E7V" },
+    { "603R", "603E7T" },
+    { "GOLDENEYE", "603R" },
+    { "604E", "604E_V2.4" },
+    { "SIROCCO", "604E" },
+    { "MACH5", "604R" },
+    { "740", "740_V3.1" },
+    { "ARTHUR", "740" },
+    { "750", "750_V3.1" },
+    { "TYPHOON", "750" },
     { "G3",      "750" },
-    { "Conan/Doyle", "750p" },
-    { "750cl", "750cl_v2.0" },
-    { "750cx", "750cx_v2.2" },
-    { "750cxe", "750cxe_v3.1b" },
-    { "750fx", "750fx_v2.3" },
-    { "750gx", "750gx_v1.2" },
-    { "750l", "750l_v3.2" },
-    { "LoneStar", "750l" },
-    { "745", "745_v2.8" },
-    { "755", "755_v2.8" },
-    { "Goldfinger", "755" },
-    { "7400", "7400_v2.9" },
-    { "Max", "7400" },
+    { "CONAN/DOYLE", "750P" },
+    { "750CL", "750CL_V2.0" },
+    { "750CX", "750CX_V2.2" },
+    { "750CXE", "750CXE_V3.1B" },
+    { "750FX", "750FX_V2.3" },
+    { "750GX", "750GX_V1.2" },
+    { "750L", "750L_V3.2" },
+    { "LONESTAR", "750L" },
+    { "745", "745_V2.8" },
+    { "755", "755_V2.8" },
+    { "GOLDFINGER", "755" },
+    { "7400", "7400_V2.9" },
+    { "MAX", "7400" },
     { "G4",  "7400" },
-    { "7410", "7410_v1.4" },
-    { "Nitro", "7410" },
-    { "7448", "7448_v2.1" },
-    { "7450", "7450_v2.1" },
-    { "Vger", "7450" },
-    { "7441", "7441_v2.3" },
-    { "7451", "7451_v2.3" },
-    { "7445", "7445_v3.2" },
-    { "7455", "7455_v3.2" },
-    { "Apollo6", "7455" },
-    { "7447", "7447_v1.1" },
-    { "7457", "7457_v1.2" },
-    { "Apollo7", "7457" },
-    { "7447A", "7447A_v1.2" },
-    { "7457A", "7457A_v1.2" },
-    { "Apollo7PM", "7457A_v1.0" },
+    { "7410", "7410_V1.4" },
+    { "NITRO", "7410" },
+    { "7448", "7448_V2.1" },
+    { "7450", "7450_V2.1" },
+    { "VGER", "7450" },
+    { "7441", "7441_V2.3" },
+    { "7451", "7451_V2.3" },
+    { "7445", "7445_V3.2" },
+    { "7455", "7455_V3.2" },
+    { "APOLLO6", "7455" },
+    { "7447", "7447_V1.1" },
+    { "7457", "7457_V1.2" },
+    { "APOLLO7", "7457" },
+    { "7447A", "7447A_V1.2" },
+    { "7457A", "7457A_V1.2" },
+    { "APOLLO7PM", "7457A_V1.0" },
 #if defined(TARGET_PPC64)
     { "POWER3", "630" },
     { "POWER3+", "631" },
-    { "POWER5+", "POWER5+_v2.1" },
-    { "POWER5gs", "POWER5+_v2.1" },
-    { "POWER7", "POWER7_v2.3" },
-    { "POWER7+", "POWER7+_v2.1" },
-    { "POWER8E", "POWER8E_v2.1" },
-    { "POWER8", "POWER8_v2.0" },
-    { "POWER8NVL", "POWER8NVL_v1.0" },
-    { "POWER9", "POWER9_v1.0" },
-    { "970", "970_v2.2" },
-    { "970fx", "970fx_v3.1" },
-    { "970mp", "970mp_v1.1" },
+    { "POWER5+", "POWER5+_V2.1" },
+    { "POWER5GS", "POWER5+_V2.1" },
+    { "POWER7", "POWER7_V2.3" },
+    { "POWER7+", "POWER7+_V2.1" },
+    { "POWER8E", "POWER8E_V2.1" },
+    { "POWER8", "POWER8_V2.0" },
+    { "POWER8NVL", "POWER8NVL_V1.0" },
+    { "POWER9", "POWER9_V1.0" },
+    { "970", "970_V2.2" },
+    { "970FX", "970FX_V3.1" },
+    { "970MP", "970MP_V1.1" },
 #endif
 
     /* Generic PowerPCs */
 #if defined(TARGET_PPC64)
-    { "ppc64", "970fx" },
+    { "PPC64", "970FX" },
 #endif
-    { "ppc32", "604" },
-    { "ppc", "ppc32" },
-    { "default", "ppc" },
+    { "PPC32", "604" },
+    { "PPC", "PPC32" },
+    { "DEFAULT", "PPC" },
     { NULL, NULL }
 };
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 8590809..3f21190 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -2480,7 +2480,7 @@ static int kvm_ppc_register_host_cpu_type(void)
      */
     dc = DEVICE_CLASS(ppc_cpu_get_family_class(pvr_pcc));
     for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
-        if (strcmp(ppc_cpu_aliases[i].alias, dc->desc) == 0) {
+        if (strcasecmp(ppc_cpu_aliases[i].alias, dc->desc) == 0) {
             char *suffix;
 
             ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index f377cf2..0325226 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -10250,7 +10250,7 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
     }
 
     for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
-        if (strcmp(ppc_cpu_aliases[i].alias, name) == 0) {
+        if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {
             return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);
         }
     }
-- 
2.7.4

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [Qemu-devel] [PATCH for-2.11 3/6] ppc: make cpu alias point only to real cpu models
  2017-08-24  8:21 [Qemu-devel] [PATCH for-2.11 0/6] ppc: cpu_model handling cleanups Igor Mammedov
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal Igor Mammedov
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent Igor Mammedov
@ 2017-08-24  8:21 ` Igor Mammedov
  2017-08-25  1:40   ` David Gibson
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups Igor Mammedov
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-24  8:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: David Gibson, Alexander Graf, qemu-ppc

alias pointing to another alias forces lookup code to
do recurrsive translation till real cpu model is reached.

Drop this nonsence and make each alias point to cpu model
that has corresponding CPU type. It will allow to drop
recurrsion in cpu model translation code and actually
make ppc_cpu_aliases[] content use PowerPCCPUAlias
fields properly
(i.e. alias goes into .alias and model goes into .model)

While at it add TODO defines around aliases that point to
cpu models excluded by the same TODO defines.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
If it were up to me, I'd remove all TODO cpu models as dead
code and make whomever wants to add them back to do so
with actual implementation.
---
 target/ppc/cpu-models.h |  2 +-
 target/ppc/cpu-models.c | 56 ++++++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h
index b563c45..d748c68 100644
--- a/target/ppc/cpu-models.h
+++ b/target/ppc/cpu-models.h
@@ -24,7 +24,7 @@
 /**
  * PowerPCCPUAlias:
  * @alias: The alias name.
- * @model: The CPU model @alias refers to.
+ * @model: The CPU model @alias refers to, that directly resolves into CPU type
  *
  * A mapping entry from CPU @alias to CPU @model.
  */
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index 346b6b1..f917b9d 100644
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -1235,6 +1235,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "X2VP50", "X2VP20" },
 
     { "440EP", "440EPB" },
+#if defined(TODO_USER_ONLY)
     { "440GP", "440GPC" },
     { "440GR", "440GRA" },
     { "440GX", "440GXF" },
@@ -1272,36 +1273,37 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "MPC875", "MPC8XX" },
     { "MPC880", "MPC8XX" },
     { "MPC885", "MPC8XX" },
+#endif
 
     /* PowerPC MPC603 microcontrollers */
     { "MPC8240", "603" },
 
-    { "MPC52XX", "MPC5200" },
+    { "MPC52XX", "MPC5200_V12" },
     { "MPC5200", "MPC5200_V12" },
     { "MPC5200B", "MPC5200B_V21" },
 
-    { "MPC82XX", "MPC8280" },
-    { "POWERQUICC-II", "MPC82XX" },
+    { "MPC82XX", "G2LEGP3" },
+    { "POWERQUICC-II", "G2LEGP3" },
     { "MPC8241", "G2HIP4" },
     { "MPC8245", "G2HIP4" },
     { "MPC8247", "G2LEGP3" },
     { "MPC8248", "G2LEGP3" },
-    { "MPC8250", "MPC8250_HIP4" },
+    { "MPC8250", "G2HIP4" },
     { "MPC8250_HIP3", "G2HIP3" },
     { "MPC8250_HIP4", "G2HIP4" },
-    { "MPC8255", "MPC8255_HIP4" },
+    { "MPC8255", "G2HIP4" },
     { "MPC8255_HIP3", "G2HIP3" },
     { "MPC8255_HIP4", "G2HIP4" },
-    { "MPC8260", "MPC8260_HIP4" },
+    { "MPC8260", "G2HIP4" },
     { "MPC8260_HIP3", "G2HIP3" },
     { "MPC8260_HIP4", "G2HIP4" },
-    { "MPC8264", "MPC8264_HIP4" },
+    { "MPC8264", "G2HIP4" },
     { "MPC8264_HIP3", "G2HIP3" },
     { "MPC8264_HIP4", "G2HIP4" },
-    { "MPC8265", "MPC8265_HIP4" },
+    { "MPC8265", "G2HIP4" },
     { "MPC8265_HIP3", "G2HIP3" },
     { "MPC8265_HIP4", "G2HIP4" },
-    { "MPC8266", "MPC8266_HIP4" },
+    { "MPC8266", "G2HIP4" },
     { "MPC8266_HIP3", "G2HIP3" },
     { "MPC8266_HIP4", "G2HIP4" },
     { "MPC8270", "G2LEGP3" },
@@ -1339,18 +1341,18 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "601V", "601_V2" },
     { "VANILLA", "603" },
     { "603E", "603E_V4.1" },
-    { "STRETCH", "603E" },
+    { "STRETCH", "603E_V4.1" },
     { "VAILLANT", "603E7V" },
     { "603R", "603E7T" },
-    { "GOLDENEYE", "603R" },
+    { "GOLDENEYE", "603E7T" },
     { "604E", "604E_V2.4" },
-    { "SIROCCO", "604E" },
+    { "SIROCCO", "604E_V2.4" },
     { "MACH5", "604R" },
     { "740", "740_V3.1" },
-    { "ARTHUR", "740" },
+    { "ARTHUR", "740_V3.1" },
     { "750", "750_V3.1" },
-    { "TYPHOON", "750" },
-    { "G3",      "750" },
+    { "TYPHOON", "750_V3.1" },
+    { "G3",      "750_V3.1" },
     { "CONAN/DOYLE", "750P" },
     { "750CL", "750CL_V2.0" },
     { "750CX", "750CX_V2.2" },
@@ -1358,32 +1360,34 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "750FX", "750FX_V2.3" },
     { "750GX", "750GX_V1.2" },
     { "750L", "750L_V3.2" },
-    { "LONESTAR", "750L" },
+    { "LONESTAR", "750L_V3.2" },
     { "745", "745_V2.8" },
     { "755", "755_V2.8" },
-    { "GOLDFINGER", "755" },
+    { "GOLDFINGER", "755_V2.8" },
     { "7400", "7400_V2.9" },
-    { "MAX", "7400" },
-    { "G4",  "7400" },
+    { "MAX", "7400_V2.9" },
+    { "G4",  "7400_V2.9" },
     { "7410", "7410_V1.4" },
-    { "NITRO", "7410" },
+    { "NITRO", "7410_V1.4" },
     { "7448", "7448_V2.1" },
     { "7450", "7450_V2.1" },
-    { "VGER", "7450" },
+    { "VGER", "7450_V2.1" },
     { "7441", "7441_V2.3" },
     { "7451", "7451_V2.3" },
     { "7445", "7445_V3.2" },
     { "7455", "7455_V3.2" },
-    { "APOLLO6", "7455" },
+    { "APOLLO6", "7455_V3.2" },
     { "7447", "7447_V1.1" },
     { "7457", "7457_V1.2" },
-    { "APOLLO7", "7457" },
+    { "APOLLO7", "7457_V1.2" },
     { "7447A", "7447A_V1.2" },
     { "7457A", "7457A_V1.2" },
     { "APOLLO7PM", "7457A_V1.0" },
 #if defined(TARGET_PPC64)
+#if defined(TODO)
     { "POWER3", "630" },
     { "POWER3+", "631" },
+#endif
     { "POWER5+", "POWER5+_V2.1" },
     { "POWER5GS", "POWER5+_V2.1" },
     { "POWER7", "POWER7_V2.3" },
@@ -1399,10 +1403,10 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
 
     /* Generic PowerPCs */
 #if defined(TARGET_PPC64)
-    { "PPC64", "970FX" },
+    { "PPC64", "970FX_V3.1" },
 #endif
     { "PPC32", "604" },
-    { "PPC", "PPC32" },
-    { "DEFAULT", "PPC" },
+    { "PPC", "604" },
+    { "DEFAULT", "604" },
     { NULL, NULL }
 };
-- 
2.7.4

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups
  2017-08-24  8:21 [Qemu-devel] [PATCH for-2.11 0/6] ppc: cpu_model handling cleanups Igor Mammedov
                   ` (2 preceding siblings ...)
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 3/6] ppc: make cpu alias point only to real cpu models Igor Mammedov
@ 2017-08-24  8:21 ` Igor Mammedov
  2017-08-25  4:12   ` David Gibson
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR Igor Mammedov
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 6/6] ppc: drop caching ObjectClass from PowerPCCPUAlias Igor Mammedov
  5 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-24  8:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: David Gibson, Alexander Graf, qemu-ppc

previous patches cleaned up cpu model/alias naming which
allows to simplify cpu model/alias to cpu type lookup a bit
byt removing recurssion and dependency of ppc_cpu_class_by_name() /
ppc_cpu_class_by_alias() on each other.
Besides of simplifying code it reduces it by ~15LOC.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 target/ppc/translate_init.c | 43 +++++++++++++------------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index 0325226..f1a559d 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -10176,22 +10176,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
     return pcc;
 }
 
-static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
-{
-    ObjectClass *oc = (ObjectClass *)a;
-    const char *name = b;
-    PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
-
-    if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
-        ppc_cpu_is_valid(pcc) &&
-        strcmp(object_class_get_name(oc) + strlen(name),
-               POWERPC_CPU_TYPE_SUFFIX) == 0) {
-        return 0;
-    }
-    return -1;
-}
-
-
 static ObjectClass *ppc_cpu_class_by_name(const char *name);
 
 static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
@@ -10216,8 +10200,8 @@ static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
 
 static ObjectClass *ppc_cpu_class_by_name(const char *name)
 {
-    GSList *list, *item;
-    ObjectClass *ret = NULL;
+    char *cpu_model, *typename;
+    ObjectClass *oc;
     const char *p;
     int i, len;
 
@@ -10238,21 +10222,20 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
         }
     }
 
-    list = object_class_get_list(TYPE_POWERPC_CPU, false);
-    item = g_slist_find_custom(list, name, ppc_cpu_compare_class_name);
-    if (item != NULL) {
-        ret = OBJECT_CLASS(item->data);
+    cpu_model = g_ascii_strup(name, -1);
+    p = ppc_cpu_lookup_alias(cpu_model);
+    if (p) {
+        g_free(cpu_model);
+        cpu_model = g_strdup(p);
     }
-    g_slist_free(list);
 
-    if (ret) {
-        return ret;
-    }
+    typename = g_strdup_printf("%s" POWERPC_CPU_TYPE_SUFFIX, cpu_model);
+    oc = object_class_by_name(typename);
+    g_free(typename);
+    g_free(cpu_model);
 
-    for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
-        if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {
-            return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);
-        }
+    if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) {
+        return oc;
     }
 
     return NULL;
-- 
2.7.4

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR
  2017-08-24  8:21 [Qemu-devel] [PATCH for-2.11 0/6] ppc: cpu_model handling cleanups Igor Mammedov
                   ` (3 preceding siblings ...)
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups Igor Mammedov
@ 2017-08-24  8:21 ` Igor Mammedov
  2017-08-25  4:16   ` David Gibson
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 6/6] ppc: drop caching ObjectClass from PowerPCCPUAlias Igor Mammedov
  5 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-24  8:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: David Gibson, Alexander Graf, qemu-ppc

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 target/ppc/translate_init.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index f1a559d..ca9f1e3 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -34,6 +34,7 @@
 #include "hw/ppc/ppc.h"
 #include "mmu-book3s-v3.h"
 #include "sysemu/qtest.h"
+#include "qemu/cutils.h"
 
 //#define PPC_DUMP_CPU
 //#define PPC_DEBUG_SPR
@@ -10203,22 +10204,16 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
     char *cpu_model, *typename;
     ObjectClass *oc;
     const char *p;
-    int i, len;
-
-    /* Check if the given name is a PVR */
-    len = strlen(name);
-    if (len == 10 && name[0] == '0' && name[1] == 'x') {
-        p = name + 2;
-        goto check_pvr;
-    } else if (len == 8) {
-        p = name;
-    check_pvr:
-        for (i = 0; i < 8; i++) {
-            if (!qemu_isxdigit(*p++))
-                break;
-        }
-        if (i == 8) {
-            return OBJECT_CLASS(ppc_cpu_class_by_pvr(strtoul(name, NULL, 16)));
+    unsigned long pvr;
+
+    /* Lookup by PVR if cpu_model is valid 8 digit hex number
+     * (excl: 0x prefix if present)
+     */
+    if (!qemu_strtoul(name, &p, 16, &pvr)) {
+        int len = p - name;
+        len = (len == 10) && (name[1] == 'x') ? len - 2 : len;
+        if (len == 8) {
+            return OBJECT_CLASS(ppc_cpu_class_by_pvr(pvr));
         }
     }
 
-- 
2.7.4

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [Qemu-devel] [PATCH for-2.11 6/6] ppc: drop caching ObjectClass from PowerPCCPUAlias
  2017-08-24  8:21 [Qemu-devel] [PATCH for-2.11 0/6] ppc: cpu_model handling cleanups Igor Mammedov
                   ` (4 preceding siblings ...)
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR Igor Mammedov
@ 2017-08-24  8:21 ` Igor Mammedov
  2017-08-25  4:22   ` David Gibson
  5 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-24  8:21 UTC (permalink / raw)
  To: qemu-devel; +Cc: David Gibson, Alexander Graf, qemu-ppc

Caching there practically doesn't give any benefits
and that at slow path druring querying supported CPU list.
But it introduces non conventional path of where from
comes used CPU type name (kvm_ppc_register_host_cpu_type).

Taking in account that kvm_ppc_register_host_cpu_type()
fixes up models the aliases point to, it's sufficient to
make ppc_cpu_class_by_name() translate cpu alias to
correct cpu type name.
So drop PowerPCCPUAlias::oc field + ppc_cpu_class_by_alias()
and let ppc_cpu_class_by_name() do conversion to cpu type name,
which simplifies code a little bit saving ~20LOC and trouble
wondering why ppc_cpu_class_by_alias() is necessary.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 target/ppc/cpu-models.h     |  1 -
 target/ppc/kvm.c            |  1 -
 target/ppc/translate_init.c | 26 ++------------------------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h
index d748c68..e9c6015 100644
--- a/target/ppc/cpu-models.h
+++ b/target/ppc/cpu-models.h
@@ -31,7 +31,6 @@
 typedef struct PowerPCCPUAlias {
     const char *alias;
     const char *model;
-    ObjectClass *oc;
 } PowerPCCPUAlias;
 
 extern PowerPCCPUAlias ppc_cpu_aliases[];
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 3f21190..995c2da 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -2488,7 +2488,6 @@ static int kvm_ppc_register_host_cpu_type(void)
             if (suffix) {
                 *suffix = 0;
             }
-            ppc_cpu_aliases[i].oc = oc;
             break;
         }
     }
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index ca9f1e3..c06f34b 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -10177,28 +10177,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
     return pcc;
 }
 
-static ObjectClass *ppc_cpu_class_by_name(const char *name);
-
-static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
-{
-    ObjectClass *invalid_class = (void*)ppc_cpu_class_by_alias;
-
-    /* Cache target class lookups in the alias table */
-    if (!alias->oc) {
-        alias->oc = ppc_cpu_class_by_name(alias->model);
-        if (!alias->oc) {
-            /* Fast check for non-existing aliases */
-            alias->oc = invalid_class;
-        }
-    }
-
-    if (alias->oc == invalid_class) {
-        return NULL;
-    } else {
-        return alias->oc;
-    }
-}
-
 static ObjectClass *ppc_cpu_class_by_name(const char *name)
 {
     char *cpu_model, *typename;
@@ -10310,7 +10288,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
                       name, pcc->pvr);
     for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
         PowerPCCPUAlias *alias = &ppc_cpu_aliases[i];
-        ObjectClass *alias_oc = ppc_cpu_class_by_alias(alias);
+        ObjectClass *alias_oc = ppc_cpu_class_by_name(alias->model);
 
         if (alias_oc != oc) {
             continue;
@@ -10390,7 +10368,7 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
         CpuDefinitionInfoList *entry;
         CpuDefinitionInfo *info;
 
-        oc = ppc_cpu_class_by_alias(alias);
+        oc = ppc_cpu_class_by_name(alias->model);
         if (oc == NULL) {
             continue;
         }
-- 
2.7.4

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal Igor Mammedov
@ 2017-08-25  1:30   ` David Gibson
  2017-08-25  7:28     ` Igor Mammedov
  0 siblings, 1 reply; 31+ messages in thread
From: David Gibson @ 2017-08-25  1:30 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 5021 bytes --]

On Thu, Aug 24, 2017 at 10:21:46AM +0200, Igor Mammedov wrote:
> Replace
>   "-" TYPE_POWERPC_CPU
> when composing cpu type name from cpu model string literal
> and the same pattern in format strings with
>  POWERPC_CPU_TYPE_SUFFIX and POWERPC_CPU_TYPE_NAME(model)
> macroses like we do in x86.
> 
> Later POWERPC_CPU_TYPE_NAME() will be used to define default
> cpu type per machine type and as bonus it will be consistent
> and easy grep-able pattern across all other targets that I'm
> plannig to treat the same way.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

I'm assuming you'll stage this for 2.11.

> ---
>  target/ppc/cpu.h            | 3 +++
>  target/ppc/kvm_ppc.h        | 2 +-
>  target/ppc/cpu-models.c     | 2 +-
>  target/ppc/kvm.c            | 2 +-
>  target/ppc/translate_init.c | 6 +++---
>  5 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index 12f0949..0512393 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -1354,6 +1354,9 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val);
>  
>  #define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)
>  
> +#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU
> +#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX
> +
>  #define cpu_signal_handler cpu_ppc_signal_handler
>  #define cpu_list ppc_cpu_list
>  
> diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
> index 6bc6fb3..bcb40f2 100644
> --- a/target/ppc/kvm_ppc.h
> +++ b/target/ppc/kvm_ppc.h
> @@ -9,7 +9,7 @@
>  #ifndef KVM_PPC_H
>  #define KVM_PPC_H
>  
> -#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
> +#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host")
>  
>  #ifdef CONFIG_KVM
>  
> diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
> index 4d3e635..8b27962 100644
> --- a/target/ppc/cpu-models.c
> +++ b/target/ppc/cpu-models.c
> @@ -51,7 +51,7 @@
>                                                                              \
>      static const TypeInfo                                                   \
>      glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_type_info) = {         \
> -        .name       = _name "-" TYPE_POWERPC_CPU,                           \
> +        .name       = POWERPC_CPU_TYPE_NAME(_name),                           \
>          .parent     = stringify(_type) "-family-" TYPE_POWERPC_CPU,         \
>          .class_init =                                                       \
>              glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_class_init),   \
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 8571379..8590809 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -2484,7 +2484,7 @@ static int kvm_ppc_register_host_cpu_type(void)
>              char *suffix;
>  
>              ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));
> -            suffix = strstr(ppc_cpu_aliases[i].model, "-"TYPE_POWERPC_CPU);
> +            suffix = strstr(ppc_cpu_aliases[i].model, POWERPC_CPU_TYPE_SUFFIX);
>              if (suffix) {
>                  *suffix = 0;
>              }
> diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> index 43be9a8..f377cf2 100644
> --- a/target/ppc/translate_init.c
> +++ b/target/ppc/translate_init.c
> @@ -10185,7 +10185,7 @@ static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
>      if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
>          ppc_cpu_is_valid(pcc) &&
>          strcmp(object_class_get_name(oc) + strlen(name),
> -               "-" TYPE_POWERPC_CPU) == 0) {
> +               POWERPC_CPU_TYPE_SUFFIX) == 0) {
>          return 0;
>      }
>      return -1;
> @@ -10327,7 +10327,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
>      }
>  
>      name = g_strndup(typename,
> -                     strlen(typename) - strlen("-" TYPE_POWERPC_CPU));
> +                     strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));
>      (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n",
>                        name, pcc->pvr);
>      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> @@ -10388,7 +10388,7 @@ static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)
>      typename = object_class_get_name(oc);
>      info = g_malloc0(sizeof(*info));
>      info->name = g_strndup(typename,
> -                           strlen(typename) - strlen("-" TYPE_POWERPC_CPU));
> +                           strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));
>  
>      entry = g_malloc0(sizeof(*entry));
>      entry->value = info;

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent Igor Mammedov
@ 2017-08-25  1:38   ` David Gibson
  2017-08-25  7:27     ` Igor Mammedov
  0 siblings, 1 reply; 31+ messages in thread
From: David Gibson @ 2017-08-25  1:38 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 80016 bytes --]

On Thu, Aug 24, 2017 at 10:21:47AM +0200, Igor Mammedov wrote:
> PPC handles -cpu FOO rather incosistently,
> i.e. it does case-insensitive matching of FOO to
> a CPU type (see: ppc_cpu_compare_class_name) but
> handles alias names as case-sensitive, as result:
> 
>  # qemu-system-ppc64 -M mac99 -cpu g3
>  qemu-system-ppc64: unable to find CPU model ' kN�U'
> 
>  # qemu-system-ppc64 -cpu 970MP_V1.1
>  qemu-system-ppc64: Unable to find sPAPR CPU Core definition
> 
> while
> 
>  # qemu-system-ppc64 -M mac99 -cpu G3
>  # qemu-system-ppc64 -cpu 970MP_v1.1
> 
> start up just fine.
> 
> Considering we can't take case-insensitive matching away,
> make it case-insensitive for  all alias/type/core_type
> lookups.
> 
> As side effect it allows to remove duplicate core types
> which are the same but use lower-case letters in name.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Hmm.  So, I'm certainly good with making the matching more consistent,
and removing extra entries differing only in case.

However, I don't like capitalizing everything in the model table.  The
"canonical" capitalization - as in how it appears in manuals and
marketing info - is quite frequently mixed case.  So I think making
everything caps in the table will make it harder to read in the
context of looking at the corresponding documentation.

Can we instead retain mixed case in the table, and capitalize both
sides at the comparison time?

> ---
> PS:
>  consistent naming will be used by follow up patch to
>  simplify cpu_model translation code and drop ~50LOC.
> ---
>  hw/ppc/spapr_cpu_core.c     |  30 +-
>  target/ppc/cpu-models.c     | 866 ++++++++++++++++++++++----------------------
>  target/ppc/kvm.c            |   2 +-
>  target/ppc/translate_init.c |   2 +-
>  4 files changed, 450 insertions(+), 450 deletions(-)
> 
> diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> index ea278ce..40936b4 100644
> --- a/hw/ppc/spapr_cpu_core.c
> +++ b/hw/ppc/spapr_cpu_core.c
> @@ -130,8 +130,10 @@ char *spapr_get_cpu_core_type(const char *model)
>  {
>      char *core_type;
>      gchar **model_pieces = g_strsplit(model, ",", 2);
> +    gchar *cpu_model = g_ascii_strup(model_pieces[0], -1);
> +    g_strfreev(model_pieces);
>  
> -    core_type = g_strdup_printf("%s-%s", model_pieces[0], TYPE_SPAPR_CPU_CORE);
> +    core_type = g_strdup_printf("%s-" TYPE_SPAPR_CPU_CORE, cpu_model);
>  
>      /* Check whether it exists or whether we have to look up an alias name */
>      if (!object_class_by_name(core_type)) {
> @@ -139,13 +141,13 @@ char *spapr_get_cpu_core_type(const char *model)
>  
>          g_free(core_type);
>          core_type = NULL;
> -        realmodel = ppc_cpu_lookup_alias(model_pieces[0]);
> +        realmodel = ppc_cpu_lookup_alias(cpu_model);
>          if (realmodel) {
>              core_type = spapr_get_cpu_core_type(realmodel);
>          }
>      }
> +    g_free(cpu_model);
>  
> -    g_strfreev(model_pieces);
>      return core_type;
>  }
>  
> @@ -265,34 +267,32 @@ err:
>  
>  static const char *spapr_core_models[] = {
>      /* 970 */
> -    "970_v2.2",
> +    "970_V2.2",
>  
>      /* 970MP variants */
> -    "970MP_v1.0",
> -    "970mp_v1.0",
> -    "970MP_v1.1",
> -    "970mp_v1.1",
> +    "970MP_V1.0",
> +    "970MP_V1.1",
>  
>      /* POWER5+ */
> -    "POWER5+_v2.1",
> +    "POWER5+_V2.1",
>  
>      /* POWER7 */
> -    "POWER7_v2.3",
> +    "POWER7_V2.3",
>  
>      /* POWER7+ */
> -    "POWER7+_v2.1",
> +    "POWER7+_V2.1",
>  
>      /* POWER8 */
> -    "POWER8_v2.0",
> +    "POWER8_V2.0",
>  
>      /* POWER8E */
> -    "POWER8E_v2.1",
> +    "POWER8E_V2.1",
>  
>      /* POWER8NVL */
> -    "POWER8NVL_v1.0",
> +    "POWER8NVL_V1.0",
>  
>      /* POWER9 */
> -    "POWER9_v1.0",
> +    "POWER9_V1.0",
>  };
>  
>  static Property spapr_cpu_core_properties[] = {
> diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
> index 8b27962..346b6b1 100644
> --- a/target/ppc/cpu-models.c
> +++ b/target/ppc/cpu-models.c
> @@ -101,10 +101,10 @@
>  #endif
>      POWERPC_DEF("IOP480",        CPU_POWERPC_IOP480,                 IOP480,
>                  "IOP480 (401 microcontroller)")
> -    POWERPC_DEF("Cobra",         CPU_POWERPC_COBRA,                  401,
> +    POWERPC_DEF("COBRA",         CPU_POWERPC_COBRA,                  401,
>                  "IBM Processor for Network Resources")
>  #if defined(TODO)
> -    POWERPC_DEF("Xipchip",       CPU_POWERPC_XIPCHIP,                401,
> +    POWERPC_DEF("XIPCHIP",       CPU_POWERPC_XIPCHIP,                401,
>                  NULL)
>  #endif
>      /* PowerPC 403 family                                                    */
> @@ -176,16 +176,16 @@
>                  "PowerPC 405 F6")
>  #endif
>      /* PowerPC 405 microcontrollers                                          */
> -    POWERPC_DEF("405CRa",        CPU_POWERPC_405CRa,                 405,
> +    POWERPC_DEF("405CRA",        CPU_POWERPC_405CRa,                 405,
>                  "PowerPC 405 CRa")
> -    POWERPC_DEF("405CRb",        CPU_POWERPC_405CRb,                 405,
> +    POWERPC_DEF("405CRB",        CPU_POWERPC_405CRb,                 405,
>                  "PowerPC 405 CRb")
> -    POWERPC_DEF("405CRc",        CPU_POWERPC_405CRc,                 405,
> +    POWERPC_DEF("405CRC",        CPU_POWERPC_405CRc,                 405,
>                  "PowerPC 405 CRc")
>      POWERPC_DEF("405EP",         CPU_POWERPC_405EP,                  405,
>                  "PowerPC 405 EP")
>  #if defined(TODO)
> -    POWERPC_DEF("405EXr",        CPU_POWERPC_405EXr,                 405,
> +    POWERPC_DEF("405EXR",        CPU_POWERPC_405EXr,                 405,
>                  "PowerPC 405 EXr")
>  #endif
>      POWERPC_DEF("405EZ",         CPU_POWERPC_405EZ,                  405,
> @@ -194,13 +194,13 @@
>      POWERPC_DEF("405FX",         CPU_POWERPC_405FX,                  405,
>                  "PowerPC 405 FX")
>  #endif
> -    POWERPC_DEF("405GPa",        CPU_POWERPC_405GPa,                 405,
> +    POWERPC_DEF("405GPA",        CPU_POWERPC_405GPa,                 405,
>                  "PowerPC 405 GPa")
> -    POWERPC_DEF("405GPb",        CPU_POWERPC_405GPb,                 405,
> +    POWERPC_DEF("405GPB",        CPU_POWERPC_405GPb,                 405,
>                  "PowerPC 405 GPb")
> -    POWERPC_DEF("405GPc",        CPU_POWERPC_405GPc,                 405,
> +    POWERPC_DEF("405GPC",        CPU_POWERPC_405GPc,                 405,
>                  "PowerPC 405 GPc")
> -    POWERPC_DEF("405GPd",        CPU_POWERPC_405GPd,                 405,
> +    POWERPC_DEF("405GPD",        CPU_POWERPC_405GPd,                 405,
>                  "PowerPC 405 GPd")
>      POWERPC_DEF("405GPR",        CPU_POWERPC_405GPR,                 405,
>                  "PowerPC 405 GPR")
> @@ -226,20 +226,20 @@
>      POWERPC_DEF("405S",          CPU_POWERPC_405S,                   405,
>                  "PowerPC 405 S")
>  #endif
> -    POWERPC_DEF("Npe405H",       CPU_POWERPC_NPE405H,                405,
> +    POWERPC_DEF("NPE405H",       CPU_POWERPC_NPE405H,                405,
>                  "Npe405 H")
> -    POWERPC_DEF("Npe405H2",      CPU_POWERPC_NPE405H2,               405,
> +    POWERPC_DEF("NPE405H2",      CPU_POWERPC_NPE405H2,               405,
>                  "Npe405 H2")
> -    POWERPC_DEF("Npe405L",       CPU_POWERPC_NPE405L,                405,
> +    POWERPC_DEF("NPE405L",       CPU_POWERPC_NPE405L,                405,
>                  "Npe405 L")
> -    POWERPC_DEF("Npe4GS3",       CPU_POWERPC_NPE4GS3,                405,
> +    POWERPC_DEF("NPE4GS3",       CPU_POWERPC_NPE4GS3,                405,
>                  "Npe4GS3")
>  #if defined(TODO)
> -    POWERPC_DEF("Npcxx1",        CPU_POWERPC_NPCxx1,                 405,
> +    POWERPC_DEF("NPCXX1",        CPU_POWERPC_NPCxx1,                 405,
>                  NULL)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("Npr161",        CPU_POWERPC_NPR161,                 405,
> +    POWERPC_DEF("NPR161",        CPU_POWERPC_NPR161,                 405,
>                  NULL)
>  #endif
>  #if defined(TODO)
> @@ -278,24 +278,24 @@
>                  "STB130")
>  #endif
>      /* Xilinx PowerPC 405 cores                                              */
> -    POWERPC_DEF("x2vp4",         CPU_POWERPC_X2VP4,                  405,
> +    POWERPC_DEF("X2VP4",         CPU_POWERPC_X2VP4,                  405,
>                  NULL)
> -    POWERPC_DEF("x2vp20",        CPU_POWERPC_X2VP20,                 405,
> +    POWERPC_DEF("X2VP20",        CPU_POWERPC_X2VP20,                 405,
>                  NULL)
>  #if defined(TODO)
> -    POWERPC_DEF("zl10310",       CPU_POWERPC_ZL10310,                405,
> +    POWERPC_DEF("ZL10310",       CPU_POWERPC_ZL10310,                405,
>                  "Zarlink ZL10310")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("zl10311",       CPU_POWERPC_ZL10311,                405,
> +    POWERPC_DEF("ZL10311",       CPU_POWERPC_ZL10311,                405,
>                  "Zarlink ZL10311")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("zl10320",       CPU_POWERPC_ZL10320,                405,
> +    POWERPC_DEF("ZL10320",       CPU_POWERPC_ZL10320,                405,
>                  "Zarlink ZL10320")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("zl10321",       CPU_POWERPC_ZL10321,                405,
> +    POWERPC_DEF("ZL10321",       CPU_POWERPC_ZL10321,                405,
>                  "Zarlink ZL10321")
>  #endif
>      /* PowerPC 440 family                                                    */
> @@ -308,10 +308,10 @@
>      POWERPC_DEF("440A4",         CPU_POWERPC_440A4,                  440x4,
>                  "PowerPC 440 A4")
>  #endif
> -    POWERPC_DEF("440-Xilinx",    CPU_POWERPC_440_XILINX,             440x5,
> +    POWERPC_DEF("440-XILINX",    CPU_POWERPC_440_XILINX,             440x5,
>                  "PowerPC 440 Xilinx 5")
>  
> -    POWERPC_DEF("440-Xilinx-w-dfpu",    CPU_POWERPC_440_XILINX, 440x5wDFPU,
> +    POWERPC_DEF("440-XILINX-W-DFPU",    CPU_POWERPC_440_XILINX, 440x5wDFPU,
>                  "PowerPC 440 Xilinx 5 With a Double Prec. FPU")
>  #if defined(TODO)
>      POWERPC_DEF("440A5",         CPU_POWERPC_440A5,                  440x5,
> @@ -342,22 +342,22 @@
>                  "PowerPC 440H6")
>  #endif
>      /* PowerPC 440 microcontrollers                                          */
> -    POWERPC_DEF("440EPa",        CPU_POWERPC_440EPa,                 440EP,
> +    POWERPC_DEF("440EPA",        CPU_POWERPC_440EPa,                 440EP,
>                  "PowerPC 440 EPa")
> -    POWERPC_DEF("440EPb",        CPU_POWERPC_440EPb,                 440EP,
> +    POWERPC_DEF("440EPB",        CPU_POWERPC_440EPb,                 440EP,
>                  "PowerPC 440 EPb")
>      POWERPC_DEF("440EPX",        CPU_POWERPC_440EPX,                 440EP,
>                  "PowerPC 440 EPX")
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("440GPb",        CPU_POWERPC_440GPb,                 440GP,
> +    POWERPC_DEF("440GPB",        CPU_POWERPC_440GPb,                 440GP,
>                  "PowerPC 440 GPb")
>  #endif
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("440GPc",        CPU_POWERPC_440GPc,                 440GP,
> +    POWERPC_DEF("440GPC",        CPU_POWERPC_440GPc,                 440GP,
>                  "PowerPC 440 GPc")
>  #endif
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("440GRa",        CPU_POWERPC_440GRa,                 440x5,
> +    POWERPC_DEF("440GRA",        CPU_POWERPC_440GRa,                 440x5,
>                  "PowerPC 440 GRa")
>  #endif
>  #if defined(TODO_USER_ONLY)
> @@ -365,19 +365,19 @@
>                  "PowerPC 440 GRX")
>  #endif
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("440GXa",        CPU_POWERPC_440GXa,                 440EP,
> +    POWERPC_DEF("440GXA",        CPU_POWERPC_440GXa,                 440EP,
>                  "PowerPC 440 GXa")
>  #endif
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("440GXb",        CPU_POWERPC_440GXb,                 440EP,
> +    POWERPC_DEF("440GXB",        CPU_POWERPC_440GXb,                 440EP,
>                  "PowerPC 440 GXb")
>  #endif
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("440GXc",        CPU_POWERPC_440GXc,                 440EP,
> +    POWERPC_DEF("440GXC",        CPU_POWERPC_440GXc,                 440EP,
>                  "PowerPC 440 GXc")
>  #endif
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("440GXf",        CPU_POWERPC_440GXf,                 440EP,
> +    POWERPC_DEF("440GXF",        CPU_POWERPC_440GXf,                 440EP,
>                  "PowerPC 440 GXf")
>  #endif
>  #if defined(TODO)
> @@ -413,12 +413,12 @@
>      /* Freescale embedded PowerPC cores                                      */
>      /* MPC5xx family (aka RCPU)                                              */
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("MPC5xx",        CPU_POWERPC_MPC5xx,                 MPC5xx,
> +    POWERPC_DEF("MPC5XX",        CPU_POWERPC_MPC5xx,                 MPC5xx,
>                  "Generic MPC5xx core")
>  #endif
>      /* MPC8xx family (aka PowerQUICC)                                        */
>  #if defined(TODO_USER_ONLY)
> -    POWERPC_DEF("MPC8xx",        CPU_POWERPC_MPC8xx,                 MPC8xx,
> +    POWERPC_DEF("MPC8XX",        CPU_POWERPC_MPC8xx,                 MPC8xx,
>                  "Generic MPC8xx core")
>  #endif
>      /* MPC82xx family (aka PowerQUICC-II)                                    */
> @@ -430,57 +430,57 @@
>                  "PowerPC G2 GP core")
>      POWERPC_DEF("G2LS",          CPU_POWERPC_G2ls,                   G2,
>                  "PowerPC G2 LS core")
> -    POWERPC_DEF("G2HiP3",        CPU_POWERPC_G2_HIP3,                G2,
> +    POWERPC_DEF("G2HIP3",        CPU_POWERPC_G2_HIP3,                G2,
>                  "PowerPC G2 HiP3 core")
> -    POWERPC_DEF("G2HiP4",        CPU_POWERPC_G2_HIP4,                G2,
> +    POWERPC_DEF("G2HIP4",        CPU_POWERPC_G2_HIP4,                G2,
>                  "PowerPC G2 HiP4 core")
>      POWERPC_DEF("MPC603",        CPU_POWERPC_MPC603,                 603E,
>                  "PowerPC MPC603 core")
> -    POWERPC_DEF("G2le",          CPU_POWERPC_G2LE,                   G2LE,
> +    POWERPC_DEF("G2LE",          CPU_POWERPC_G2LE,                   G2LE,
>          "PowerPC G2le core (same as G2 plus little-endian mode support)")
> -    POWERPC_DEF("G2leGP",        CPU_POWERPC_G2LEgp,                 G2LE,
> +    POWERPC_DEF("G2LEGP",        CPU_POWERPC_G2LEgp,                 G2LE,
>                  "PowerPC G2LE GP core")
> -    POWERPC_DEF("G2leLS",        CPU_POWERPC_G2LEls,                 G2LE,
> +    POWERPC_DEF("G2LELS",        CPU_POWERPC_G2LEls,                 G2LE,
>                  "PowerPC G2LE LS core")
> -    POWERPC_DEF("G2leGP1",       CPU_POWERPC_G2LEgp1,                G2LE,
> +    POWERPC_DEF("G2LEGP1",       CPU_POWERPC_G2LEgp1,                G2LE,
>                  "PowerPC G2LE GP1 core")
> -    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp3,                G2LE,
> +    POWERPC_DEF("G2LEGP3",       CPU_POWERPC_G2LEgp3,                G2LE,
>                  "PowerPC G2LE GP3 core")
>      /* PowerPC G2 microcontrollers                                           */
>  #if defined(TODO)
>      POWERPC_DEF_SVR("MPC5121", "MPC5121",
>                      CPU_POWERPC_MPC5121,      POWERPC_SVR_5121,      G2LE)
>  #endif
> -    POWERPC_DEF_SVR("MPC5200_v10", "MPC5200 v1.0",
> +    POWERPC_DEF_SVR("MPC5200_V10", "MPC5200 v1.0",
>                      CPU_POWERPC_MPC5200_v10,  POWERPC_SVR_5200_v10,  G2LE)
> -    POWERPC_DEF_SVR("MPC5200_v11", "MPC5200 v1.1",
> +    POWERPC_DEF_SVR("MPC5200_V11", "MPC5200 v1.1",
>                      CPU_POWERPC_MPC5200_v11,  POWERPC_SVR_5200_v11,  G2LE)
> -    POWERPC_DEF_SVR("MPC5200_v12", "MPC5200 v1.2",
> +    POWERPC_DEF_SVR("MPC5200_V12", "MPC5200 v1.2",
>                      CPU_POWERPC_MPC5200_v12,  POWERPC_SVR_5200_v12,  G2LE)
> -    POWERPC_DEF_SVR("MPC5200B_v20", "MPC5200B v2.0",
> +    POWERPC_DEF_SVR("MPC5200B_V20", "MPC5200B v2.0",
>                      CPU_POWERPC_MPC5200B_v20, POWERPC_SVR_5200B_v20, G2LE)
> -    POWERPC_DEF_SVR("MPC5200B_v21", "MPC5200B v2.1",
> +    POWERPC_DEF_SVR("MPC5200B_V21", "MPC5200B v2.1",
>                      CPU_POWERPC_MPC5200B_v21, POWERPC_SVR_5200B_v21, G2LE)
>      /* e200 family                                                           */
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC55xx", "Generic MPC55xx core",
> +    POWERPC_DEF_SVR("MPC55XX", "Generic MPC55xx core",
>                      CPU_POWERPC_MPC55xx,      POWERPC_SVR_55xx,      e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("e200z0",        CPU_POWERPC_e200z0,                 e200,
> +    POWERPC_DEF("E200Z0",        CPU_POWERPC_e200z0,                 e200,
>                  "PowerPC e200z0 core")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("e200z1",        CPU_POWERPC_e200z1,                 e200,
> +    POWERPC_DEF("E200Z1",        CPU_POWERPC_e200z1,                 e200,
>                  "PowerPC e200z1 core")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("e200z3",        CPU_POWERPC_e200z3,                 e200,
> +    POWERPC_DEF("E200Z3",        CPU_POWERPC_e200z3,                 e200,
>                  "PowerPC e200z3 core")
>  #endif
> -    POWERPC_DEF("e200z5",        CPU_POWERPC_e200z5,                 e200,
> +    POWERPC_DEF("E200Z5",        CPU_POWERPC_e200z5,                 e200,
>                  "PowerPC e200z5 core")
> -    POWERPC_DEF("e200z6",        CPU_POWERPC_e200z6,                 e200,
> +    POWERPC_DEF("E200Z6",        CPU_POWERPC_e200z6,                 e200,
>                  "PowerPC e200z6 core")
>      /* PowerPC e200 microcontrollers                                         */
>  #if defined(TODO)
> @@ -488,11 +488,11 @@
>                      CPU_POWERPC_MPC5514E,     POWERPC_SVR_5514E,     e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC5514E_v0", "MPC5514E v0",
> +    POWERPC_DEF_SVR("MPC5514E_V0", "MPC5514E v0",
>                      CPU_POWERPC_MPC5514E_v0,  POWERPC_SVR_5514E_v0,  e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC5514E_v1", "MPC5514E v1",
> +    POWERPC_DEF_SVR("MPC5514E_V1", "MPC5514E v1",
>                      CPU_POWERPC_MPC5514E_v1,  POWERPC_SVR_5514E_v1,  e200)
>  #endif
>  #if defined(TODO)
> @@ -500,11 +500,11 @@
>                      CPU_POWERPC_MPC5514G,     POWERPC_SVR_5514G,     e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC5514G_v0", "MPC5514G v0",
> +    POWERPC_DEF_SVR("MPC5514G_V0", "MPC5514G v0",
>                      CPU_POWERPC_MPC5514G_v0,  POWERPC_SVR_5514G_v0,  e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC5514G_v1", "MPC5514G v1",
> +    POWERPC_DEF_SVR("MPC5514G_V1", "MPC5514G v1",
>                      CPU_POWERPC_MPC5514G_v1,  POWERPC_SVR_5514G_v1,  e200)
>  #endif
>  #if defined(TODO)
> @@ -516,11 +516,11 @@
>                      CPU_POWERPC_MPC5516E,     POWERPC_SVR_5516E,     e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC5516E_v0", "MPC5516E v0",
> +    POWERPC_DEF_SVR("MPC5516E_V0", "MPC5516E v0",
>                      CPU_POWERPC_MPC5516E_v0,  POWERPC_SVR_5516E_v0,  e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC5516E_v1", "MPC5516E v1",
> +    POWERPC_DEF_SVR("MPC5516E_V1", "MPC5516E v1",
>                      CPU_POWERPC_MPC5516E_v1,  POWERPC_SVR_5516E_v1,  e200)
>  #endif
>  #if defined(TODO)
> @@ -528,11 +528,11 @@
>                      CPU_POWERPC_MPC5516G,     POWERPC_SVR_5516G,     e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC5516G_v0", "MPC5516G v0",
> +    POWERPC_DEF_SVR("MPC5516G_V0", "MPC5516G v0",
>                      CPU_POWERPC_MPC5516G_v0,  POWERPC_SVR_5516G_v0,  e200)
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF_SVR("MPC5516G_v1", "MPC5516G v1",
> +    POWERPC_DEF_SVR("MPC5516G_V1", "MPC5516G v1",
>                      CPU_POWERPC_MPC5516G_v1,  POWERPC_SVR_5516G_v1,  e200)
>  #endif
>  #if defined(TODO)
> @@ -572,13 +572,13 @@
>                      CPU_POWERPC_MPC5567,      POWERPC_SVR_5567,      e200)
>  #endif
>      /* e300 family                                                           */
> -    POWERPC_DEF("e300c1",        CPU_POWERPC_e300c1,                 e300,
> +    POWERPC_DEF("E300C1",        CPU_POWERPC_e300c1,                 e300,
>                  "PowerPC e300c1 core")
> -    POWERPC_DEF("e300c2",        CPU_POWERPC_e300c2,                 e300,
> +    POWERPC_DEF("E300C2",        CPU_POWERPC_e300c2,                 e300,
>                  "PowerPC e300c2 core")
> -    POWERPC_DEF("e300c3",        CPU_POWERPC_e300c3,                 e300,
> +    POWERPC_DEF("E300C3",        CPU_POWERPC_e300c3,                 e300,
>                  "PowerPC e300c3 core")
> -    POWERPC_DEF("e300c4",        CPU_POWERPC_e300c4,                 e300,
> +    POWERPC_DEF("E300C4",        CPU_POWERPC_e300c4,                 e300,
>                  "PowerPC e300c4 core")
>      /* PowerPC e300 microcontrollers                                         */
>  #if defined(TODO)
> @@ -674,114 +674,114 @@
>      POWERPC_DEF_SVR("MPC8379E", "MPC8379E",
>                      CPU_POWERPC_MPC837x,      POWERPC_SVR_8379E,     e300)
>      /* e500 family                                                           */
> -    POWERPC_DEF_SVR("e500_v10", "PowerPC e500 v1.0 core",
> +    POWERPC_DEF_SVR("E500_V10", "PowerPC e500 v1.0 core",
>                      CPU_POWERPC_e500v1_v10,   POWERPC_SVR_E500,      e500v1);
> -    POWERPC_DEF_SVR("e500_v20", "PowerPC e500 v2.0 core",
> +    POWERPC_DEF_SVR("E500_V20", "PowerPC e500 v2.0 core",
>                      CPU_POWERPC_e500v1_v20,   POWERPC_SVR_E500,      e500v1);
> -    POWERPC_DEF_SVR("e500v2_v10", "PowerPC e500v2 v1.0 core",
> +    POWERPC_DEF_SVR("E500V2_V10", "PowerPC e500v2 v1.0 core",
>                      CPU_POWERPC_e500v2_v10,   POWERPC_SVR_E500,      e500v2);
> -    POWERPC_DEF_SVR("e500v2_v20", "PowerPC e500v2 v2.0 core",
> +    POWERPC_DEF_SVR("E500V2_V20", "PowerPC e500v2 v2.0 core",
>                      CPU_POWERPC_e500v2_v20,   POWERPC_SVR_E500,      e500v2);
> -    POWERPC_DEF_SVR("e500v2_v21", "PowerPC e500v2 v2.1 core",
> +    POWERPC_DEF_SVR("E500V2_V21", "PowerPC e500v2 v2.1 core",
>                      CPU_POWERPC_e500v2_v21,   POWERPC_SVR_E500,      e500v2);
> -    POWERPC_DEF_SVR("e500v2_v22", "PowerPC e500v2 v2.2 core",
> +    POWERPC_DEF_SVR("E500V2_V22", "PowerPC e500v2 v2.2 core",
>                      CPU_POWERPC_e500v2_v22,   POWERPC_SVR_E500,      e500v2);
> -    POWERPC_DEF_SVR("e500v2_v30", "PowerPC e500v2 v3.0 core",
> +    POWERPC_DEF_SVR("E500V2_V30", "PowerPC e500v2 v3.0 core",
>                      CPU_POWERPC_e500v2_v30,   POWERPC_SVR_E500,      e500v2);
> -    POWERPC_DEF_SVR("e500mc", "e500mc",
> +    POWERPC_DEF_SVR("E500MC", "e500mc",
>                      CPU_POWERPC_e500mc,       POWERPC_SVR_E500,      e500mc)
>  #ifdef TARGET_PPC64
> -    POWERPC_DEF_SVR("e5500", "e5500",
> +    POWERPC_DEF_SVR("E5500", "e5500",
>                      CPU_POWERPC_e5500,        POWERPC_SVR_E500,      e5500)
>  #endif
>      /* PowerPC e500 microcontrollers                                         */
> -    POWERPC_DEF_SVR("MPC8533_v10", "MPC8533 v1.0",
> +    POWERPC_DEF_SVR("MPC8533_V10", "MPC8533 v1.0",
>                      CPU_POWERPC_MPC8533_v10,  POWERPC_SVR_8533_v10,  e500v2)
> -    POWERPC_DEF_SVR("MPC8533_v11", "MPC8533 v1.1",
> +    POWERPC_DEF_SVR("MPC8533_V11", "MPC8533 v1.1",
>                      CPU_POWERPC_MPC8533_v11,  POWERPC_SVR_8533_v11,  e500v2)
> -    POWERPC_DEF_SVR("MPC8533E_v10", "MPC8533E v1.0",
> +    POWERPC_DEF_SVR("MPC8533E_V10", "MPC8533E v1.0",
>                      CPU_POWERPC_MPC8533E_v10, POWERPC_SVR_8533E_v10, e500v2)
> -    POWERPC_DEF_SVR("MPC8533E_v11", "MPC8533E v1.1",
> +    POWERPC_DEF_SVR("MPC8533E_V11", "MPC8533E v1.1",
>                      CPU_POWERPC_MPC8533E_v11, POWERPC_SVR_8533E_v11, e500v2)
> -    POWERPC_DEF_SVR("MPC8540_v10", "MPC8540 v1.0",
> +    POWERPC_DEF_SVR("MPC8540_V10", "MPC8540 v1.0",
>                      CPU_POWERPC_MPC8540_v10,  POWERPC_SVR_8540_v10,  e500v1)
> -    POWERPC_DEF_SVR("MPC8540_v20", "MPC8540 v2.0",
> +    POWERPC_DEF_SVR("MPC8540_V20", "MPC8540 v2.0",
>                      CPU_POWERPC_MPC8540_v20,  POWERPC_SVR_8540_v20,  e500v1)
> -    POWERPC_DEF_SVR("MPC8540_v21", "MPC8540 v2.1",
> +    POWERPC_DEF_SVR("MPC8540_V21", "MPC8540 v2.1",
>                      CPU_POWERPC_MPC8540_v21,  POWERPC_SVR_8540_v21,  e500v1)
> -    POWERPC_DEF_SVR("MPC8541_v10", "MPC8541 v1.0",
> +    POWERPC_DEF_SVR("MPC8541_V10", "MPC8541 v1.0",
>                      CPU_POWERPC_MPC8541_v10,  POWERPC_SVR_8541_v10,  e500v1)
> -    POWERPC_DEF_SVR("MPC8541_v11", "MPC8541 v1.1",
> +    POWERPC_DEF_SVR("MPC8541_V11", "MPC8541 v1.1",
>                      CPU_POWERPC_MPC8541_v11,  POWERPC_SVR_8541_v11,  e500v1)
> -    POWERPC_DEF_SVR("MPC8541E_v10", "MPC8541E v1.0",
> +    POWERPC_DEF_SVR("MPC8541E_V10", "MPC8541E v1.0",
>                      CPU_POWERPC_MPC8541E_v10, POWERPC_SVR_8541E_v10, e500v1)
> -    POWERPC_DEF_SVR("MPC8541E_v11", "MPC8541E v1.1",
> +    POWERPC_DEF_SVR("MPC8541E_V11", "MPC8541E v1.1",
>                      CPU_POWERPC_MPC8541E_v11, POWERPC_SVR_8541E_v11, e500v1)
> -    POWERPC_DEF_SVR("MPC8543_v10", "MPC8543 v1.0",
> +    POWERPC_DEF_SVR("MPC8543_V10", "MPC8543 v1.0",
>                      CPU_POWERPC_MPC8543_v10,  POWERPC_SVR_8543_v10,  e500v2)
> -    POWERPC_DEF_SVR("MPC8543_v11", "MPC8543 v1.1",
> +    POWERPC_DEF_SVR("MPC8543_V11", "MPC8543 v1.1",
>                      CPU_POWERPC_MPC8543_v11,  POWERPC_SVR_8543_v11,  e500v2)
> -    POWERPC_DEF_SVR("MPC8543_v20", "MPC8543 v2.0",
> +    POWERPC_DEF_SVR("MPC8543_V20", "MPC8543 v2.0",
>                      CPU_POWERPC_MPC8543_v20,  POWERPC_SVR_8543_v20,  e500v2)
> -    POWERPC_DEF_SVR("MPC8543_v21", "MPC8543 v2.1",
> +    POWERPC_DEF_SVR("MPC8543_V21", "MPC8543 v2.1",
>                      CPU_POWERPC_MPC8543_v21,  POWERPC_SVR_8543_v21,  e500v2)
> -    POWERPC_DEF_SVR("MPC8543E_v10", "MPC8543E v1.0",
> +    POWERPC_DEF_SVR("MPC8543E_V10", "MPC8543E v1.0",
>                      CPU_POWERPC_MPC8543E_v10, POWERPC_SVR_8543E_v10, e500v2)
> -    POWERPC_DEF_SVR("MPC8543E_v11", "MPC8543E v1.1",
> +    POWERPC_DEF_SVR("MPC8543E_V11", "MPC8543E v1.1",
>                      CPU_POWERPC_MPC8543E_v11, POWERPC_SVR_8543E_v11, e500v2)
> -    POWERPC_DEF_SVR("MPC8543E_v20", "MPC8543E v2.0",
> +    POWERPC_DEF_SVR("MPC8543E_V20", "MPC8543E v2.0",
>                      CPU_POWERPC_MPC8543E_v20, POWERPC_SVR_8543E_v20, e500v2)
> -    POWERPC_DEF_SVR("MPC8543E_v21", "MPC8543E v2.1",
> +    POWERPC_DEF_SVR("MPC8543E_V21", "MPC8543E v2.1",
>                      CPU_POWERPC_MPC8543E_v21, POWERPC_SVR_8543E_v21, e500v2)
> -    POWERPC_DEF_SVR("MPC8544_v10", "MPC8544 v1.0",
> +    POWERPC_DEF_SVR("MPC8544_V10", "MPC8544 v1.0",
>                      CPU_POWERPC_MPC8544_v10,  POWERPC_SVR_8544_v10,  e500v2)
> -    POWERPC_DEF_SVR("MPC8544_v11", "MPC8544 v1.1",
> +    POWERPC_DEF_SVR("MPC8544_V11", "MPC8544 v1.1",
>                      CPU_POWERPC_MPC8544_v11,  POWERPC_SVR_8544_v11,  e500v2)
> -    POWERPC_DEF_SVR("MPC8544E_v10", "MPC8544E v1.0",
> +    POWERPC_DEF_SVR("MPC8544E_V10", "MPC8544E v1.0",
>                      CPU_POWERPC_MPC8544E_v10, POWERPC_SVR_8544E_v10, e500v2)
> -    POWERPC_DEF_SVR("MPC8544E_v11", "MPC8544E v1.1",
> +    POWERPC_DEF_SVR("MPC8544E_V11", "MPC8544E v1.1",
>                      CPU_POWERPC_MPC8544E_v11, POWERPC_SVR_8544E_v11, e500v2)
> -    POWERPC_DEF_SVR("MPC8545_v20", "MPC8545 v2.0",
> +    POWERPC_DEF_SVR("MPC8545_V20", "MPC8545 v2.0",
>                      CPU_POWERPC_MPC8545_v20,  POWERPC_SVR_8545_v20,  e500v2)
> -    POWERPC_DEF_SVR("MPC8545_v21", "MPC8545 v2.1",
> +    POWERPC_DEF_SVR("MPC8545_V21", "MPC8545 v2.1",
>                      CPU_POWERPC_MPC8545_v21,  POWERPC_SVR_8545_v21,  e500v2)
> -    POWERPC_DEF_SVR("MPC8545E_v20", "MPC8545E v2.0",
> +    POWERPC_DEF_SVR("MPC8545E_V20", "MPC8545E v2.0",
>                      CPU_POWERPC_MPC8545E_v20, POWERPC_SVR_8545E_v20, e500v2)
> -    POWERPC_DEF_SVR("MPC8545E_v21", "MPC8545E v2.1",
> +    POWERPC_DEF_SVR("MPC8545E_V21", "MPC8545E v2.1",
>                      CPU_POWERPC_MPC8545E_v21, POWERPC_SVR_8545E_v21, e500v2)
> -    POWERPC_DEF_SVR("MPC8547E_v20", "MPC8547E v2.0",
> +    POWERPC_DEF_SVR("MPC8547E_V20", "MPC8547E v2.0",
>                      CPU_POWERPC_MPC8547E_v20, POWERPC_SVR_8547E_v20, e500v2)
> -    POWERPC_DEF_SVR("MPC8547E_v21", "MPC8547E v2.1",
> +    POWERPC_DEF_SVR("MPC8547E_V21", "MPC8547E v2.1",
>                      CPU_POWERPC_MPC8547E_v21, POWERPC_SVR_8547E_v21, e500v2)
> -    POWERPC_DEF_SVR("MPC8548_v10", "MPC8548 v1.0",
> +    POWERPC_DEF_SVR("MPC8548_V10", "MPC8548 v1.0",
>                      CPU_POWERPC_MPC8548_v10,  POWERPC_SVR_8548_v10,  e500v2)
> -    POWERPC_DEF_SVR("MPC8548_v11", "MPC8548 v1.1",
> +    POWERPC_DEF_SVR("MPC8548_V11", "MPC8548 v1.1",
>                      CPU_POWERPC_MPC8548_v11,  POWERPC_SVR_8548_v11,  e500v2)
> -    POWERPC_DEF_SVR("MPC8548_v20", "MPC8548 v2.0",
> +    POWERPC_DEF_SVR("MPC8548_V20", "MPC8548 v2.0",
>                      CPU_POWERPC_MPC8548_v20,  POWERPC_SVR_8548_v20,  e500v2)
> -    POWERPC_DEF_SVR("MPC8548_v21", "MPC8548 v2.1",
> +    POWERPC_DEF_SVR("MPC8548_V21", "MPC8548 v2.1",
>                      CPU_POWERPC_MPC8548_v21,  POWERPC_SVR_8548_v21,  e500v2)
> -    POWERPC_DEF_SVR("MPC8548E_v10", "MPC8548E v1.0",
> +    POWERPC_DEF_SVR("MPC8548E_V10", "MPC8548E v1.0",
>                      CPU_POWERPC_MPC8548E_v10, POWERPC_SVR_8548E_v10, e500v2)
> -    POWERPC_DEF_SVR("MPC8548E_v11", "MPC8548E v1.1",
> +    POWERPC_DEF_SVR("MPC8548E_V11", "MPC8548E v1.1",
>                      CPU_POWERPC_MPC8548E_v11, POWERPC_SVR_8548E_v11, e500v2)
> -    POWERPC_DEF_SVR("MPC8548E_v20", "MPC8548E v2.0",
> +    POWERPC_DEF_SVR("MPC8548E_V20", "MPC8548E v2.0",
>                      CPU_POWERPC_MPC8548E_v20, POWERPC_SVR_8548E_v20, e500v2)
> -    POWERPC_DEF_SVR("MPC8548E_v21", "MPC8548E v2.1",
> +    POWERPC_DEF_SVR("MPC8548E_V21", "MPC8548E v2.1",
>                      CPU_POWERPC_MPC8548E_v21, POWERPC_SVR_8548E_v21, e500v2)
> -    POWERPC_DEF_SVR("MPC8555_v10", "MPC8555 v1.0",
> +    POWERPC_DEF_SVR("MPC8555_V10", "MPC8555 v1.0",
>                      CPU_POWERPC_MPC8555_v10,  POWERPC_SVR_8555_v10,  e500v2)
> -    POWERPC_DEF_SVR("MPC8555_v11", "MPC8555 v1.1",
> +    POWERPC_DEF_SVR("MPC8555_V11", "MPC8555 v1.1",
>                      CPU_POWERPC_MPC8555_v11,  POWERPC_SVR_8555_v11,  e500v2)
> -    POWERPC_DEF_SVR("MPC8555E_v10", "MPC8555E v1.0",
> +    POWERPC_DEF_SVR("MPC8555E_V10", "MPC8555E v1.0",
>                      CPU_POWERPC_MPC8555E_v10, POWERPC_SVR_8555E_v10, e500v2)
> -    POWERPC_DEF_SVR("MPC8555E_v11", "MPC8555E v1.1",
> +    POWERPC_DEF_SVR("MPC8555E_V11", "MPC8555E v1.1",
>                      CPU_POWERPC_MPC8555E_v11, POWERPC_SVR_8555E_v11, e500v2)
> -    POWERPC_DEF_SVR("MPC8560_v10", "MPC8560 v1.0",
> +    POWERPC_DEF_SVR("MPC8560_V10", "MPC8560 v1.0",
>                      CPU_POWERPC_MPC8560_v10,  POWERPC_SVR_8560_v10,  e500v2)
> -    POWERPC_DEF_SVR("MPC8560_v20", "MPC8560 v2.0",
> +    POWERPC_DEF_SVR("MPC8560_V20", "MPC8560 v2.0",
>                      CPU_POWERPC_MPC8560_v20,  POWERPC_SVR_8560_v20,  e500v2)
> -    POWERPC_DEF_SVR("MPC8560_v21", "MPC8560 v2.1",
> +    POWERPC_DEF_SVR("MPC8560_V21", "MPC8560 v2.1",
>                      CPU_POWERPC_MPC8560_v21,  POWERPC_SVR_8560_v21,  e500v2)
>      POWERPC_DEF_SVR("MPC8567", "MPC8567",
>                      CPU_POWERPC_MPC8567,      POWERPC_SVR_8567,      e500v2)
> @@ -796,7 +796,7 @@
>      POWERPC_DEF_SVR("MPC8572E", "MPC8572E",
>                      CPU_POWERPC_MPC8572E,     POWERPC_SVR_8572E,     e500v2)
>      /* e600 family                                                           */
> -    POWERPC_DEF("e600",          CPU_POWERPC_e600,                   e600,
> +    POWERPC_DEF("E600",          CPU_POWERPC_e600,                   e600,
>                  "PowerPC e600 core")
>      /* PowerPC e600 microcontrollers                                         */
>      POWERPC_DEF_SVR("MPC8610", "MPC8610",
> @@ -807,299 +807,299 @@
>                      CPU_POWERPC_MPC8641D,     POWERPC_SVR_8641D,     e600)
>      /* 32 bits "classic" PowerPC                                             */
>      /* PowerPC 6xx family                                                    */
> -    POWERPC_DEF("601_v0",        CPU_POWERPC_601_v0,                 601,
> +    POWERPC_DEF("601_V0",        CPU_POWERPC_601_v0,                 601,
>                  "PowerPC 601v0")
> -    POWERPC_DEF("601_v1",        CPU_POWERPC_601_v1,                 601,
> +    POWERPC_DEF("601_V1",        CPU_POWERPC_601_v1,                 601,
>                  "PowerPC 601v1")
> -    POWERPC_DEF("601_v2",        CPU_POWERPC_601_v2,                 601v,
> +    POWERPC_DEF("601_V2",        CPU_POWERPC_601_v2,                 601v,
>                  "PowerPC 601v2")
>      POWERPC_DEF("602",           CPU_POWERPC_602,                    602,
>                  "PowerPC 602")
>      POWERPC_DEF("603",           CPU_POWERPC_603,                    603,
>                  "PowerPC 603")
> -    POWERPC_DEF("603e_v1.1",     CPU_POWERPC_603E_v11,               603E,
> +    POWERPC_DEF("603E_V1.1",     CPU_POWERPC_603E_v11,               603E,
>                  "PowerPC 603e v1.1")
> -    POWERPC_DEF("603e_v1.2",     CPU_POWERPC_603E_v12,               603E,
> +    POWERPC_DEF("603E_V1.2",     CPU_POWERPC_603E_v12,               603E,
>                  "PowerPC 603e v1.2")
> -    POWERPC_DEF("603e_v1.3",     CPU_POWERPC_603E_v13,               603E,
> +    POWERPC_DEF("603E_V1.3",     CPU_POWERPC_603E_v13,               603E,
>                  "PowerPC 603e v1.3")
> -    POWERPC_DEF("603e_v1.4",     CPU_POWERPC_603E_v14,               603E,
> +    POWERPC_DEF("603E_V1.4",     CPU_POWERPC_603E_v14,               603E,
>                  "PowerPC 603e v1.4")
> -    POWERPC_DEF("603e_v2.2",     CPU_POWERPC_603E_v22,               603E,
> +    POWERPC_DEF("603E_V2.2",     CPU_POWERPC_603E_v22,               603E,
>                  "PowerPC 603e v2.2")
> -    POWERPC_DEF("603e_v3",       CPU_POWERPC_603E_v3,                603E,
> +    POWERPC_DEF("603E_V3",       CPU_POWERPC_603E_v3,                603E,
>                  "PowerPC 603e v3")
> -    POWERPC_DEF("603e_v4",       CPU_POWERPC_603E_v4,                603E,
> +    POWERPC_DEF("603E_V4",       CPU_POWERPC_603E_v4,                603E,
>                  "PowerPC 603e v4")
> -    POWERPC_DEF("603e_v4.1",     CPU_POWERPC_603E_v41,               603E,
> +    POWERPC_DEF("603E_V4.1",     CPU_POWERPC_603E_v41,               603E,
>                  "PowerPC 603e v4.1")
> -    POWERPC_DEF("603e7",         CPU_POWERPC_603E7,                  603E,
> +    POWERPC_DEF("603E7",         CPU_POWERPC_603E7,                  603E,
>                  "PowerPC 603e (aka PID7)")
> -    POWERPC_DEF("603e7t",        CPU_POWERPC_603E7t,                 603E,
> +    POWERPC_DEF("603E7T",        CPU_POWERPC_603E7t,                 603E,
>                  "PowerPC 603e7t")
> -    POWERPC_DEF("603e7v",        CPU_POWERPC_603E7v,                 603E,
> +    POWERPC_DEF("603E7V",        CPU_POWERPC_603E7v,                 603E,
>                  "PowerPC 603e7v")
> -    POWERPC_DEF("603e7v1",       CPU_POWERPC_603E7v1,                603E,
> +    POWERPC_DEF("603E7V1",       CPU_POWERPC_603E7v1,                603E,
>                  "PowerPC 603e7v1")
> -    POWERPC_DEF("603e7v2",       CPU_POWERPC_603E7v2,                603E,
> +    POWERPC_DEF("603E7V2",       CPU_POWERPC_603E7v2,                603E,
>                  "PowerPC 603e7v2")
> -    POWERPC_DEF("603p",          CPU_POWERPC_603P,                   603E,
> +    POWERPC_DEF("603P",          CPU_POWERPC_603P,                   603E,
>                  "PowerPC 603p (aka PID7v)")
>      POWERPC_DEF("604",           CPU_POWERPC_604,                    604,
>                  "PowerPC 604")
> -    POWERPC_DEF("604e_v1.0",     CPU_POWERPC_604E_v10,               604E,
> +    POWERPC_DEF("604E_V1.0",     CPU_POWERPC_604E_v10,               604E,
>                  "PowerPC 604e v1.0")
> -    POWERPC_DEF("604e_v2.2",     CPU_POWERPC_604E_v22,               604E,
> +    POWERPC_DEF("604E_V2.2",     CPU_POWERPC_604E_v22,               604E,
>                  "PowerPC 604e v2.2")
> -    POWERPC_DEF("604e_v2.4",     CPU_POWERPC_604E_v24,               604E,
> +    POWERPC_DEF("604E_V2.4",     CPU_POWERPC_604E_v24,               604E,
>                  "PowerPC 604e v2.4")
> -    POWERPC_DEF("604r",          CPU_POWERPC_604R,                   604E,
> +    POWERPC_DEF("604R",          CPU_POWERPC_604R,                   604E,
>                  "PowerPC 604r (aka PIDA)")
>  #if defined(TODO)
> -    POWERPC_DEF("604ev",         CPU_POWERPC_604EV,                  604E,
> +    POWERPC_DEF("604EV",         CPU_POWERPC_604EV,                  604E,
>                  "PowerPC 604ev")
>  #endif
>      /* PowerPC 7xx family                                                    */
> -    POWERPC_DEF("740_v1.0",      CPU_POWERPC_7x0_v10,                740,
> +    POWERPC_DEF("740_V1.0",      CPU_POWERPC_7x0_v10,                740,
>                  "PowerPC 740 v1.0 (G3)")
> -    POWERPC_DEF("750_v1.0",      CPU_POWERPC_7x0_v10,                750,
> +    POWERPC_DEF("750_V1.0",      CPU_POWERPC_7x0_v10,                750,
>                  "PowerPC 750 v1.0 (G3)")
> -    POWERPC_DEF("740_v2.0",      CPU_POWERPC_7x0_v20,                740,
> +    POWERPC_DEF("740_V2.0",      CPU_POWERPC_7x0_v20,                740,
>                  "PowerPC 740 v2.0 (G3)")
> -    POWERPC_DEF("750_v2.0",      CPU_POWERPC_7x0_v20,                750,
> +    POWERPC_DEF("750_V2.0",      CPU_POWERPC_7x0_v20,                750,
>                  "PowerPC 750 v2.0 (G3)")
> -    POWERPC_DEF("740_v2.1",      CPU_POWERPC_7x0_v21,                740,
> +    POWERPC_DEF("740_V2.1",      CPU_POWERPC_7x0_v21,                740,
>                  "PowerPC 740 v2.1 (G3)")
> -    POWERPC_DEF("750_v2.1",      CPU_POWERPC_7x0_v21,                750,
> +    POWERPC_DEF("750_V2.1",      CPU_POWERPC_7x0_v21,                750,
>                  "PowerPC 750 v2.1 (G3)")
> -    POWERPC_DEF("740_v2.2",      CPU_POWERPC_7x0_v22,                740,
> +    POWERPC_DEF("740_V2.2",      CPU_POWERPC_7x0_v22,                740,
>                  "PowerPC 740 v2.2 (G3)")
> -    POWERPC_DEF("750_v2.2",      CPU_POWERPC_7x0_v22,                750,
> +    POWERPC_DEF("750_V2.2",      CPU_POWERPC_7x0_v22,                750,
>                  "PowerPC 750 v2.2 (G3)")
> -    POWERPC_DEF("740_v3.0",      CPU_POWERPC_7x0_v30,                740,
> +    POWERPC_DEF("740_V3.0",      CPU_POWERPC_7x0_v30,                740,
>                  "PowerPC 740 v3.0 (G3)")
> -    POWERPC_DEF("750_v3.0",      CPU_POWERPC_7x0_v30,                750,
> +    POWERPC_DEF("750_V3.0",      CPU_POWERPC_7x0_v30,                750,
>                  "PowerPC 750 v3.0 (G3)")
> -    POWERPC_DEF("740_v3.1",      CPU_POWERPC_7x0_v31,                740,
> +    POWERPC_DEF("740_V3.1",      CPU_POWERPC_7x0_v31,                740,
>                  "PowerPC 740 v3.1 (G3)")
> -    POWERPC_DEF("750_v3.1",      CPU_POWERPC_7x0_v31,                750,
> +    POWERPC_DEF("750_V3.1",      CPU_POWERPC_7x0_v31,                750,
>                  "PowerPC 750 v3.1 (G3)")
> -    POWERPC_DEF("740e",          CPU_POWERPC_740E,                   740,
> +    POWERPC_DEF("740E",          CPU_POWERPC_740E,                   740,
>                  "PowerPC 740E (G3)")
> -    POWERPC_DEF("750e",          CPU_POWERPC_750E,                   750,
> +    POWERPC_DEF("750E",          CPU_POWERPC_750E,                   750,
>                  "PowerPC 750E (G3)")
> -    POWERPC_DEF("740p",          CPU_POWERPC_7x0P,                   740,
> +    POWERPC_DEF("740P",          CPU_POWERPC_7x0P,                   740,
>                  "PowerPC 740P (G3)")
> -    POWERPC_DEF("750p",          CPU_POWERPC_7x0P,                   750,
> +    POWERPC_DEF("750P",          CPU_POWERPC_7x0P,                   750,
>                  "PowerPC 750P (G3)")
> -    POWERPC_DEF("750cl_v1.0",    CPU_POWERPC_750CL_v10,              750cl,
> +    POWERPC_DEF("750CL_V1.0",    CPU_POWERPC_750CL_v10,              750cl,
>                  "PowerPC 750CL v1.0")
> -    POWERPC_DEF("750cl_v2.0",    CPU_POWERPC_750CL_v20,              750cl,
> +    POWERPC_DEF("750CL_V2.0",    CPU_POWERPC_750CL_v20,              750cl,
>                  "PowerPC 750CL v2.0")
> -    POWERPC_DEF("750cx_v1.0",    CPU_POWERPC_750CX_v10,              750cx,
> +    POWERPC_DEF("750CX_V1.0",    CPU_POWERPC_750CX_v10,              750cx,
>                  "PowerPC 750CX v1.0 (G3 embedded)")
> -    POWERPC_DEF("750cx_v2.0",    CPU_POWERPC_750CX_v20,              750cx,
> +    POWERPC_DEF("750CX_V2.0",    CPU_POWERPC_750CX_v20,              750cx,
>                  "PowerPC 750CX v2.1 (G3 embedded)")
> -    POWERPC_DEF("750cx_v2.1",    CPU_POWERPC_750CX_v21,              750cx,
> +    POWERPC_DEF("750CX_V2.1",    CPU_POWERPC_750CX_v21,              750cx,
>                  "PowerPC 750CX v2.1 (G3 embedded)")
> -    POWERPC_DEF("750cx_v2.2",    CPU_POWERPC_750CX_v22,              750cx,
> +    POWERPC_DEF("750CX_V2.2",    CPU_POWERPC_750CX_v22,              750cx,
>                  "PowerPC 750CX v2.2 (G3 embedded)")
> -    POWERPC_DEF("750cxe_v2.1",   CPU_POWERPC_750CXE_v21,             750cx,
> +    POWERPC_DEF("750CXE_V2.1",   CPU_POWERPC_750CXE_v21,             750cx,
>                  "PowerPC 750CXe v2.1 (G3 embedded)")
> -    POWERPC_DEF("750cxe_v2.2",   CPU_POWERPC_750CXE_v22,             750cx,
> +    POWERPC_DEF("750CXE_V2.2",   CPU_POWERPC_750CXE_v22,             750cx,
>                  "PowerPC 750CXe v2.2 (G3 embedded)")
> -    POWERPC_DEF("750cxe_v2.3",   CPU_POWERPC_750CXE_v23,             750cx,
> +    POWERPC_DEF("750CXE_V2.3",   CPU_POWERPC_750CXE_v23,             750cx,
>                  "PowerPC 750CXe v2.3 (G3 embedded)")
> -    POWERPC_DEF("750cxe_v2.4",   CPU_POWERPC_750CXE_v24,             750cx,
> +    POWERPC_DEF("750CXE_V2.4",   CPU_POWERPC_750CXE_v24,             750cx,
>                  "PowerPC 750CXe v2.4 (G3 embedded)")
> -    POWERPC_DEF("750cxe_v2.4b",  CPU_POWERPC_750CXE_v24b,            750cx,
> +    POWERPC_DEF("750CXE_V2.4B",  CPU_POWERPC_750CXE_v24b,            750cx,
>                  "PowerPC 750CXe v2.4b (G3 embedded)")
> -    POWERPC_DEF("750cxe_v3.0",   CPU_POWERPC_750CXE_v30,             750cx,
> +    POWERPC_DEF("750CXE_V3.0",   CPU_POWERPC_750CXE_v30,             750cx,
>                  "PowerPC 750CXe v3.0 (G3 embedded)")
> -    POWERPC_DEF("750cxe_v3.1",   CPU_POWERPC_750CXE_v31,             750cx,
> +    POWERPC_DEF("750CXE_V3.1",   CPU_POWERPC_750CXE_v31,             750cx,
>                  "PowerPC 750CXe v3.1 (G3 embedded)")
> -    POWERPC_DEF("750cxe_v3.1b",  CPU_POWERPC_750CXE_v31b,            750cx,
> +    POWERPC_DEF("750CXE_V3.1B",  CPU_POWERPC_750CXE_v31b,            750cx,
>                  "PowerPC 750CXe v3.1b (G3 embedded)")
> -    POWERPC_DEF("750cxr",        CPU_POWERPC_750CXR,                 750cx,
> +    POWERPC_DEF("750CXR",        CPU_POWERPC_750CXR,                 750cx,
>                  "PowerPC 750CXr (G3 embedded)")
> -    POWERPC_DEF("750fl",         CPU_POWERPC_750FL,                  750fx,
> +    POWERPC_DEF("750FL",         CPU_POWERPC_750FL,                  750fx,
>                  "PowerPC 750FL (G3 embedded)")
> -    POWERPC_DEF("750fx_v1.0",    CPU_POWERPC_750FX_v10,              750fx,
> +    POWERPC_DEF("750FX_V1.0",    CPU_POWERPC_750FX_v10,              750fx,
>                  "PowerPC 750FX v1.0 (G3 embedded)")
> -    POWERPC_DEF("750fx_v2.0",    CPU_POWERPC_750FX_v20,              750fx,
> +    POWERPC_DEF("750FX_V2.0",    CPU_POWERPC_750FX_v20,              750fx,
>                  "PowerPC 750FX v2.0 (G3 embedded)")
> -    POWERPC_DEF("750fx_v2.1",    CPU_POWERPC_750FX_v21,              750fx,
> +    POWERPC_DEF("750FX_V2.1",    CPU_POWERPC_750FX_v21,              750fx,
>                  "PowerPC 750FX v2.1 (G3 embedded)")
> -    POWERPC_DEF("750fx_v2.2",    CPU_POWERPC_750FX_v22,              750fx,
> +    POWERPC_DEF("750FX_V2.2",    CPU_POWERPC_750FX_v22,              750fx,
>                  "PowerPC 750FX v2.2 (G3 embedded)")
> -    POWERPC_DEF("750fx_v2.3",    CPU_POWERPC_750FX_v23,              750fx,
> +    POWERPC_DEF("750FX_V2.3",    CPU_POWERPC_750FX_v23,              750fx,
>                  "PowerPC 750FX v2.3 (G3 embedded)")
> -    POWERPC_DEF("750gl",         CPU_POWERPC_750GL,                  750gx,
> +    POWERPC_DEF("750GL",         CPU_POWERPC_750GL,                  750gx,
>                  "PowerPC 750GL (G3 embedded)")
> -    POWERPC_DEF("750gx_v1.0",    CPU_POWERPC_750GX_v10,              750gx,
> +    POWERPC_DEF("750GX_V1.0",    CPU_POWERPC_750GX_v10,              750gx,
>                  "PowerPC 750GX v1.0 (G3 embedded)")
> -    POWERPC_DEF("750gx_v1.1",    CPU_POWERPC_750GX_v11,              750gx,
> +    POWERPC_DEF("750GX_V1.1",    CPU_POWERPC_750GX_v11,              750gx,
>                  "PowerPC 750GX v1.1 (G3 embedded)")
> -    POWERPC_DEF("750gx_v1.2",    CPU_POWERPC_750GX_v12,              750gx,
> +    POWERPC_DEF("750GX_V1.2",    CPU_POWERPC_750GX_v12,              750gx,
>                  "PowerPC 750GX v1.2 (G3 embedded)")
> -    POWERPC_DEF("750l_v2.0",     CPU_POWERPC_750L_v20,               750,
> +    POWERPC_DEF("750L_V2.0",     CPU_POWERPC_750L_v20,               750,
>                  "PowerPC 750L v2.0 (G3 embedded)")
> -    POWERPC_DEF("750l_v2.1",     CPU_POWERPC_750L_v21,               750,
> +    POWERPC_DEF("750L_V2.1",     CPU_POWERPC_750L_v21,               750,
>                  "PowerPC 750L v2.1 (G3 embedded)")
> -    POWERPC_DEF("750l_v2.2",     CPU_POWERPC_750L_v22,               750,
> +    POWERPC_DEF("750L_V2.2",     CPU_POWERPC_750L_v22,               750,
>                  "PowerPC 750L v2.2 (G3 embedded)")
> -    POWERPC_DEF("750l_v3.0",     CPU_POWERPC_750L_v30,               750,
> +    POWERPC_DEF("750L_V3.0",     CPU_POWERPC_750L_v30,               750,
>                  "PowerPC 750L v3.0 (G3 embedded)")
> -    POWERPC_DEF("750l_v3.2",     CPU_POWERPC_750L_v32,               750,
> +    POWERPC_DEF("750L_V3.2",     CPU_POWERPC_750L_v32,               750,
>                  "PowerPC 750L v3.2 (G3 embedded)")
> -    POWERPC_DEF("745_v1.0",      CPU_POWERPC_7x5_v10,                745,
> +    POWERPC_DEF("745_V1.0",      CPU_POWERPC_7x5_v10,                745,
>                  "PowerPC 745 v1.0")
> -    POWERPC_DEF("755_v1.0",      CPU_POWERPC_7x5_v10,                755,
> +    POWERPC_DEF("755_V1.0",      CPU_POWERPC_7x5_v10,                755,
>                  "PowerPC 755 v1.0")
> -    POWERPC_DEF("745_v1.1",      CPU_POWERPC_7x5_v11,                745,
> +    POWERPC_DEF("745_V1.1",      CPU_POWERPC_7x5_v11,                745,
>                  "PowerPC 745 v1.1")
> -    POWERPC_DEF("755_v1.1",      CPU_POWERPC_7x5_v11,                755,
> +    POWERPC_DEF("755_V1.1",      CPU_POWERPC_7x5_v11,                755,
>                  "PowerPC 755 v1.1")
> -    POWERPC_DEF("745_v2.0",      CPU_POWERPC_7x5_v20,                745,
> +    POWERPC_DEF("745_V2.0",      CPU_POWERPC_7x5_v20,                745,
>                  "PowerPC 745 v2.0")
> -    POWERPC_DEF("755_v2.0",      CPU_POWERPC_7x5_v20,                755,
> +    POWERPC_DEF("755_V2.0",      CPU_POWERPC_7x5_v20,                755,
>                  "PowerPC 755 v2.0")
> -    POWERPC_DEF("745_v2.1",      CPU_POWERPC_7x5_v21,                745,
> +    POWERPC_DEF("745_V2.1",      CPU_POWERPC_7x5_v21,                745,
>                  "PowerPC 745 v2.1")
> -    POWERPC_DEF("755_v2.1",      CPU_POWERPC_7x5_v21,                755,
> +    POWERPC_DEF("755_V2.1",      CPU_POWERPC_7x5_v21,                755,
>                  "PowerPC 755 v2.1")
> -    POWERPC_DEF("745_v2.2",      CPU_POWERPC_7x5_v22,                745,
> +    POWERPC_DEF("745_V2.2",      CPU_POWERPC_7x5_v22,                745,
>                  "PowerPC 745 v2.2")
> -    POWERPC_DEF("755_v2.2",      CPU_POWERPC_7x5_v22,                755,
> +    POWERPC_DEF("755_V2.2",      CPU_POWERPC_7x5_v22,                755,
>                  "PowerPC 755 v2.2")
> -    POWERPC_DEF("745_v2.3",      CPU_POWERPC_7x5_v23,                745,
> +    POWERPC_DEF("745_V2.3",      CPU_POWERPC_7x5_v23,                745,
>                  "PowerPC 745 v2.3")
> -    POWERPC_DEF("755_v2.3",      CPU_POWERPC_7x5_v23,                755,
> +    POWERPC_DEF("755_V2.3",      CPU_POWERPC_7x5_v23,                755,
>                  "PowerPC 755 v2.3")
> -    POWERPC_DEF("745_v2.4",      CPU_POWERPC_7x5_v24,                745,
> +    POWERPC_DEF("745_V2.4",      CPU_POWERPC_7x5_v24,                745,
>                  "PowerPC 745 v2.4")
> -    POWERPC_DEF("755_v2.4",      CPU_POWERPC_7x5_v24,                755,
> +    POWERPC_DEF("755_V2.4",      CPU_POWERPC_7x5_v24,                755,
>                  "PowerPC 755 v2.4")
> -    POWERPC_DEF("745_v2.5",      CPU_POWERPC_7x5_v25,                745,
> +    POWERPC_DEF("745_V2.5",      CPU_POWERPC_7x5_v25,                745,
>                  "PowerPC 745 v2.5")
> -    POWERPC_DEF("755_v2.5",      CPU_POWERPC_7x5_v25,                755,
> +    POWERPC_DEF("755_V2.5",      CPU_POWERPC_7x5_v25,                755,
>                  "PowerPC 755 v2.5")
> -    POWERPC_DEF("745_v2.6",      CPU_POWERPC_7x5_v26,                745,
> +    POWERPC_DEF("745_V2.6",      CPU_POWERPC_7x5_v26,                745,
>                  "PowerPC 745 v2.6")
> -    POWERPC_DEF("755_v2.6",      CPU_POWERPC_7x5_v26,                755,
> +    POWERPC_DEF("755_V2.6",      CPU_POWERPC_7x5_v26,                755,
>                  "PowerPC 755 v2.6")
> -    POWERPC_DEF("745_v2.7",      CPU_POWERPC_7x5_v27,                745,
> +    POWERPC_DEF("745_V2.7",      CPU_POWERPC_7x5_v27,                745,
>                  "PowerPC 745 v2.7")
> -    POWERPC_DEF("755_v2.7",      CPU_POWERPC_7x5_v27,                755,
> +    POWERPC_DEF("755_V2.7",      CPU_POWERPC_7x5_v27,                755,
>                  "PowerPC 755 v2.7")
> -    POWERPC_DEF("745_v2.8",      CPU_POWERPC_7x5_v28,                745,
> +    POWERPC_DEF("745_V2.8",      CPU_POWERPC_7x5_v28,                745,
>                  "PowerPC 745 v2.8")
> -    POWERPC_DEF("755_v2.8",      CPU_POWERPC_7x5_v28,                755,
> +    POWERPC_DEF("755_V2.8",      CPU_POWERPC_7x5_v28,                755,
>                  "PowerPC 755 v2.8")
>  #if defined(TODO)
> -    POWERPC_DEF("745p",          CPU_POWERPC_7x5P,                   745,
> +    POWERPC_DEF("745P",          CPU_POWERPC_7x5P,                   745,
>                  "PowerPC 745P (G3)")
> -    POWERPC_DEF("755p",          CPU_POWERPC_7x5P,                   755,
> +    POWERPC_DEF("755P",          CPU_POWERPC_7x5P,                   755,
>                  "PowerPC 755P (G3)")
>  #endif
>      /* PowerPC 74xx family                                                   */
> -    POWERPC_DEF("7400_v1.0",     CPU_POWERPC_7400_v10,               7400,
> +    POWERPC_DEF("7400_V1.0",     CPU_POWERPC_7400_v10,               7400,
>                  "PowerPC 7400 v1.0 (G4)")
> -    POWERPC_DEF("7400_v1.1",     CPU_POWERPC_7400_v11,               7400,
> +    POWERPC_DEF("7400_V1.1",     CPU_POWERPC_7400_v11,               7400,
>                  "PowerPC 7400 v1.1 (G4)")
> -    POWERPC_DEF("7400_v2.0",     CPU_POWERPC_7400_v20,               7400,
> +    POWERPC_DEF("7400_V2.0",     CPU_POWERPC_7400_v20,               7400,
>                  "PowerPC 7400 v2.0 (G4)")
> -    POWERPC_DEF("7400_v2.1",     CPU_POWERPC_7400_v21,               7400,
> +    POWERPC_DEF("7400_V2.1",     CPU_POWERPC_7400_v21,               7400,
>                  "PowerPC 7400 v2.1 (G4)")
> -    POWERPC_DEF("7400_v2.2",     CPU_POWERPC_7400_v22,               7400,
> +    POWERPC_DEF("7400_V2.2",     CPU_POWERPC_7400_v22,               7400,
>                  "PowerPC 7400 v2.2 (G4)")
> -    POWERPC_DEF("7400_v2.6",     CPU_POWERPC_7400_v26,               7400,
> +    POWERPC_DEF("7400_V2.6",     CPU_POWERPC_7400_v26,               7400,
>                  "PowerPC 7400 v2.6 (G4)")
> -    POWERPC_DEF("7400_v2.7",     CPU_POWERPC_7400_v27,               7400,
> +    POWERPC_DEF("7400_V2.7",     CPU_POWERPC_7400_v27,               7400,
>                  "PowerPC 7400 v2.7 (G4)")
> -    POWERPC_DEF("7400_v2.8",     CPU_POWERPC_7400_v28,               7400,
> +    POWERPC_DEF("7400_V2.8",     CPU_POWERPC_7400_v28,               7400,
>                  "PowerPC 7400 v2.8 (G4)")
> -    POWERPC_DEF("7400_v2.9",     CPU_POWERPC_7400_v29,               7400,
> +    POWERPC_DEF("7400_V2.9",     CPU_POWERPC_7400_v29,               7400,
>                  "PowerPC 7400 v2.9 (G4)")
> -    POWERPC_DEF("7410_v1.0",     CPU_POWERPC_7410_v10,               7410,
> +    POWERPC_DEF("7410_V1.0",     CPU_POWERPC_7410_v10,               7410,
>                  "PowerPC 7410 v1.0 (G4)")
> -    POWERPC_DEF("7410_v1.1",     CPU_POWERPC_7410_v11,               7410,
> +    POWERPC_DEF("7410_V1.1",     CPU_POWERPC_7410_v11,               7410,
>                  "PowerPC 7410 v1.1 (G4)")
> -    POWERPC_DEF("7410_v1.2",     CPU_POWERPC_7410_v12,               7410,
> +    POWERPC_DEF("7410_V1.2",     CPU_POWERPC_7410_v12,               7410,
>                  "PowerPC 7410 v1.2 (G4)")
> -    POWERPC_DEF("7410_v1.3",     CPU_POWERPC_7410_v13,               7410,
> +    POWERPC_DEF("7410_V1.3",     CPU_POWERPC_7410_v13,               7410,
>                  "PowerPC 7410 v1.3 (G4)")
> -    POWERPC_DEF("7410_v1.4",     CPU_POWERPC_7410_v14,               7410,
> +    POWERPC_DEF("7410_V1.4",     CPU_POWERPC_7410_v14,               7410,
>                  "PowerPC 7410 v1.4 (G4)")
> -    POWERPC_DEF("7448_v1.0",     CPU_POWERPC_7448_v10,               7400,
> +    POWERPC_DEF("7448_V1.0",     CPU_POWERPC_7448_v10,               7400,
>                  "PowerPC 7448 v1.0 (G4)")
> -    POWERPC_DEF("7448_v1.1",     CPU_POWERPC_7448_v11,               7400,
> +    POWERPC_DEF("7448_V1.1",     CPU_POWERPC_7448_v11,               7400,
>                  "PowerPC 7448 v1.1 (G4)")
> -    POWERPC_DEF("7448_v2.0",     CPU_POWERPC_7448_v20,               7400,
> +    POWERPC_DEF("7448_V2.0",     CPU_POWERPC_7448_v20,               7400,
>                  "PowerPC 7448 v2.0 (G4)")
> -    POWERPC_DEF("7448_v2.1",     CPU_POWERPC_7448_v21,               7400,
> +    POWERPC_DEF("7448_V2.1",     CPU_POWERPC_7448_v21,               7400,
>                  "PowerPC 7448 v2.1 (G4)")
> -    POWERPC_DEF("7450_v1.0",     CPU_POWERPC_7450_v10,               7450,
> +    POWERPC_DEF("7450_V1.0",     CPU_POWERPC_7450_v10,               7450,
>                  "PowerPC 7450 v1.0 (G4)")
> -    POWERPC_DEF("7450_v1.1",     CPU_POWERPC_7450_v11,               7450,
> +    POWERPC_DEF("7450_V1.1",     CPU_POWERPC_7450_v11,               7450,
>                  "PowerPC 7450 v1.1 (G4)")
> -    POWERPC_DEF("7450_v1.2",     CPU_POWERPC_7450_v12,               7450,
> +    POWERPC_DEF("7450_V1.2",     CPU_POWERPC_7450_v12,               7450,
>                  "PowerPC 7450 v1.2 (G4)")
> -    POWERPC_DEF("7450_v2.0",     CPU_POWERPC_7450_v20,               7450,
> +    POWERPC_DEF("7450_V2.0",     CPU_POWERPC_7450_v20,               7450,
>                  "PowerPC 7450 v2.0 (G4)")
> -    POWERPC_DEF("7450_v2.1",     CPU_POWERPC_7450_v21,               7450,
> +    POWERPC_DEF("7450_V2.1",     CPU_POWERPC_7450_v21,               7450,
>                  "PowerPC 7450 v2.1 (G4)")
> -    POWERPC_DEF("7441_v2.1",     CPU_POWERPC_7450_v21,               7440,
> +    POWERPC_DEF("7441_V2.1",     CPU_POWERPC_7450_v21,               7440,
>                  "PowerPC 7441 v2.1 (G4)")
> -    POWERPC_DEF("7441_v2.3",     CPU_POWERPC_74x1_v23,               7440,
> +    POWERPC_DEF("7441_V2.3",     CPU_POWERPC_74x1_v23,               7440,
>                  "PowerPC 7441 v2.3 (G4)")
> -    POWERPC_DEF("7451_v2.3",     CPU_POWERPC_74x1_v23,               7450,
> +    POWERPC_DEF("7451_V2.3",     CPU_POWERPC_74x1_v23,               7450,
>                  "PowerPC 7451 v2.3 (G4)")
> -    POWERPC_DEF("7441_v2.10",    CPU_POWERPC_74x1_v210,              7440,
> +    POWERPC_DEF("7441_V2.10",    CPU_POWERPC_74x1_v210,              7440,
>                  "PowerPC 7441 v2.10 (G4)")
> -    POWERPC_DEF("7451_v2.10",    CPU_POWERPC_74x1_v210,              7450,
> +    POWERPC_DEF("7451_V2.10",    CPU_POWERPC_74x1_v210,              7450,
>                  "PowerPC 7451 v2.10 (G4)")
> -    POWERPC_DEF("7445_v1.0",     CPU_POWERPC_74x5_v10,               7445,
> +    POWERPC_DEF("7445_V1.0",     CPU_POWERPC_74x5_v10,               7445,
>                  "PowerPC 7445 v1.0 (G4)")
> -    POWERPC_DEF("7455_v1.0",     CPU_POWERPC_74x5_v10,               7455,
> +    POWERPC_DEF("7455_V1.0",     CPU_POWERPC_74x5_v10,               7455,
>                  "PowerPC 7455 v1.0 (G4)")
> -    POWERPC_DEF("7445_v2.1",     CPU_POWERPC_74x5_v21,               7445,
> +    POWERPC_DEF("7445_V2.1",     CPU_POWERPC_74x5_v21,               7445,
>                  "PowerPC 7445 v2.1 (G4)")
> -    POWERPC_DEF("7455_v2.1",     CPU_POWERPC_74x5_v21,               7455,
> +    POWERPC_DEF("7455_V2.1",     CPU_POWERPC_74x5_v21,               7455,
>                  "PowerPC 7455 v2.1 (G4)")
> -    POWERPC_DEF("7445_v3.2",     CPU_POWERPC_74x5_v32,               7445,
> +    POWERPC_DEF("7445_V3.2",     CPU_POWERPC_74x5_v32,               7445,
>                  "PowerPC 7445 v3.2 (G4)")
> -    POWERPC_DEF("7455_v3.2",     CPU_POWERPC_74x5_v32,               7455,
> +    POWERPC_DEF("7455_V3.2",     CPU_POWERPC_74x5_v32,               7455,
>                  "PowerPC 7455 v3.2 (G4)")
> -    POWERPC_DEF("7445_v3.3",     CPU_POWERPC_74x5_v33,               7445,
> +    POWERPC_DEF("7445_V3.3",     CPU_POWERPC_74x5_v33,               7445,
>                  "PowerPC 7445 v3.3 (G4)")
> -    POWERPC_DEF("7455_v3.3",     CPU_POWERPC_74x5_v33,               7455,
> +    POWERPC_DEF("7455_V3.3",     CPU_POWERPC_74x5_v33,               7455,
>                  "PowerPC 7455 v3.3 (G4)")
> -    POWERPC_DEF("7445_v3.4",     CPU_POWERPC_74x5_v34,               7445,
> +    POWERPC_DEF("7445_V3.4",     CPU_POWERPC_74x5_v34,               7445,
>                  "PowerPC 7445 v3.4 (G4)")
> -    POWERPC_DEF("7455_v3.4",     CPU_POWERPC_74x5_v34,               7455,
> +    POWERPC_DEF("7455_V3.4",     CPU_POWERPC_74x5_v34,               7455,
>                  "PowerPC 7455 v3.4 (G4)")
> -    POWERPC_DEF("7447_v1.0",     CPU_POWERPC_74x7_v10,               7445,
> +    POWERPC_DEF("7447_V1.0",     CPU_POWERPC_74x7_v10,               7445,
>                  "PowerPC 7447 v1.0 (G4)")
> -    POWERPC_DEF("7457_v1.0",     CPU_POWERPC_74x7_v10,               7455,
> +    POWERPC_DEF("7457_V1.0",     CPU_POWERPC_74x7_v10,               7455,
>                  "PowerPC 7457 v1.0 (G4)")
> -    POWERPC_DEF("7447_v1.1",     CPU_POWERPC_74x7_v11,               7445,
> +    POWERPC_DEF("7447_V1.1",     CPU_POWERPC_74x7_v11,               7445,
>                  "PowerPC 7447 v1.1 (G4)")
> -    POWERPC_DEF("7457_v1.1",     CPU_POWERPC_74x7_v11,               7455,
> +    POWERPC_DEF("7457_V1.1",     CPU_POWERPC_74x7_v11,               7455,
>                  "PowerPC 7457 v1.1 (G4)")
> -    POWERPC_DEF("7457_v1.2",     CPU_POWERPC_74x7_v12,               7455,
> +    POWERPC_DEF("7457_V1.2",     CPU_POWERPC_74x7_v12,               7455,
>                  "PowerPC 7457 v1.2 (G4)")
> -    POWERPC_DEF("7447A_v1.0",    CPU_POWERPC_74x7A_v10,              7445,
> +    POWERPC_DEF("7447A_V1.0",    CPU_POWERPC_74x7A_v10,              7445,
>                  "PowerPC 7447A v1.0 (G4)")
> -    POWERPC_DEF("7457A_v1.0",    CPU_POWERPC_74x7A_v10,              7455,
> +    POWERPC_DEF("7457A_V1.0",    CPU_POWERPC_74x7A_v10,              7455,
>                  "PowerPC 7457A v1.0 (G4)")
> -    POWERPC_DEF("7447A_v1.1",    CPU_POWERPC_74x7A_v11,              7445,
> +    POWERPC_DEF("7447A_V1.1",    CPU_POWERPC_74x7A_v11,              7445,
>                  "PowerPC 7447A v1.1 (G4)")
> -    POWERPC_DEF("7457A_v1.1",    CPU_POWERPC_74x7A_v11,              7455,
> +    POWERPC_DEF("7457A_V1.1",    CPU_POWERPC_74x7A_v11,              7455,
>                  "PowerPC 7457A v1.1 (G4)")
> -    POWERPC_DEF("7447A_v1.2",    CPU_POWERPC_74x7A_v12,              7445,
> +    POWERPC_DEF("7447A_V1.2",    CPU_POWERPC_74x7A_v12,              7445,
>                  "PowerPC 7447A v1.2 (G4)")
> -    POWERPC_DEF("7457A_v1.2",    CPU_POWERPC_74x7A_v12,              7455,
> +    POWERPC_DEF("7457A_V1.2",    CPU_POWERPC_74x7A_v12,              7455,
>                  "PowerPC 7457A v1.2 (G4)")
>      /* 64 bits PowerPC                                                       */
>  #if defined (TARGET_PPC64)
> @@ -1125,64 +1125,64 @@
>      POWERPC_DEF("POWER5",        CPU_POWERPC_POWER5,                 POWER5,
>                  "POWER5")
>  #endif
> -    POWERPC_DEF("POWER5+_v2.1",  CPU_POWERPC_POWER5P_v21,            POWER5P,
> +    POWERPC_DEF("POWER5+_V2.1",  CPU_POWERPC_POWER5P_v21,            POWER5P,
>                  "POWER5+ v2.1")
>  #if defined(TODO)
>      POWERPC_DEF("POWER6",        CPU_POWERPC_POWER6,                 POWER6,
>                  "POWER6")
>  #endif
> -    POWERPC_DEF("POWER7_v2.3",   CPU_POWERPC_POWER7_v23,             POWER7,
> +    POWERPC_DEF("POWER7_V2.3",   CPU_POWERPC_POWER7_v23,             POWER7,
>                  "POWER7 v2.3")
> -    POWERPC_DEF("POWER7+_v2.1",  CPU_POWERPC_POWER7P_v21,            POWER7,
> +    POWERPC_DEF("POWER7+_V2.1",  CPU_POWERPC_POWER7P_v21,            POWER7,
>                  "POWER7+ v2.1")
> -    POWERPC_DEF("POWER8E_v2.1",  CPU_POWERPC_POWER8E_v21,            POWER8,
> +    POWERPC_DEF("POWER8E_V2.1",  CPU_POWERPC_POWER8E_v21,            POWER8,
>                  "POWER8E v2.1")
> -    POWERPC_DEF("POWER8_v2.0",   CPU_POWERPC_POWER8_v20,             POWER8,
> +    POWERPC_DEF("POWER8_V2.0",   CPU_POWERPC_POWER8_v20,             POWER8,
>                  "POWER8 v2.0")
> -    POWERPC_DEF("POWER8NVL_v1.0",CPU_POWERPC_POWER8NVL_v10,          POWER8,
> +    POWERPC_DEF("POWER8NVL_V1.0", CPU_POWERPC_POWER8NVL_v10,         POWER8,
>                  "POWER8NVL v1.0")
> -    POWERPC_DEF("970_v2.2",      CPU_POWERPC_970_v22,                970,
> +    POWERPC_DEF("970_V2.2",      CPU_POWERPC_970_v22,                970,
>                  "PowerPC 970 v2.2")
>  
> -    POWERPC_DEF("POWER9_v1.0",   CPU_POWERPC_POWER9_BASE,            POWER9,
> +    POWERPC_DEF("POWER9_V1.0",   CPU_POWERPC_POWER9_BASE,            POWER9,
>                  "POWER9 v1.0")
>  
> -    POWERPC_DEF("970fx_v1.0",    CPU_POWERPC_970FX_v10,              970,
> +    POWERPC_DEF("970FX_V1.0",    CPU_POWERPC_970FX_v10,              970,
>                  "PowerPC 970FX v1.0 (G5)")
> -    POWERPC_DEF("970fx_v2.0",    CPU_POWERPC_970FX_v20,              970,
> +    POWERPC_DEF("970FX_V2.0",    CPU_POWERPC_970FX_v20,              970,
>                  "PowerPC 970FX v2.0 (G5)")
> -    POWERPC_DEF("970fx_v2.1",    CPU_POWERPC_970FX_v21,              970,
> +    POWERPC_DEF("970FX_V2.1",    CPU_POWERPC_970FX_v21,              970,
>                  "PowerPC 970FX v2.1 (G5)")
> -    POWERPC_DEF("970fx_v3.0",    CPU_POWERPC_970FX_v30,              970,
> +    POWERPC_DEF("970FX_V3.0",    CPU_POWERPC_970FX_v30,              970,
>                  "PowerPC 970FX v3.0 (G5)")
> -    POWERPC_DEF("970fx_v3.1",    CPU_POWERPC_970FX_v31,              970,
> +    POWERPC_DEF("970FX_V3.1",    CPU_POWERPC_970FX_v31,              970,
>                  "PowerPC 970FX v3.1 (G5)")
> -    POWERPC_DEF("970mp_v1.0",    CPU_POWERPC_970MP_v10,              970,
> +    POWERPC_DEF("970MP_V1.0",    CPU_POWERPC_970MP_v10,              970,
>                  "PowerPC 970MP v1.0")
> -    POWERPC_DEF("970mp_v1.1",    CPU_POWERPC_970MP_v11,              970,
> +    POWERPC_DEF("970MP_V1.1",    CPU_POWERPC_970MP_v11,              970,
>                  "PowerPC 970MP v1.1")
>  #if defined(TODO)
> -    POWERPC_DEF("Cell",          CPU_POWERPC_CELL,                   970,
> +    POWERPC_DEF("CELL",          CPU_POWERPC_CELL,                   970,
>                  "PowerPC Cell")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("Cell_v1.0",     CPU_POWERPC_CELL_v10,               970,
> +    POWERPC_DEF("CELL_V1.0",     CPU_POWERPC_CELL_v10,               970,
>                  "PowerPC Cell v1.0")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("Cell_v2.0",     CPU_POWERPC_CELL_v20,               970,
> +    POWERPC_DEF("CELL_V2.0",     CPU_POWERPC_CELL_v20,               970,
>                  "PowerPC Cell v2.0")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("Cell_v3.0",     CPU_POWERPC_CELL_v30,               970,
> +    POWERPC_DEF("CELL_V3.0",     CPU_POWERPC_CELL_v30,               970,
>                  "PowerPC Cell v3.0")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("Cell_v3.1",     CPU_POWERPC_CELL_v31,               970,
> +    POWERPC_DEF("CELL_V3.1",     CPU_POWERPC_CELL_v31,               970,
>                  "PowerPC Cell v3.1")
>  #endif
>  #if defined(TODO)
> -    POWERPC_DEF("Cell_v3.2",     CPU_POWERPC_CELL_v32,               970,
> +    POWERPC_DEF("CELL_V3.2",     CPU_POWERPC_CELL_v32,               970,
>                  "PowerPC Cell v3.2")
>  #endif
>  #if defined(TODO)
> @@ -1228,181 +1228,181 @@
>  PowerPCCPUAlias ppc_cpu_aliases[] = {
>      { "403", "403GC" },
>      { "405", "405D4" },
> -    { "405CR", "405CRc" },
> -    { "405GP", "405GPd" },
> -    { "405GPe", "405CRc" },
> -    { "x2vp7", "x2vp4" },
> -    { "x2vp50", "x2vp20" },
> +    { "405CR", "405CRC" },
> +    { "405GP", "405GPD" },
> +    { "405GPE", "405CRC" },
> +    { "X2VP7", "X2VP4" },
> +    { "X2VP50", "X2VP20" },
>  
> -    { "440EP", "440EPb" },
> -    { "440GP", "440GPc" },
> -    { "440GR", "440GRa" },
> -    { "440GX", "440GXf" },
> +    { "440EP", "440EPB" },
> +    { "440GP", "440GPC" },
> +    { "440GR", "440GRA" },
> +    { "440GX", "440GXF" },
>  
> -    { "RCPU", "MPC5xx" },
> +    { "RCPU", "MPC5XX" },
>      /* MPC5xx microcontrollers */
> -    { "MGT560", "MPC5xx" },
> -    { "MPC509", "MPC5xx" },
> -    { "MPC533", "MPC5xx" },
> -    { "MPC534", "MPC5xx" },
> -    { "MPC555", "MPC5xx" },
> -    { "MPC556", "MPC5xx" },
> -    { "MPC560", "MPC5xx" },
> -    { "MPC561", "MPC5xx" },
> -    { "MPC562", "MPC5xx" },
> -    { "MPC563", "MPC5xx" },
> -    { "MPC564", "MPC5xx" },
> -    { "MPC565", "MPC5xx" },
> -    { "MPC566", "MPC5xx" },
> +    { "MGT560", "MPC5XX" },
> +    { "MPC509", "MPC5XX" },
> +    { "MPC533", "MPC5XX" },
> +    { "MPC534", "MPC5XX" },
> +    { "MPC555", "MPC5XX" },
> +    { "MPC556", "MPC5XX" },
> +    { "MPC560", "MPC5XX" },
> +    { "MPC561", "MPC5XX" },
> +    { "MPC562", "MPC5XX" },
> +    { "MPC563", "MPC5XX" },
> +    { "MPC564", "MPC5XX" },
> +    { "MPC565", "MPC5XX" },
> +    { "MPC566", "MPC5XX" },
>  
> -    { "PowerQUICC", "MPC8xx" },
> +    { "POWERQUICC", "MPC8XX" },
>      /* MPC8xx microcontrollers */
> -    { "MGT823", "MPC8xx" },
> -    { "MPC821", "MPC8xx" },
> -    { "MPC823", "MPC8xx" },
> -    { "MPC850", "MPC8xx" },
> -    { "MPC852T", "MPC8xx" },
> -    { "MPC855T", "MPC8xx" },
> -    { "MPC857", "MPC8xx" },
> -    { "MPC859", "MPC8xx" },
> -    { "MPC860", "MPC8xx" },
> -    { "MPC862", "MPC8xx" },
> -    { "MPC866", "MPC8xx" },
> -    { "MPC870", "MPC8xx" },
> -    { "MPC875", "MPC8xx" },
> -    { "MPC880", "MPC8xx" },
> -    { "MPC885", "MPC8xx" },
> +    { "MGT823", "MPC8XX" },
> +    { "MPC821", "MPC8XX" },
> +    { "MPC823", "MPC8XX" },
> +    { "MPC850", "MPC8XX" },
> +    { "MPC852T", "MPC8XX" },
> +    { "MPC855T", "MPC8XX" },
> +    { "MPC857", "MPC8XX" },
> +    { "MPC859", "MPC8XX" },
> +    { "MPC860", "MPC8XX" },
> +    { "MPC862", "MPC8XX" },
> +    { "MPC866", "MPC8XX" },
> +    { "MPC870", "MPC8XX" },
> +    { "MPC875", "MPC8XX" },
> +    { "MPC880", "MPC8XX" },
> +    { "MPC885", "MPC8XX" },
>  
>      /* PowerPC MPC603 microcontrollers */
>      { "MPC8240", "603" },
>  
> -    { "MPC52xx", "MPC5200" },
> -    { "MPC5200", "MPC5200_v12" },
> -    { "MPC5200B", "MPC5200B_v21" },
> +    { "MPC52XX", "MPC5200" },
> +    { "MPC5200", "MPC5200_V12" },
> +    { "MPC5200B", "MPC5200B_V21" },
>  
> -    { "MPC82xx", "MPC8280" },
> -    { "PowerQUICC-II", "MPC82xx" },
> -    { "MPC8241", "G2HiP4" },
> -    { "MPC8245", "G2HiP4" },
> -    { "MPC8247", "G2leGP3" },
> -    { "MPC8248", "G2leGP3" },
> -    { "MPC8250", "MPC8250_HiP4" },
> -    { "MPC8250_HiP3", "G2HiP3" },
> -    { "MPC8250_HiP4", "G2HiP4" },
> -    { "MPC8255", "MPC8255_HiP4" },
> -    { "MPC8255_HiP3", "G2HiP3" },
> -    { "MPC8255_HiP4", "G2HiP4" },
> -    { "MPC8260", "MPC8260_HiP4" },
> -    { "MPC8260_HiP3", "G2HiP3" },
> -    { "MPC8260_HiP4", "G2HiP4" },
> -    { "MPC8264", "MPC8264_HiP4" },
> -    { "MPC8264_HiP3", "G2HiP3" },
> -    { "MPC8264_HiP4", "G2HiP4" },
> -    { "MPC8265", "MPC8265_HiP4" },
> -    { "MPC8265_HiP3", "G2HiP3" },
> -    { "MPC8265_HiP4", "G2HiP4" },
> -    { "MPC8266", "MPC8266_HiP4" },
> -    { "MPC8266_HiP3", "G2HiP3" },
> -    { "MPC8266_HiP4", "G2HiP4" },
> -    { "MPC8270", "G2leGP3" },
> -    { "MPC8271", "G2leGP3" },
> -    { "MPC8272", "G2leGP3" },
> -    { "MPC8275", "G2leGP3" },
> -    { "MPC8280", "G2leGP3" },
> -    { "e200", "e200z6" },
> -    { "e300", "e300c3" },
> +    { "MPC82XX", "MPC8280" },
> +    { "POWERQUICC-II", "MPC82XX" },
> +    { "MPC8241", "G2HIP4" },
> +    { "MPC8245", "G2HIP4" },
> +    { "MPC8247", "G2LEGP3" },
> +    { "MPC8248", "G2LEGP3" },
> +    { "MPC8250", "MPC8250_HIP4" },
> +    { "MPC8250_HIP3", "G2HIP3" },
> +    { "MPC8250_HIP4", "G2HIP4" },
> +    { "MPC8255", "MPC8255_HIP4" },
> +    { "MPC8255_HIP3", "G2HIP3" },
> +    { "MPC8255_HIP4", "G2HIP4" },
> +    { "MPC8260", "MPC8260_HIP4" },
> +    { "MPC8260_HIP3", "G2HIP3" },
> +    { "MPC8260_HIP4", "G2HIP4" },
> +    { "MPC8264", "MPC8264_HIP4" },
> +    { "MPC8264_HIP3", "G2HIP3" },
> +    { "MPC8264_HIP4", "G2HIP4" },
> +    { "MPC8265", "MPC8265_HIP4" },
> +    { "MPC8265_HIP3", "G2HIP3" },
> +    { "MPC8265_HIP4", "G2HIP4" },
> +    { "MPC8266", "MPC8266_HIP4" },
> +    { "MPC8266_HIP3", "G2HIP3" },
> +    { "MPC8266_HIP4", "G2HIP4" },
> +    { "MPC8270", "G2LEGP3" },
> +    { "MPC8271", "G2LEGP3" },
> +    { "MPC8272", "G2LEGP3" },
> +    { "MPC8275", "G2LEGP3" },
> +    { "MPC8280", "G2LEGP3" },
> +    { "E200", "E200Z6" },
> +    { "E300", "E300C3" },
>      { "MPC8347", "MPC8347T" },
>      { "MPC8347A", "MPC8347AT" },
>      { "MPC8347E", "MPC8347ET" },
>      { "MPC8347EA", "MPC8347EAT" },
> -    { "e500", "e500v2_v22" },
> -    { "e500v1", "e500_v20" },
> -    { "e500v2", "e500v2_v22" },
> -    { "MPC8533", "MPC8533_v11" },
> -    { "MPC8533E", "MPC8533E_v11" },
> -    { "MPC8540", "MPC8540_v21" },
> -    { "MPC8541", "MPC8541_v11" },
> -    { "MPC8541E", "MPC8541E_v11" },
> -    { "MPC8543", "MPC8543_v21" },
> -    { "MPC8543E", "MPC8543E_v21" },
> -    { "MPC8544", "MPC8544_v11" },
> -    { "MPC8544E", "MPC8544E_v11" },
> -    { "MPC8545", "MPC8545_v21" },
> -    { "MPC8545E", "MPC8545E_v21" },
> -    { "MPC8547E", "MPC8547E_v21" },
> -    { "MPC8548", "MPC8548_v21" },
> -    { "MPC8548E", "MPC8548E_v21" },
> -    { "MPC8555", "MPC8555_v11" },
> -    { "MPC8555E", "MPC8555E_v11" },
> -    { "MPC8560", "MPC8560_v21" },
> -    { "601",  "601_v2" },
> -    { "601v", "601_v2" },
> -    { "Vanilla", "603" },
> -    { "603e", "603e_v4.1" },
> -    { "Stretch", "603e" },
> -    { "Vaillant", "603e7v" },
> -    { "603r", "603e7t" },
> -    { "Goldeneye", "603r" },
> -    { "604e", "604e_v2.4" },
> -    { "Sirocco", "604e" },
> -    { "Mach5", "604r" },
> -    { "740", "740_v3.1" },
> -    { "Arthur", "740" },
> -    { "750", "750_v3.1" },
> -    { "Typhoon", "750" },
> +    { "E500", "E500V2_V22" },
> +    { "E500V1", "E500_V20" },
> +    { "E500V2", "E500V2_V22" },
> +    { "MPC8533", "MPC8533_V11" },
> +    { "MPC8533E", "MPC8533E_V11" },
> +    { "MPC8540", "MPC8540_V21" },
> +    { "MPC8541", "MPC8541_V11" },
> +    { "MPC8541E", "MPC8541E_V11" },
> +    { "MPC8543", "MPC8543_V21" },
> +    { "MPC8543E", "MPC8543E_V21" },
> +    { "MPC8544", "MPC8544_V11" },
> +    { "MPC8544E", "MPC8544E_V11" },
> +    { "MPC8545", "MPC8545_V21" },
> +    { "MPC8545E", "MPC8545E_V21" },
> +    { "MPC8547E", "MPC8547E_V21" },
> +    { "MPC8548", "MPC8548_V21" },
> +    { "MPC8548E", "MPC8548E_V21" },
> +    { "MPC8555", "MPC8555_V11" },
> +    { "MPC8555E", "MPC8555E_V11" },
> +    { "MPC8560", "MPC8560_V21" },
> +    { "601",  "601_V2" },
> +    { "601V", "601_V2" },
> +    { "VANILLA", "603" },
> +    { "603E", "603E_V4.1" },
> +    { "STRETCH", "603E" },
> +    { "VAILLANT", "603E7V" },
> +    { "603R", "603E7T" },
> +    { "GOLDENEYE", "603R" },
> +    { "604E", "604E_V2.4" },
> +    { "SIROCCO", "604E" },
> +    { "MACH5", "604R" },
> +    { "740", "740_V3.1" },
> +    { "ARTHUR", "740" },
> +    { "750", "750_V3.1" },
> +    { "TYPHOON", "750" },
>      { "G3",      "750" },
> -    { "Conan/Doyle", "750p" },
> -    { "750cl", "750cl_v2.0" },
> -    { "750cx", "750cx_v2.2" },
> -    { "750cxe", "750cxe_v3.1b" },
> -    { "750fx", "750fx_v2.3" },
> -    { "750gx", "750gx_v1.2" },
> -    { "750l", "750l_v3.2" },
> -    { "LoneStar", "750l" },
> -    { "745", "745_v2.8" },
> -    { "755", "755_v2.8" },
> -    { "Goldfinger", "755" },
> -    { "7400", "7400_v2.9" },
> -    { "Max", "7400" },
> +    { "CONAN/DOYLE", "750P" },
> +    { "750CL", "750CL_V2.0" },
> +    { "750CX", "750CX_V2.2" },
> +    { "750CXE", "750CXE_V3.1B" },
> +    { "750FX", "750FX_V2.3" },
> +    { "750GX", "750GX_V1.2" },
> +    { "750L", "750L_V3.2" },
> +    { "LONESTAR", "750L" },
> +    { "745", "745_V2.8" },
> +    { "755", "755_V2.8" },
> +    { "GOLDFINGER", "755" },
> +    { "7400", "7400_V2.9" },
> +    { "MAX", "7400" },
>      { "G4",  "7400" },
> -    { "7410", "7410_v1.4" },
> -    { "Nitro", "7410" },
> -    { "7448", "7448_v2.1" },
> -    { "7450", "7450_v2.1" },
> -    { "Vger", "7450" },
> -    { "7441", "7441_v2.3" },
> -    { "7451", "7451_v2.3" },
> -    { "7445", "7445_v3.2" },
> -    { "7455", "7455_v3.2" },
> -    { "Apollo6", "7455" },
> -    { "7447", "7447_v1.1" },
> -    { "7457", "7457_v1.2" },
> -    { "Apollo7", "7457" },
> -    { "7447A", "7447A_v1.2" },
> -    { "7457A", "7457A_v1.2" },
> -    { "Apollo7PM", "7457A_v1.0" },
> +    { "7410", "7410_V1.4" },
> +    { "NITRO", "7410" },
> +    { "7448", "7448_V2.1" },
> +    { "7450", "7450_V2.1" },
> +    { "VGER", "7450" },
> +    { "7441", "7441_V2.3" },
> +    { "7451", "7451_V2.3" },
> +    { "7445", "7445_V3.2" },
> +    { "7455", "7455_V3.2" },
> +    { "APOLLO6", "7455" },
> +    { "7447", "7447_V1.1" },
> +    { "7457", "7457_V1.2" },
> +    { "APOLLO7", "7457" },
> +    { "7447A", "7447A_V1.2" },
> +    { "7457A", "7457A_V1.2" },
> +    { "APOLLO7PM", "7457A_V1.0" },
>  #if defined(TARGET_PPC64)
>      { "POWER3", "630" },
>      { "POWER3+", "631" },
> -    { "POWER5+", "POWER5+_v2.1" },
> -    { "POWER5gs", "POWER5+_v2.1" },
> -    { "POWER7", "POWER7_v2.3" },
> -    { "POWER7+", "POWER7+_v2.1" },
> -    { "POWER8E", "POWER8E_v2.1" },
> -    { "POWER8", "POWER8_v2.0" },
> -    { "POWER8NVL", "POWER8NVL_v1.0" },
> -    { "POWER9", "POWER9_v1.0" },
> -    { "970", "970_v2.2" },
> -    { "970fx", "970fx_v3.1" },
> -    { "970mp", "970mp_v1.1" },
> +    { "POWER5+", "POWER5+_V2.1" },
> +    { "POWER5GS", "POWER5+_V2.1" },
> +    { "POWER7", "POWER7_V2.3" },
> +    { "POWER7+", "POWER7+_V2.1" },
> +    { "POWER8E", "POWER8E_V2.1" },
> +    { "POWER8", "POWER8_V2.0" },
> +    { "POWER8NVL", "POWER8NVL_V1.0" },
> +    { "POWER9", "POWER9_V1.0" },
> +    { "970", "970_V2.2" },
> +    { "970FX", "970FX_V3.1" },
> +    { "970MP", "970MP_V1.1" },
>  #endif
>  
>      /* Generic PowerPCs */
>  #if defined(TARGET_PPC64)
> -    { "ppc64", "970fx" },
> +    { "PPC64", "970FX" },
>  #endif
> -    { "ppc32", "604" },
> -    { "ppc", "ppc32" },
> -    { "default", "ppc" },
> +    { "PPC32", "604" },
> +    { "PPC", "PPC32" },
> +    { "DEFAULT", "PPC" },
>      { NULL, NULL }
>  };
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 8590809..3f21190 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -2480,7 +2480,7 @@ static int kvm_ppc_register_host_cpu_type(void)
>       */
>      dc = DEVICE_CLASS(ppc_cpu_get_family_class(pvr_pcc));
>      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> -        if (strcmp(ppc_cpu_aliases[i].alias, dc->desc) == 0) {
> +        if (strcasecmp(ppc_cpu_aliases[i].alias, dc->desc) == 0) {
>              char *suffix;
>  
>              ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));
> diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> index f377cf2..0325226 100644
> --- a/target/ppc/translate_init.c
> +++ b/target/ppc/translate_init.c
> @@ -10250,7 +10250,7 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
>      }
>  
>      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> -        if (strcmp(ppc_cpu_aliases[i].alias, name) == 0) {
> +        if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {
>              return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);
>          }
>      }

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 3/6] ppc: make cpu alias point only to real cpu models
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 3/6] ppc: make cpu alias point only to real cpu models Igor Mammedov
@ 2017-08-25  1:40   ` David Gibson
  0 siblings, 0 replies; 31+ messages in thread
From: David Gibson @ 2017-08-25  1:40 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 6505 bytes --]

On Thu, Aug 24, 2017 at 10:21:48AM +0200, Igor Mammedov wrote:
> alias pointing to another alias forces lookup code to
> do recurrsive translation till real cpu model is reached.
> 
> Drop this nonsence and make each alias point to cpu model
> that has corresponding CPU type. It will allow to drop
> recurrsion in cpu model translation code and actually
> make ppc_cpu_aliases[] content use PowerPCCPUAlias
> fields properly
> (i.e. alias goes into .alias and model goes into .model)
> 
> While at it add TODO defines around aliases that point to
> cpu models excluded by the same TODO defines.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Acked-by: David Gibson <david@gibson.dropbear.id.au>

> ---
> If it were up to me, I'd remove all TODO cpu models as dead
> code and make whomever wants to add them back to do so
> with actual implementation.

I tend to agree, actually.  There's a lot of old cruft there that
no-one's ever likely to work on.

> ---
>  target/ppc/cpu-models.h |  2 +-
>  target/ppc/cpu-models.c | 56 ++++++++++++++++++++++++++-----------------------
>  2 files changed, 31 insertions(+), 27 deletions(-)
> 
> diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h
> index b563c45..d748c68 100644
> --- a/target/ppc/cpu-models.h
> +++ b/target/ppc/cpu-models.h
> @@ -24,7 +24,7 @@
>  /**
>   * PowerPCCPUAlias:
>   * @alias: The alias name.
> - * @model: The CPU model @alias refers to.
> + * @model: The CPU model @alias refers to, that directly resolves into CPU type
>   *
>   * A mapping entry from CPU @alias to CPU @model.
>   */
> diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
> index 346b6b1..f917b9d 100644
> --- a/target/ppc/cpu-models.c
> +++ b/target/ppc/cpu-models.c
> @@ -1235,6 +1235,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
>      { "X2VP50", "X2VP20" },
>  
>      { "440EP", "440EPB" },
> +#if defined(TODO_USER_ONLY)
>      { "440GP", "440GPC" },
>      { "440GR", "440GRA" },
>      { "440GX", "440GXF" },
> @@ -1272,36 +1273,37 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
>      { "MPC875", "MPC8XX" },
>      { "MPC880", "MPC8XX" },
>      { "MPC885", "MPC8XX" },
> +#endif
>  
>      /* PowerPC MPC603 microcontrollers */
>      { "MPC8240", "603" },
>  
> -    { "MPC52XX", "MPC5200" },
> +    { "MPC52XX", "MPC5200_V12" },
>      { "MPC5200", "MPC5200_V12" },
>      { "MPC5200B", "MPC5200B_V21" },
>  
> -    { "MPC82XX", "MPC8280" },
> -    { "POWERQUICC-II", "MPC82XX" },
> +    { "MPC82XX", "G2LEGP3" },
> +    { "POWERQUICC-II", "G2LEGP3" },
>      { "MPC8241", "G2HIP4" },
>      { "MPC8245", "G2HIP4" },
>      { "MPC8247", "G2LEGP3" },
>      { "MPC8248", "G2LEGP3" },
> -    { "MPC8250", "MPC8250_HIP4" },
> +    { "MPC8250", "G2HIP4" },
>      { "MPC8250_HIP3", "G2HIP3" },
>      { "MPC8250_HIP4", "G2HIP4" },
> -    { "MPC8255", "MPC8255_HIP4" },
> +    { "MPC8255", "G2HIP4" },
>      { "MPC8255_HIP3", "G2HIP3" },
>      { "MPC8255_HIP4", "G2HIP4" },
> -    { "MPC8260", "MPC8260_HIP4" },
> +    { "MPC8260", "G2HIP4" },
>      { "MPC8260_HIP3", "G2HIP3" },
>      { "MPC8260_HIP4", "G2HIP4" },
> -    { "MPC8264", "MPC8264_HIP4" },
> +    { "MPC8264", "G2HIP4" },
>      { "MPC8264_HIP3", "G2HIP3" },
>      { "MPC8264_HIP4", "G2HIP4" },
> -    { "MPC8265", "MPC8265_HIP4" },
> +    { "MPC8265", "G2HIP4" },
>      { "MPC8265_HIP3", "G2HIP3" },
>      { "MPC8265_HIP4", "G2HIP4" },
> -    { "MPC8266", "MPC8266_HIP4" },
> +    { "MPC8266", "G2HIP4" },
>      { "MPC8266_HIP3", "G2HIP3" },
>      { "MPC8266_HIP4", "G2HIP4" },
>      { "MPC8270", "G2LEGP3" },
> @@ -1339,18 +1341,18 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
>      { "601V", "601_V2" },
>      { "VANILLA", "603" },
>      { "603E", "603E_V4.1" },
> -    { "STRETCH", "603E" },
> +    { "STRETCH", "603E_V4.1" },
>      { "VAILLANT", "603E7V" },
>      { "603R", "603E7T" },
> -    { "GOLDENEYE", "603R" },
> +    { "GOLDENEYE", "603E7T" },
>      { "604E", "604E_V2.4" },
> -    { "SIROCCO", "604E" },
> +    { "SIROCCO", "604E_V2.4" },
>      { "MACH5", "604R" },
>      { "740", "740_V3.1" },
> -    { "ARTHUR", "740" },
> +    { "ARTHUR", "740_V3.1" },
>      { "750", "750_V3.1" },
> -    { "TYPHOON", "750" },
> -    { "G3",      "750" },
> +    { "TYPHOON", "750_V3.1" },
> +    { "G3",      "750_V3.1" },
>      { "CONAN/DOYLE", "750P" },
>      { "750CL", "750CL_V2.0" },
>      { "750CX", "750CX_V2.2" },
> @@ -1358,32 +1360,34 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
>      { "750FX", "750FX_V2.3" },
>      { "750GX", "750GX_V1.2" },
>      { "750L", "750L_V3.2" },
> -    { "LONESTAR", "750L" },
> +    { "LONESTAR", "750L_V3.2" },
>      { "745", "745_V2.8" },
>      { "755", "755_V2.8" },
> -    { "GOLDFINGER", "755" },
> +    { "GOLDFINGER", "755_V2.8" },
>      { "7400", "7400_V2.9" },
> -    { "MAX", "7400" },
> -    { "G4",  "7400" },
> +    { "MAX", "7400_V2.9" },
> +    { "G4",  "7400_V2.9" },
>      { "7410", "7410_V1.4" },
> -    { "NITRO", "7410" },
> +    { "NITRO", "7410_V1.4" },
>      { "7448", "7448_V2.1" },
>      { "7450", "7450_V2.1" },
> -    { "VGER", "7450" },
> +    { "VGER", "7450_V2.1" },
>      { "7441", "7441_V2.3" },
>      { "7451", "7451_V2.3" },
>      { "7445", "7445_V3.2" },
>      { "7455", "7455_V3.2" },
> -    { "APOLLO6", "7455" },
> +    { "APOLLO6", "7455_V3.2" },
>      { "7447", "7447_V1.1" },
>      { "7457", "7457_V1.2" },
> -    { "APOLLO7", "7457" },
> +    { "APOLLO7", "7457_V1.2" },
>      { "7447A", "7447A_V1.2" },
>      { "7457A", "7457A_V1.2" },
>      { "APOLLO7PM", "7457A_V1.0" },
>  #if defined(TARGET_PPC64)
> +#if defined(TODO)
>      { "POWER3", "630" },
>      { "POWER3+", "631" },
> +#endif
>      { "POWER5+", "POWER5+_V2.1" },
>      { "POWER5GS", "POWER5+_V2.1" },
>      { "POWER7", "POWER7_V2.3" },
> @@ -1399,10 +1403,10 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
>  
>      /* Generic PowerPCs */
>  #if defined(TARGET_PPC64)
> -    { "PPC64", "970FX" },
> +    { "PPC64", "970FX_V3.1" },
>  #endif
>      { "PPC32", "604" },
> -    { "PPC", "PPC32" },
> -    { "DEFAULT", "PPC" },
> +    { "PPC", "604" },
> +    { "DEFAULT", "604" },
>      { NULL, NULL }
>  };

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups Igor Mammedov
@ 2017-08-25  4:12   ` David Gibson
  2017-08-25  7:34     ` Igor Mammedov
  0 siblings, 1 reply; 31+ messages in thread
From: David Gibson @ 2017-08-25  4:12 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 3294 bytes --]

On Thu, Aug 24, 2017 at 10:21:49AM +0200, Igor Mammedov wrote:
> previous patches cleaned up cpu model/alias naming which
> allows to simplify cpu model/alias to cpu type lookup a bit
> byt removing recurssion and dependency of ppc_cpu_class_by_name() /
> ppc_cpu_class_by_alias() on each other.
> Besides of simplifying code it reduces it by ~15LOC.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Urm.. I think this is probably good.  But I'm having a little trouble
convincing myself this really has the same effect as before.

> ---
>  target/ppc/translate_init.c | 43 +++++++++++++------------------------------
>  1 file changed, 13 insertions(+), 30 deletions(-)
> 
> diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> index 0325226..f1a559d 100644
> --- a/target/ppc/translate_init.c
> +++ b/target/ppc/translate_init.c
> @@ -10176,22 +10176,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
>      return pcc;
>  }
>  
> -static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
> -{
> -    ObjectClass *oc = (ObjectClass *)a;
> -    const char *name = b;
> -    PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> -
> -    if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
> -        ppc_cpu_is_valid(pcc) &&
> -        strcmp(object_class_get_name(oc) + strlen(name),
> -               POWERPC_CPU_TYPE_SUFFIX) == 0) {
> -        return 0;
> -    }
> -    return -1;
> -}
> -
> -
>  static ObjectClass *ppc_cpu_class_by_name(const char *name);
>  
>  static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> @@ -10216,8 +10200,8 @@ static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
>  
>  static ObjectClass *ppc_cpu_class_by_name(const char *name)
>  {
> -    GSList *list, *item;
> -    ObjectClass *ret = NULL;
> +    char *cpu_model, *typename;
> +    ObjectClass *oc;
>      const char *p;
>      int i, len;
>  
> @@ -10238,21 +10222,20 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
>          }
>      }
>  
> -    list = object_class_get_list(TYPE_POWERPC_CPU, false);
> -    item = g_slist_find_custom(list, name, ppc_cpu_compare_class_name);
> -    if (item != NULL) {
> -        ret = OBJECT_CLASS(item->data);
> +    cpu_model = g_ascii_strup(name, -1);
> +    p = ppc_cpu_lookup_alias(cpu_model);
> +    if (p) {
> +        g_free(cpu_model);
> +        cpu_model = g_strdup(p);
>      }
> -    g_slist_free(list);
>  
> -    if (ret) {
> -        return ret;
> -    }
> +    typename = g_strdup_printf("%s" POWERPC_CPU_TYPE_SUFFIX, cpu_model);
> +    oc = object_class_by_name(typename);
> +    g_free(typename);
> +    g_free(cpu_model);
>  
> -    for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> -        if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {
> -            return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);
> -        }
> +    if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) {
> +        return oc;
>      }
>  
>      return NULL;

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR Igor Mammedov
@ 2017-08-25  4:16   ` David Gibson
  2017-08-25  7:40     ` Igor Mammedov
  0 siblings, 1 reply; 31+ messages in thread
From: David Gibson @ 2017-08-25  4:16 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 2386 bytes --]

On Thu, Aug 24, 2017 at 10:21:50AM +0200, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>  target/ppc/translate_init.c | 27 +++++++++++----------------
>  1 file changed, 11 insertions(+), 16 deletions(-)
> 
> diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> index f1a559d..ca9f1e3 100644
> --- a/target/ppc/translate_init.c
> +++ b/target/ppc/translate_init.c
> @@ -34,6 +34,7 @@
>  #include "hw/ppc/ppc.h"
>  #include "mmu-book3s-v3.h"
>  #include "sysemu/qtest.h"
> +#include "qemu/cutils.h"
>  
>  //#define PPC_DUMP_CPU
>  //#define PPC_DEBUG_SPR
> @@ -10203,22 +10204,16 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
>      char *cpu_model, *typename;
>      ObjectClass *oc;
>      const char *p;
> -    int i, len;
> -
> -    /* Check if the given name is a PVR */
> -    len = strlen(name);
> -    if (len == 10 && name[0] == '0' && name[1] == 'x') {
> -        p = name + 2;
> -        goto check_pvr;
> -    } else if (len == 8) {
> -        p = name;
> -    check_pvr:
> -        for (i = 0; i < 8; i++) {
> -            if (!qemu_isxdigit(*p++))
> -                break;
> -        }
> -        if (i == 8) {
> -            return OBJECT_CLASS(ppc_cpu_class_by_pvr(strtoul(name, NULL, 16)));
> +    unsigned long pvr;
> +
> +    /* Lookup by PVR if cpu_model is valid 8 digit hex number
> +     * (excl: 0x prefix if present)
> +     */
> +    if (!qemu_strtoul(name, &p, 16, &pvr)) {
> +        int len = p - name;
> +        len = (len == 10) && (name[1] == 'x') ? len - 2 : len;
> +        if (len == 8) {
> +            return OBJECT_CLASS(ppc_cpu_class_by_pvr(pvr));

This doesn't look quite right.  A hex string of a PVR followed by
other stuff isn't a valid option, so if p (endptr) doesn't point to
the end of the string, then we shouldn't be using this path (from the
looks of qemu_strtoul() we can simply omit the endptr parameter to get
that behaviour).  I'm not sure what the messing around with len is
for, either.  If it's a valid hex string we can try this, I don't see
that we need further checks.

>          }
>      }
>  

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 6/6] ppc: drop caching ObjectClass from PowerPCCPUAlias
  2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 6/6] ppc: drop caching ObjectClass from PowerPCCPUAlias Igor Mammedov
@ 2017-08-25  4:22   ` David Gibson
  2017-08-25  7:49     ` Igor Mammedov
  0 siblings, 1 reply; 31+ messages in thread
From: David Gibson @ 2017-08-25  4:22 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 4688 bytes --]

On Thu, Aug 24, 2017 at 10:21:51AM +0200, Igor Mammedov wrote:
> Caching there practically doesn't give any benefits
> and that at slow path druring querying supported CPU list.
> But it introduces non conventional path of where from
> comes used CPU type name (kvm_ppc_register_host_cpu_type).
> 
> Taking in account that kvm_ppc_register_host_cpu_type()
> fixes up models the aliases point to, it's sufficient to
> make ppc_cpu_class_by_name() translate cpu alias to
> correct cpu type name.
> So drop PowerPCCPUAlias::oc field + ppc_cpu_class_by_alias()
> and let ppc_cpu_class_by_name() do conversion to cpu type name,
> which simplifies code a little bit saving ~20LOC and trouble
> wondering why ppc_cpu_class_by_alias() is necessary.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Unfortunately, this will break things.  This isn't purely a cache, in
the case handled by kvm_ppc_register_host_cpu_type(), 'oc' is *not*
redundant with the name.  The name is based on the specific CPU
description, but the oc points to the information for the "host" cpu.

There may well be a better way to do this, but this isn't it.

The problem we're trying to solve here is that KVM HV basically only
works with -cpu host.  But for the benefit of libvirt (and others), we
want, say, -cpu POWER8 to also work if the host *is* a POWER8.  But we
*don't* want to require that the host be exactly the same model of
POWER8 as "POWER8" would be aliased to with TCG.

So basically we take the "family" name of the host CPU and make it an
alias to the host cpu definition.

It's certainly mucky, but there is a reason for it.

> ---
>  target/ppc/cpu-models.h     |  1 -
>  target/ppc/kvm.c            |  1 -
>  target/ppc/translate_init.c | 26 ++------------------------
>  3 files changed, 2 insertions(+), 26 deletions(-)
> 
> diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h
> index d748c68..e9c6015 100644
> --- a/target/ppc/cpu-models.h
> +++ b/target/ppc/cpu-models.h
> @@ -31,7 +31,6 @@
>  typedef struct PowerPCCPUAlias {
>      const char *alias;
>      const char *model;
> -    ObjectClass *oc;
>  } PowerPCCPUAlias;
>  
>  extern PowerPCCPUAlias ppc_cpu_aliases[];
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 3f21190..995c2da 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -2488,7 +2488,6 @@ static int kvm_ppc_register_host_cpu_type(void)
>              if (suffix) {
>                  *suffix = 0;
>              }
> -            ppc_cpu_aliases[i].oc = oc;
>              break;
>          }
>      }
> diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> index ca9f1e3..c06f34b 100644
> --- a/target/ppc/translate_init.c
> +++ b/target/ppc/translate_init.c
> @@ -10177,28 +10177,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
>      return pcc;
>  }
>  
> -static ObjectClass *ppc_cpu_class_by_name(const char *name);
> -
> -static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> -{
> -    ObjectClass *invalid_class = (void*)ppc_cpu_class_by_alias;
> -
> -    /* Cache target class lookups in the alias table */
> -    if (!alias->oc) {
> -        alias->oc = ppc_cpu_class_by_name(alias->model);
> -        if (!alias->oc) {
> -            /* Fast check for non-existing aliases */
> -            alias->oc = invalid_class;
> -        }
> -    }
> -
> -    if (alias->oc == invalid_class) {
> -        return NULL;
> -    } else {
> -        return alias->oc;
> -    }
> -}
> -
>  static ObjectClass *ppc_cpu_class_by_name(const char *name)
>  {
>      char *cpu_model, *typename;
> @@ -10310,7 +10288,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
>                        name, pcc->pvr);
>      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
>          PowerPCCPUAlias *alias = &ppc_cpu_aliases[i];
> -        ObjectClass *alias_oc = ppc_cpu_class_by_alias(alias);
> +        ObjectClass *alias_oc = ppc_cpu_class_by_name(alias->model);
>  
>          if (alias_oc != oc) {
>              continue;
> @@ -10390,7 +10368,7 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
>          CpuDefinitionInfoList *entry;
>          CpuDefinitionInfo *info;
>  
> -        oc = ppc_cpu_class_by_alias(alias);
> +        oc = ppc_cpu_class_by_name(alias->model);
>          if (oc == NULL) {
>              continue;
>          }

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent
  2017-08-25  1:38   ` David Gibson
@ 2017-08-25  7:27     ` Igor Mammedov
  2017-08-25  9:45       ` David Gibson
  0 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-25  7:27 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-devel, Alexander Graf, qemu-ppc

On Fri, 25 Aug 2017 11:38:19 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Thu, Aug 24, 2017 at 10:21:47AM +0200, Igor Mammedov wrote:
> > PPC handles -cpu FOO rather incosistently,
> > i.e. it does case-insensitive matching of FOO to
> > a CPU type (see: ppc_cpu_compare_class_name) but
> > handles alias names as case-sensitive, as result:
> > 
> >  # qemu-system-ppc64 -M mac99 -cpu g3
> >  qemu-system-ppc64: unable to find CPU model ' kN�U'
> > 
> >  # qemu-system-ppc64 -cpu 970MP_V1.1
> >  qemu-system-ppc64: Unable to find sPAPR CPU Core definition
> > 
> > while
> > 
> >  # qemu-system-ppc64 -M mac99 -cpu G3
> >  # qemu-system-ppc64 -cpu 970MP_v1.1
> > 
> > start up just fine.
> > 
> > Considering we can't take case-insensitive matching away,
> > make it case-insensitive for  all alias/type/core_type
> > lookups.
> > 
> > As side effect it allows to remove duplicate core types
> > which are the same but use lower-case letters in name.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> 
> Hmm.  So, I'm certainly good with making the matching more consistent,
> and removing extra entries differing only in case.
> 
> However, I don't like capitalizing everything in the model table.  The
> "canonical" capitalization - as in how it appears in manuals and
> marketing info - is quite frequently mixed case.  So I think making
> everything caps in the table will make it harder to read in the
> context of looking at the corresponding documentation.
only cpu models => typenames are made caps, the rest
incl. description is kept as is in mixed case.
It looks like _desc is the thing one would use for
1:1 lookup in spec, while _name isn't direct match consistently
(i.e. sometimes it skips spaces and sometimes spaces are replaced by underscore).
So keeping _name in mixed case unnecessarily complicates name->type lookup.

These mixed case + case-insensitive is what made lookup
code over-engineered and overly complex.
As result it evolved (regressed) to inconsistent name handling
since it's rather hard to understand what's going on there.

> Can we instead retain mixed case in the table, and capitalize both
> sides at the comparison time?
it has to be the same-case since PPC has case-insensitive cpu_model
matching (sometimes :/). Normalized /same case/ typenames
are necessary for object_class_by_name() to work as it does exact match.
So it would be possible to replace custom fetching of CPU types
and iterating over it with custom comparator with object_class_by_name().
As it's done in 4/6.
This patch and 3/6 are only preparatory patches for 4/6.

> > ---
> > PS:
> >  consistent naming will be used by follow up patch to
> >  simplify cpu_model translation code and drop ~50LOC.
> > ---
> >  hw/ppc/spapr_cpu_core.c     |  30 +-
> >  target/ppc/cpu-models.c     | 866 ++++++++++++++++++++++----------------------
> >  target/ppc/kvm.c            |   2 +-
> >  target/ppc/translate_init.c |   2 +-
> >  4 files changed, 450 insertions(+), 450 deletions(-)
> > 
> > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> > index ea278ce..40936b4 100644
> > --- a/hw/ppc/spapr_cpu_core.c
> > +++ b/hw/ppc/spapr_cpu_core.c
> > @@ -130,8 +130,10 @@ char *spapr_get_cpu_core_type(const char *model)
> >  {
> >      char *core_type;
> >      gchar **model_pieces = g_strsplit(model, ",", 2);
> > +    gchar *cpu_model = g_ascii_strup(model_pieces[0], -1);
> > +    g_strfreev(model_pieces);
> >  
> > -    core_type = g_strdup_printf("%s-%s", model_pieces[0], TYPE_SPAPR_CPU_CORE);
> > +    core_type = g_strdup_printf("%s-" TYPE_SPAPR_CPU_CORE, cpu_model);
> >  
> >      /* Check whether it exists or whether we have to look up an alias name */
> >      if (!object_class_by_name(core_type)) {
> > @@ -139,13 +141,13 @@ char *spapr_get_cpu_core_type(const char *model)
> >  
> >          g_free(core_type);
> >          core_type = NULL;
> > -        realmodel = ppc_cpu_lookup_alias(model_pieces[0]);
> > +        realmodel = ppc_cpu_lookup_alias(cpu_model);
> >          if (realmodel) {
> >              core_type = spapr_get_cpu_core_type(realmodel);
> >          }
> >      }
> > +    g_free(cpu_model);
> >  
> > -    g_strfreev(model_pieces);
> >      return core_type;
> >  }
> >  
> > @@ -265,34 +267,32 @@ err:
> >  
> >  static const char *spapr_core_models[] = {
> >      /* 970 */
> > -    "970_v2.2",
> > +    "970_V2.2",
> >  
> >      /* 970MP variants */
> > -    "970MP_v1.0",
> > -    "970mp_v1.0",
> > -    "970MP_v1.1",
> > -    "970mp_v1.1",
> > +    "970MP_V1.0",
> > +    "970MP_V1.1",
> >  
> >      /* POWER5+ */
> > -    "POWER5+_v2.1",
> > +    "POWER5+_V2.1",
> >  
> >      /* POWER7 */
> > -    "POWER7_v2.3",
> > +    "POWER7_V2.3",
> >  
> >      /* POWER7+ */
> > -    "POWER7+_v2.1",
> > +    "POWER7+_V2.1",
> >  
> >      /* POWER8 */
> > -    "POWER8_v2.0",
> > +    "POWER8_V2.0",
> >  
> >      /* POWER8E */
> > -    "POWER8E_v2.1",
> > +    "POWER8E_V2.1",
> >  
> >      /* POWER8NVL */
> > -    "POWER8NVL_v1.0",
> > +    "POWER8NVL_V1.0",
> >  
> >      /* POWER9 */
> > -    "POWER9_v1.0",
> > +    "POWER9_V1.0",
> >  };
> >  
> >  static Property spapr_cpu_core_properties[] = {
> > diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
> > index 8b27962..346b6b1 100644
> > --- a/target/ppc/cpu-models.c
> > +++ b/target/ppc/cpu-models.c
> > @@ -101,10 +101,10 @@
> >  #endif
> >      POWERPC_DEF("IOP480",        CPU_POWERPC_IOP480,                 IOP480,
> >                  "IOP480 (401 microcontroller)")
> > -    POWERPC_DEF("Cobra",         CPU_POWERPC_COBRA,                  401,
> > +    POWERPC_DEF("COBRA",         CPU_POWERPC_COBRA,                  401,
> >                  "IBM Processor for Network Resources")
> >  #if defined(TODO)
> > -    POWERPC_DEF("Xipchip",       CPU_POWERPC_XIPCHIP,                401,
> > +    POWERPC_DEF("XIPCHIP",       CPU_POWERPC_XIPCHIP,                401,
> >                  NULL)
> >  #endif
> >      /* PowerPC 403 family                                                    */
> > @@ -176,16 +176,16 @@
> >                  "PowerPC 405 F6")
> >  #endif
> >      /* PowerPC 405 microcontrollers                                          */
> > -    POWERPC_DEF("405CRa",        CPU_POWERPC_405CRa,                 405,
> > +    POWERPC_DEF("405CRA",        CPU_POWERPC_405CRa,                 405,
> >                  "PowerPC 405 CRa")
> > -    POWERPC_DEF("405CRb",        CPU_POWERPC_405CRb,                 405,
> > +    POWERPC_DEF("405CRB",        CPU_POWERPC_405CRb,                 405,
> >                  "PowerPC 405 CRb")
> > -    POWERPC_DEF("405CRc",        CPU_POWERPC_405CRc,                 405,
> > +    POWERPC_DEF("405CRC",        CPU_POWERPC_405CRc,                 405,
> >                  "PowerPC 405 CRc")
> >      POWERPC_DEF("405EP",         CPU_POWERPC_405EP,                  405,
> >                  "PowerPC 405 EP")
> >  #if defined(TODO)
> > -    POWERPC_DEF("405EXr",        CPU_POWERPC_405EXr,                 405,
> > +    POWERPC_DEF("405EXR",        CPU_POWERPC_405EXr,                 405,
> >                  "PowerPC 405 EXr")
> >  #endif
> >      POWERPC_DEF("405EZ",         CPU_POWERPC_405EZ,                  405,
> > @@ -194,13 +194,13 @@
> >      POWERPC_DEF("405FX",         CPU_POWERPC_405FX,                  405,
> >                  "PowerPC 405 FX")
> >  #endif
> > -    POWERPC_DEF("405GPa",        CPU_POWERPC_405GPa,                 405,
> > +    POWERPC_DEF("405GPA",        CPU_POWERPC_405GPa,                 405,
> >                  "PowerPC 405 GPa")
> > -    POWERPC_DEF("405GPb",        CPU_POWERPC_405GPb,                 405,
> > +    POWERPC_DEF("405GPB",        CPU_POWERPC_405GPb,                 405,
> >                  "PowerPC 405 GPb")
> > -    POWERPC_DEF("405GPc",        CPU_POWERPC_405GPc,                 405,
> > +    POWERPC_DEF("405GPC",        CPU_POWERPC_405GPc,                 405,
> >                  "PowerPC 405 GPc")
> > -    POWERPC_DEF("405GPd",        CPU_POWERPC_405GPd,                 405,
> > +    POWERPC_DEF("405GPD",        CPU_POWERPC_405GPd,                 405,
> >                  "PowerPC 405 GPd")
> >      POWERPC_DEF("405GPR",        CPU_POWERPC_405GPR,                 405,
> >                  "PowerPC 405 GPR")
> > @@ -226,20 +226,20 @@
> >      POWERPC_DEF("405S",          CPU_POWERPC_405S,                   405,
> >                  "PowerPC 405 S")
> >  #endif
> > -    POWERPC_DEF("Npe405H",       CPU_POWERPC_NPE405H,                405,
> > +    POWERPC_DEF("NPE405H",       CPU_POWERPC_NPE405H,                405,
> >                  "Npe405 H")
> > -    POWERPC_DEF("Npe405H2",      CPU_POWERPC_NPE405H2,               405,
> > +    POWERPC_DEF("NPE405H2",      CPU_POWERPC_NPE405H2,               405,
> >                  "Npe405 H2")
> > -    POWERPC_DEF("Npe405L",       CPU_POWERPC_NPE405L,                405,
> > +    POWERPC_DEF("NPE405L",       CPU_POWERPC_NPE405L,                405,
> >                  "Npe405 L")
> > -    POWERPC_DEF("Npe4GS3",       CPU_POWERPC_NPE4GS3,                405,
> > +    POWERPC_DEF("NPE4GS3",       CPU_POWERPC_NPE4GS3,                405,
> >                  "Npe4GS3")
> >  #if defined(TODO)
> > -    POWERPC_DEF("Npcxx1",        CPU_POWERPC_NPCxx1,                 405,
> > +    POWERPC_DEF("NPCXX1",        CPU_POWERPC_NPCxx1,                 405,
> >                  NULL)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("Npr161",        CPU_POWERPC_NPR161,                 405,
> > +    POWERPC_DEF("NPR161",        CPU_POWERPC_NPR161,                 405,
> >                  NULL)
> >  #endif
> >  #if defined(TODO)
> > @@ -278,24 +278,24 @@
> >                  "STB130")
> >  #endif
> >      /* Xilinx PowerPC 405 cores                                              */
> > -    POWERPC_DEF("x2vp4",         CPU_POWERPC_X2VP4,                  405,
> > +    POWERPC_DEF("X2VP4",         CPU_POWERPC_X2VP4,                  405,
> >                  NULL)
> > -    POWERPC_DEF("x2vp20",        CPU_POWERPC_X2VP20,                 405,
> > +    POWERPC_DEF("X2VP20",        CPU_POWERPC_X2VP20,                 405,
> >                  NULL)
> >  #if defined(TODO)
> > -    POWERPC_DEF("zl10310",       CPU_POWERPC_ZL10310,                405,
> > +    POWERPC_DEF("ZL10310",       CPU_POWERPC_ZL10310,                405,
> >                  "Zarlink ZL10310")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("zl10311",       CPU_POWERPC_ZL10311,                405,
> > +    POWERPC_DEF("ZL10311",       CPU_POWERPC_ZL10311,                405,
> >                  "Zarlink ZL10311")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("zl10320",       CPU_POWERPC_ZL10320,                405,
> > +    POWERPC_DEF("ZL10320",       CPU_POWERPC_ZL10320,                405,
> >                  "Zarlink ZL10320")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("zl10321",       CPU_POWERPC_ZL10321,                405,
> > +    POWERPC_DEF("ZL10321",       CPU_POWERPC_ZL10321,                405,
> >                  "Zarlink ZL10321")
> >  #endif
> >      /* PowerPC 440 family                                                    */
> > @@ -308,10 +308,10 @@
> >      POWERPC_DEF("440A4",         CPU_POWERPC_440A4,                  440x4,
> >                  "PowerPC 440 A4")
> >  #endif
> > -    POWERPC_DEF("440-Xilinx",    CPU_POWERPC_440_XILINX,             440x5,
> > +    POWERPC_DEF("440-XILINX",    CPU_POWERPC_440_XILINX,             440x5,
> >                  "PowerPC 440 Xilinx 5")
> >  
> > -    POWERPC_DEF("440-Xilinx-w-dfpu",    CPU_POWERPC_440_XILINX, 440x5wDFPU,
> > +    POWERPC_DEF("440-XILINX-W-DFPU",    CPU_POWERPC_440_XILINX, 440x5wDFPU,
> >                  "PowerPC 440 Xilinx 5 With a Double Prec. FPU")
> >  #if defined(TODO)
> >      POWERPC_DEF("440A5",         CPU_POWERPC_440A5,                  440x5,
> > @@ -342,22 +342,22 @@
> >                  "PowerPC 440H6")
> >  #endif
> >      /* PowerPC 440 microcontrollers                                          */
> > -    POWERPC_DEF("440EPa",        CPU_POWERPC_440EPa,                 440EP,
> > +    POWERPC_DEF("440EPA",        CPU_POWERPC_440EPa,                 440EP,
> >                  "PowerPC 440 EPa")
> > -    POWERPC_DEF("440EPb",        CPU_POWERPC_440EPb,                 440EP,
> > +    POWERPC_DEF("440EPB",        CPU_POWERPC_440EPb,                 440EP,
> >                  "PowerPC 440 EPb")
> >      POWERPC_DEF("440EPX",        CPU_POWERPC_440EPX,                 440EP,
> >                  "PowerPC 440 EPX")
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("440GPb",        CPU_POWERPC_440GPb,                 440GP,
> > +    POWERPC_DEF("440GPB",        CPU_POWERPC_440GPb,                 440GP,
> >                  "PowerPC 440 GPb")
> >  #endif
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("440GPc",        CPU_POWERPC_440GPc,                 440GP,
> > +    POWERPC_DEF("440GPC",        CPU_POWERPC_440GPc,                 440GP,
> >                  "PowerPC 440 GPc")
> >  #endif
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("440GRa",        CPU_POWERPC_440GRa,                 440x5,
> > +    POWERPC_DEF("440GRA",        CPU_POWERPC_440GRa,                 440x5,
> >                  "PowerPC 440 GRa")
> >  #endif
> >  #if defined(TODO_USER_ONLY)
> > @@ -365,19 +365,19 @@
> >                  "PowerPC 440 GRX")
> >  #endif
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("440GXa",        CPU_POWERPC_440GXa,                 440EP,
> > +    POWERPC_DEF("440GXA",        CPU_POWERPC_440GXa,                 440EP,
> >                  "PowerPC 440 GXa")
> >  #endif
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("440GXb",        CPU_POWERPC_440GXb,                 440EP,
> > +    POWERPC_DEF("440GXB",        CPU_POWERPC_440GXb,                 440EP,
> >                  "PowerPC 440 GXb")
> >  #endif
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("440GXc",        CPU_POWERPC_440GXc,                 440EP,
> > +    POWERPC_DEF("440GXC",        CPU_POWERPC_440GXc,                 440EP,
> >                  "PowerPC 440 GXc")
> >  #endif
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("440GXf",        CPU_POWERPC_440GXf,                 440EP,
> > +    POWERPC_DEF("440GXF",        CPU_POWERPC_440GXf,                 440EP,
> >                  "PowerPC 440 GXf")
> >  #endif
> >  #if defined(TODO)
> > @@ -413,12 +413,12 @@
> >      /* Freescale embedded PowerPC cores                                      */
> >      /* MPC5xx family (aka RCPU)                                              */
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("MPC5xx",        CPU_POWERPC_MPC5xx,                 MPC5xx,
> > +    POWERPC_DEF("MPC5XX",        CPU_POWERPC_MPC5xx,                 MPC5xx,
> >                  "Generic MPC5xx core")
> >  #endif
> >      /* MPC8xx family (aka PowerQUICC)                                        */
> >  #if defined(TODO_USER_ONLY)
> > -    POWERPC_DEF("MPC8xx",        CPU_POWERPC_MPC8xx,                 MPC8xx,
> > +    POWERPC_DEF("MPC8XX",        CPU_POWERPC_MPC8xx,                 MPC8xx,
> >                  "Generic MPC8xx core")
> >  #endif
> >      /* MPC82xx family (aka PowerQUICC-II)                                    */
> > @@ -430,57 +430,57 @@
> >                  "PowerPC G2 GP core")
> >      POWERPC_DEF("G2LS",          CPU_POWERPC_G2ls,                   G2,
> >                  "PowerPC G2 LS core")
> > -    POWERPC_DEF("G2HiP3",        CPU_POWERPC_G2_HIP3,                G2,
> > +    POWERPC_DEF("G2HIP3",        CPU_POWERPC_G2_HIP3,                G2,
> >                  "PowerPC G2 HiP3 core")
> > -    POWERPC_DEF("G2HiP4",        CPU_POWERPC_G2_HIP4,                G2,
> > +    POWERPC_DEF("G2HIP4",        CPU_POWERPC_G2_HIP4,                G2,
> >                  "PowerPC G2 HiP4 core")
> >      POWERPC_DEF("MPC603",        CPU_POWERPC_MPC603,                 603E,
> >                  "PowerPC MPC603 core")
> > -    POWERPC_DEF("G2le",          CPU_POWERPC_G2LE,                   G2LE,
> > +    POWERPC_DEF("G2LE",          CPU_POWERPC_G2LE,                   G2LE,
> >          "PowerPC G2le core (same as G2 plus little-endian mode support)")
> > -    POWERPC_DEF("G2leGP",        CPU_POWERPC_G2LEgp,                 G2LE,
> > +    POWERPC_DEF("G2LEGP",        CPU_POWERPC_G2LEgp,                 G2LE,
> >                  "PowerPC G2LE GP core")
> > -    POWERPC_DEF("G2leLS",        CPU_POWERPC_G2LEls,                 G2LE,
> > +    POWERPC_DEF("G2LELS",        CPU_POWERPC_G2LEls,                 G2LE,
> >                  "PowerPC G2LE LS core")
> > -    POWERPC_DEF("G2leGP1",       CPU_POWERPC_G2LEgp1,                G2LE,
> > +    POWERPC_DEF("G2LEGP1",       CPU_POWERPC_G2LEgp1,                G2LE,
> >                  "PowerPC G2LE GP1 core")
> > -    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp3,                G2LE,
> > +    POWERPC_DEF("G2LEGP3",       CPU_POWERPC_G2LEgp3,                G2LE,
> >                  "PowerPC G2LE GP3 core")
> >      /* PowerPC G2 microcontrollers                                           */
> >  #if defined(TODO)
> >      POWERPC_DEF_SVR("MPC5121", "MPC5121",
> >                      CPU_POWERPC_MPC5121,      POWERPC_SVR_5121,      G2LE)
> >  #endif
> > -    POWERPC_DEF_SVR("MPC5200_v10", "MPC5200 v1.0",
> > +    POWERPC_DEF_SVR("MPC5200_V10", "MPC5200 v1.0",
> >                      CPU_POWERPC_MPC5200_v10,  POWERPC_SVR_5200_v10,  G2LE)
> > -    POWERPC_DEF_SVR("MPC5200_v11", "MPC5200 v1.1",
> > +    POWERPC_DEF_SVR("MPC5200_V11", "MPC5200 v1.1",
> >                      CPU_POWERPC_MPC5200_v11,  POWERPC_SVR_5200_v11,  G2LE)
> > -    POWERPC_DEF_SVR("MPC5200_v12", "MPC5200 v1.2",
> > +    POWERPC_DEF_SVR("MPC5200_V12", "MPC5200 v1.2",
> >                      CPU_POWERPC_MPC5200_v12,  POWERPC_SVR_5200_v12,  G2LE)
> > -    POWERPC_DEF_SVR("MPC5200B_v20", "MPC5200B v2.0",
> > +    POWERPC_DEF_SVR("MPC5200B_V20", "MPC5200B v2.0",
> >                      CPU_POWERPC_MPC5200B_v20, POWERPC_SVR_5200B_v20, G2LE)
> > -    POWERPC_DEF_SVR("MPC5200B_v21", "MPC5200B v2.1",
> > +    POWERPC_DEF_SVR("MPC5200B_V21", "MPC5200B v2.1",
> >                      CPU_POWERPC_MPC5200B_v21, POWERPC_SVR_5200B_v21, G2LE)
> >      /* e200 family                                                           */
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC55xx", "Generic MPC55xx core",
> > +    POWERPC_DEF_SVR("MPC55XX", "Generic MPC55xx core",
> >                      CPU_POWERPC_MPC55xx,      POWERPC_SVR_55xx,      e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("e200z0",        CPU_POWERPC_e200z0,                 e200,
> > +    POWERPC_DEF("E200Z0",        CPU_POWERPC_e200z0,                 e200,
> >                  "PowerPC e200z0 core")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("e200z1",        CPU_POWERPC_e200z1,                 e200,
> > +    POWERPC_DEF("E200Z1",        CPU_POWERPC_e200z1,                 e200,
> >                  "PowerPC e200z1 core")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("e200z3",        CPU_POWERPC_e200z3,                 e200,
> > +    POWERPC_DEF("E200Z3",        CPU_POWERPC_e200z3,                 e200,
> >                  "PowerPC e200z3 core")
> >  #endif
> > -    POWERPC_DEF("e200z5",        CPU_POWERPC_e200z5,                 e200,
> > +    POWERPC_DEF("E200Z5",        CPU_POWERPC_e200z5,                 e200,
> >                  "PowerPC e200z5 core")
> > -    POWERPC_DEF("e200z6",        CPU_POWERPC_e200z6,                 e200,
> > +    POWERPC_DEF("E200Z6",        CPU_POWERPC_e200z6,                 e200,
> >                  "PowerPC e200z6 core")
> >      /* PowerPC e200 microcontrollers                                         */
> >  #if defined(TODO)
> > @@ -488,11 +488,11 @@
> >                      CPU_POWERPC_MPC5514E,     POWERPC_SVR_5514E,     e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC5514E_v0", "MPC5514E v0",
> > +    POWERPC_DEF_SVR("MPC5514E_V0", "MPC5514E v0",
> >                      CPU_POWERPC_MPC5514E_v0,  POWERPC_SVR_5514E_v0,  e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC5514E_v1", "MPC5514E v1",
> > +    POWERPC_DEF_SVR("MPC5514E_V1", "MPC5514E v1",
> >                      CPU_POWERPC_MPC5514E_v1,  POWERPC_SVR_5514E_v1,  e200)
> >  #endif
> >  #if defined(TODO)
> > @@ -500,11 +500,11 @@
> >                      CPU_POWERPC_MPC5514G,     POWERPC_SVR_5514G,     e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC5514G_v0", "MPC5514G v0",
> > +    POWERPC_DEF_SVR("MPC5514G_V0", "MPC5514G v0",
> >                      CPU_POWERPC_MPC5514G_v0,  POWERPC_SVR_5514G_v0,  e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC5514G_v1", "MPC5514G v1",
> > +    POWERPC_DEF_SVR("MPC5514G_V1", "MPC5514G v1",
> >                      CPU_POWERPC_MPC5514G_v1,  POWERPC_SVR_5514G_v1,  e200)
> >  #endif
> >  #if defined(TODO)
> > @@ -516,11 +516,11 @@
> >                      CPU_POWERPC_MPC5516E,     POWERPC_SVR_5516E,     e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC5516E_v0", "MPC5516E v0",
> > +    POWERPC_DEF_SVR("MPC5516E_V0", "MPC5516E v0",
> >                      CPU_POWERPC_MPC5516E_v0,  POWERPC_SVR_5516E_v0,  e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC5516E_v1", "MPC5516E v1",
> > +    POWERPC_DEF_SVR("MPC5516E_V1", "MPC5516E v1",
> >                      CPU_POWERPC_MPC5516E_v1,  POWERPC_SVR_5516E_v1,  e200)
> >  #endif
> >  #if defined(TODO)
> > @@ -528,11 +528,11 @@
> >                      CPU_POWERPC_MPC5516G,     POWERPC_SVR_5516G,     e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC5516G_v0", "MPC5516G v0",
> > +    POWERPC_DEF_SVR("MPC5516G_V0", "MPC5516G v0",
> >                      CPU_POWERPC_MPC5516G_v0,  POWERPC_SVR_5516G_v0,  e200)
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF_SVR("MPC5516G_v1", "MPC5516G v1",
> > +    POWERPC_DEF_SVR("MPC5516G_V1", "MPC5516G v1",
> >                      CPU_POWERPC_MPC5516G_v1,  POWERPC_SVR_5516G_v1,  e200)
> >  #endif
> >  #if defined(TODO)
> > @@ -572,13 +572,13 @@
> >                      CPU_POWERPC_MPC5567,      POWERPC_SVR_5567,      e200)
> >  #endif
> >      /* e300 family                                                           */
> > -    POWERPC_DEF("e300c1",        CPU_POWERPC_e300c1,                 e300,
> > +    POWERPC_DEF("E300C1",        CPU_POWERPC_e300c1,                 e300,
> >                  "PowerPC e300c1 core")
> > -    POWERPC_DEF("e300c2",        CPU_POWERPC_e300c2,                 e300,
> > +    POWERPC_DEF("E300C2",        CPU_POWERPC_e300c2,                 e300,
> >                  "PowerPC e300c2 core")
> > -    POWERPC_DEF("e300c3",        CPU_POWERPC_e300c3,                 e300,
> > +    POWERPC_DEF("E300C3",        CPU_POWERPC_e300c3,                 e300,
> >                  "PowerPC e300c3 core")
> > -    POWERPC_DEF("e300c4",        CPU_POWERPC_e300c4,                 e300,
> > +    POWERPC_DEF("E300C4",        CPU_POWERPC_e300c4,                 e300,
> >                  "PowerPC e300c4 core")
> >      /* PowerPC e300 microcontrollers                                         */
> >  #if defined(TODO)
> > @@ -674,114 +674,114 @@
> >      POWERPC_DEF_SVR("MPC8379E", "MPC8379E",
> >                      CPU_POWERPC_MPC837x,      POWERPC_SVR_8379E,     e300)
> >      /* e500 family                                                           */
> > -    POWERPC_DEF_SVR("e500_v10", "PowerPC e500 v1.0 core",
> > +    POWERPC_DEF_SVR("E500_V10", "PowerPC e500 v1.0 core",
> >                      CPU_POWERPC_e500v1_v10,   POWERPC_SVR_E500,      e500v1);
> > -    POWERPC_DEF_SVR("e500_v20", "PowerPC e500 v2.0 core",
> > +    POWERPC_DEF_SVR("E500_V20", "PowerPC e500 v2.0 core",
> >                      CPU_POWERPC_e500v1_v20,   POWERPC_SVR_E500,      e500v1);
> > -    POWERPC_DEF_SVR("e500v2_v10", "PowerPC e500v2 v1.0 core",
> > +    POWERPC_DEF_SVR("E500V2_V10", "PowerPC e500v2 v1.0 core",
> >                      CPU_POWERPC_e500v2_v10,   POWERPC_SVR_E500,      e500v2);
> > -    POWERPC_DEF_SVR("e500v2_v20", "PowerPC e500v2 v2.0 core",
> > +    POWERPC_DEF_SVR("E500V2_V20", "PowerPC e500v2 v2.0 core",
> >                      CPU_POWERPC_e500v2_v20,   POWERPC_SVR_E500,      e500v2);
> > -    POWERPC_DEF_SVR("e500v2_v21", "PowerPC e500v2 v2.1 core",
> > +    POWERPC_DEF_SVR("E500V2_V21", "PowerPC e500v2 v2.1 core",
> >                      CPU_POWERPC_e500v2_v21,   POWERPC_SVR_E500,      e500v2);
> > -    POWERPC_DEF_SVR("e500v2_v22", "PowerPC e500v2 v2.2 core",
> > +    POWERPC_DEF_SVR("E500V2_V22", "PowerPC e500v2 v2.2 core",
> >                      CPU_POWERPC_e500v2_v22,   POWERPC_SVR_E500,      e500v2);
> > -    POWERPC_DEF_SVR("e500v2_v30", "PowerPC e500v2 v3.0 core",
> > +    POWERPC_DEF_SVR("E500V2_V30", "PowerPC e500v2 v3.0 core",
> >                      CPU_POWERPC_e500v2_v30,   POWERPC_SVR_E500,      e500v2);
> > -    POWERPC_DEF_SVR("e500mc", "e500mc",
> > +    POWERPC_DEF_SVR("E500MC", "e500mc",
> >                      CPU_POWERPC_e500mc,       POWERPC_SVR_E500,      e500mc)
> >  #ifdef TARGET_PPC64
> > -    POWERPC_DEF_SVR("e5500", "e5500",
> > +    POWERPC_DEF_SVR("E5500", "e5500",
> >                      CPU_POWERPC_e5500,        POWERPC_SVR_E500,      e5500)
> >  #endif
> >      /* PowerPC e500 microcontrollers                                         */
> > -    POWERPC_DEF_SVR("MPC8533_v10", "MPC8533 v1.0",
> > +    POWERPC_DEF_SVR("MPC8533_V10", "MPC8533 v1.0",
> >                      CPU_POWERPC_MPC8533_v10,  POWERPC_SVR_8533_v10,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8533_v11", "MPC8533 v1.1",
> > +    POWERPC_DEF_SVR("MPC8533_V11", "MPC8533 v1.1",
> >                      CPU_POWERPC_MPC8533_v11,  POWERPC_SVR_8533_v11,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8533E_v10", "MPC8533E v1.0",
> > +    POWERPC_DEF_SVR("MPC8533E_V10", "MPC8533E v1.0",
> >                      CPU_POWERPC_MPC8533E_v10, POWERPC_SVR_8533E_v10, e500v2)
> > -    POWERPC_DEF_SVR("MPC8533E_v11", "MPC8533E v1.1",
> > +    POWERPC_DEF_SVR("MPC8533E_V11", "MPC8533E v1.1",
> >                      CPU_POWERPC_MPC8533E_v11, POWERPC_SVR_8533E_v11, e500v2)
> > -    POWERPC_DEF_SVR("MPC8540_v10", "MPC8540 v1.0",
> > +    POWERPC_DEF_SVR("MPC8540_V10", "MPC8540 v1.0",
> >                      CPU_POWERPC_MPC8540_v10,  POWERPC_SVR_8540_v10,  e500v1)
> > -    POWERPC_DEF_SVR("MPC8540_v20", "MPC8540 v2.0",
> > +    POWERPC_DEF_SVR("MPC8540_V20", "MPC8540 v2.0",
> >                      CPU_POWERPC_MPC8540_v20,  POWERPC_SVR_8540_v20,  e500v1)
> > -    POWERPC_DEF_SVR("MPC8540_v21", "MPC8540 v2.1",
> > +    POWERPC_DEF_SVR("MPC8540_V21", "MPC8540 v2.1",
> >                      CPU_POWERPC_MPC8540_v21,  POWERPC_SVR_8540_v21,  e500v1)
> > -    POWERPC_DEF_SVR("MPC8541_v10", "MPC8541 v1.0",
> > +    POWERPC_DEF_SVR("MPC8541_V10", "MPC8541 v1.0",
> >                      CPU_POWERPC_MPC8541_v10,  POWERPC_SVR_8541_v10,  e500v1)
> > -    POWERPC_DEF_SVR("MPC8541_v11", "MPC8541 v1.1",
> > +    POWERPC_DEF_SVR("MPC8541_V11", "MPC8541 v1.1",
> >                      CPU_POWERPC_MPC8541_v11,  POWERPC_SVR_8541_v11,  e500v1)
> > -    POWERPC_DEF_SVR("MPC8541E_v10", "MPC8541E v1.0",
> > +    POWERPC_DEF_SVR("MPC8541E_V10", "MPC8541E v1.0",
> >                      CPU_POWERPC_MPC8541E_v10, POWERPC_SVR_8541E_v10, e500v1)
> > -    POWERPC_DEF_SVR("MPC8541E_v11", "MPC8541E v1.1",
> > +    POWERPC_DEF_SVR("MPC8541E_V11", "MPC8541E v1.1",
> >                      CPU_POWERPC_MPC8541E_v11, POWERPC_SVR_8541E_v11, e500v1)
> > -    POWERPC_DEF_SVR("MPC8543_v10", "MPC8543 v1.0",
> > +    POWERPC_DEF_SVR("MPC8543_V10", "MPC8543 v1.0",
> >                      CPU_POWERPC_MPC8543_v10,  POWERPC_SVR_8543_v10,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8543_v11", "MPC8543 v1.1",
> > +    POWERPC_DEF_SVR("MPC8543_V11", "MPC8543 v1.1",
> >                      CPU_POWERPC_MPC8543_v11,  POWERPC_SVR_8543_v11,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8543_v20", "MPC8543 v2.0",
> > +    POWERPC_DEF_SVR("MPC8543_V20", "MPC8543 v2.0",
> >                      CPU_POWERPC_MPC8543_v20,  POWERPC_SVR_8543_v20,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8543_v21", "MPC8543 v2.1",
> > +    POWERPC_DEF_SVR("MPC8543_V21", "MPC8543 v2.1",
> >                      CPU_POWERPC_MPC8543_v21,  POWERPC_SVR_8543_v21,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8543E_v10", "MPC8543E v1.0",
> > +    POWERPC_DEF_SVR("MPC8543E_V10", "MPC8543E v1.0",
> >                      CPU_POWERPC_MPC8543E_v10, POWERPC_SVR_8543E_v10, e500v2)
> > -    POWERPC_DEF_SVR("MPC8543E_v11", "MPC8543E v1.1",
> > +    POWERPC_DEF_SVR("MPC8543E_V11", "MPC8543E v1.1",
> >                      CPU_POWERPC_MPC8543E_v11, POWERPC_SVR_8543E_v11, e500v2)
> > -    POWERPC_DEF_SVR("MPC8543E_v20", "MPC8543E v2.0",
> > +    POWERPC_DEF_SVR("MPC8543E_V20", "MPC8543E v2.0",
> >                      CPU_POWERPC_MPC8543E_v20, POWERPC_SVR_8543E_v20, e500v2)
> > -    POWERPC_DEF_SVR("MPC8543E_v21", "MPC8543E v2.1",
> > +    POWERPC_DEF_SVR("MPC8543E_V21", "MPC8543E v2.1",
> >                      CPU_POWERPC_MPC8543E_v21, POWERPC_SVR_8543E_v21, e500v2)
> > -    POWERPC_DEF_SVR("MPC8544_v10", "MPC8544 v1.0",
> > +    POWERPC_DEF_SVR("MPC8544_V10", "MPC8544 v1.0",
> >                      CPU_POWERPC_MPC8544_v10,  POWERPC_SVR_8544_v10,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8544_v11", "MPC8544 v1.1",
> > +    POWERPC_DEF_SVR("MPC8544_V11", "MPC8544 v1.1",
> >                      CPU_POWERPC_MPC8544_v11,  POWERPC_SVR_8544_v11,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8544E_v10", "MPC8544E v1.0",
> > +    POWERPC_DEF_SVR("MPC8544E_V10", "MPC8544E v1.0",
> >                      CPU_POWERPC_MPC8544E_v10, POWERPC_SVR_8544E_v10, e500v2)
> > -    POWERPC_DEF_SVR("MPC8544E_v11", "MPC8544E v1.1",
> > +    POWERPC_DEF_SVR("MPC8544E_V11", "MPC8544E v1.1",
> >                      CPU_POWERPC_MPC8544E_v11, POWERPC_SVR_8544E_v11, e500v2)
> > -    POWERPC_DEF_SVR("MPC8545_v20", "MPC8545 v2.0",
> > +    POWERPC_DEF_SVR("MPC8545_V20", "MPC8545 v2.0",
> >                      CPU_POWERPC_MPC8545_v20,  POWERPC_SVR_8545_v20,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8545_v21", "MPC8545 v2.1",
> > +    POWERPC_DEF_SVR("MPC8545_V21", "MPC8545 v2.1",
> >                      CPU_POWERPC_MPC8545_v21,  POWERPC_SVR_8545_v21,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8545E_v20", "MPC8545E v2.0",
> > +    POWERPC_DEF_SVR("MPC8545E_V20", "MPC8545E v2.0",
> >                      CPU_POWERPC_MPC8545E_v20, POWERPC_SVR_8545E_v20, e500v2)
> > -    POWERPC_DEF_SVR("MPC8545E_v21", "MPC8545E v2.1",
> > +    POWERPC_DEF_SVR("MPC8545E_V21", "MPC8545E v2.1",
> >                      CPU_POWERPC_MPC8545E_v21, POWERPC_SVR_8545E_v21, e500v2)
> > -    POWERPC_DEF_SVR("MPC8547E_v20", "MPC8547E v2.0",
> > +    POWERPC_DEF_SVR("MPC8547E_V20", "MPC8547E v2.0",
> >                      CPU_POWERPC_MPC8547E_v20, POWERPC_SVR_8547E_v20, e500v2)
> > -    POWERPC_DEF_SVR("MPC8547E_v21", "MPC8547E v2.1",
> > +    POWERPC_DEF_SVR("MPC8547E_V21", "MPC8547E v2.1",
> >                      CPU_POWERPC_MPC8547E_v21, POWERPC_SVR_8547E_v21, e500v2)
> > -    POWERPC_DEF_SVR("MPC8548_v10", "MPC8548 v1.0",
> > +    POWERPC_DEF_SVR("MPC8548_V10", "MPC8548 v1.0",
> >                      CPU_POWERPC_MPC8548_v10,  POWERPC_SVR_8548_v10,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8548_v11", "MPC8548 v1.1",
> > +    POWERPC_DEF_SVR("MPC8548_V11", "MPC8548 v1.1",
> >                      CPU_POWERPC_MPC8548_v11,  POWERPC_SVR_8548_v11,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8548_v20", "MPC8548 v2.0",
> > +    POWERPC_DEF_SVR("MPC8548_V20", "MPC8548 v2.0",
> >                      CPU_POWERPC_MPC8548_v20,  POWERPC_SVR_8548_v20,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8548_v21", "MPC8548 v2.1",
> > +    POWERPC_DEF_SVR("MPC8548_V21", "MPC8548 v2.1",
> >                      CPU_POWERPC_MPC8548_v21,  POWERPC_SVR_8548_v21,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8548E_v10", "MPC8548E v1.0",
> > +    POWERPC_DEF_SVR("MPC8548E_V10", "MPC8548E v1.0",
> >                      CPU_POWERPC_MPC8548E_v10, POWERPC_SVR_8548E_v10, e500v2)
> > -    POWERPC_DEF_SVR("MPC8548E_v11", "MPC8548E v1.1",
> > +    POWERPC_DEF_SVR("MPC8548E_V11", "MPC8548E v1.1",
> >                      CPU_POWERPC_MPC8548E_v11, POWERPC_SVR_8548E_v11, e500v2)
> > -    POWERPC_DEF_SVR("MPC8548E_v20", "MPC8548E v2.0",
> > +    POWERPC_DEF_SVR("MPC8548E_V20", "MPC8548E v2.0",
> >                      CPU_POWERPC_MPC8548E_v20, POWERPC_SVR_8548E_v20, e500v2)
> > -    POWERPC_DEF_SVR("MPC8548E_v21", "MPC8548E v2.1",
> > +    POWERPC_DEF_SVR("MPC8548E_V21", "MPC8548E v2.1",
> >                      CPU_POWERPC_MPC8548E_v21, POWERPC_SVR_8548E_v21, e500v2)
> > -    POWERPC_DEF_SVR("MPC8555_v10", "MPC8555 v1.0",
> > +    POWERPC_DEF_SVR("MPC8555_V10", "MPC8555 v1.0",
> >                      CPU_POWERPC_MPC8555_v10,  POWERPC_SVR_8555_v10,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8555_v11", "MPC8555 v1.1",
> > +    POWERPC_DEF_SVR("MPC8555_V11", "MPC8555 v1.1",
> >                      CPU_POWERPC_MPC8555_v11,  POWERPC_SVR_8555_v11,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8555E_v10", "MPC8555E v1.0",
> > +    POWERPC_DEF_SVR("MPC8555E_V10", "MPC8555E v1.0",
> >                      CPU_POWERPC_MPC8555E_v10, POWERPC_SVR_8555E_v10, e500v2)
> > -    POWERPC_DEF_SVR("MPC8555E_v11", "MPC8555E v1.1",
> > +    POWERPC_DEF_SVR("MPC8555E_V11", "MPC8555E v1.1",
> >                      CPU_POWERPC_MPC8555E_v11, POWERPC_SVR_8555E_v11, e500v2)
> > -    POWERPC_DEF_SVR("MPC8560_v10", "MPC8560 v1.0",
> > +    POWERPC_DEF_SVR("MPC8560_V10", "MPC8560 v1.0",
> >                      CPU_POWERPC_MPC8560_v10,  POWERPC_SVR_8560_v10,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8560_v20", "MPC8560 v2.0",
> > +    POWERPC_DEF_SVR("MPC8560_V20", "MPC8560 v2.0",
> >                      CPU_POWERPC_MPC8560_v20,  POWERPC_SVR_8560_v20,  e500v2)
> > -    POWERPC_DEF_SVR("MPC8560_v21", "MPC8560 v2.1",
> > +    POWERPC_DEF_SVR("MPC8560_V21", "MPC8560 v2.1",
> >                      CPU_POWERPC_MPC8560_v21,  POWERPC_SVR_8560_v21,  e500v2)
> >      POWERPC_DEF_SVR("MPC8567", "MPC8567",
> >                      CPU_POWERPC_MPC8567,      POWERPC_SVR_8567,      e500v2)
> > @@ -796,7 +796,7 @@
> >      POWERPC_DEF_SVR("MPC8572E", "MPC8572E",
> >                      CPU_POWERPC_MPC8572E,     POWERPC_SVR_8572E,     e500v2)
> >      /* e600 family                                                           */
> > -    POWERPC_DEF("e600",          CPU_POWERPC_e600,                   e600,
> > +    POWERPC_DEF("E600",          CPU_POWERPC_e600,                   e600,
> >                  "PowerPC e600 core")
> >      /* PowerPC e600 microcontrollers                                         */
> >      POWERPC_DEF_SVR("MPC8610", "MPC8610",
> > @@ -807,299 +807,299 @@
> >                      CPU_POWERPC_MPC8641D,     POWERPC_SVR_8641D,     e600)
> >      /* 32 bits "classic" PowerPC                                             */
> >      /* PowerPC 6xx family                                                    */
> > -    POWERPC_DEF("601_v0",        CPU_POWERPC_601_v0,                 601,
> > +    POWERPC_DEF("601_V0",        CPU_POWERPC_601_v0,                 601,
> >                  "PowerPC 601v0")
> > -    POWERPC_DEF("601_v1",        CPU_POWERPC_601_v1,                 601,
> > +    POWERPC_DEF("601_V1",        CPU_POWERPC_601_v1,                 601,
> >                  "PowerPC 601v1")
> > -    POWERPC_DEF("601_v2",        CPU_POWERPC_601_v2,                 601v,
> > +    POWERPC_DEF("601_V2",        CPU_POWERPC_601_v2,                 601v,
> >                  "PowerPC 601v2")
> >      POWERPC_DEF("602",           CPU_POWERPC_602,                    602,
> >                  "PowerPC 602")
> >      POWERPC_DEF("603",           CPU_POWERPC_603,                    603,
> >                  "PowerPC 603")
> > -    POWERPC_DEF("603e_v1.1",     CPU_POWERPC_603E_v11,               603E,
> > +    POWERPC_DEF("603E_V1.1",     CPU_POWERPC_603E_v11,               603E,
> >                  "PowerPC 603e v1.1")
> > -    POWERPC_DEF("603e_v1.2",     CPU_POWERPC_603E_v12,               603E,
> > +    POWERPC_DEF("603E_V1.2",     CPU_POWERPC_603E_v12,               603E,
> >                  "PowerPC 603e v1.2")
> > -    POWERPC_DEF("603e_v1.3",     CPU_POWERPC_603E_v13,               603E,
> > +    POWERPC_DEF("603E_V1.3",     CPU_POWERPC_603E_v13,               603E,
> >                  "PowerPC 603e v1.3")
> > -    POWERPC_DEF("603e_v1.4",     CPU_POWERPC_603E_v14,               603E,
> > +    POWERPC_DEF("603E_V1.4",     CPU_POWERPC_603E_v14,               603E,
> >                  "PowerPC 603e v1.4")
> > -    POWERPC_DEF("603e_v2.2",     CPU_POWERPC_603E_v22,               603E,
> > +    POWERPC_DEF("603E_V2.2",     CPU_POWERPC_603E_v22,               603E,
> >                  "PowerPC 603e v2.2")
> > -    POWERPC_DEF("603e_v3",       CPU_POWERPC_603E_v3,                603E,
> > +    POWERPC_DEF("603E_V3",       CPU_POWERPC_603E_v3,                603E,
> >                  "PowerPC 603e v3")
> > -    POWERPC_DEF("603e_v4",       CPU_POWERPC_603E_v4,                603E,
> > +    POWERPC_DEF("603E_V4",       CPU_POWERPC_603E_v4,                603E,
> >                  "PowerPC 603e v4")
> > -    POWERPC_DEF("603e_v4.1",     CPU_POWERPC_603E_v41,               603E,
> > +    POWERPC_DEF("603E_V4.1",     CPU_POWERPC_603E_v41,               603E,
> >                  "PowerPC 603e v4.1")
> > -    POWERPC_DEF("603e7",         CPU_POWERPC_603E7,                  603E,
> > +    POWERPC_DEF("603E7",         CPU_POWERPC_603E7,                  603E,
> >                  "PowerPC 603e (aka PID7)")
> > -    POWERPC_DEF("603e7t",        CPU_POWERPC_603E7t,                 603E,
> > +    POWERPC_DEF("603E7T",        CPU_POWERPC_603E7t,                 603E,
> >                  "PowerPC 603e7t")
> > -    POWERPC_DEF("603e7v",        CPU_POWERPC_603E7v,                 603E,
> > +    POWERPC_DEF("603E7V",        CPU_POWERPC_603E7v,                 603E,
> >                  "PowerPC 603e7v")
> > -    POWERPC_DEF("603e7v1",       CPU_POWERPC_603E7v1,                603E,
> > +    POWERPC_DEF("603E7V1",       CPU_POWERPC_603E7v1,                603E,
> >                  "PowerPC 603e7v1")
> > -    POWERPC_DEF("603e7v2",       CPU_POWERPC_603E7v2,                603E,
> > +    POWERPC_DEF("603E7V2",       CPU_POWERPC_603E7v2,                603E,
> >                  "PowerPC 603e7v2")
> > -    POWERPC_DEF("603p",          CPU_POWERPC_603P,                   603E,
> > +    POWERPC_DEF("603P",          CPU_POWERPC_603P,                   603E,
> >                  "PowerPC 603p (aka PID7v)")
> >      POWERPC_DEF("604",           CPU_POWERPC_604,                    604,
> >                  "PowerPC 604")
> > -    POWERPC_DEF("604e_v1.0",     CPU_POWERPC_604E_v10,               604E,
> > +    POWERPC_DEF("604E_V1.0",     CPU_POWERPC_604E_v10,               604E,
> >                  "PowerPC 604e v1.0")
> > -    POWERPC_DEF("604e_v2.2",     CPU_POWERPC_604E_v22,               604E,
> > +    POWERPC_DEF("604E_V2.2",     CPU_POWERPC_604E_v22,               604E,
> >                  "PowerPC 604e v2.2")
> > -    POWERPC_DEF("604e_v2.4",     CPU_POWERPC_604E_v24,               604E,
> > +    POWERPC_DEF("604E_V2.4",     CPU_POWERPC_604E_v24,               604E,
> >                  "PowerPC 604e v2.4")
> > -    POWERPC_DEF("604r",          CPU_POWERPC_604R,                   604E,
> > +    POWERPC_DEF("604R",          CPU_POWERPC_604R,                   604E,
> >                  "PowerPC 604r (aka PIDA)")
> >  #if defined(TODO)
> > -    POWERPC_DEF("604ev",         CPU_POWERPC_604EV,                  604E,
> > +    POWERPC_DEF("604EV",         CPU_POWERPC_604EV,                  604E,
> >                  "PowerPC 604ev")
> >  #endif
> >      /* PowerPC 7xx family                                                    */
> > -    POWERPC_DEF("740_v1.0",      CPU_POWERPC_7x0_v10,                740,
> > +    POWERPC_DEF("740_V1.0",      CPU_POWERPC_7x0_v10,                740,
> >                  "PowerPC 740 v1.0 (G3)")
> > -    POWERPC_DEF("750_v1.0",      CPU_POWERPC_7x0_v10,                750,
> > +    POWERPC_DEF("750_V1.0",      CPU_POWERPC_7x0_v10,                750,
> >                  "PowerPC 750 v1.0 (G3)")
> > -    POWERPC_DEF("740_v2.0",      CPU_POWERPC_7x0_v20,                740,
> > +    POWERPC_DEF("740_V2.0",      CPU_POWERPC_7x0_v20,                740,
> >                  "PowerPC 740 v2.0 (G3)")
> > -    POWERPC_DEF("750_v2.0",      CPU_POWERPC_7x0_v20,                750,
> > +    POWERPC_DEF("750_V2.0",      CPU_POWERPC_7x0_v20,                750,
> >                  "PowerPC 750 v2.0 (G3)")
> > -    POWERPC_DEF("740_v2.1",      CPU_POWERPC_7x0_v21,                740,
> > +    POWERPC_DEF("740_V2.1",      CPU_POWERPC_7x0_v21,                740,
> >                  "PowerPC 740 v2.1 (G3)")
> > -    POWERPC_DEF("750_v2.1",      CPU_POWERPC_7x0_v21,                750,
> > +    POWERPC_DEF("750_V2.1",      CPU_POWERPC_7x0_v21,                750,
> >                  "PowerPC 750 v2.1 (G3)")
> > -    POWERPC_DEF("740_v2.2",      CPU_POWERPC_7x0_v22,                740,
> > +    POWERPC_DEF("740_V2.2",      CPU_POWERPC_7x0_v22,                740,
> >                  "PowerPC 740 v2.2 (G3)")
> > -    POWERPC_DEF("750_v2.2",      CPU_POWERPC_7x0_v22,                750,
> > +    POWERPC_DEF("750_V2.2",      CPU_POWERPC_7x0_v22,                750,
> >                  "PowerPC 750 v2.2 (G3)")
> > -    POWERPC_DEF("740_v3.0",      CPU_POWERPC_7x0_v30,                740,
> > +    POWERPC_DEF("740_V3.0",      CPU_POWERPC_7x0_v30,                740,
> >                  "PowerPC 740 v3.0 (G3)")
> > -    POWERPC_DEF("750_v3.0",      CPU_POWERPC_7x0_v30,                750,
> > +    POWERPC_DEF("750_V3.0",      CPU_POWERPC_7x0_v30,                750,
> >                  "PowerPC 750 v3.0 (G3)")
> > -    POWERPC_DEF("740_v3.1",      CPU_POWERPC_7x0_v31,                740,
> > +    POWERPC_DEF("740_V3.1",      CPU_POWERPC_7x0_v31,                740,
> >                  "PowerPC 740 v3.1 (G3)")
> > -    POWERPC_DEF("750_v3.1",      CPU_POWERPC_7x0_v31,                750,
> > +    POWERPC_DEF("750_V3.1",      CPU_POWERPC_7x0_v31,                750,
> >                  "PowerPC 750 v3.1 (G3)")
> > -    POWERPC_DEF("740e",          CPU_POWERPC_740E,                   740,
> > +    POWERPC_DEF("740E",          CPU_POWERPC_740E,                   740,
> >                  "PowerPC 740E (G3)")
> > -    POWERPC_DEF("750e",          CPU_POWERPC_750E,                   750,
> > +    POWERPC_DEF("750E",          CPU_POWERPC_750E,                   750,
> >                  "PowerPC 750E (G3)")
> > -    POWERPC_DEF("740p",          CPU_POWERPC_7x0P,                   740,
> > +    POWERPC_DEF("740P",          CPU_POWERPC_7x0P,                   740,
> >                  "PowerPC 740P (G3)")
> > -    POWERPC_DEF("750p",          CPU_POWERPC_7x0P,                   750,
> > +    POWERPC_DEF("750P",          CPU_POWERPC_7x0P,                   750,
> >                  "PowerPC 750P (G3)")
> > -    POWERPC_DEF("750cl_v1.0",    CPU_POWERPC_750CL_v10,              750cl,
> > +    POWERPC_DEF("750CL_V1.0",    CPU_POWERPC_750CL_v10,              750cl,
> >                  "PowerPC 750CL v1.0")
> > -    POWERPC_DEF("750cl_v2.0",    CPU_POWERPC_750CL_v20,              750cl,
> > +    POWERPC_DEF("750CL_V2.0",    CPU_POWERPC_750CL_v20,              750cl,
> >                  "PowerPC 750CL v2.0")
> > -    POWERPC_DEF("750cx_v1.0",    CPU_POWERPC_750CX_v10,              750cx,
> > +    POWERPC_DEF("750CX_V1.0",    CPU_POWERPC_750CX_v10,              750cx,
> >                  "PowerPC 750CX v1.0 (G3 embedded)")
> > -    POWERPC_DEF("750cx_v2.0",    CPU_POWERPC_750CX_v20,              750cx,
> > +    POWERPC_DEF("750CX_V2.0",    CPU_POWERPC_750CX_v20,              750cx,
> >                  "PowerPC 750CX v2.1 (G3 embedded)")
> > -    POWERPC_DEF("750cx_v2.1",    CPU_POWERPC_750CX_v21,              750cx,
> > +    POWERPC_DEF("750CX_V2.1",    CPU_POWERPC_750CX_v21,              750cx,
> >                  "PowerPC 750CX v2.1 (G3 embedded)")
> > -    POWERPC_DEF("750cx_v2.2",    CPU_POWERPC_750CX_v22,              750cx,
> > +    POWERPC_DEF("750CX_V2.2",    CPU_POWERPC_750CX_v22,              750cx,
> >                  "PowerPC 750CX v2.2 (G3 embedded)")
> > -    POWERPC_DEF("750cxe_v2.1",   CPU_POWERPC_750CXE_v21,             750cx,
> > +    POWERPC_DEF("750CXE_V2.1",   CPU_POWERPC_750CXE_v21,             750cx,
> >                  "PowerPC 750CXe v2.1 (G3 embedded)")
> > -    POWERPC_DEF("750cxe_v2.2",   CPU_POWERPC_750CXE_v22,             750cx,
> > +    POWERPC_DEF("750CXE_V2.2",   CPU_POWERPC_750CXE_v22,             750cx,
> >                  "PowerPC 750CXe v2.2 (G3 embedded)")
> > -    POWERPC_DEF("750cxe_v2.3",   CPU_POWERPC_750CXE_v23,             750cx,
> > +    POWERPC_DEF("750CXE_V2.3",   CPU_POWERPC_750CXE_v23,             750cx,
> >                  "PowerPC 750CXe v2.3 (G3 embedded)")
> > -    POWERPC_DEF("750cxe_v2.4",   CPU_POWERPC_750CXE_v24,             750cx,
> > +    POWERPC_DEF("750CXE_V2.4",   CPU_POWERPC_750CXE_v24,             750cx,
> >                  "PowerPC 750CXe v2.4 (G3 embedded)")
> > -    POWERPC_DEF("750cxe_v2.4b",  CPU_POWERPC_750CXE_v24b,            750cx,
> > +    POWERPC_DEF("750CXE_V2.4B",  CPU_POWERPC_750CXE_v24b,            750cx,
> >                  "PowerPC 750CXe v2.4b (G3 embedded)")
> > -    POWERPC_DEF("750cxe_v3.0",   CPU_POWERPC_750CXE_v30,             750cx,
> > +    POWERPC_DEF("750CXE_V3.0",   CPU_POWERPC_750CXE_v30,             750cx,
> >                  "PowerPC 750CXe v3.0 (G3 embedded)")
> > -    POWERPC_DEF("750cxe_v3.1",   CPU_POWERPC_750CXE_v31,             750cx,
> > +    POWERPC_DEF("750CXE_V3.1",   CPU_POWERPC_750CXE_v31,             750cx,
> >                  "PowerPC 750CXe v3.1 (G3 embedded)")
> > -    POWERPC_DEF("750cxe_v3.1b",  CPU_POWERPC_750CXE_v31b,            750cx,
> > +    POWERPC_DEF("750CXE_V3.1B",  CPU_POWERPC_750CXE_v31b,            750cx,
> >                  "PowerPC 750CXe v3.1b (G3 embedded)")
> > -    POWERPC_DEF("750cxr",        CPU_POWERPC_750CXR,                 750cx,
> > +    POWERPC_DEF("750CXR",        CPU_POWERPC_750CXR,                 750cx,
> >                  "PowerPC 750CXr (G3 embedded)")
> > -    POWERPC_DEF("750fl",         CPU_POWERPC_750FL,                  750fx,
> > +    POWERPC_DEF("750FL",         CPU_POWERPC_750FL,                  750fx,
> >                  "PowerPC 750FL (G3 embedded)")
> > -    POWERPC_DEF("750fx_v1.0",    CPU_POWERPC_750FX_v10,              750fx,
> > +    POWERPC_DEF("750FX_V1.0",    CPU_POWERPC_750FX_v10,              750fx,
> >                  "PowerPC 750FX v1.0 (G3 embedded)")
> > -    POWERPC_DEF("750fx_v2.0",    CPU_POWERPC_750FX_v20,              750fx,
> > +    POWERPC_DEF("750FX_V2.0",    CPU_POWERPC_750FX_v20,              750fx,
> >                  "PowerPC 750FX v2.0 (G3 embedded)")
> > -    POWERPC_DEF("750fx_v2.1",    CPU_POWERPC_750FX_v21,              750fx,
> > +    POWERPC_DEF("750FX_V2.1",    CPU_POWERPC_750FX_v21,              750fx,
> >                  "PowerPC 750FX v2.1 (G3 embedded)")
> > -    POWERPC_DEF("750fx_v2.2",    CPU_POWERPC_750FX_v22,              750fx,
> > +    POWERPC_DEF("750FX_V2.2",    CPU_POWERPC_750FX_v22,              750fx,
> >                  "PowerPC 750FX v2.2 (G3 embedded)")
> > -    POWERPC_DEF("750fx_v2.3",    CPU_POWERPC_750FX_v23,              750fx,
> > +    POWERPC_DEF("750FX_V2.3",    CPU_POWERPC_750FX_v23,              750fx,
> >                  "PowerPC 750FX v2.3 (G3 embedded)")
> > -    POWERPC_DEF("750gl",         CPU_POWERPC_750GL,                  750gx,
> > +    POWERPC_DEF("750GL",         CPU_POWERPC_750GL,                  750gx,
> >                  "PowerPC 750GL (G3 embedded)")
> > -    POWERPC_DEF("750gx_v1.0",    CPU_POWERPC_750GX_v10,              750gx,
> > +    POWERPC_DEF("750GX_V1.0",    CPU_POWERPC_750GX_v10,              750gx,
> >                  "PowerPC 750GX v1.0 (G3 embedded)")
> > -    POWERPC_DEF("750gx_v1.1",    CPU_POWERPC_750GX_v11,              750gx,
> > +    POWERPC_DEF("750GX_V1.1",    CPU_POWERPC_750GX_v11,              750gx,
> >                  "PowerPC 750GX v1.1 (G3 embedded)")
> > -    POWERPC_DEF("750gx_v1.2",    CPU_POWERPC_750GX_v12,              750gx,
> > +    POWERPC_DEF("750GX_V1.2",    CPU_POWERPC_750GX_v12,              750gx,
> >                  "PowerPC 750GX v1.2 (G3 embedded)")
> > -    POWERPC_DEF("750l_v2.0",     CPU_POWERPC_750L_v20,               750,
> > +    POWERPC_DEF("750L_V2.0",     CPU_POWERPC_750L_v20,               750,
> >                  "PowerPC 750L v2.0 (G3 embedded)")
> > -    POWERPC_DEF("750l_v2.1",     CPU_POWERPC_750L_v21,               750,
> > +    POWERPC_DEF("750L_V2.1",     CPU_POWERPC_750L_v21,               750,
> >                  "PowerPC 750L v2.1 (G3 embedded)")
> > -    POWERPC_DEF("750l_v2.2",     CPU_POWERPC_750L_v22,               750,
> > +    POWERPC_DEF("750L_V2.2",     CPU_POWERPC_750L_v22,               750,
> >                  "PowerPC 750L v2.2 (G3 embedded)")
> > -    POWERPC_DEF("750l_v3.0",     CPU_POWERPC_750L_v30,               750,
> > +    POWERPC_DEF("750L_V3.0",     CPU_POWERPC_750L_v30,               750,
> >                  "PowerPC 750L v3.0 (G3 embedded)")
> > -    POWERPC_DEF("750l_v3.2",     CPU_POWERPC_750L_v32,               750,
> > +    POWERPC_DEF("750L_V3.2",     CPU_POWERPC_750L_v32,               750,
> >                  "PowerPC 750L v3.2 (G3 embedded)")
> > -    POWERPC_DEF("745_v1.0",      CPU_POWERPC_7x5_v10,                745,
> > +    POWERPC_DEF("745_V1.0",      CPU_POWERPC_7x5_v10,                745,
> >                  "PowerPC 745 v1.0")
> > -    POWERPC_DEF("755_v1.0",      CPU_POWERPC_7x5_v10,                755,
> > +    POWERPC_DEF("755_V1.0",      CPU_POWERPC_7x5_v10,                755,
> >                  "PowerPC 755 v1.0")
> > -    POWERPC_DEF("745_v1.1",      CPU_POWERPC_7x5_v11,                745,
> > +    POWERPC_DEF("745_V1.1",      CPU_POWERPC_7x5_v11,                745,
> >                  "PowerPC 745 v1.1")
> > -    POWERPC_DEF("755_v1.1",      CPU_POWERPC_7x5_v11,                755,
> > +    POWERPC_DEF("755_V1.1",      CPU_POWERPC_7x5_v11,                755,
> >                  "PowerPC 755 v1.1")
> > -    POWERPC_DEF("745_v2.0",      CPU_POWERPC_7x5_v20,                745,
> > +    POWERPC_DEF("745_V2.0",      CPU_POWERPC_7x5_v20,                745,
> >                  "PowerPC 745 v2.0")
> > -    POWERPC_DEF("755_v2.0",      CPU_POWERPC_7x5_v20,                755,
> > +    POWERPC_DEF("755_V2.0",      CPU_POWERPC_7x5_v20,                755,
> >                  "PowerPC 755 v2.0")
> > -    POWERPC_DEF("745_v2.1",      CPU_POWERPC_7x5_v21,                745,
> > +    POWERPC_DEF("745_V2.1",      CPU_POWERPC_7x5_v21,                745,
> >                  "PowerPC 745 v2.1")
> > -    POWERPC_DEF("755_v2.1",      CPU_POWERPC_7x5_v21,                755,
> > +    POWERPC_DEF("755_V2.1",      CPU_POWERPC_7x5_v21,                755,
> >                  "PowerPC 755 v2.1")
> > -    POWERPC_DEF("745_v2.2",      CPU_POWERPC_7x5_v22,                745,
> > +    POWERPC_DEF("745_V2.2",      CPU_POWERPC_7x5_v22,                745,
> >                  "PowerPC 745 v2.2")
> > -    POWERPC_DEF("755_v2.2",      CPU_POWERPC_7x5_v22,                755,
> > +    POWERPC_DEF("755_V2.2",      CPU_POWERPC_7x5_v22,                755,
> >                  "PowerPC 755 v2.2")
> > -    POWERPC_DEF("745_v2.3",      CPU_POWERPC_7x5_v23,                745,
> > +    POWERPC_DEF("745_V2.3",      CPU_POWERPC_7x5_v23,                745,
> >                  "PowerPC 745 v2.3")
> > -    POWERPC_DEF("755_v2.3",      CPU_POWERPC_7x5_v23,                755,
> > +    POWERPC_DEF("755_V2.3",      CPU_POWERPC_7x5_v23,                755,
> >                  "PowerPC 755 v2.3")
> > -    POWERPC_DEF("745_v2.4",      CPU_POWERPC_7x5_v24,                745,
> > +    POWERPC_DEF("745_V2.4",      CPU_POWERPC_7x5_v24,                745,
> >                  "PowerPC 745 v2.4")
> > -    POWERPC_DEF("755_v2.4",      CPU_POWERPC_7x5_v24,                755,
> > +    POWERPC_DEF("755_V2.4",      CPU_POWERPC_7x5_v24,                755,
> >                  "PowerPC 755 v2.4")
> > -    POWERPC_DEF("745_v2.5",      CPU_POWERPC_7x5_v25,                745,
> > +    POWERPC_DEF("745_V2.5",      CPU_POWERPC_7x5_v25,                745,
> >                  "PowerPC 745 v2.5")
> > -    POWERPC_DEF("755_v2.5",      CPU_POWERPC_7x5_v25,                755,
> > +    POWERPC_DEF("755_V2.5",      CPU_POWERPC_7x5_v25,                755,
> >                  "PowerPC 755 v2.5")
> > -    POWERPC_DEF("745_v2.6",      CPU_POWERPC_7x5_v26,                745,
> > +    POWERPC_DEF("745_V2.6",      CPU_POWERPC_7x5_v26,                745,
> >                  "PowerPC 745 v2.6")
> > -    POWERPC_DEF("755_v2.6",      CPU_POWERPC_7x5_v26,                755,
> > +    POWERPC_DEF("755_V2.6",      CPU_POWERPC_7x5_v26,                755,
> >                  "PowerPC 755 v2.6")
> > -    POWERPC_DEF("745_v2.7",      CPU_POWERPC_7x5_v27,                745,
> > +    POWERPC_DEF("745_V2.7",      CPU_POWERPC_7x5_v27,                745,
> >                  "PowerPC 745 v2.7")
> > -    POWERPC_DEF("755_v2.7",      CPU_POWERPC_7x5_v27,                755,
> > +    POWERPC_DEF("755_V2.7",      CPU_POWERPC_7x5_v27,                755,
> >                  "PowerPC 755 v2.7")
> > -    POWERPC_DEF("745_v2.8",      CPU_POWERPC_7x5_v28,                745,
> > +    POWERPC_DEF("745_V2.8",      CPU_POWERPC_7x5_v28,                745,
> >                  "PowerPC 745 v2.8")
> > -    POWERPC_DEF("755_v2.8",      CPU_POWERPC_7x5_v28,                755,
> > +    POWERPC_DEF("755_V2.8",      CPU_POWERPC_7x5_v28,                755,
> >                  "PowerPC 755 v2.8")
> >  #if defined(TODO)
> > -    POWERPC_DEF("745p",          CPU_POWERPC_7x5P,                   745,
> > +    POWERPC_DEF("745P",          CPU_POWERPC_7x5P,                   745,
> >                  "PowerPC 745P (G3)")
> > -    POWERPC_DEF("755p",          CPU_POWERPC_7x5P,                   755,
> > +    POWERPC_DEF("755P",          CPU_POWERPC_7x5P,                   755,
> >                  "PowerPC 755P (G3)")
> >  #endif
> >      /* PowerPC 74xx family                                                   */
> > -    POWERPC_DEF("7400_v1.0",     CPU_POWERPC_7400_v10,               7400,
> > +    POWERPC_DEF("7400_V1.0",     CPU_POWERPC_7400_v10,               7400,
> >                  "PowerPC 7400 v1.0 (G4)")
> > -    POWERPC_DEF("7400_v1.1",     CPU_POWERPC_7400_v11,               7400,
> > +    POWERPC_DEF("7400_V1.1",     CPU_POWERPC_7400_v11,               7400,
> >                  "PowerPC 7400 v1.1 (G4)")
> > -    POWERPC_DEF("7400_v2.0",     CPU_POWERPC_7400_v20,               7400,
> > +    POWERPC_DEF("7400_V2.0",     CPU_POWERPC_7400_v20,               7400,
> >                  "PowerPC 7400 v2.0 (G4)")
> > -    POWERPC_DEF("7400_v2.1",     CPU_POWERPC_7400_v21,               7400,
> > +    POWERPC_DEF("7400_V2.1",     CPU_POWERPC_7400_v21,               7400,
> >                  "PowerPC 7400 v2.1 (G4)")
> > -    POWERPC_DEF("7400_v2.2",     CPU_POWERPC_7400_v22,               7400,
> > +    POWERPC_DEF("7400_V2.2",     CPU_POWERPC_7400_v22,               7400,
> >                  "PowerPC 7400 v2.2 (G4)")
> > -    POWERPC_DEF("7400_v2.6",     CPU_POWERPC_7400_v26,               7400,
> > +    POWERPC_DEF("7400_V2.6",     CPU_POWERPC_7400_v26,               7400,
> >                  "PowerPC 7400 v2.6 (G4)")
> > -    POWERPC_DEF("7400_v2.7",     CPU_POWERPC_7400_v27,               7400,
> > +    POWERPC_DEF("7400_V2.7",     CPU_POWERPC_7400_v27,               7400,
> >                  "PowerPC 7400 v2.7 (G4)")
> > -    POWERPC_DEF("7400_v2.8",     CPU_POWERPC_7400_v28,               7400,
> > +    POWERPC_DEF("7400_V2.8",     CPU_POWERPC_7400_v28,               7400,
> >                  "PowerPC 7400 v2.8 (G4)")
> > -    POWERPC_DEF("7400_v2.9",     CPU_POWERPC_7400_v29,               7400,
> > +    POWERPC_DEF("7400_V2.9",     CPU_POWERPC_7400_v29,               7400,
> >                  "PowerPC 7400 v2.9 (G4)")
> > -    POWERPC_DEF("7410_v1.0",     CPU_POWERPC_7410_v10,               7410,
> > +    POWERPC_DEF("7410_V1.0",     CPU_POWERPC_7410_v10,               7410,
> >                  "PowerPC 7410 v1.0 (G4)")
> > -    POWERPC_DEF("7410_v1.1",     CPU_POWERPC_7410_v11,               7410,
> > +    POWERPC_DEF("7410_V1.1",     CPU_POWERPC_7410_v11,               7410,
> >                  "PowerPC 7410 v1.1 (G4)")
> > -    POWERPC_DEF("7410_v1.2",     CPU_POWERPC_7410_v12,               7410,
> > +    POWERPC_DEF("7410_V1.2",     CPU_POWERPC_7410_v12,               7410,
> >                  "PowerPC 7410 v1.2 (G4)")
> > -    POWERPC_DEF("7410_v1.3",     CPU_POWERPC_7410_v13,               7410,
> > +    POWERPC_DEF("7410_V1.3",     CPU_POWERPC_7410_v13,               7410,
> >                  "PowerPC 7410 v1.3 (G4)")
> > -    POWERPC_DEF("7410_v1.4",     CPU_POWERPC_7410_v14,               7410,
> > +    POWERPC_DEF("7410_V1.4",     CPU_POWERPC_7410_v14,               7410,
> >                  "PowerPC 7410 v1.4 (G4)")
> > -    POWERPC_DEF("7448_v1.0",     CPU_POWERPC_7448_v10,               7400,
> > +    POWERPC_DEF("7448_V1.0",     CPU_POWERPC_7448_v10,               7400,
> >                  "PowerPC 7448 v1.0 (G4)")
> > -    POWERPC_DEF("7448_v1.1",     CPU_POWERPC_7448_v11,               7400,
> > +    POWERPC_DEF("7448_V1.1",     CPU_POWERPC_7448_v11,               7400,
> >                  "PowerPC 7448 v1.1 (G4)")
> > -    POWERPC_DEF("7448_v2.0",     CPU_POWERPC_7448_v20,               7400,
> > +    POWERPC_DEF("7448_V2.0",     CPU_POWERPC_7448_v20,               7400,
> >                  "PowerPC 7448 v2.0 (G4)")
> > -    POWERPC_DEF("7448_v2.1",     CPU_POWERPC_7448_v21,               7400,
> > +    POWERPC_DEF("7448_V2.1",     CPU_POWERPC_7448_v21,               7400,
> >                  "PowerPC 7448 v2.1 (G4)")
> > -    POWERPC_DEF("7450_v1.0",     CPU_POWERPC_7450_v10,               7450,
> > +    POWERPC_DEF("7450_V1.0",     CPU_POWERPC_7450_v10,               7450,
> >                  "PowerPC 7450 v1.0 (G4)")
> > -    POWERPC_DEF("7450_v1.1",     CPU_POWERPC_7450_v11,               7450,
> > +    POWERPC_DEF("7450_V1.1",     CPU_POWERPC_7450_v11,               7450,
> >                  "PowerPC 7450 v1.1 (G4)")
> > -    POWERPC_DEF("7450_v1.2",     CPU_POWERPC_7450_v12,               7450,
> > +    POWERPC_DEF("7450_V1.2",     CPU_POWERPC_7450_v12,               7450,
> >                  "PowerPC 7450 v1.2 (G4)")
> > -    POWERPC_DEF("7450_v2.0",     CPU_POWERPC_7450_v20,               7450,
> > +    POWERPC_DEF("7450_V2.0",     CPU_POWERPC_7450_v20,               7450,
> >                  "PowerPC 7450 v2.0 (G4)")
> > -    POWERPC_DEF("7450_v2.1",     CPU_POWERPC_7450_v21,               7450,
> > +    POWERPC_DEF("7450_V2.1",     CPU_POWERPC_7450_v21,               7450,
> >                  "PowerPC 7450 v2.1 (G4)")
> > -    POWERPC_DEF("7441_v2.1",     CPU_POWERPC_7450_v21,               7440,
> > +    POWERPC_DEF("7441_V2.1",     CPU_POWERPC_7450_v21,               7440,
> >                  "PowerPC 7441 v2.1 (G4)")
> > -    POWERPC_DEF("7441_v2.3",     CPU_POWERPC_74x1_v23,               7440,
> > +    POWERPC_DEF("7441_V2.3",     CPU_POWERPC_74x1_v23,               7440,
> >                  "PowerPC 7441 v2.3 (G4)")
> > -    POWERPC_DEF("7451_v2.3",     CPU_POWERPC_74x1_v23,               7450,
> > +    POWERPC_DEF("7451_V2.3",     CPU_POWERPC_74x1_v23,               7450,
> >                  "PowerPC 7451 v2.3 (G4)")
> > -    POWERPC_DEF("7441_v2.10",    CPU_POWERPC_74x1_v210,              7440,
> > +    POWERPC_DEF("7441_V2.10",    CPU_POWERPC_74x1_v210,              7440,
> >                  "PowerPC 7441 v2.10 (G4)")
> > -    POWERPC_DEF("7451_v2.10",    CPU_POWERPC_74x1_v210,              7450,
> > +    POWERPC_DEF("7451_V2.10",    CPU_POWERPC_74x1_v210,              7450,
> >                  "PowerPC 7451 v2.10 (G4)")
> > -    POWERPC_DEF("7445_v1.0",     CPU_POWERPC_74x5_v10,               7445,
> > +    POWERPC_DEF("7445_V1.0",     CPU_POWERPC_74x5_v10,               7445,
> >                  "PowerPC 7445 v1.0 (G4)")
> > -    POWERPC_DEF("7455_v1.0",     CPU_POWERPC_74x5_v10,               7455,
> > +    POWERPC_DEF("7455_V1.0",     CPU_POWERPC_74x5_v10,               7455,
> >                  "PowerPC 7455 v1.0 (G4)")
> > -    POWERPC_DEF("7445_v2.1",     CPU_POWERPC_74x5_v21,               7445,
> > +    POWERPC_DEF("7445_V2.1",     CPU_POWERPC_74x5_v21,               7445,
> >                  "PowerPC 7445 v2.1 (G4)")
> > -    POWERPC_DEF("7455_v2.1",     CPU_POWERPC_74x5_v21,               7455,
> > +    POWERPC_DEF("7455_V2.1",     CPU_POWERPC_74x5_v21,               7455,
> >                  "PowerPC 7455 v2.1 (G4)")
> > -    POWERPC_DEF("7445_v3.2",     CPU_POWERPC_74x5_v32,               7445,
> > +    POWERPC_DEF("7445_V3.2",     CPU_POWERPC_74x5_v32,               7445,
> >                  "PowerPC 7445 v3.2 (G4)")
> > -    POWERPC_DEF("7455_v3.2",     CPU_POWERPC_74x5_v32,               7455,
> > +    POWERPC_DEF("7455_V3.2",     CPU_POWERPC_74x5_v32,               7455,
> >                  "PowerPC 7455 v3.2 (G4)")
> > -    POWERPC_DEF("7445_v3.3",     CPU_POWERPC_74x5_v33,               7445,
> > +    POWERPC_DEF("7445_V3.3",     CPU_POWERPC_74x5_v33,               7445,
> >                  "PowerPC 7445 v3.3 (G4)")
> > -    POWERPC_DEF("7455_v3.3",     CPU_POWERPC_74x5_v33,               7455,
> > +    POWERPC_DEF("7455_V3.3",     CPU_POWERPC_74x5_v33,               7455,
> >                  "PowerPC 7455 v3.3 (G4)")
> > -    POWERPC_DEF("7445_v3.4",     CPU_POWERPC_74x5_v34,               7445,
> > +    POWERPC_DEF("7445_V3.4",     CPU_POWERPC_74x5_v34,               7445,
> >                  "PowerPC 7445 v3.4 (G4)")
> > -    POWERPC_DEF("7455_v3.4",     CPU_POWERPC_74x5_v34,               7455,
> > +    POWERPC_DEF("7455_V3.4",     CPU_POWERPC_74x5_v34,               7455,
> >                  "PowerPC 7455 v3.4 (G4)")
> > -    POWERPC_DEF("7447_v1.0",     CPU_POWERPC_74x7_v10,               7445,
> > +    POWERPC_DEF("7447_V1.0",     CPU_POWERPC_74x7_v10,               7445,
> >                  "PowerPC 7447 v1.0 (G4)")
> > -    POWERPC_DEF("7457_v1.0",     CPU_POWERPC_74x7_v10,               7455,
> > +    POWERPC_DEF("7457_V1.0",     CPU_POWERPC_74x7_v10,               7455,
> >                  "PowerPC 7457 v1.0 (G4)")
> > -    POWERPC_DEF("7447_v1.1",     CPU_POWERPC_74x7_v11,               7445,
> > +    POWERPC_DEF("7447_V1.1",     CPU_POWERPC_74x7_v11,               7445,
> >                  "PowerPC 7447 v1.1 (G4)")
> > -    POWERPC_DEF("7457_v1.1",     CPU_POWERPC_74x7_v11,               7455,
> > +    POWERPC_DEF("7457_V1.1",     CPU_POWERPC_74x7_v11,               7455,
> >                  "PowerPC 7457 v1.1 (G4)")
> > -    POWERPC_DEF("7457_v1.2",     CPU_POWERPC_74x7_v12,               7455,
> > +    POWERPC_DEF("7457_V1.2",     CPU_POWERPC_74x7_v12,               7455,
> >                  "PowerPC 7457 v1.2 (G4)")
> > -    POWERPC_DEF("7447A_v1.0",    CPU_POWERPC_74x7A_v10,              7445,
> > +    POWERPC_DEF("7447A_V1.0",    CPU_POWERPC_74x7A_v10,              7445,
> >                  "PowerPC 7447A v1.0 (G4)")
> > -    POWERPC_DEF("7457A_v1.0",    CPU_POWERPC_74x7A_v10,              7455,
> > +    POWERPC_DEF("7457A_V1.0",    CPU_POWERPC_74x7A_v10,              7455,
> >                  "PowerPC 7457A v1.0 (G4)")
> > -    POWERPC_DEF("7447A_v1.1",    CPU_POWERPC_74x7A_v11,              7445,
> > +    POWERPC_DEF("7447A_V1.1",    CPU_POWERPC_74x7A_v11,              7445,
> >                  "PowerPC 7447A v1.1 (G4)")
> > -    POWERPC_DEF("7457A_v1.1",    CPU_POWERPC_74x7A_v11,              7455,
> > +    POWERPC_DEF("7457A_V1.1",    CPU_POWERPC_74x7A_v11,              7455,
> >                  "PowerPC 7457A v1.1 (G4)")
> > -    POWERPC_DEF("7447A_v1.2",    CPU_POWERPC_74x7A_v12,              7445,
> > +    POWERPC_DEF("7447A_V1.2",    CPU_POWERPC_74x7A_v12,              7445,
> >                  "PowerPC 7447A v1.2 (G4)")
> > -    POWERPC_DEF("7457A_v1.2",    CPU_POWERPC_74x7A_v12,              7455,
> > +    POWERPC_DEF("7457A_V1.2",    CPU_POWERPC_74x7A_v12,              7455,
> >                  "PowerPC 7457A v1.2 (G4)")
> >      /* 64 bits PowerPC                                                       */
> >  #if defined (TARGET_PPC64)
> > @@ -1125,64 +1125,64 @@
> >      POWERPC_DEF("POWER5",        CPU_POWERPC_POWER5,                 POWER5,
> >                  "POWER5")
> >  #endif
> > -    POWERPC_DEF("POWER5+_v2.1",  CPU_POWERPC_POWER5P_v21,            POWER5P,
> > +    POWERPC_DEF("POWER5+_V2.1",  CPU_POWERPC_POWER5P_v21,            POWER5P,
> >                  "POWER5+ v2.1")
> >  #if defined(TODO)
> >      POWERPC_DEF("POWER6",        CPU_POWERPC_POWER6,                 POWER6,
> >                  "POWER6")
> >  #endif
> > -    POWERPC_DEF("POWER7_v2.3",   CPU_POWERPC_POWER7_v23,             POWER7,
> > +    POWERPC_DEF("POWER7_V2.3",   CPU_POWERPC_POWER7_v23,             POWER7,
> >                  "POWER7 v2.3")
> > -    POWERPC_DEF("POWER7+_v2.1",  CPU_POWERPC_POWER7P_v21,            POWER7,
> > +    POWERPC_DEF("POWER7+_V2.1",  CPU_POWERPC_POWER7P_v21,            POWER7,
> >                  "POWER7+ v2.1")
> > -    POWERPC_DEF("POWER8E_v2.1",  CPU_POWERPC_POWER8E_v21,            POWER8,
> > +    POWERPC_DEF("POWER8E_V2.1",  CPU_POWERPC_POWER8E_v21,            POWER8,
> >                  "POWER8E v2.1")
> > -    POWERPC_DEF("POWER8_v2.0",   CPU_POWERPC_POWER8_v20,             POWER8,
> > +    POWERPC_DEF("POWER8_V2.0",   CPU_POWERPC_POWER8_v20,             POWER8,
> >                  "POWER8 v2.0")
> > -    POWERPC_DEF("POWER8NVL_v1.0",CPU_POWERPC_POWER8NVL_v10,          POWER8,
> > +    POWERPC_DEF("POWER8NVL_V1.0", CPU_POWERPC_POWER8NVL_v10,         POWER8,
> >                  "POWER8NVL v1.0")
> > -    POWERPC_DEF("970_v2.2",      CPU_POWERPC_970_v22,                970,
> > +    POWERPC_DEF("970_V2.2",      CPU_POWERPC_970_v22,                970,
> >                  "PowerPC 970 v2.2")
> >  
> > -    POWERPC_DEF("POWER9_v1.0",   CPU_POWERPC_POWER9_BASE,            POWER9,
> > +    POWERPC_DEF("POWER9_V1.0",   CPU_POWERPC_POWER9_BASE,            POWER9,
> >                  "POWER9 v1.0")
> >  
> > -    POWERPC_DEF("970fx_v1.0",    CPU_POWERPC_970FX_v10,              970,
> > +    POWERPC_DEF("970FX_V1.0",    CPU_POWERPC_970FX_v10,              970,
> >                  "PowerPC 970FX v1.0 (G5)")
> > -    POWERPC_DEF("970fx_v2.0",    CPU_POWERPC_970FX_v20,              970,
> > +    POWERPC_DEF("970FX_V2.0",    CPU_POWERPC_970FX_v20,              970,
> >                  "PowerPC 970FX v2.0 (G5)")
> > -    POWERPC_DEF("970fx_v2.1",    CPU_POWERPC_970FX_v21,              970,
> > +    POWERPC_DEF("970FX_V2.1",    CPU_POWERPC_970FX_v21,              970,
> >                  "PowerPC 970FX v2.1 (G5)")
> > -    POWERPC_DEF("970fx_v3.0",    CPU_POWERPC_970FX_v30,              970,
> > +    POWERPC_DEF("970FX_V3.0",    CPU_POWERPC_970FX_v30,              970,
> >                  "PowerPC 970FX v3.0 (G5)")
> > -    POWERPC_DEF("970fx_v3.1",    CPU_POWERPC_970FX_v31,              970,
> > +    POWERPC_DEF("970FX_V3.1",    CPU_POWERPC_970FX_v31,              970,
> >                  "PowerPC 970FX v3.1 (G5)")
> > -    POWERPC_DEF("970mp_v1.0",    CPU_POWERPC_970MP_v10,              970,
> > +    POWERPC_DEF("970MP_V1.0",    CPU_POWERPC_970MP_v10,              970,
> >                  "PowerPC 970MP v1.0")
> > -    POWERPC_DEF("970mp_v1.1",    CPU_POWERPC_970MP_v11,              970,
> > +    POWERPC_DEF("970MP_V1.1",    CPU_POWERPC_970MP_v11,              970,
> >                  "PowerPC 970MP v1.1")
> >  #if defined(TODO)
> > -    POWERPC_DEF("Cell",          CPU_POWERPC_CELL,                   970,
> > +    POWERPC_DEF("CELL",          CPU_POWERPC_CELL,                   970,
> >                  "PowerPC Cell")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("Cell_v1.0",     CPU_POWERPC_CELL_v10,               970,
> > +    POWERPC_DEF("CELL_V1.0",     CPU_POWERPC_CELL_v10,               970,
> >                  "PowerPC Cell v1.0")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("Cell_v2.0",     CPU_POWERPC_CELL_v20,               970,
> > +    POWERPC_DEF("CELL_V2.0",     CPU_POWERPC_CELL_v20,               970,
> >                  "PowerPC Cell v2.0")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("Cell_v3.0",     CPU_POWERPC_CELL_v30,               970,
> > +    POWERPC_DEF("CELL_V3.0",     CPU_POWERPC_CELL_v30,               970,
> >                  "PowerPC Cell v3.0")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("Cell_v3.1",     CPU_POWERPC_CELL_v31,               970,
> > +    POWERPC_DEF("CELL_V3.1",     CPU_POWERPC_CELL_v31,               970,
> >                  "PowerPC Cell v3.1")
> >  #endif
> >  #if defined(TODO)
> > -    POWERPC_DEF("Cell_v3.2",     CPU_POWERPC_CELL_v32,               970,
> > +    POWERPC_DEF("CELL_V3.2",     CPU_POWERPC_CELL_v32,               970,
> >                  "PowerPC Cell v3.2")
> >  #endif
> >  #if defined(TODO)
> > @@ -1228,181 +1228,181 @@
> >  PowerPCCPUAlias ppc_cpu_aliases[] = {
> >      { "403", "403GC" },
> >      { "405", "405D4" },
> > -    { "405CR", "405CRc" },
> > -    { "405GP", "405GPd" },
> > -    { "405GPe", "405CRc" },
> > -    { "x2vp7", "x2vp4" },
> > -    { "x2vp50", "x2vp20" },
> > +    { "405CR", "405CRC" },
> > +    { "405GP", "405GPD" },
> > +    { "405GPE", "405CRC" },
> > +    { "X2VP7", "X2VP4" },
> > +    { "X2VP50", "X2VP20" },
> >  
> > -    { "440EP", "440EPb" },
> > -    { "440GP", "440GPc" },
> > -    { "440GR", "440GRa" },
> > -    { "440GX", "440GXf" },
> > +    { "440EP", "440EPB" },
> > +    { "440GP", "440GPC" },
> > +    { "440GR", "440GRA" },
> > +    { "440GX", "440GXF" },
> >  
> > -    { "RCPU", "MPC5xx" },
> > +    { "RCPU", "MPC5XX" },
> >      /* MPC5xx microcontrollers */
> > -    { "MGT560", "MPC5xx" },
> > -    { "MPC509", "MPC5xx" },
> > -    { "MPC533", "MPC5xx" },
> > -    { "MPC534", "MPC5xx" },
> > -    { "MPC555", "MPC5xx" },
> > -    { "MPC556", "MPC5xx" },
> > -    { "MPC560", "MPC5xx" },
> > -    { "MPC561", "MPC5xx" },
> > -    { "MPC562", "MPC5xx" },
> > -    { "MPC563", "MPC5xx" },
> > -    { "MPC564", "MPC5xx" },
> > -    { "MPC565", "MPC5xx" },
> > -    { "MPC566", "MPC5xx" },
> > +    { "MGT560", "MPC5XX" },
> > +    { "MPC509", "MPC5XX" },
> > +    { "MPC533", "MPC5XX" },
> > +    { "MPC534", "MPC5XX" },
> > +    { "MPC555", "MPC5XX" },
> > +    { "MPC556", "MPC5XX" },
> > +    { "MPC560", "MPC5XX" },
> > +    { "MPC561", "MPC5XX" },
> > +    { "MPC562", "MPC5XX" },
> > +    { "MPC563", "MPC5XX" },
> > +    { "MPC564", "MPC5XX" },
> > +    { "MPC565", "MPC5XX" },
> > +    { "MPC566", "MPC5XX" },
> >  
> > -    { "PowerQUICC", "MPC8xx" },
> > +    { "POWERQUICC", "MPC8XX" },
> >      /* MPC8xx microcontrollers */
> > -    { "MGT823", "MPC8xx" },
> > -    { "MPC821", "MPC8xx" },
> > -    { "MPC823", "MPC8xx" },
> > -    { "MPC850", "MPC8xx" },
> > -    { "MPC852T", "MPC8xx" },
> > -    { "MPC855T", "MPC8xx" },
> > -    { "MPC857", "MPC8xx" },
> > -    { "MPC859", "MPC8xx" },
> > -    { "MPC860", "MPC8xx" },
> > -    { "MPC862", "MPC8xx" },
> > -    { "MPC866", "MPC8xx" },
> > -    { "MPC870", "MPC8xx" },
> > -    { "MPC875", "MPC8xx" },
> > -    { "MPC880", "MPC8xx" },
> > -    { "MPC885", "MPC8xx" },
> > +    { "MGT823", "MPC8XX" },
> > +    { "MPC821", "MPC8XX" },
> > +    { "MPC823", "MPC8XX" },
> > +    { "MPC850", "MPC8XX" },
> > +    { "MPC852T", "MPC8XX" },
> > +    { "MPC855T", "MPC8XX" },
> > +    { "MPC857", "MPC8XX" },
> > +    { "MPC859", "MPC8XX" },
> > +    { "MPC860", "MPC8XX" },
> > +    { "MPC862", "MPC8XX" },
> > +    { "MPC866", "MPC8XX" },
> > +    { "MPC870", "MPC8XX" },
> > +    { "MPC875", "MPC8XX" },
> > +    { "MPC880", "MPC8XX" },
> > +    { "MPC885", "MPC8XX" },
> >  
> >      /* PowerPC MPC603 microcontrollers */
> >      { "MPC8240", "603" },
> >  
> > -    { "MPC52xx", "MPC5200" },
> > -    { "MPC5200", "MPC5200_v12" },
> > -    { "MPC5200B", "MPC5200B_v21" },
> > +    { "MPC52XX", "MPC5200" },
> > +    { "MPC5200", "MPC5200_V12" },
> > +    { "MPC5200B", "MPC5200B_V21" },
> >  
> > -    { "MPC82xx", "MPC8280" },
> > -    { "PowerQUICC-II", "MPC82xx" },
> > -    { "MPC8241", "G2HiP4" },
> > -    { "MPC8245", "G2HiP4" },
> > -    { "MPC8247", "G2leGP3" },
> > -    { "MPC8248", "G2leGP3" },
> > -    { "MPC8250", "MPC8250_HiP4" },
> > -    { "MPC8250_HiP3", "G2HiP3" },
> > -    { "MPC8250_HiP4", "G2HiP4" },
> > -    { "MPC8255", "MPC8255_HiP4" },
> > -    { "MPC8255_HiP3", "G2HiP3" },
> > -    { "MPC8255_HiP4", "G2HiP4" },
> > -    { "MPC8260", "MPC8260_HiP4" },
> > -    { "MPC8260_HiP3", "G2HiP3" },
> > -    { "MPC8260_HiP4", "G2HiP4" },
> > -    { "MPC8264", "MPC8264_HiP4" },
> > -    { "MPC8264_HiP3", "G2HiP3" },
> > -    { "MPC8264_HiP4", "G2HiP4" },
> > -    { "MPC8265", "MPC8265_HiP4" },
> > -    { "MPC8265_HiP3", "G2HiP3" },
> > -    { "MPC8265_HiP4", "G2HiP4" },
> > -    { "MPC8266", "MPC8266_HiP4" },
> > -    { "MPC8266_HiP3", "G2HiP3" },
> > -    { "MPC8266_HiP4", "G2HiP4" },
> > -    { "MPC8270", "G2leGP3" },
> > -    { "MPC8271", "G2leGP3" },
> > -    { "MPC8272", "G2leGP3" },
> > -    { "MPC8275", "G2leGP3" },
> > -    { "MPC8280", "G2leGP3" },
> > -    { "e200", "e200z6" },
> > -    { "e300", "e300c3" },
> > +    { "MPC82XX", "MPC8280" },
> > +    { "POWERQUICC-II", "MPC82XX" },
> > +    { "MPC8241", "G2HIP4" },
> > +    { "MPC8245", "G2HIP4" },
> > +    { "MPC8247", "G2LEGP3" },
> > +    { "MPC8248", "G2LEGP3" },
> > +    { "MPC8250", "MPC8250_HIP4" },
> > +    { "MPC8250_HIP3", "G2HIP3" },
> > +    { "MPC8250_HIP4", "G2HIP4" },
> > +    { "MPC8255", "MPC8255_HIP4" },
> > +    { "MPC8255_HIP3", "G2HIP3" },
> > +    { "MPC8255_HIP4", "G2HIP4" },
> > +    { "MPC8260", "MPC8260_HIP4" },
> > +    { "MPC8260_HIP3", "G2HIP3" },
> > +    { "MPC8260_HIP4", "G2HIP4" },
> > +    { "MPC8264", "MPC8264_HIP4" },
> > +    { "MPC8264_HIP3", "G2HIP3" },
> > +    { "MPC8264_HIP4", "G2HIP4" },
> > +    { "MPC8265", "MPC8265_HIP4" },
> > +    { "MPC8265_HIP3", "G2HIP3" },
> > +    { "MPC8265_HIP4", "G2HIP4" },
> > +    { "MPC8266", "MPC8266_HIP4" },
> > +    { "MPC8266_HIP3", "G2HIP3" },
> > +    { "MPC8266_HIP4", "G2HIP4" },
> > +    { "MPC8270", "G2LEGP3" },
> > +    { "MPC8271", "G2LEGP3" },
> > +    { "MPC8272", "G2LEGP3" },
> > +    { "MPC8275", "G2LEGP3" },
> > +    { "MPC8280", "G2LEGP3" },
> > +    { "E200", "E200Z6" },
> > +    { "E300", "E300C3" },
> >      { "MPC8347", "MPC8347T" },
> >      { "MPC8347A", "MPC8347AT" },
> >      { "MPC8347E", "MPC8347ET" },
> >      { "MPC8347EA", "MPC8347EAT" },
> > -    { "e500", "e500v2_v22" },
> > -    { "e500v1", "e500_v20" },
> > -    { "e500v2", "e500v2_v22" },
> > -    { "MPC8533", "MPC8533_v11" },
> > -    { "MPC8533E", "MPC8533E_v11" },
> > -    { "MPC8540", "MPC8540_v21" },
> > -    { "MPC8541", "MPC8541_v11" },
> > -    { "MPC8541E", "MPC8541E_v11" },
> > -    { "MPC8543", "MPC8543_v21" },
> > -    { "MPC8543E", "MPC8543E_v21" },
> > -    { "MPC8544", "MPC8544_v11" },
> > -    { "MPC8544E", "MPC8544E_v11" },
> > -    { "MPC8545", "MPC8545_v21" },
> > -    { "MPC8545E", "MPC8545E_v21" },
> > -    { "MPC8547E", "MPC8547E_v21" },
> > -    { "MPC8548", "MPC8548_v21" },
> > -    { "MPC8548E", "MPC8548E_v21" },
> > -    { "MPC8555", "MPC8555_v11" },
> > -    { "MPC8555E", "MPC8555E_v11" },
> > -    { "MPC8560", "MPC8560_v21" },
> > -    { "601",  "601_v2" },
> > -    { "601v", "601_v2" },
> > -    { "Vanilla", "603" },
> > -    { "603e", "603e_v4.1" },
> > -    { "Stretch", "603e" },
> > -    { "Vaillant", "603e7v" },
> > -    { "603r", "603e7t" },
> > -    { "Goldeneye", "603r" },
> > -    { "604e", "604e_v2.4" },
> > -    { "Sirocco", "604e" },
> > -    { "Mach5", "604r" },
> > -    { "740", "740_v3.1" },
> > -    { "Arthur", "740" },
> > -    { "750", "750_v3.1" },
> > -    { "Typhoon", "750" },
> > +    { "E500", "E500V2_V22" },
> > +    { "E500V1", "E500_V20" },
> > +    { "E500V2", "E500V2_V22" },
> > +    { "MPC8533", "MPC8533_V11" },
> > +    { "MPC8533E", "MPC8533E_V11" },
> > +    { "MPC8540", "MPC8540_V21" },
> > +    { "MPC8541", "MPC8541_V11" },
> > +    { "MPC8541E", "MPC8541E_V11" },
> > +    { "MPC8543", "MPC8543_V21" },
> > +    { "MPC8543E", "MPC8543E_V21" },
> > +    { "MPC8544", "MPC8544_V11" },
> > +    { "MPC8544E", "MPC8544E_V11" },
> > +    { "MPC8545", "MPC8545_V21" },
> > +    { "MPC8545E", "MPC8545E_V21" },
> > +    { "MPC8547E", "MPC8547E_V21" },
> > +    { "MPC8548", "MPC8548_V21" },
> > +    { "MPC8548E", "MPC8548E_V21" },
> > +    { "MPC8555", "MPC8555_V11" },
> > +    { "MPC8555E", "MPC8555E_V11" },
> > +    { "MPC8560", "MPC8560_V21" },
> > +    { "601",  "601_V2" },
> > +    { "601V", "601_V2" },
> > +    { "VANILLA", "603" },
> > +    { "603E", "603E_V4.1" },
> > +    { "STRETCH", "603E" },
> > +    { "VAILLANT", "603E7V" },
> > +    { "603R", "603E7T" },
> > +    { "GOLDENEYE", "603R" },
> > +    { "604E", "604E_V2.4" },
> > +    { "SIROCCO", "604E" },
> > +    { "MACH5", "604R" },
> > +    { "740", "740_V3.1" },
> > +    { "ARTHUR", "740" },
> > +    { "750", "750_V3.1" },
> > +    { "TYPHOON", "750" },
> >      { "G3",      "750" },
> > -    { "Conan/Doyle", "750p" },
> > -    { "750cl", "750cl_v2.0" },
> > -    { "750cx", "750cx_v2.2" },
> > -    { "750cxe", "750cxe_v3.1b" },
> > -    { "750fx", "750fx_v2.3" },
> > -    { "750gx", "750gx_v1.2" },
> > -    { "750l", "750l_v3.2" },
> > -    { "LoneStar", "750l" },
> > -    { "745", "745_v2.8" },
> > -    { "755", "755_v2.8" },
> > -    { "Goldfinger", "755" },
> > -    { "7400", "7400_v2.9" },
> > -    { "Max", "7400" },
> > +    { "CONAN/DOYLE", "750P" },
> > +    { "750CL", "750CL_V2.0" },
> > +    { "750CX", "750CX_V2.2" },
> > +    { "750CXE", "750CXE_V3.1B" },
> > +    { "750FX", "750FX_V2.3" },
> > +    { "750GX", "750GX_V1.2" },
> > +    { "750L", "750L_V3.2" },
> > +    { "LONESTAR", "750L" },
> > +    { "745", "745_V2.8" },
> > +    { "755", "755_V2.8" },
> > +    { "GOLDFINGER", "755" },
> > +    { "7400", "7400_V2.9" },
> > +    { "MAX", "7400" },
> >      { "G4",  "7400" },
> > -    { "7410", "7410_v1.4" },
> > -    { "Nitro", "7410" },
> > -    { "7448", "7448_v2.1" },
> > -    { "7450", "7450_v2.1" },
> > -    { "Vger", "7450" },
> > -    { "7441", "7441_v2.3" },
> > -    { "7451", "7451_v2.3" },
> > -    { "7445", "7445_v3.2" },
> > -    { "7455", "7455_v3.2" },
> > -    { "Apollo6", "7455" },
> > -    { "7447", "7447_v1.1" },
> > -    { "7457", "7457_v1.2" },
> > -    { "Apollo7", "7457" },
> > -    { "7447A", "7447A_v1.2" },
> > -    { "7457A", "7457A_v1.2" },
> > -    { "Apollo7PM", "7457A_v1.0" },
> > +    { "7410", "7410_V1.4" },
> > +    { "NITRO", "7410" },
> > +    { "7448", "7448_V2.1" },
> > +    { "7450", "7450_V2.1" },
> > +    { "VGER", "7450" },
> > +    { "7441", "7441_V2.3" },
> > +    { "7451", "7451_V2.3" },
> > +    { "7445", "7445_V3.2" },
> > +    { "7455", "7455_V3.2" },
> > +    { "APOLLO6", "7455" },
> > +    { "7447", "7447_V1.1" },
> > +    { "7457", "7457_V1.2" },
> > +    { "APOLLO7", "7457" },
> > +    { "7447A", "7447A_V1.2" },
> > +    { "7457A", "7457A_V1.2" },
> > +    { "APOLLO7PM", "7457A_V1.0" },
> >  #if defined(TARGET_PPC64)
> >      { "POWER3", "630" },
> >      { "POWER3+", "631" },
> > -    { "POWER5+", "POWER5+_v2.1" },
> > -    { "POWER5gs", "POWER5+_v2.1" },
> > -    { "POWER7", "POWER7_v2.3" },
> > -    { "POWER7+", "POWER7+_v2.1" },
> > -    { "POWER8E", "POWER8E_v2.1" },
> > -    { "POWER8", "POWER8_v2.0" },
> > -    { "POWER8NVL", "POWER8NVL_v1.0" },
> > -    { "POWER9", "POWER9_v1.0" },
> > -    { "970", "970_v2.2" },
> > -    { "970fx", "970fx_v3.1" },
> > -    { "970mp", "970mp_v1.1" },
> > +    { "POWER5+", "POWER5+_V2.1" },
> > +    { "POWER5GS", "POWER5+_V2.1" },
> > +    { "POWER7", "POWER7_V2.3" },
> > +    { "POWER7+", "POWER7+_V2.1" },
> > +    { "POWER8E", "POWER8E_V2.1" },
> > +    { "POWER8", "POWER8_V2.0" },
> > +    { "POWER8NVL", "POWER8NVL_V1.0" },
> > +    { "POWER9", "POWER9_V1.0" },
> > +    { "970", "970_V2.2" },
> > +    { "970FX", "970FX_V3.1" },
> > +    { "970MP", "970MP_V1.1" },
> >  #endif
> >  
> >      /* Generic PowerPCs */
> >  #if defined(TARGET_PPC64)
> > -    { "ppc64", "970fx" },
> > +    { "PPC64", "970FX" },
> >  #endif
> > -    { "ppc32", "604" },
> > -    { "ppc", "ppc32" },
> > -    { "default", "ppc" },
> > +    { "PPC32", "604" },
> > +    { "PPC", "PPC32" },
> > +    { "DEFAULT", "PPC" },
> >      { NULL, NULL }
> >  };
> > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> > index 8590809..3f21190 100644
> > --- a/target/ppc/kvm.c
> > +++ b/target/ppc/kvm.c
> > @@ -2480,7 +2480,7 @@ static int kvm_ppc_register_host_cpu_type(void)
> >       */
> >      dc = DEVICE_CLASS(ppc_cpu_get_family_class(pvr_pcc));
> >      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> > -        if (strcmp(ppc_cpu_aliases[i].alias, dc->desc) == 0) {
> > +        if (strcasecmp(ppc_cpu_aliases[i].alias, dc->desc) == 0) {
> >              char *suffix;
> >  
> >              ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));
> > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > index f377cf2..0325226 100644
> > --- a/target/ppc/translate_init.c
> > +++ b/target/ppc/translate_init.c
> > @@ -10250,7 +10250,7 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> >      }
> >  
> >      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> > -        if (strcmp(ppc_cpu_aliases[i].alias, name) == 0) {
> > +        if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {
> >              return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);
> >          }
> >      }  
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal
  2017-08-25  1:30   ` David Gibson
@ 2017-08-25  7:28     ` Igor Mammedov
  2017-08-25 13:24       ` David Gibson
  0 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-25  7:28 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-ppc, qemu-devel, Alexander Graf

On Fri, 25 Aug 2017 11:30:47 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Thu, Aug 24, 2017 at 10:21:46AM +0200, Igor Mammedov wrote:
> > Replace
> >   "-" TYPE_POWERPC_CPU
> > when composing cpu type name from cpu model string literal
> > and the same pattern in format strings with
> >  POWERPC_CPU_TYPE_SUFFIX and POWERPC_CPU_TYPE_NAME(model)
> > macroses like we do in x86.
> > 
> > Later POWERPC_CPU_TYPE_NAME() will be used to define default
> > cpu type per machine type and as bonus it will be consistent
> > and easy grep-able pattern across all other targets that I'm
> > plannig to treat the same way.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> 
> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> 
> I'm assuming you'll stage this for 2.11.
I've been hoping that it would go via your tree

> 
> > ---
> >  target/ppc/cpu.h            | 3 +++
> >  target/ppc/kvm_ppc.h        | 2 +-
> >  target/ppc/cpu-models.c     | 2 +-
> >  target/ppc/kvm.c            | 2 +-
> >  target/ppc/translate_init.c | 6 +++---
> >  5 files changed, 9 insertions(+), 6 deletions(-)
> > 
> > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> > index 12f0949..0512393 100644
> > --- a/target/ppc/cpu.h
> > +++ b/target/ppc/cpu.h
> > @@ -1354,6 +1354,9 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val);
> >  
> >  #define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)
> >  
> > +#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU
> > +#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX
> > +
> >  #define cpu_signal_handler cpu_ppc_signal_handler
> >  #define cpu_list ppc_cpu_list
> >  
> > diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
> > index 6bc6fb3..bcb40f2 100644
> > --- a/target/ppc/kvm_ppc.h
> > +++ b/target/ppc/kvm_ppc.h
> > @@ -9,7 +9,7 @@
> >  #ifndef KVM_PPC_H
> >  #define KVM_PPC_H
> >  
> > -#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
> > +#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host")
> >  
> >  #ifdef CONFIG_KVM
> >  
> > diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
> > index 4d3e635..8b27962 100644
> > --- a/target/ppc/cpu-models.c
> > +++ b/target/ppc/cpu-models.c
> > @@ -51,7 +51,7 @@
> >                                                                              \
> >      static const TypeInfo                                                   \
> >      glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_type_info) = {         \
> > -        .name       = _name "-" TYPE_POWERPC_CPU,                           \
> > +        .name       = POWERPC_CPU_TYPE_NAME(_name),                           \
> >          .parent     = stringify(_type) "-family-" TYPE_POWERPC_CPU,         \
> >          .class_init =                                                       \
> >              glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_class_init),   \
> > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> > index 8571379..8590809 100644
> > --- a/target/ppc/kvm.c
> > +++ b/target/ppc/kvm.c
> > @@ -2484,7 +2484,7 @@ static int kvm_ppc_register_host_cpu_type(void)
> >              char *suffix;
> >  
> >              ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));
> > -            suffix = strstr(ppc_cpu_aliases[i].model, "-"TYPE_POWERPC_CPU);
> > +            suffix = strstr(ppc_cpu_aliases[i].model, POWERPC_CPU_TYPE_SUFFIX);
> >              if (suffix) {
> >                  *suffix = 0;
> >              }
> > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > index 43be9a8..f377cf2 100644
> > --- a/target/ppc/translate_init.c
> > +++ b/target/ppc/translate_init.c
> > @@ -10185,7 +10185,7 @@ static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
> >      if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
> >          ppc_cpu_is_valid(pcc) &&
> >          strcmp(object_class_get_name(oc) + strlen(name),
> > -               "-" TYPE_POWERPC_CPU) == 0) {
> > +               POWERPC_CPU_TYPE_SUFFIX) == 0) {
> >          return 0;
> >      }
> >      return -1;
> > @@ -10327,7 +10327,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
> >      }
> >  
> >      name = g_strndup(typename,
> > -                     strlen(typename) - strlen("-" TYPE_POWERPC_CPU));
> > +                     strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));
> >      (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n",
> >                        name, pcc->pvr);
> >      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> > @@ -10388,7 +10388,7 @@ static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)
> >      typename = object_class_get_name(oc);
> >      info = g_malloc0(sizeof(*info));
> >      info->name = g_strndup(typename,
> > -                           strlen(typename) - strlen("-" TYPE_POWERPC_CPU));
> > +                           strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));
> >  
> >      entry = g_malloc0(sizeof(*entry));
> >      entry->value = info;  
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups
  2017-08-25  4:12   ` David Gibson
@ 2017-08-25  7:34     ` Igor Mammedov
  2017-08-30  3:05       ` David Gibson
  0 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-25  7:34 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-ppc, qemu-devel, Alexander Graf

On Fri, 25 Aug 2017 14:12:08 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Thu, Aug 24, 2017 at 10:21:49AM +0200, Igor Mammedov wrote:
> > previous patches cleaned up cpu model/alias naming which
> > allows to simplify cpu model/alias to cpu type lookup a bit
> > byt removing recurssion and dependency of ppc_cpu_class_by_name() /
> > ppc_cpu_class_by_alias() on each other.
> > Besides of simplifying code it reduces it by ~15LOC.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> 
> Urm.. I think this is probably good.  But I'm having a little trouble
> convincing myself this really has the same effect as before.
It's hard to wrap brain around current cyclic recursion and
how to 2 simple linear lookups could replace it.

By itself this patch won't work, it depends on 2-3/6 for
normalized cpu type names and recursion-less alias table.

The only change in behavior here is that it does alias
translation first and only then cpu_model to type translation.

> 
> > ---
> >  target/ppc/translate_init.c | 43 +++++++++++++------------------------------
> >  1 file changed, 13 insertions(+), 30 deletions(-)
> > 
> > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > index 0325226..f1a559d 100644
> > --- a/target/ppc/translate_init.c
> > +++ b/target/ppc/translate_init.c
> > @@ -10176,22 +10176,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
> >      return pcc;
> >  }
> >  
> > -static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
> > -{
> > -    ObjectClass *oc = (ObjectClass *)a;
> > -    const char *name = b;
> > -    PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> > -
> > -    if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
> > -        ppc_cpu_is_valid(pcc) &&
> > -        strcmp(object_class_get_name(oc) + strlen(name),
> > -               POWERPC_CPU_TYPE_SUFFIX) == 0) {
> > -        return 0;
> > -    }
> > -    return -1;
> > -}
> > -
> > -
> >  static ObjectClass *ppc_cpu_class_by_name(const char *name);
> >  
> >  static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> > @@ -10216,8 +10200,8 @@ static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> >  
> >  static ObjectClass *ppc_cpu_class_by_name(const char *name)
> >  {
> > -    GSList *list, *item;
> > -    ObjectClass *ret = NULL;
> > +    char *cpu_model, *typename;
> > +    ObjectClass *oc;
> >      const char *p;
> >      int i, len;
> >  
> > @@ -10238,21 +10222,20 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> >          }
> >      }
> >  
> > -    list = object_class_get_list(TYPE_POWERPC_CPU, false);
> > -    item = g_slist_find_custom(list, name, ppc_cpu_compare_class_name);
> > -    if (item != NULL) {
> > -        ret = OBJECT_CLASS(item->data);
> > +    cpu_model = g_ascii_strup(name, -1);
> > +    p = ppc_cpu_lookup_alias(cpu_model);
> > +    if (p) {
> > +        g_free(cpu_model);
> > +        cpu_model = g_strdup(p);
> >      }
> > -    g_slist_free(list);
> >  
> > -    if (ret) {
> > -        return ret;
> > -    }
> > +    typename = g_strdup_printf("%s" POWERPC_CPU_TYPE_SUFFIX, cpu_model);
> > +    oc = object_class_by_name(typename);
> > +    g_free(typename);
> > +    g_free(cpu_model);
> >  
> > -    for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> > -        if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {
> > -            return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);
> > -        }
> > +    if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) {
> > +        return oc;
> >      }
> >  
> >      return NULL;  
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR
  2017-08-25  4:16   ` David Gibson
@ 2017-08-25  7:40     ` Igor Mammedov
  2017-08-25  9:32       ` David Gibson
  0 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-25  7:40 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-ppc, qemu-devel, Alexander Graf

On Fri, 25 Aug 2017 14:16:44 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Thu, Aug 24, 2017 at 10:21:50AM +0200, Igor Mammedov wrote:
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> >  target/ppc/translate_init.c | 27 +++++++++++----------------
> >  1 file changed, 11 insertions(+), 16 deletions(-)
> > 
> > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > index f1a559d..ca9f1e3 100644
> > --- a/target/ppc/translate_init.c
> > +++ b/target/ppc/translate_init.c
> > @@ -34,6 +34,7 @@
> >  #include "hw/ppc/ppc.h"
> >  #include "mmu-book3s-v3.h"
> >  #include "sysemu/qtest.h"
> > +#include "qemu/cutils.h"
> >  
> >  //#define PPC_DUMP_CPU
> >  //#define PPC_DEBUG_SPR
> > @@ -10203,22 +10204,16 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> >      char *cpu_model, *typename;
> >      ObjectClass *oc;
> >      const char *p;
> > -    int i, len;
> > -
> > -    /* Check if the given name is a PVR */
> > -    len = strlen(name);
> > -    if (len == 10 && name[0] == '0' && name[1] == 'x') {
> > -        p = name + 2;
> > -        goto check_pvr;
> > -    } else if (len == 8) {
> > -        p = name;
> > -    check_pvr:
> > -        for (i = 0; i < 8; i++) {
> > -            if (!qemu_isxdigit(*p++))
> > -                break;
> > -        }
> > -        if (i == 8) {
> > -            return OBJECT_CLASS(ppc_cpu_class_by_pvr(strtoul(name, NULL, 16)));
> > +    unsigned long pvr;
> > +
> > +    /* Lookup by PVR if cpu_model is valid 8 digit hex number
> > +     * (excl: 0x prefix if present)
> > +     */
> > +    if (!qemu_strtoul(name, &p, 16, &pvr)) {
> > +        int len = p - name;
> > +        len = (len == 10) && (name[1] == 'x') ? len - 2 : len;
> > +        if (len == 8) {
> > +            return OBJECT_CLASS(ppc_cpu_class_by_pvr(pvr));  
> 
> This doesn't look quite right.  A hex string of a PVR followed by
> other stuff isn't a valid option, so if p (endptr) doesn't point to
> the end of the string, then we shouldn't be using this path
yep, my mistake, I've lost somewhere *p == '\0' check when cleaning up the patch

>(from the
> looks of qemu_strtoul() we can simply omit the endptr parameter to get
> that behaviour).  I'm not sure what the messing around with len is
> for, either.  If it's a valid hex string we can try this, I don't see
> that we need further checks.
I've tried to keep current limitation here i.e. 8 hex symbols,
but if any hex number is fine then doing
 qemu_strtoul(name, NULL, 16, &pvr)
is even better, so would you prefer to drop 8 symbol check altogether?

> 
> >          }
> >      }
> >    
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 6/6] ppc: drop caching ObjectClass from PowerPCCPUAlias
  2017-08-25  4:22   ` David Gibson
@ 2017-08-25  7:49     ` Igor Mammedov
  2017-08-29  7:30       ` David Gibson
  0 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-25  7:49 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-devel, Alexander Graf, qemu-ppc

On Fri, 25 Aug 2017 14:22:03 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Thu, Aug 24, 2017 at 10:21:51AM +0200, Igor Mammedov wrote:
> > Caching there practically doesn't give any benefits
> > and that at slow path druring querying supported CPU list.
> > But it introduces non conventional path of where from
> > comes used CPU type name (kvm_ppc_register_host_cpu_type).
> > 
> > Taking in account that kvm_ppc_register_host_cpu_type()
> > fixes up models the aliases point to, it's sufficient to
> > make ppc_cpu_class_by_name() translate cpu alias to
> > correct cpu type name.
> > So drop PowerPCCPUAlias::oc field + ppc_cpu_class_by_alias()
> > and let ppc_cpu_class_by_name() do conversion to cpu type name,
> > which simplifies code a little bit saving ~20LOC and trouble
> > wondering why ppc_cpu_class_by_alias() is necessary.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> 
> Unfortunately, this will break things.  This isn't purely a cache, in
> the case handled by kvm_ppc_register_host_cpu_type(), 'oc' is *not*
> redundant with the name.  The name is based on the specific CPU
> description, but the oc points to the information for the "host" cpu.
> 
> There may well be a better way to do this, but this isn't it.
> 
> The problem we're trying to solve here is that KVM HV basically only
> works with -cpu host.  But for the benefit of libvirt (and others), we
> want, say, -cpu POWER8 to also work if the host *is* a POWER8.  But we
> *don't* want to require that the host be exactly the same model of
> POWER8 as "POWER8" would be aliased to with TCG.

here is snippet from kvm_ppc_register_host_cpu_type()

1:
            ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));      
            suffix = strstr(ppc_cpu_aliases[i].model, "-"TYPE_POWERPC_CPU);      
            if (suffix) {                                                        
                *suffix = 0;                                                     
            }
2:                                                        
            ppc_cpu_aliases[i].oc = oc;

where model is fixed up (1) to the name that corresponds to
exactly the same 'oc' that is cached into (2)

any follow up attempt to translate fixed up alias will end up resolving
it into model => the same 'oc' that would be cached in ppc_cpu_aliases[i].oc

isn't it?

> 
> So basically we take the "family" name of the host CPU and make it an
> alias to the host cpu definition.
> 
> It's certainly mucky, but there is a reason for it.
> 
> > ---
> >  target/ppc/cpu-models.h     |  1 -
> >  target/ppc/kvm.c            |  1 -
> >  target/ppc/translate_init.c | 26 ++------------------------
> >  3 files changed, 2 insertions(+), 26 deletions(-)
> > 
> > diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h
> > index d748c68..e9c6015 100644
> > --- a/target/ppc/cpu-models.h
> > +++ b/target/ppc/cpu-models.h
> > @@ -31,7 +31,6 @@
> >  typedef struct PowerPCCPUAlias {
> >      const char *alias;
> >      const char *model;
> > -    ObjectClass *oc;
> >  } PowerPCCPUAlias;
> >  
> >  extern PowerPCCPUAlias ppc_cpu_aliases[];
> > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> > index 3f21190..995c2da 100644
> > --- a/target/ppc/kvm.c
> > +++ b/target/ppc/kvm.c
> > @@ -2488,7 +2488,6 @@ static int kvm_ppc_register_host_cpu_type(void)
> >              if (suffix) {
> >                  *suffix = 0;
> >              }
> > -            ppc_cpu_aliases[i].oc = oc;
> >              break;
> >          }
> >      }
> > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > index ca9f1e3..c06f34b 100644
> > --- a/target/ppc/translate_init.c
> > +++ b/target/ppc/translate_init.c
> > @@ -10177,28 +10177,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
> >      return pcc;
> >  }
> >  
> > -static ObjectClass *ppc_cpu_class_by_name(const char *name);
> > -
> > -static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> > -{
> > -    ObjectClass *invalid_class = (void*)ppc_cpu_class_by_alias;
> > -
> > -    /* Cache target class lookups in the alias table */
> > -    if (!alias->oc) {
> > -        alias->oc = ppc_cpu_class_by_name(alias->model);
> > -        if (!alias->oc) {
> > -            /* Fast check for non-existing aliases */
> > -            alias->oc = invalid_class;
> > -        }
> > -    }
> > -
> > -    if (alias->oc == invalid_class) {
> > -        return NULL;
> > -    } else {
> > -        return alias->oc;
> > -    }
> > -}
> > -
> >  static ObjectClass *ppc_cpu_class_by_name(const char *name)
> >  {
> >      char *cpu_model, *typename;
> > @@ -10310,7 +10288,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
> >                        name, pcc->pvr);
> >      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> >          PowerPCCPUAlias *alias = &ppc_cpu_aliases[i];
> > -        ObjectClass *alias_oc = ppc_cpu_class_by_alias(alias);
> > +        ObjectClass *alias_oc = ppc_cpu_class_by_name(alias->model);
> >  
> >          if (alias_oc != oc) {
> >              continue;
> > @@ -10390,7 +10368,7 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
> >          CpuDefinitionInfoList *entry;
> >          CpuDefinitionInfo *info;
> >  
> > -        oc = ppc_cpu_class_by_alias(alias);
> > +        oc = ppc_cpu_class_by_name(alias->model);
> >          if (oc == NULL) {
> >              continue;
> >          }  
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR
  2017-08-25  7:40     ` Igor Mammedov
@ 2017-08-25  9:32       ` David Gibson
  2017-08-25 11:41         ` Igor Mammedov
  2017-08-30 10:50         ` Igor Mammedov
  0 siblings, 2 replies; 31+ messages in thread
From: David Gibson @ 2017-08-25  9:32 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-ppc, qemu-devel, Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 3117 bytes --]

On Fri, Aug 25, 2017 at 09:40:37AM +0200, Igor Mammedov wrote:
> On Fri, 25 Aug 2017 14:16:44 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Thu, Aug 24, 2017 at 10:21:50AM +0200, Igor Mammedov wrote:
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > ---
> > >  target/ppc/translate_init.c | 27 +++++++++++----------------
> > >  1 file changed, 11 insertions(+), 16 deletions(-)
> > > 
> > > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > > index f1a559d..ca9f1e3 100644
> > > --- a/target/ppc/translate_init.c
> > > +++ b/target/ppc/translate_init.c
> > > @@ -34,6 +34,7 @@
> > >  #include "hw/ppc/ppc.h"
> > >  #include "mmu-book3s-v3.h"
> > >  #include "sysemu/qtest.h"
> > > +#include "qemu/cutils.h"
> > >  
> > >  //#define PPC_DUMP_CPU
> > >  //#define PPC_DEBUG_SPR
> > > @@ -10203,22 +10204,16 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> > >      char *cpu_model, *typename;
> > >      ObjectClass *oc;
> > >      const char *p;
> > > -    int i, len;
> > > -
> > > -    /* Check if the given name is a PVR */
> > > -    len = strlen(name);
> > > -    if (len == 10 && name[0] == '0' && name[1] == 'x') {
> > > -        p = name + 2;
> > > -        goto check_pvr;
> > > -    } else if (len == 8) {
> > > -        p = name;
> > > -    check_pvr:
> > > -        for (i = 0; i < 8; i++) {
> > > -            if (!qemu_isxdigit(*p++))
> > > -                break;
> > > -        }
> > > -        if (i == 8) {
> > > -            return OBJECT_CLASS(ppc_cpu_class_by_pvr(strtoul(name, NULL, 16)));
> > > +    unsigned long pvr;
> > > +
> > > +    /* Lookup by PVR if cpu_model is valid 8 digit hex number
> > > +     * (excl: 0x prefix if present)
> > > +     */
> > > +    if (!qemu_strtoul(name, &p, 16, &pvr)) {
> > > +        int len = p - name;
> > > +        len = (len == 10) && (name[1] == 'x') ? len - 2 : len;
> > > +        if (len == 8) {
> > > +            return OBJECT_CLASS(ppc_cpu_class_by_pvr(pvr));  
> > 
> > This doesn't look quite right.  A hex string of a PVR followed by
> > other stuff isn't a valid option, so if p (endptr) doesn't point to
> > the end of the string, then we shouldn't be using this path
> yep, my mistake, I've lost somewhere *p == '\0' check when cleaning up the patch

Ok.

> >(from the
> > looks of qemu_strtoul() we can simply omit the endptr parameter to get
> > that behaviour).  I'm not sure what the messing around with len is
> > for, either.  If it's a valid hex string we can try this, I don't see
> > that we need further checks.
> I've tried to keep current limitation here i.e. 8 hex symbols,
> but if any hex number is fine then doing
>  qemu_strtoul(name, NULL, 16, &pvr)
> is even better, so would you prefer to drop 8 symbol check altogether?

Yeah, I don't see any value to the 8 character check.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent
  2017-08-25  7:27     ` Igor Mammedov
@ 2017-08-25  9:45       ` David Gibson
  2017-08-25 11:40         ` Igor Mammedov
  0 siblings, 1 reply; 31+ messages in thread
From: David Gibson @ 2017-08-25  9:45 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 3315 bytes --]

On Fri, Aug 25, 2017 at 09:27:40AM +0200, Igor Mammedov wrote:
> On Fri, 25 Aug 2017 11:38:19 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Thu, Aug 24, 2017 at 10:21:47AM +0200, Igor Mammedov wrote:
> > > PPC handles -cpu FOO rather incosistently,
> > > i.e. it does case-insensitive matching of FOO to
> > > a CPU type (see: ppc_cpu_compare_class_name) but
> > > handles alias names as case-sensitive, as result:
> > > 
> > >  # qemu-system-ppc64 -M mac99 -cpu g3
> > >  qemu-system-ppc64: unable to find CPU model ' kN�U'
> > > 
> > >  # qemu-system-ppc64 -cpu 970MP_V1.1
> > >  qemu-system-ppc64: Unable to find sPAPR CPU Core definition
> > > 
> > > while
> > > 
> > >  # qemu-system-ppc64 -M mac99 -cpu G3
> > >  # qemu-system-ppc64 -cpu 970MP_v1.1
> > > 
> > > start up just fine.
> > > 
> > > Considering we can't take case-insensitive matching away,
> > > make it case-insensitive for  all alias/type/core_type
> > > lookups.
> > > 
> > > As side effect it allows to remove duplicate core types
> > > which are the same but use lower-case letters in name.
> > > 
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> > 
> > Hmm.  So, I'm certainly good with making the matching more consistent,
> > and removing extra entries differing only in case.
> > 
> > However, I don't like capitalizing everything in the model table.  The
> > "canonical" capitalization - as in how it appears in manuals and
> > marketing info - is quite frequently mixed case.  So I think making
> > everything caps in the table will make it harder to read in the
> > context of looking at the corresponding documentation.
> only cpu models => typenames are made caps, the rest

Yes, I know.  A number of the CPU model names themselves have mixed
case.  Really.

> incl. description is kept as is in mixed case.
> It looks like _desc is the thing one would use for
> 1:1 lookup in spec, while _name isn't direct match consistently
> (i.e. sometimes it skips spaces and sometimes spaces are replaced by underscore).
> So keeping _name in mixed case unnecessarily complicates name->type lookup.
> 
> These mixed case + case-insensitive is what made lookup
> code over-engineered and overly complex.

I'm fine with making all the lookups case insensitive.  I just don't
want to drop the case on the names in the actual code.

> As result it evolved (regressed) to inconsistent name handling
> since it's rather hard to understand what's going on there.

Yeah, I know :/.

> > Can we instead retain mixed case in the table, and capitalize both
> > sides at the comparison time?
> it has to be the same-case since PPC has case-insensitive cpu_model
> matching (sometimes :/). Normalized /same case/ typenames
> are necessary for object_class_by_name() to work as it does exact match.
> So it would be possible to replace custom fetching of CPU types
> and iterating over it with custom comparator with object_class_by_name().
> As it's done in 4/6.
> This patch and 3/6 are only preparatory patches for 4/6.

Ah.  Hrm.  That's awkward.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent
  2017-08-25  9:45       ` David Gibson
@ 2017-08-25 11:40         ` Igor Mammedov
  2017-08-25 13:28           ` David Gibson
  0 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-25 11:40 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-devel, Alexander Graf, qemu-ppc

On Fri, 25 Aug 2017 19:45:38 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Fri, Aug 25, 2017 at 09:27:40AM +0200, Igor Mammedov wrote:
> > On Fri, 25 Aug 2017 11:38:19 +1000
> > David Gibson <david@gibson.dropbear.id.au> wrote:
> >   
> > > On Thu, Aug 24, 2017 at 10:21:47AM +0200, Igor Mammedov wrote:  
> > > > PPC handles -cpu FOO rather incosistently,
> > > > i.e. it does case-insensitive matching of FOO to
> > > > a CPU type (see: ppc_cpu_compare_class_name) but
> > > > handles alias names as case-sensitive, as result:
> > > > 
> > > >  # qemu-system-ppc64 -M mac99 -cpu g3
> > > >  qemu-system-ppc64: unable to find CPU model ' kN�U'
> > > > 
> > > >  # qemu-system-ppc64 -cpu 970MP_V1.1
> > > >  qemu-system-ppc64: Unable to find sPAPR CPU Core definition
> > > > 
> > > > while
> > > > 
> > > >  # qemu-system-ppc64 -M mac99 -cpu G3
> > > >  # qemu-system-ppc64 -cpu 970MP_v1.1
> > > > 
> > > > start up just fine.
> > > > 
> > > > Considering we can't take case-insensitive matching away,
> > > > make it case-insensitive for  all alias/type/core_type
> > > > lookups.
> > > > 
> > > > As side effect it allows to remove duplicate core types
> > > > which are the same but use lower-case letters in name.
> > > > 
> > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>    
> > > 
> > > Hmm.  So, I'm certainly good with making the matching more consistent,
> > > and removing extra entries differing only in case.
> > > 
> > > However, I don't like capitalizing everything in the model table.  The
> > > "canonical" capitalization - as in how it appears in manuals and
> > > marketing info - is quite frequently mixed case.  So I think making
> > > everything caps in the table will make it harder to read in the
> > > context of looking at the corresponding documentation.  
> > only cpu models => typenames are made caps, the rest  
> 
> Yes, I know.  A number of the CPU model names themselves have mixed
> case.  Really.
> 
> > incl. description is kept as is in mixed case.
> > It looks like _desc is the thing one would use for
> > 1:1 lookup in spec, while _name isn't direct match consistently
> > (i.e. sometimes it skips spaces and sometimes spaces are replaced by underscore).
> > So keeping _name in mixed case unnecessarily complicates name->type lookup.
> > 
> > These mixed case + case-insensitive is what made lookup
> > code over-engineered and overly complex.  
> 
> I'm fine with making all the lookups case insensitive.  I just don't
> want to drop the case on the names in the actual code.
I've tried to find a way but considering that names are statically
'converted' into typenames and lack of ability to magically
uppercase them with preprocessor, I've gave up on this approach.

Providing that there is _desc with model name that should be
greppable in spec and complexity of lookup code that mixed-cased
typenames incur, I've opted in favor of simplifying lookup
code at expense uniform typenames (which is inter QEMU thingy).
It is easier to maintain and less chances to make mistake.

Other targets use exact match for cpu_model so whether
they use mixed casing or not doesn't matter.

> > As result it evolved (regressed) to inconsistent name handling
> > since it's rather hard to understand what's going on there.  
> 
> Yeah, I know :/.
> 
> > > Can we instead retain mixed case in the table, and capitalize both
> > > sides at the comparison time?  
> > it has to be the same-case since PPC has case-insensitive cpu_model
> > matching (sometimes :/). Normalized /same case/ typenames
> > are necessary for object_class_by_name() to work as it does exact match.
> > So it would be possible to replace custom fetching of CPU types
> > and iterating over it with custom comparator with object_class_by_name().
> > As it's done in 4/6.
> > This patch and 3/6 are only preparatory patches for 4/6.  
> 
> Ah.  Hrm.  That's awkward.
It's fine to squash all 3 in 1 patch, but then it becomes huge and
unreview-able, as logic changes are buried within names normalization.

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR
  2017-08-25  9:32       ` David Gibson
@ 2017-08-25 11:41         ` Igor Mammedov
  2017-08-30 10:50         ` Igor Mammedov
  1 sibling, 0 replies; 31+ messages in thread
From: Igor Mammedov @ 2017-08-25 11:41 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-ppc, qemu-devel, Alexander Graf

On Fri, 25 Aug 2017 19:32:29 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Fri, Aug 25, 2017 at 09:40:37AM +0200, Igor Mammedov wrote:
> > On Fri, 25 Aug 2017 14:16:44 +1000
> > David Gibson <david@gibson.dropbear.id.au> wrote:
> >   
> > > On Thu, Aug 24, 2017 at 10:21:50AM +0200, Igor Mammedov wrote:  
> > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > ---
> > > >  target/ppc/translate_init.c | 27 +++++++++++----------------
> > > >  1 file changed, 11 insertions(+), 16 deletions(-)
> > > > 
> > > > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > > > index f1a559d..ca9f1e3 100644
> > > > --- a/target/ppc/translate_init.c
> > > > +++ b/target/ppc/translate_init.c
> > > > @@ -34,6 +34,7 @@
> > > >  #include "hw/ppc/ppc.h"
> > > >  #include "mmu-book3s-v3.h"
> > > >  #include "sysemu/qtest.h"
> > > > +#include "qemu/cutils.h"
> > > >  
> > > >  //#define PPC_DUMP_CPU
> > > >  //#define PPC_DEBUG_SPR
> > > > @@ -10203,22 +10204,16 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> > > >      char *cpu_model, *typename;
> > > >      ObjectClass *oc;
> > > >      const char *p;
> > > > -    int i, len;
> > > > -
> > > > -    /* Check if the given name is a PVR */
> > > > -    len = strlen(name);
> > > > -    if (len == 10 && name[0] == '0' && name[1] == 'x') {
> > > > -        p = name + 2;
> > > > -        goto check_pvr;
> > > > -    } else if (len == 8) {
> > > > -        p = name;
> > > > -    check_pvr:
> > > > -        for (i = 0; i < 8; i++) {
> > > > -            if (!qemu_isxdigit(*p++))
> > > > -                break;
> > > > -        }
> > > > -        if (i == 8) {
> > > > -            return OBJECT_CLASS(ppc_cpu_class_by_pvr(strtoul(name, NULL, 16)));
> > > > +    unsigned long pvr;
> > > > +
> > > > +    /* Lookup by PVR if cpu_model is valid 8 digit hex number
> > > > +     * (excl: 0x prefix if present)
> > > > +     */
> > > > +    if (!qemu_strtoul(name, &p, 16, &pvr)) {
> > > > +        int len = p - name;
> > > > +        len = (len == 10) && (name[1] == 'x') ? len - 2 : len;
> > > > +        if (len == 8) {
> > > > +            return OBJECT_CLASS(ppc_cpu_class_by_pvr(pvr));    
> > > 
> > > This doesn't look quite right.  A hex string of a PVR followed by
> > > other stuff isn't a valid option, so if p (endptr) doesn't point to
> > > the end of the string, then we shouldn't be using this path  
> > yep, my mistake, I've lost somewhere *p == '\0' check when cleaning up the patch  
> 
> Ok.
> 
> > >(from the
> > > looks of qemu_strtoul() we can simply omit the endptr parameter to get
> > > that behaviour).  I'm not sure what the messing around with len is
> > > for, either.  If it's a valid hex string we can try this, I don't see
> > > that we need further checks.  
> > I've tried to keep current limitation here i.e. 8 hex symbols,
> > but if any hex number is fine then doing
> >  qemu_strtoul(name, NULL, 16, &pvr)
> > is even better, so would you prefer to drop 8 symbol check altogether?  
> 
> Yeah, I don't see any value to the 8 character check.
then I'll drop it and do as you've suggested. 

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal
  2017-08-25  7:28     ` Igor Mammedov
@ 2017-08-25 13:24       ` David Gibson
  0 siblings, 0 replies; 31+ messages in thread
From: David Gibson @ 2017-08-25 13:24 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-ppc, qemu-devel, Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 5731 bytes --]

On Fri, Aug 25, 2017 at 09:28:22AM +0200, Igor Mammedov wrote:
> On Fri, 25 Aug 2017 11:30:47 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Thu, Aug 24, 2017 at 10:21:46AM +0200, Igor Mammedov wrote:
> > > Replace
> > >   "-" TYPE_POWERPC_CPU
> > > when composing cpu type name from cpu model string literal
> > > and the same pattern in format strings with
> > >  POWERPC_CPU_TYPE_SUFFIX and POWERPC_CPU_TYPE_NAME(model)
> > > macroses like we do in x86.
> > > 
> > > Later POWERPC_CPU_TYPE_NAME() will be used to define default
> > > cpu type per machine type and as bonus it will be consistent
> > > and easy grep-able pattern across all other targets that I'm
> > > plannig to treat the same way.
> > > 
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> > 
> > Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> > 
> > I'm assuming you'll stage this for 2.11.
> I've been hoping that it would go via your tree

Ok, I can do that if you prefer.

> 
> > 
> > > ---
> > >  target/ppc/cpu.h            | 3 +++
> > >  target/ppc/kvm_ppc.h        | 2 +-
> > >  target/ppc/cpu-models.c     | 2 +-
> > >  target/ppc/kvm.c            | 2 +-
> > >  target/ppc/translate_init.c | 6 +++---
> > >  5 files changed, 9 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> > > index 12f0949..0512393 100644
> > > --- a/target/ppc/cpu.h
> > > +++ b/target/ppc/cpu.h
> > > @@ -1354,6 +1354,9 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val);
> > >  
> > >  #define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)
> > >  
> > > +#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU
> > > +#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX
> > > +
> > >  #define cpu_signal_handler cpu_ppc_signal_handler
> > >  #define cpu_list ppc_cpu_list
> > >  
> > > diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
> > > index 6bc6fb3..bcb40f2 100644
> > > --- a/target/ppc/kvm_ppc.h
> > > +++ b/target/ppc/kvm_ppc.h
> > > @@ -9,7 +9,7 @@
> > >  #ifndef KVM_PPC_H
> > >  #define KVM_PPC_H
> > >  
> > > -#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
> > > +#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host")
> > >  
> > >  #ifdef CONFIG_KVM
> > >  
> > > diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
> > > index 4d3e635..8b27962 100644
> > > --- a/target/ppc/cpu-models.c
> > > +++ b/target/ppc/cpu-models.c
> > > @@ -51,7 +51,7 @@
> > >                                                                              \
> > >      static const TypeInfo                                                   \
> > >      glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_type_info) = {         \
> > > -        .name       = _name "-" TYPE_POWERPC_CPU,                           \
> > > +        .name       = POWERPC_CPU_TYPE_NAME(_name),                           \
> > >          .parent     = stringify(_type) "-family-" TYPE_POWERPC_CPU,         \
> > >          .class_init =                                                       \
> > >              glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_class_init),   \
> > > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> > > index 8571379..8590809 100644
> > > --- a/target/ppc/kvm.c
> > > +++ b/target/ppc/kvm.c
> > > @@ -2484,7 +2484,7 @@ static int kvm_ppc_register_host_cpu_type(void)
> > >              char *suffix;
> > >  
> > >              ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));
> > > -            suffix = strstr(ppc_cpu_aliases[i].model, "-"TYPE_POWERPC_CPU);
> > > +            suffix = strstr(ppc_cpu_aliases[i].model, POWERPC_CPU_TYPE_SUFFIX);
> > >              if (suffix) {
> > >                  *suffix = 0;
> > >              }
> > > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > > index 43be9a8..f377cf2 100644
> > > --- a/target/ppc/translate_init.c
> > > +++ b/target/ppc/translate_init.c
> > > @@ -10185,7 +10185,7 @@ static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
> > >      if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
> > >          ppc_cpu_is_valid(pcc) &&
> > >          strcmp(object_class_get_name(oc) + strlen(name),
> > > -               "-" TYPE_POWERPC_CPU) == 0) {
> > > +               POWERPC_CPU_TYPE_SUFFIX) == 0) {
> > >          return 0;
> > >      }
> > >      return -1;
> > > @@ -10327,7 +10327,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
> > >      }
> > >  
> > >      name = g_strndup(typename,
> > > -                     strlen(typename) - strlen("-" TYPE_POWERPC_CPU));
> > > +                     strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));
> > >      (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n",
> > >                        name, pcc->pvr);
> > >      for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> > > @@ -10388,7 +10388,7 @@ static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)
> > >      typename = object_class_get_name(oc);
> > >      info = g_malloc0(sizeof(*info));
> > >      info->name = g_strndup(typename,
> > > -                           strlen(typename) - strlen("-" TYPE_POWERPC_CPU));
> > > +                           strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));
> > >  
> > >      entry = g_malloc0(sizeof(*entry));
> > >      entry->value = info;  
> > 
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent
  2017-08-25 11:40         ` Igor Mammedov
@ 2017-08-25 13:28           ` David Gibson
  2017-08-25 14:34             ` Igor Mammedov
  0 siblings, 1 reply; 31+ messages in thread
From: David Gibson @ 2017-08-25 13:28 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 5017 bytes --]

On Fri, Aug 25, 2017 at 01:40:07PM +0200, Igor Mammedov wrote:
> On Fri, 25 Aug 2017 19:45:38 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Fri, Aug 25, 2017 at 09:27:40AM +0200, Igor Mammedov wrote:
> > > On Fri, 25 Aug 2017 11:38:19 +1000
> > > David Gibson <david@gibson.dropbear.id.au> wrote:
> > >   
> > > > On Thu, Aug 24, 2017 at 10:21:47AM +0200, Igor Mammedov wrote:  
> > > > > PPC handles -cpu FOO rather incosistently,
> > > > > i.e. it does case-insensitive matching of FOO to
> > > > > a CPU type (see: ppc_cpu_compare_class_name) but
> > > > > handles alias names as case-sensitive, as result:
> > > > > 
> > > > >  # qemu-system-ppc64 -M mac99 -cpu g3
> > > > >  qemu-system-ppc64: unable to find CPU model ' kN�U'
> > > > > 
> > > > >  # qemu-system-ppc64 -cpu 970MP_V1.1
> > > > >  qemu-system-ppc64: Unable to find sPAPR CPU Core definition
> > > > > 
> > > > > while
> > > > > 
> > > > >  # qemu-system-ppc64 -M mac99 -cpu G3
> > > > >  # qemu-system-ppc64 -cpu 970MP_v1.1
> > > > > 
> > > > > start up just fine.
> > > > > 
> > > > > Considering we can't take case-insensitive matching away,
> > > > > make it case-insensitive for  all alias/type/core_type
> > > > > lookups.
> > > > > 
> > > > > As side effect it allows to remove duplicate core types
> > > > > which are the same but use lower-case letters in name.
> > > > > 
> > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>    
> > > > 
> > > > Hmm.  So, I'm certainly good with making the matching more consistent,
> > > > and removing extra entries differing only in case.
> > > > 
> > > > However, I don't like capitalizing everything in the model table.  The
> > > > "canonical" capitalization - as in how it appears in manuals and
> > > > marketing info - is quite frequently mixed case.  So I think making
> > > > everything caps in the table will make it harder to read in the
> > > > context of looking at the corresponding documentation.  
> > > only cpu models => typenames are made caps, the rest  
> > 
> > Yes, I know.  A number of the CPU model names themselves have mixed
> > case.  Really.
> > 
> > > incl. description is kept as is in mixed case.
> > > It looks like _desc is the thing one would use for
> > > 1:1 lookup in spec, while _name isn't direct match consistently
> > > (i.e. sometimes it skips spaces and sometimes spaces are replaced by underscore).
> > > So keeping _name in mixed case unnecessarily complicates name->type lookup.
> > > 
> > > These mixed case + case-insensitive is what made lookup
> > > code over-engineered and overly complex.  
> > 
> > I'm fine with making all the lookups case insensitive.  I just don't
> > want to drop the case on the names in the actual code.
> I've tried to find a way but considering that names are statically
> 'converted' into typenames and lack of ability to magically
> uppercase them with preprocessor, I've gave up on this approach.

Ok.

> Providing that there is _desc with model name that should be
> greppable in spec and complexity of lookup code that mixed-cased
> typenames incur, I've opted in favor of simplifying lookup
> code at expense uniform typenames (which is inter QEMU thingy).
> It is easier to maintain and less chances to make mistake.

Yeah, I guess.  It just looks weird to have non-standard capsing in
the table field.

Any chance we could standardize on lowercase rather than upper - for
some reason that would seem less odd to me (I guess because C-ish
names and identifiers are usually lowercased).

> Other targets use exact match for cpu_model so whether
> they use mixed casing or not doesn't matter.
> 
> > > As result it evolved (regressed) to inconsistent name handling
> > > since it's rather hard to understand what's going on there.  
> > 
> > Yeah, I know :/.
> > 
> > > > Can we instead retain mixed case in the table, and capitalize both
> > > > sides at the comparison time?  
> > > it has to be the same-case since PPC has case-insensitive cpu_model
> > > matching (sometimes :/). Normalized /same case/ typenames
> > > are necessary for object_class_by_name() to work as it does exact match.
> > > So it would be possible to replace custom fetching of CPU types
> > > and iterating over it with custom comparator with object_class_by_name().
> > > As it's done in 4/6.
> > > This patch and 3/6 are only preparatory patches for 4/6.  
> > 
> > Ah.  Hrm.  That's awkward.
> It's fine to squash all 3 in 1 patch, but then it becomes huge and
> unreview-able, as logic changes are buried within names normalization.

Sorry, I meant it's awkward that that object_class_by_name() uses exact
and so we'd need a custom iterator to do a case insensitive search.
The patch structure is fine.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent
  2017-08-25 13:28           ` David Gibson
@ 2017-08-25 14:34             ` Igor Mammedov
  2017-08-29  7:26               ` David Gibson
  0 siblings, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-25 14:34 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-devel, Alexander Graf, qemu-ppc

On Fri, 25 Aug 2017 23:28:00 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Fri, Aug 25, 2017 at 01:40:07PM +0200, Igor Mammedov wrote:
> > On Fri, 25 Aug 2017 19:45:38 +1000
> > David Gibson <david@gibson.dropbear.id.au> wrote:
> >   
> > > On Fri, Aug 25, 2017 at 09:27:40AM +0200, Igor Mammedov wrote:  
> > > > On Fri, 25 Aug 2017 11:38:19 +1000
> > > > David Gibson <david@gibson.dropbear.id.au> wrote:
> > > >     
> > > > > On Thu, Aug 24, 2017 at 10:21:47AM +0200, Igor Mammedov wrote:    
> > > > > > PPC handles -cpu FOO rather incosistently,
> > > > > > i.e. it does case-insensitive matching of FOO to
> > > > > > a CPU type (see: ppc_cpu_compare_class_name) but
> > > > > > handles alias names as case-sensitive, as result:
> > > > > > 
> > > > > >  # qemu-system-ppc64 -M mac99 -cpu g3
> > > > > >  qemu-system-ppc64: unable to find CPU model ' kN�U'
> > > > > > 
> > > > > >  # qemu-system-ppc64 -cpu 970MP_V1.1
> > > > > >  qemu-system-ppc64: Unable to find sPAPR CPU Core definition
> > > > > > 
> > > > > > while
> > > > > > 
> > > > > >  # qemu-system-ppc64 -M mac99 -cpu G3
> > > > > >  # qemu-system-ppc64 -cpu 970MP_v1.1
> > > > > > 
> > > > > > start up just fine.
> > > > > > 
> > > > > > Considering we can't take case-insensitive matching away,
> > > > > > make it case-insensitive for  all alias/type/core_type
> > > > > > lookups.
> > > > > > 
> > > > > > As side effect it allows to remove duplicate core types
> > > > > > which are the same but use lower-case letters in name.
> > > > > > 
> > > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>      
> > > > > 
> > > > > Hmm.  So, I'm certainly good with making the matching more consistent,
> > > > > and removing extra entries differing only in case.
> > > > > 
> > > > > However, I don't like capitalizing everything in the model table.  The
> > > > > "canonical" capitalization - as in how it appears in manuals and
> > > > > marketing info - is quite frequently mixed case.  So I think making
> > > > > everything caps in the table will make it harder to read in the
> > > > > context of looking at the corresponding documentation.    
> > > > only cpu models => typenames are made caps, the rest    
> > > 
> > > Yes, I know.  A number of the CPU model names themselves have mixed
> > > case.  Really.
> > >   
> > > > incl. description is kept as is in mixed case.
> > > > It looks like _desc is the thing one would use for
> > > > 1:1 lookup in spec, while _name isn't direct match consistently
> > > > (i.e. sometimes it skips spaces and sometimes spaces are replaced by underscore).
> > > > So keeping _name in mixed case unnecessarily complicates name->type lookup.
> > > > 
> > > > These mixed case + case-insensitive is what made lookup
> > > > code over-engineered and overly complex.    
> > > 
> > > I'm fine with making all the lookups case insensitive.  I just don't
> > > want to drop the case on the names in the actual code.  
> > I've tried to find a way but considering that names are statically
> > 'converted' into typenames and lack of ability to magically
> > uppercase them with preprocessor, I've gave up on this approach.  
> 
> Ok.
> 
> > Providing that there is _desc with model name that should be
> > greppable in spec and complexity of lookup code that mixed-cased
> > typenames incur, I've opted in favor of simplifying lookup
> > code at expense uniform typenames (which is inter QEMU thingy).
> > It is easier to maintain and less chances to make mistake.  
> 
> Yeah, I guess.  It just looks weird to have non-standard capsing in
> the table field.
> 
> Any chance we could standardize on lowercase rather than upper - for
> some reason that would seem less odd to me (I guess because C-ish
> names and identifiers are usually lowercased).
The only reason I've picked up uppercase is that diffstat is smaller
then with lowercase.
So if you prefer lowercase, I'll switch case in v2.
 
[...]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent
  2017-08-25 14:34             ` Igor Mammedov
@ 2017-08-29  7:26               ` David Gibson
  0 siblings, 0 replies; 31+ messages in thread
From: David Gibson @ 2017-08-29  7:26 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 4461 bytes --]

On Fri, Aug 25, 2017 at 04:34:26PM +0200, Igor Mammedov wrote:
> On Fri, 25 Aug 2017 23:28:00 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Fri, Aug 25, 2017 at 01:40:07PM +0200, Igor Mammedov wrote:
> > > On Fri, 25 Aug 2017 19:45:38 +1000
> > > David Gibson <david@gibson.dropbear.id.au> wrote:
> > >   
> > > > On Fri, Aug 25, 2017 at 09:27:40AM +0200, Igor Mammedov wrote:  
> > > > > On Fri, 25 Aug 2017 11:38:19 +1000
> > > > > David Gibson <david@gibson.dropbear.id.au> wrote:
> > > > >     
> > > > > > On Thu, Aug 24, 2017 at 10:21:47AM +0200, Igor Mammedov wrote:    
> > > > > > > PPC handles -cpu FOO rather incosistently,
> > > > > > > i.e. it does case-insensitive matching of FOO to
> > > > > > > a CPU type (see: ppc_cpu_compare_class_name) but
> > > > > > > handles alias names as case-sensitive, as result:
> > > > > > > 
> > > > > > >  # qemu-system-ppc64 -M mac99 -cpu g3
> > > > > > >  qemu-system-ppc64: unable to find CPU model ' kN�U'
> > > > > > > 
> > > > > > >  # qemu-system-ppc64 -cpu 970MP_V1.1
> > > > > > >  qemu-system-ppc64: Unable to find sPAPR CPU Core definition
> > > > > > > 
> > > > > > > while
> > > > > > > 
> > > > > > >  # qemu-system-ppc64 -M mac99 -cpu G3
> > > > > > >  # qemu-system-ppc64 -cpu 970MP_v1.1
> > > > > > > 
> > > > > > > start up just fine.
> > > > > > > 
> > > > > > > Considering we can't take case-insensitive matching away,
> > > > > > > make it case-insensitive for  all alias/type/core_type
> > > > > > > lookups.
> > > > > > > 
> > > > > > > As side effect it allows to remove duplicate core types
> > > > > > > which are the same but use lower-case letters in name.
> > > > > > > 
> > > > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>      
> > > > > > 
> > > > > > Hmm.  So, I'm certainly good with making the matching more consistent,
> > > > > > and removing extra entries differing only in case.
> > > > > > 
> > > > > > However, I don't like capitalizing everything in the model table.  The
> > > > > > "canonical" capitalization - as in how it appears in manuals and
> > > > > > marketing info - is quite frequently mixed case.  So I think making
> > > > > > everything caps in the table will make it harder to read in the
> > > > > > context of looking at the corresponding documentation.    
> > > > > only cpu models => typenames are made caps, the rest    
> > > > 
> > > > Yes, I know.  A number of the CPU model names themselves have mixed
> > > > case.  Really.
> > > >   
> > > > > incl. description is kept as is in mixed case.
> > > > > It looks like _desc is the thing one would use for
> > > > > 1:1 lookup in spec, while _name isn't direct match consistently
> > > > > (i.e. sometimes it skips spaces and sometimes spaces are replaced by underscore).
> > > > > So keeping _name in mixed case unnecessarily complicates name->type lookup.
> > > > > 
> > > > > These mixed case + case-insensitive is what made lookup
> > > > > code over-engineered and overly complex.    
> > > > 
> > > > I'm fine with making all the lookups case insensitive.  I just don't
> > > > want to drop the case on the names in the actual code.  
> > > I've tried to find a way but considering that names are statically
> > > 'converted' into typenames and lack of ability to magically
> > > uppercase them with preprocessor, I've gave up on this approach.  
> > 
> > Ok.
> > 
> > > Providing that there is _desc with model name that should be
> > > greppable in spec and complexity of lookup code that mixed-cased
> > > typenames incur, I've opted in favor of simplifying lookup
> > > code at expense uniform typenames (which is inter QEMU thingy).
> > > It is easier to maintain and less chances to make mistake.  
> > 
> > Yeah, I guess.  It just looks weird to have non-standard capsing in
> > the table field.
> > 
> > Any chance we could standardize on lowercase rather than upper - for
> > some reason that would seem less odd to me (I guess because C-ish
> > names and identifiers are usually lowercased).
> The only reason I've picked up uppercase is that diffstat is smaller
> then with lowercase.
> So if you prefer lowercase, I'll switch case in v2.

Please do, thanks.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 6/6] ppc: drop caching ObjectClass from PowerPCCPUAlias
  2017-08-25  7:49     ` Igor Mammedov
@ 2017-08-29  7:30       ` David Gibson
  0 siblings, 0 replies; 31+ messages in thread
From: David Gibson @ 2017-08-29  7:30 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, Alexander Graf, qemu-ppc

[-- Attachment #1: Type: text/plain, Size: 2834 bytes --]

On Fri, Aug 25, 2017 at 09:49:48AM +0200, Igor Mammedov wrote:
> On Fri, 25 Aug 2017 14:22:03 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Thu, Aug 24, 2017 at 10:21:51AM +0200, Igor Mammedov wrote:
> > > Caching there practically doesn't give any benefits
> > > and that at slow path druring querying supported CPU list.
> > > But it introduces non conventional path of where from
> > > comes used CPU type name (kvm_ppc_register_host_cpu_type).
> > > 
> > > Taking in account that kvm_ppc_register_host_cpu_type()
> > > fixes up models the aliases point to, it's sufficient to
> > > make ppc_cpu_class_by_name() translate cpu alias to
> > > correct cpu type name.
> > > So drop PowerPCCPUAlias::oc field + ppc_cpu_class_by_alias()
> > > and let ppc_cpu_class_by_name() do conversion to cpu type name,
> > > which simplifies code a little bit saving ~20LOC and trouble
> > > wondering why ppc_cpu_class_by_alias() is necessary.
> > > 
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> > 
> > Unfortunately, this will break things.  This isn't purely a cache, in
> > the case handled by kvm_ppc_register_host_cpu_type(), 'oc' is *not*
> > redundant with the name.  The name is based on the specific CPU
> > description, but the oc points to the information for the "host" cpu.
> > 
> > There may well be a better way to do this, but this isn't it.
> > 
> > The problem we're trying to solve here is that KVM HV basically only
> > works with -cpu host.  But for the benefit of libvirt (and others), we
> > want, say, -cpu POWER8 to also work if the host *is* a POWER8.  But we
> > *don't* want to require that the host be exactly the same model of
> > POWER8 as "POWER8" would be aliased to with TCG.
> 
> here is snippet from kvm_ppc_register_host_cpu_type()
> 
> 1:
>             ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));      
>             suffix = strstr(ppc_cpu_aliases[i].model, "-"TYPE_POWERPC_CPU);      
>             if (suffix) {                                                        
>                 *suffix = 0;                                                     
>             }
> 2:                                                        
>             ppc_cpu_aliases[i].oc = oc;
> 
> where model is fixed up (1) to the name that corresponds to
> exactly the same 'oc' that is cached into (2)
> 
> any follow up attempt to translate fixed up alias will end up resolving
> it into model => the same 'oc' that would be cached in ppc_cpu_aliases[i].oc
> 
> isn't it?


You're right, I misread the code, sorry.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups
  2017-08-25  7:34     ` Igor Mammedov
@ 2017-08-30  3:05       ` David Gibson
  2017-08-30  6:16         ` Igor Mammedov
  0 siblings, 1 reply; 31+ messages in thread
From: David Gibson @ 2017-08-30  3:05 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-ppc, qemu-devel, Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 4591 bytes --]

On Fri, Aug 25, 2017 at 09:34:32AM +0200, Igor Mammedov wrote:
> On Fri, 25 Aug 2017 14:12:08 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Thu, Aug 24, 2017 at 10:21:49AM +0200, Igor Mammedov wrote:
> > > previous patches cleaned up cpu model/alias naming which
> > > allows to simplify cpu model/alias to cpu type lookup a bit
> > > byt removing recurssion and dependency of ppc_cpu_class_by_name() /
> > > ppc_cpu_class_by_alias() on each other.
> > > Besides of simplifying code it reduces it by ~15LOC.
> > > 
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> > 
> > Urm.. I think this is probably good.  But I'm having a little trouble
> > convincing myself this really has the same effect as before.
> It's hard to wrap brain around current cyclic recursion and
> how to 2 simple linear lookups could replace it.

I noticed :)

> By itself this patch won't work, it depends on 2-3/6 for
> normalized cpu type names and recursion-less alias table.
> 
> The only change in behavior here is that it does alias
> translation first and only then cpu_model to type translation.

I've had a closer look and convinced myself of that now.

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

I'm sorry, I've lost track of these patches a bit, since I wasn't
originally expecting to queue them.  I can't actually remember if
there were any comments needing a respin.

Regardless, can you resend the series (including my R-bs) and I'll
queue it for 2.11.

> 
> > 
> > > ---
> > >  target/ppc/translate_init.c | 43 +++++++++++++------------------------------
> > >  1 file changed, 13 insertions(+), 30 deletions(-)
> > > 
> > > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > > index 0325226..f1a559d 100644
> > > --- a/target/ppc/translate_init.c
> > > +++ b/target/ppc/translate_init.c
> > > @@ -10176,22 +10176,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
> > >      return pcc;
> > >  }
> > >  
> > > -static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
> > > -{
> > > -    ObjectClass *oc = (ObjectClass *)a;
> > > -    const char *name = b;
> > > -    PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> > > -
> > > -    if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
> > > -        ppc_cpu_is_valid(pcc) &&
> > > -        strcmp(object_class_get_name(oc) + strlen(name),
> > > -               POWERPC_CPU_TYPE_SUFFIX) == 0) {
> > > -        return 0;
> > > -    }
> > > -    return -1;
> > > -}
> > > -
> > > -
> > >  static ObjectClass *ppc_cpu_class_by_name(const char *name);
> > >  
> > >  static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> > > @@ -10216,8 +10200,8 @@ static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> > >  
> > >  static ObjectClass *ppc_cpu_class_by_name(const char *name)
> > >  {
> > > -    GSList *list, *item;
> > > -    ObjectClass *ret = NULL;
> > > +    char *cpu_model, *typename;
> > > +    ObjectClass *oc;
> > >      const char *p;
> > >      int i, len;
> > >  
> > > @@ -10238,21 +10222,20 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> > >          }
> > >      }
> > >  
> > > -    list = object_class_get_list(TYPE_POWERPC_CPU, false);
> > > -    item = g_slist_find_custom(list, name, ppc_cpu_compare_class_name);
> > > -    if (item != NULL) {
> > > -        ret = OBJECT_CLASS(item->data);
> > > +    cpu_model = g_ascii_strup(name, -1);
> > > +    p = ppc_cpu_lookup_alias(cpu_model);
> > > +    if (p) {
> > > +        g_free(cpu_model);
> > > +        cpu_model = g_strdup(p);
> > >      }
> > > -    g_slist_free(list);
> > >  
> > > -    if (ret) {
> > > -        return ret;
> > > -    }
> > > +    typename = g_strdup_printf("%s" POWERPC_CPU_TYPE_SUFFIX, cpu_model);
> > > +    oc = object_class_by_name(typename);
> > > +    g_free(typename);
> > > +    g_free(cpu_model);
> > >  
> > > -    for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> > > -        if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {
> > > -            return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);
> > > -        }
> > > +    if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) {
> > > +        return oc;
> > >      }
> > >  
> > >      return NULL;  
> > 
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups
  2017-08-30  3:05       ` David Gibson
@ 2017-08-30  6:16         ` Igor Mammedov
  0 siblings, 0 replies; 31+ messages in thread
From: Igor Mammedov @ 2017-08-30  6:16 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-ppc, qemu-devel, Alexander Graf

On Wed, 30 Aug 2017 13:05:01 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Fri, Aug 25, 2017 at 09:34:32AM +0200, Igor Mammedov wrote:
> > On Fri, 25 Aug 2017 14:12:08 +1000
> > David Gibson <david@gibson.dropbear.id.au> wrote:
> >   
> > > On Thu, Aug 24, 2017 at 10:21:49AM +0200, Igor Mammedov wrote:  
> > > > previous patches cleaned up cpu model/alias naming which
> > > > allows to simplify cpu model/alias to cpu type lookup a bit
> > > > byt removing recurssion and dependency of ppc_cpu_class_by_name() /
> > > > ppc_cpu_class_by_alias() on each other.
> > > > Besides of simplifying code it reduces it by ~15LOC.
> > > > 
> > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>    
> > > 
> > > Urm.. I think this is probably good.  But I'm having a little trouble
> > > convincing myself this really has the same effect as before.  
> > It's hard to wrap brain around current cyclic recursion and
> > how to 2 simple linear lookups could replace it.  
> 
> I noticed :)
> 
> > By itself this patch won't work, it depends on 2-3/6 for
> > normalized cpu type names and recursion-less alias table.
> > 
> > The only change in behavior here is that it does alias
> > translation first and only then cpu_model to type translation.  
> 
> I've had a closer look and convinced myself of that now.
> 
> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> 
> I'm sorry, I've lost track of these patches a bit, since I wasn't
> originally expecting to queue them.  I can't actually remember if
> there were any comments needing a respin.
> 
> Regardless, can you resend the series (including my R-bs) and I'll
> queue it for 2.11.
sure, I'll do it today

> 
> >   
> > >   
> > > > ---
> > > >  target/ppc/translate_init.c | 43 +++++++++++++------------------------------
> > > >  1 file changed, 13 insertions(+), 30 deletions(-)
> > > > 
> > > > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > > > index 0325226..f1a559d 100644
> > > > --- a/target/ppc/translate_init.c
> > > > +++ b/target/ppc/translate_init.c
> > > > @@ -10176,22 +10176,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
> > > >      return pcc;
> > > >  }
> > > >  
> > > > -static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
> > > > -{
> > > > -    ObjectClass *oc = (ObjectClass *)a;
> > > > -    const char *name = b;
> > > > -    PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> > > > -
> > > > -    if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
> > > > -        ppc_cpu_is_valid(pcc) &&
> > > > -        strcmp(object_class_get_name(oc) + strlen(name),
> > > > -               POWERPC_CPU_TYPE_SUFFIX) == 0) {
> > > > -        return 0;
> > > > -    }
> > > > -    return -1;
> > > > -}
> > > > -
> > > > -
> > > >  static ObjectClass *ppc_cpu_class_by_name(const char *name);
> > > >  
> > > >  static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> > > > @@ -10216,8 +10200,8 @@ static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
> > > >  
> > > >  static ObjectClass *ppc_cpu_class_by_name(const char *name)
> > > >  {
> > > > -    GSList *list, *item;
> > > > -    ObjectClass *ret = NULL;
> > > > +    char *cpu_model, *typename;
> > > > +    ObjectClass *oc;
> > > >      const char *p;
> > > >      int i, len;
> > > >  
> > > > @@ -10238,21 +10222,20 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> > > >          }
> > > >      }
> > > >  
> > > > -    list = object_class_get_list(TYPE_POWERPC_CPU, false);
> > > > -    item = g_slist_find_custom(list, name, ppc_cpu_compare_class_name);
> > > > -    if (item != NULL) {
> > > > -        ret = OBJECT_CLASS(item->data);
> > > > +    cpu_model = g_ascii_strup(name, -1);
> > > > +    p = ppc_cpu_lookup_alias(cpu_model);
> > > > +    if (p) {
> > > > +        g_free(cpu_model);
> > > > +        cpu_model = g_strdup(p);
> > > >      }
> > > > -    g_slist_free(list);
> > > >  
> > > > -    if (ret) {
> > > > -        return ret;
> > > > -    }
> > > > +    typename = g_strdup_printf("%s" POWERPC_CPU_TYPE_SUFFIX, cpu_model);
> > > > +    oc = object_class_by_name(typename);
> > > > +    g_free(typename);
> > > > +    g_free(cpu_model);
> > > >  
> > > > -    for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {
> > > > -        if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {
> > > > -            return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);
> > > > -        }
> > > > +    if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) {
> > > > +        return oc;
> > > >      }
> > > >  
> > > >      return NULL;    
> > >   
> >   
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR
  2017-08-25  9:32       ` David Gibson
  2017-08-25 11:41         ` Igor Mammedov
@ 2017-08-30 10:50         ` Igor Mammedov
  2017-08-31  5:54           ` David Gibson
  1 sibling, 1 reply; 31+ messages in thread
From: Igor Mammedov @ 2017-08-30 10:50 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-ppc, qemu-devel, Alexander Graf

On Fri, 25 Aug 2017 19:32:29 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Fri, Aug 25, 2017 at 09:40:37AM +0200, Igor Mammedov wrote:
> > On Fri, 25 Aug 2017 14:16:44 +1000
> > David Gibson <david@gibson.dropbear.id.au> wrote:
> >   
> > > On Thu, Aug 24, 2017 at 10:21:50AM +0200, Igor Mammedov wrote:  
> > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > ---
> > > >  target/ppc/translate_init.c | 27 +++++++++++----------------
> > > >  1 file changed, 11 insertions(+), 16 deletions(-)
> > > > 
> > > > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > > > index f1a559d..ca9f1e3 100644
> > > > --- a/target/ppc/translate_init.c
> > > > +++ b/target/ppc/translate_init.c
> > > > @@ -34,6 +34,7 @@
> > > >  #include "hw/ppc/ppc.h"
> > > >  #include "mmu-book3s-v3.h"
> > > >  #include "sysemu/qtest.h"
> > > > +#include "qemu/cutils.h"
> > > >  
> > > >  //#define PPC_DUMP_CPU
> > > >  //#define PPC_DEBUG_SPR
> > > > @@ -10203,22 +10204,16 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> > > >      char *cpu_model, *typename;
> > > >      ObjectClass *oc;
> > > >      const char *p;
> > > > -    int i, len;
> > > > -
> > > > -    /* Check if the given name is a PVR */
> > > > -    len = strlen(name);
> > > > -    if (len == 10 && name[0] == '0' && name[1] == 'x') {
> > > > -        p = name + 2;
> > > > -        goto check_pvr;
> > > > -    } else if (len == 8) {
> > > > -        p = name;
> > > > -    check_pvr:
> > > > -        for (i = 0; i < 8; i++) {
> > > > -            if (!qemu_isxdigit(*p++))
> > > > -                break;
> > > > -        }
> > > > -        if (i == 8) {
> > > > -            return OBJECT_CLASS(ppc_cpu_class_by_pvr(strtoul(name, NULL, 16)));
> > > > +    unsigned long pvr;
> > > > +
> > > > +    /* Lookup by PVR if cpu_model is valid 8 digit hex number
> > > > +     * (excl: 0x prefix if present)
> > > > +     */
> > > > +    if (!qemu_strtoul(name, &p, 16, &pvr)) {
> > > > +        int len = p - name;
> > > > +        len = (len == 10) && (name[1] == 'x') ? len - 2 : len;
> > > > +        if (len == 8) {
> > > > +            return OBJECT_CLASS(ppc_cpu_class_by_pvr(pvr));    
> > > 
> > > This doesn't look quite right.  A hex string of a PVR followed by
> > > other stuff isn't a valid option, so if p (endptr) doesn't point to
> > > the end of the string, then we shouldn't be using this path  
> > yep, my mistake, I've lost somewhere *p == '\0' check when cleaning up the patch  
> 
> Ok.
> 
> > >(from the
> > > looks of qemu_strtoul() we can simply omit the endptr parameter to get
> > > that behaviour).  I'm not sure what the messing around with len is
> > > for, either.  If it's a valid hex string we can try this, I don't see
> > > that we need further checks.  
> > I've tried to keep current limitation here i.e. 8 hex symbols,
> > but if any hex number is fine then doing
> >  qemu_strtoul(name, NULL, 16, &pvr)
> > is even better, so would you prefer to drop 8 symbol check altogether?  
> 
> Yeah, I don't see any value to the 8 character check.
there are cpu models consisting of pure numbers => valid hex number
so if check is dropped then it lookup will go PVR route,
that will fail there.
So check should be there to avoid regression.

I'll fix whole string consumption check that I've missed before
and respin with it.

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR
  2017-08-30 10:50         ` Igor Mammedov
@ 2017-08-31  5:54           ` David Gibson
  0 siblings, 0 replies; 31+ messages in thread
From: David Gibson @ 2017-08-31  5:54 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-ppc, qemu-devel, Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 3903 bytes --]

On Wed, Aug 30, 2017 at 12:50:33PM +0200, Igor Mammedov wrote:
> On Fri, 25 Aug 2017 19:32:29 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Fri, Aug 25, 2017 at 09:40:37AM +0200, Igor Mammedov wrote:
> > > On Fri, 25 Aug 2017 14:16:44 +1000
> > > David Gibson <david@gibson.dropbear.id.au> wrote:
> > >   
> > > > On Thu, Aug 24, 2017 at 10:21:50AM +0200, Igor Mammedov wrote:  
> > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > > ---
> > > > >  target/ppc/translate_init.c | 27 +++++++++++----------------
> > > > >  1 file changed, 11 insertions(+), 16 deletions(-)
> > > > > 
> > > > > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
> > > > > index f1a559d..ca9f1e3 100644
> > > > > --- a/target/ppc/translate_init.c
> > > > > +++ b/target/ppc/translate_init.c
> > > > > @@ -34,6 +34,7 @@
> > > > >  #include "hw/ppc/ppc.h"
> > > > >  #include "mmu-book3s-v3.h"
> > > > >  #include "sysemu/qtest.h"
> > > > > +#include "qemu/cutils.h"
> > > > >  
> > > > >  //#define PPC_DUMP_CPU
> > > > >  //#define PPC_DEBUG_SPR
> > > > > @@ -10203,22 +10204,16 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
> > > > >      char *cpu_model, *typename;
> > > > >      ObjectClass *oc;
> > > > >      const char *p;
> > > > > -    int i, len;
> > > > > -
> > > > > -    /* Check if the given name is a PVR */
> > > > > -    len = strlen(name);
> > > > > -    if (len == 10 && name[0] == '0' && name[1] == 'x') {
> > > > > -        p = name + 2;
> > > > > -        goto check_pvr;
> > > > > -    } else if (len == 8) {
> > > > > -        p = name;
> > > > > -    check_pvr:
> > > > > -        for (i = 0; i < 8; i++) {
> > > > > -            if (!qemu_isxdigit(*p++))
> > > > > -                break;
> > > > > -        }
> > > > > -        if (i == 8) {
> > > > > -            return OBJECT_CLASS(ppc_cpu_class_by_pvr(strtoul(name, NULL, 16)));
> > > > > +    unsigned long pvr;
> > > > > +
> > > > > +    /* Lookup by PVR if cpu_model is valid 8 digit hex number
> > > > > +     * (excl: 0x prefix if present)
> > > > > +     */
> > > > > +    if (!qemu_strtoul(name, &p, 16, &pvr)) {
> > > > > +        int len = p - name;
> > > > > +        len = (len == 10) && (name[1] == 'x') ? len - 2 : len;
> > > > > +        if (len == 8) {
> > > > > +            return OBJECT_CLASS(ppc_cpu_class_by_pvr(pvr));    
> > > > 
> > > > This doesn't look quite right.  A hex string of a PVR followed by
> > > > other stuff isn't a valid option, so if p (endptr) doesn't point to
> > > > the end of the string, then we shouldn't be using this path  
> > > yep, my mistake, I've lost somewhere *p == '\0' check when cleaning up the patch  
> > 
> > Ok.
> > 
> > > >(from the
> > > > looks of qemu_strtoul() we can simply omit the endptr parameter to get
> > > > that behaviour).  I'm not sure what the messing around with len is
> > > > for, either.  If it's a valid hex string we can try this, I don't see
> > > > that we need further checks.  
> > > I've tried to keep current limitation here i.e. 8 hex symbols,
> > > but if any hex number is fine then doing
> > >  qemu_strtoul(name, NULL, 16, &pvr)
> > > is even better, so would you prefer to drop 8 symbol check altogether?  
> > 
> > Yeah, I don't see any value to the 8 character check.
> there are cpu models consisting of pure numbers => valid hex number
> so if check is dropped then it lookup will go PVR route,
> that will fail there.
> So check should be there to avoid regression.

Ah.  Good point.

> I'll fix whole string consumption check that I've missed before
> and respin with it.
> 
> 
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2017-08-31  5:58 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-24  8:21 [Qemu-devel] [PATCH for-2.11 0/6] ppc: cpu_model handling cleanups Igor Mammedov
2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 1/6] ppc: use macros to make cpu type name from string literal Igor Mammedov
2017-08-25  1:30   ` David Gibson
2017-08-25  7:28     ` Igor Mammedov
2017-08-25 13:24       ` David Gibson
2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 2/6] ppc: make cpu_model translation to type consistent Igor Mammedov
2017-08-25  1:38   ` David Gibson
2017-08-25  7:27     ` Igor Mammedov
2017-08-25  9:45       ` David Gibson
2017-08-25 11:40         ` Igor Mammedov
2017-08-25 13:28           ` David Gibson
2017-08-25 14:34             ` Igor Mammedov
2017-08-29  7:26               ` David Gibson
2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 3/6] ppc: make cpu alias point only to real cpu models Igor Mammedov
2017-08-25  1:40   ` David Gibson
2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 4/6] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups Igor Mammedov
2017-08-25  4:12   ` David Gibson
2017-08-25  7:34     ` Igor Mammedov
2017-08-30  3:05       ` David Gibson
2017-08-30  6:16         ` Igor Mammedov
2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 5/6] ppc: simplify cpu model lookup by PVR Igor Mammedov
2017-08-25  4:16   ` David Gibson
2017-08-25  7:40     ` Igor Mammedov
2017-08-25  9:32       ` David Gibson
2017-08-25 11:41         ` Igor Mammedov
2017-08-30 10:50         ` Igor Mammedov
2017-08-31  5:54           ` David Gibson
2017-08-24  8:21 ` [Qemu-devel] [PATCH for-2.11 6/6] ppc: drop caching ObjectClass from PowerPCCPUAlias Igor Mammedov
2017-08-25  4:22   ` David Gibson
2017-08-25  7:49     ` Igor Mammedov
2017-08-29  7:30       ` David Gibson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.