Received: from eggs.gnu.org ([208.118.235.92]:48408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aO-00009P-O8 for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a7-0000YY-4l for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:12 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:16 +0100 Message-Id: <1362773228-1747-15-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 14/66] target-ppc: Extract 74x7[A] 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 | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 86b5c91..27e625e 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7368,11 +7368,9 @@ enum { CPU_POWERPC_74x5_v32 =3D 0x80010302, CPU_POWERPC_74x5_v33 =3D 0x80010303, /* aka F: 3.3 */ CPU_POWERPC_74x5_v34 =3D 0x80010304, /* aka G: 3.4 */ -#define CPU_POWERPC_74x7 CPU_POWERPC_74x7_v12 CPU_POWERPC_74x7_v10 =3D 0x80020100, /* aka A: 1.0 */ CPU_POWERPC_74x7_v11 =3D 0x80020101, /* aka B: 1.1 */ CPU_POWERPC_74x7_v12 =3D 0x80020102, /* aka C: 1.2 */ -#define CPU_POWERPC_74x7A CPU_POWERPC_74x7A_v12 CPU_POWERPC_74x7A_v10 =3D 0x80030100, /* aka A: 1.0 */ CPU_POWERPC_74x7A_v11 =3D 0x80030101, /* aka B: 1.1 */ CPU_POWERPC_74x7A_v12 =3D 0x80030102, /* aka C: 1.2 */ @@ -8929,10 +8927,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("7445_v3.4", CPU_POWERPC_74x5_v34, 744= 5) /* PowerPC 7455 v3.4 (G4) = */ POWERPC_DEF("7455_v3.4", CPU_POWERPC_74x5_v34, 745= 5) - /* PowerPC 7447 (G4) = */ - POWERPC_DEF("7447", CPU_POWERPC_74x7, 744= 5) - /* PowerPC 7457 (G4) = */ - POWERPC_DEF("7457", CPU_POWERPC_74x7, 745= 5) /* PowerPC 7447 v1.0 (G4) = */ POWERPC_DEF("7447_v1.0", CPU_POWERPC_74x7_v10, 744= 5) /* PowerPC 7457 v1.0 (G4) = */ @@ -8943,10 +8937,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("7457_v1.1", CPU_POWERPC_74x7_v11, 745= 5) /* PowerPC 7457 v1.2 (G4) = */ POWERPC_DEF("7457_v1.2", CPU_POWERPC_74x7_v12, 745= 5) - /* PowerPC 7447A (G4) = */ - POWERPC_DEF("7447A", CPU_POWERPC_74x7A, 744= 5) - /* PowerPC 7457A (G4) = */ - POWERPC_DEF("7457A", CPU_POWERPC_74x7A, 745= 5) /* PowerPC 7447A v1.0 (G4) = */ POWERPC_DEF("7447A_v1.0", CPU_POWERPC_74x7A_v10, 744= 5) /* PowerPC 7457A v1.0 (G4) = */ @@ -9158,7 +9148,11 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] =3D= { { "Nitro", "7410" }, { "Vger", "7450" }, { "Apollo6", "7455" }, + { "7447", "7447_v1.2" }, + { "7457", "7457_v1.2" }, { "Apollo7", "7457" }, + { "7447A", "7447A_v1.2" }, + { "7457A", "7457A_v1.2" }, { "Apollo7PM", "7457A_v1.0" }, #if defined(TARGET_PPC64) { "Trident", "620" }, --=20 1.6.0.2