mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-ppc: Make ppc40x CPUs available in ppcemb

Browse Source 
Not only 44x CPUs (BookE) but also 40x CPUs can run with 1k page size.

Move the criteria to a central inline function to avoid repetition
and #ifdef'fery. Update qom-test to no longer exempt them.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2014-01-23 17:47:44 +01:00
parent aaab89a68e
commit 292363e15c
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
target-ppc/translate_init.c
View File

@ -7960,6 +7960,17 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu)
return 0; return 0;
} }
static inline bool ppc_cpu_is_valid(PowerPCCPUClass *pcc)
{
#ifdef TARGET_PPCEMB
return pcc->mmu_model == POWERPC_MMU_BOOKE ||
pcc->mmu_model == POWERPC_MMU_SOFT_4xx ||
pcc->mmu_model == POWERPC_MMU_SOFT_4xx_Z;
#else
return true;
#endif
}
static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
{ {
CPUState *cs = CPU(dev); CPUState *cs = CPU(dev);
@ -7991,8 +8002,8 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
} }
#if defined(TARGET_PPCEMB) #if defined(TARGET_PPCEMB)
if (pcc->mmu_model != POWERPC_MMU_BOOKE) { if (!ppc_cpu_is_valid(pcc)) {
error_setg(errp, "CPU does not possess a BookE MMU. " error_setg(errp, "CPU does not possess a BookE or 4xx MMU. "
"Please use qemu-system-ppc or qemu-system-ppc64 instead " "Please use qemu-system-ppc or qemu-system-ppc64 instead "
"or choose another CPU model."); "or choose another CPU model.");
return; return;
@ -8209,11 +8220,9 @@ static gint ppc_cpu_compare_class_pvr(gconstpointer a, gconstpointer b)
return -1; return -1;
} }
#if defined(TARGET_PPCEMB) if (!ppc_cpu_is_valid(pcc)) {
if (pcc->mmu_model != POWERPC_MMU_BOOKE) {
return -1; return -1;
} }
#endif
return pcc->pvr == pvr ? 0 : -1; return pcc->pvr == pvr ? 0 : -1;
} }
@ -8246,11 +8255,10 @@ static gint ppc_cpu_compare_class_pvr_mask(gconstpointer a, gconstpointer b)
return -1; return -1;
} }
#if defined(TARGET_PPCEMB) if (!ppc_cpu_is_valid(pcc)) {
if (pcc->mmu_model != POWERPC_MMU_BOOKE) {
return -1; return -1;
} }
#endif
ret = (((pcc->pvr & pcc->pvr_mask) == (pvr & pcc->pvr_mask)) ? 0 : -1); ret = (((pcc->pvr & pcc->pvr_mask) == (pvr & pcc->pvr_mask)) ? 0 : -1);
return ret; return ret;
@ -8275,14 +8283,10 @@ static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
{ {
ObjectClass *oc = (ObjectClass *)a; ObjectClass *oc = (ObjectClass *)a;
const char *name = b; const char *name = b;
#if defined(TARGET_PPCEMB)
PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
#endif
if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 && if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
#if defined(TARGET_PPCEMB) ppc_cpu_is_valid(pcc) &&
pcc->mmu_model == POWERPC_MMU_BOOKE &&
#endif
strcmp(object_class_get_name(oc) + strlen(name), strcmp(object_class_get_name(oc) + strlen(name),
"-" TYPE_POWERPC_CPU) == 0) { "-" TYPE_POWERPC_CPU) == 0) {
return 0; return 0;
@ -8414,11 +8418,9 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
char *name; char *name;
int i; int i;
#if defined(TARGET_PPCEMB) if (!ppc_cpu_is_valid(pcc)) {
if (pcc->mmu_model != POWERPC_MMU_BOOKE) {
return; return;
} }
#endif
if (unlikely(strcmp(typename, TYPE_HOST_POWERPC_CPU) == 0)) { if (unlikely(strcmp(typename, TYPE_HOST_POWERPC_CPU) == 0)) {
return; return;
} }
@ -8466,13 +8468,11 @@ static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)
const char *typename; const char *typename;
CpuDefinitionInfoList *entry; CpuDefinitionInfoList *entry;
CpuDefinitionInfo *info; CpuDefinitionInfo *info;
#if defined(TARGET_PPCEMB)
PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
if (pcc->mmu_model != POWERPC_MMU_BOOKE) { if (!ppc_cpu_is_valid(pcc)) {
return; return;
} }
#endif
typename = object_class_get_name(oc); typename = object_class_get_name(oc);
info = g_malloc0(sizeof(*info)); info = g_malloc0(sizeof(*info));

3
tests/qom-test.c
View File

@ -221,10 +221,7 @@ int main(int argc, char **argv)
} else if (strcmp(arch, "or32") == 0) { } else if (strcmp(arch, "or32") == 0) {
ADD_MACHINE_TESTS(arch, openrisc_machines); ADD_MACHINE_TESTS(arch, openrisc_machines);
} else if (strcmp(arch, "ppcemb") == 0) { } else if (strcmp(arch, "ppcemb") == 0) {
#if 0
/* XXX Available in ppcemb but don't work */
ADD_MACHINE_TESTS(arch, ppc405_machines); ADD_MACHINE_TESTS(arch, ppc405_machines);
#endif
ADD_MACHINE_TESTS(arch, ppc440_machines); ADD_MACHINE_TESTS(arch, ppc440_machines);
} else if (strcmp(arch, "ppc") == 0) { } else if (strcmp(arch, "ppc") == 0) {
ADD_MACHINE_TESTS(arch, ppc405_machines); ADD_MACHINE_TESTS(arch, ppc405_machines);