Received: from eggs.gnu.org ([208.118.235.92]:48288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aH-00006C-VM for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a6-0000WA-Cw for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:05 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:15 +0100 Message-Id: <1362773228-1747-14-git-send-email-agraf@suse.de> In-Reply-To: <1362773228-1747-1-git-send-email-agraf@suse.de> References: <1362773228-1747-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 13/66] target-ppc: Turn "ppc32" and "ppc64" CPUs into aliases List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel qemu-devel Cc: Blue Swirl , "qemu-ppc@nongnu.org list:PowerPC" , =?utf-8?q?Andreas=20F=C3=A4rber?= , =?utf-8?q?Aur=C3=A9lien=20Jarno?= From: Andreas F=C3=A4rber Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- target-ppc/translate_init.c | 36 +++++------------------------------- 1 files changed, 5 insertions(+), 31 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index fb0a366..86b5c91 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -6798,32 +6798,6 @@ static void init_proc_620 (CPUPPCState *env) } #endif /* defined (TARGET_PPC64) */ =20 -/* Default 32 bits PowerPC target will be 604 */ -#define CPU_POWERPC_PPC32 CPU_POWERPC_604 -#define POWERPC_INSNS_PPC32 POWERPC_INSNS_604 -#define POWERPC_INSNS2_PPC32 POWERPC_INSNS2_604 -#define POWERPC_MSRM_PPC32 POWERPC_MSRM_604 -#define POWERPC_MMU_PPC32 POWERPC_MMU_604 -#define POWERPC_EXCP_PPC32 POWERPC_EXCP_604 -#define POWERPC_INPUT_PPC32 POWERPC_INPUT_604 -#define POWERPC_BFDM_PPC32 POWERPC_BFDM_604 -#define POWERPC_FLAG_PPC32 POWERPC_FLAG_604 -#define check_pow_PPC32 check_pow_604 -#define init_proc_PPC32 init_proc_604 - -/* Default 64 bits PowerPC target will be 970 FX */ -#define CPU_POWERPC_PPC64 CPU_POWERPC_970FX -#define POWERPC_INSNS_PPC64 POWERPC_INSNS_970FX -#define POWERPC_INSNS2_PPC64 POWERPC_INSNS2_970FX -#define POWERPC_MSRM_PPC64 POWERPC_MSRM_970FX -#define POWERPC_MMU_PPC64 POWERPC_MMU_970FX -#define POWERPC_EXCP_PPC64 POWERPC_EXCP_970FX -#define POWERPC_INPUT_PPC64 POWERPC_INPUT_970FX -#define POWERPC_BFDM_PPC64 POWERPC_BFDM_970FX -#define POWERPC_FLAG_PPC64 POWERPC_FLAG_970FX -#define check_pow_PPC64 check_pow_970FX -#define init_proc_PPC64 init_proc_970FX - /***********************************************************************= ******/ /* PVR definitions for most known PowerPC = */ enum { @@ -9111,11 +9085,6 @@ static const ppc_def_t ppc_defs[] =3D { /* PA PA6T */ POWERPC_DEF("PA6T", CPU_POWERPC_PA6T, PA6= T) #endif - /* Generic PowerPCs = */ -#if defined (TARGET_PPC64) - POWERPC_DEF("ppc64", CPU_POWERPC_PPC64, PPC= 64) -#endif - POWERPC_DEF("ppc32", CPU_POWERPC_PPC32, PPC= 32) }; =20 typedef struct PowerPCCPUAlias { @@ -9213,6 +9182,11 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] =3D= { { "RSC2", "POWER2" }, { "P2SC", "POWER2" }, =20 + /* Generic PowerPCs */ +#if defined(TARGET_PPC64) + { "ppc64", "970fx" }, +#endif + { "ppc32", "604" }, { "ppc", "ppc32" }, { "default", "ppc" }, }; --=20 1.6.0.2