From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aG-000067-PH for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a6-0000WB-DR for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:04 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:10 +0100 Message-Id: <1362773228-1747-9-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 08/66] target-ppc: Make -cpu "ppc" an alias to "ppc32" 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 Drop the #if 0'ed alternative to make it "ppc64" for TARGET_PPC64. If we ever want to change it, we can more easily do so now. Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- target-ppc/translate_init.c | 29 +---------------------------- 1 files changed, 1 insertions(+), 28 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 862f40a..8923105 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -6824,33 +6824,6 @@ static void init_proc_620 (CPUPPCState *env) #define check_pow_PPC64 check_pow_970FX #define init_proc_PPC64 init_proc_970FX =20 -/* Default PowerPC target will be PowerPC 32 */ -#if defined (TARGET_PPC64) && 0 // XXX: TODO -#define CPU_POWERPC_DEFAULT CPU_POWERPC_PPC64 -#define POWERPC_INSNS_DEFAULT POWERPC_INSNS_PPC64 -#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS2_PPC64 -#define POWERPC_MSRM_DEFAULT POWERPC_MSRM_PPC64 -#define POWERPC_MMU_DEFAULT POWERPC_MMU_PPC64 -#define POWERPC_EXCP_DEFAULT POWERPC_EXCP_PPC64 -#define POWERPC_INPUT_DEFAULT POWERPC_INPUT_PPC64 -#define POWERPC_BFDM_DEFAULT POWERPC_BFDM_PPC64 -#define POWERPC_FLAG_DEFAULT POWERPC_FLAG_PPC64 -#define check_pow_DEFAULT check_pow_PPC64 -#define init_proc_DEFAULT init_proc_PPC64 -#else -#define CPU_POWERPC_DEFAULT CPU_POWERPC_PPC32 -#define POWERPC_INSNS_DEFAULT POWERPC_INSNS_PPC32 -#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS2_PPC32 -#define POWERPC_MSRM_DEFAULT POWERPC_MSRM_PPC32 -#define POWERPC_MMU_DEFAULT POWERPC_MMU_PPC32 -#define POWERPC_EXCP_DEFAULT POWERPC_EXCP_PPC32 -#define POWERPC_INPUT_DEFAULT POWERPC_INPUT_PPC32 -#define POWERPC_BFDM_DEFAULT POWERPC_BFDM_PPC32 -#define POWERPC_FLAG_DEFAULT POWERPC_FLAG_PPC32 -#define check_pow_DEFAULT check_pow_PPC32 -#define init_proc_DEFAULT init_proc_PPC32 -#endif - /***********************************************************************= ******/ /* PVR definitions for most known PowerPC = */ enum { @@ -9321,7 +9294,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("ppc64", CPU_POWERPC_PPC64, PPC= 64) #endif POWERPC_DEF("ppc32", CPU_POWERPC_PPC32, PPC= 32) - POWERPC_DEF("ppc", CPU_POWERPC_DEFAULT, DEF= AULT) }; =20 typedef struct PowerPCCPUAlias { @@ -9375,6 +9347,7 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] =3D = { { "RSC2", "POWER2" }, { "P2SC", "POWER2" }, =20 + { "ppc", "ppc32" }, { "default", "ppc" }, }; =20 --=20 1.6.0.2