From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aI-00006D-Iz for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a6-0000Wd-GJ for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:06 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:14 +0100 Message-Id: <1362773228-1747-13-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 12/66] target-ppc: Extract 440 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 | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 8a3cf9f..fb0a366 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7013,17 +7013,13 @@ enum { CPU_POWERPC_440H6 =3D xxx, #endif /* PowerPC 440 microcontrolers */ -#define CPU_POWERPC_440EP CPU_POWERPC_440EPb CPU_POWERPC_440EPa =3D 0x42221850, CPU_POWERPC_440EPb =3D 0x422218D3, -#define CPU_POWERPC_440GP CPU_POWERPC_440GPc CPU_POWERPC_440GPb =3D 0x40120440, CPU_POWERPC_440GPc =3D 0x40120481, -#define CPU_POWERPC_440GR CPU_POWERPC_440GRa #define CPU_POWERPC_440GRa CPU_POWERPC_440EPb CPU_POWERPC_440GRX =3D 0x200008D0, #define CPU_POWERPC_440EPX CPU_POWERPC_440GRX -#define CPU_POWERPC_440GX CPU_POWERPC_440GXf CPU_POWERPC_440GXa =3D 0x51B21850, CPU_POWERPC_440GXb =3D 0x51B21851, CPU_POWERPC_440GXc =3D 0x51B21892, @@ -7922,8 +7918,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("440H6", CPU_POWERPC_440H6, 440= Gx5) #endif /* PowerPC 440 microcontrolers = */ - /* PowerPC 440 EP = */ - POWERPC_DEF("440EP", CPU_POWERPC_440EP, 440= EP) /* PowerPC 440 EPa = */ POWERPC_DEF("440EPa", CPU_POWERPC_440EPa, 440= EP) /* PowerPC 440 EPb = */ @@ -7931,10 +7925,6 @@ static const ppc_def_t ppc_defs[] =3D { /* PowerPC 440 EPX = */ POWERPC_DEF("440EPX", CPU_POWERPC_440EPX, 440= EP) #if defined(TODO_USER_ONLY) - /* PowerPC 440 GP = */ - POWERPC_DEF("440GP", CPU_POWERPC_440GP, 440= GP) -#endif -#if defined(TODO_USER_ONLY) /* PowerPC 440 GPb = */ POWERPC_DEF("440GPb", CPU_POWERPC_440GPb, 440= GP) #endif @@ -7943,10 +7933,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("440GPc", CPU_POWERPC_440GPc, 440= GP) #endif #if defined(TODO_USER_ONLY) - /* PowerPC 440 GR = */ - POWERPC_DEF("440GR", CPU_POWERPC_440GR, 440= x5) -#endif -#if defined(TODO_USER_ONLY) /* PowerPC 440 GRa = */ POWERPC_DEF("440GRa", CPU_POWERPC_440GRa, 440= x5) #endif @@ -7955,10 +7941,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("440GRX", CPU_POWERPC_440GRX, 440= x5) #endif #if defined(TODO_USER_ONLY) - /* PowerPC 440 GX = */ - POWERPC_DEF("440GX", CPU_POWERPC_440GX, 440= EP) -#endif -#if defined(TODO_USER_ONLY) /* PowerPC 440 GXa = */ POWERPC_DEF("440GXa", CPU_POWERPC_440GXa, 440= EP) #endif @@ -9149,6 +9131,11 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] =3D= { { "x2vp7", "x2vp4" }, { "x2vp50", "x2vp20" }, =20 + { "440EP", "440EPb" }, + { "440GP", "440GPc" }, + { "440GR", "440GRa" }, + { "440GX", "440GXf" }, + { "RCPU", "MPC5xx" }, /* MPC5xx microcontrollers */ { "MGT560", "MPC5xx" }, --=20 1.6.0.2