From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCvjH-0004jj-OJ for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCvj9-0005ox-M8 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:15 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 10 Feb 2014 19:36:21 +0100 Message-Id: <1392057426-31990-5-git-send-email-afaerber@suse.de> In-Reply-To: <1392057426-31990-1-git-send-email-afaerber@suse.de> References: <1392057426-31990-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 04/48] target-ppc: Make ppc40x CPUs available in ppcemb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "open list:PowerPC" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf 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=C3=A4rber --- target-ppc/translate_init.c | 38 +++++++++++++++++++------------------- tests/qom-test.c | 3 --- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index c030a20..445c360 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7960,6 +7960,17 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu) return 0; } =20 +static inline bool ppc_cpu_is_valid(PowerPCCPUClass *pcc) +{ +#ifdef TARGET_PPCEMB + return pcc->mmu_model =3D=3D POWERPC_MMU_BOOKE || + pcc->mmu_model =3D=3D POWERPC_MMU_SOFT_4xx || + pcc->mmu_model =3D=3D POWERPC_MMU_SOFT_4xx_Z; +#else + return true; +#endif +} + static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs =3D CPU(dev); @@ -7991,8 +8002,8 @@ static void ppc_cpu_realizefn(DeviceState *dev, Err= or **errp) } =20 #if defined(TARGET_PPCEMB) - if (pcc->mmu_model !=3D POWERPC_MMU_BOOKE) { - error_setg(errp, "CPU does not possess a BookE MMU. " + if (!ppc_cpu_is_valid(pcc)) { + error_setg(errp, "CPU does not possess a BookE or 4xx MMU. " "Please use qemu-system-ppc or qemu-system-ppc64 inst= ead " "or choose another CPU model."); return; @@ -8209,11 +8220,9 @@ static gint ppc_cpu_compare_class_pvr(gconstpointe= r a, gconstpointer b) return -1; } =20 -#if defined(TARGET_PPCEMB) - if (pcc->mmu_model !=3D POWERPC_MMU_BOOKE) { + if (!ppc_cpu_is_valid(pcc)) { return -1; } -#endif =20 return pcc->pvr =3D=3D pvr ? 0 : -1; } @@ -8246,11 +8255,10 @@ static gint ppc_cpu_compare_class_pvr_mask(gconst= pointer a, gconstpointer b) return -1; } =20 -#if defined(TARGET_PPCEMB) - if (pcc->mmu_model !=3D POWERPC_MMU_BOOKE) { + if (!ppc_cpu_is_valid(pcc)) { return -1; } -#endif + ret =3D (((pcc->pvr & pcc->pvr_mask) =3D=3D (pvr & pcc->pvr_mask)) ?= 0 : -1); =20 return ret; @@ -8275,14 +8283,10 @@ static gint ppc_cpu_compare_class_name(gconstpoin= ter a, gconstpointer b) { ObjectClass *oc =3D (ObjectClass *)a; const char *name =3D b; -#if defined(TARGET_PPCEMB) PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); -#endif =20 if (strncasecmp(name, object_class_get_name(oc), strlen(name)) =3D=3D= 0 && -#if defined(TARGET_PPCEMB) - pcc->mmu_model =3D=3D POWERPC_MMU_BOOKE && -#endif + ppc_cpu_is_valid(pcc) && strcmp(object_class_get_name(oc) + strlen(name), "-" TYPE_POWERPC_CPU) =3D=3D 0) { return 0; @@ -8414,11 +8418,9 @@ static void ppc_cpu_list_entry(gpointer data, gpoi= nter user_data) char *name; int i; =20 -#if defined(TARGET_PPCEMB) - if (pcc->mmu_model !=3D POWERPC_MMU_BOOKE) { + if (!ppc_cpu_is_valid(pcc)) { return; } -#endif if (unlikely(strcmp(typename, TYPE_HOST_POWERPC_CPU) =3D=3D 0)) { return; } @@ -8466,13 +8468,11 @@ static void ppc_cpu_defs_entry(gpointer data, gpo= inter user_data) const char *typename; CpuDefinitionInfoList *entry; CpuDefinitionInfo *info; -#if defined(TARGET_PPCEMB) PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); =20 - if (pcc->mmu_model !=3D POWERPC_MMU_BOOKE) { + if (!ppc_cpu_is_valid(pcc)) { return; } -#endif =20 typename =3D object_class_get_name(oc); info =3D g_malloc0(sizeof(*info)); diff --git a/tests/qom-test.c b/tests/qom-test.c index 5e5af7a..4dd23f8 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -221,10 +221,7 @@ int main(int argc, char **argv) } else if (strcmp(arch, "or32") =3D=3D 0) { ADD_MACHINE_TESTS(arch, openrisc_machines); } else if (strcmp(arch, "ppcemb") =3D=3D 0) { -#if 0 - /* XXX Available in ppcemb but don't work */ ADD_MACHINE_TESTS(arch, ppc405_machines); -#endif ADD_MACHINE_TESTS(arch, ppc440_machines); } else if (strcmp(arch, "ppc") =3D=3D 0) { ADD_MACHINE_TESTS(arch, ppc405_machines); --=20 1.8.4.5