From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aH-000068-1T for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a6-0000Wi-Gx for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:04 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:13 +0100 Message-Id: <1362773228-1747-12-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 11/66] target-ppc: Extract 40x 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 | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 6a86e10..8a3cf9f 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -6852,8 +6852,6 @@ enum { CPU_POWERPC_XIPCHIP =3D xxx, #endif /* PowerPC 403 family */ - /* Generic PowerPC 403 */ -#define CPU_POWERPC_403 CPU_POWERPC_403GC /* PowerPC 403 microcontrollers */ CPU_POWERPC_403GA =3D 0x00200011, CPU_POWERPC_403GB =3D 0x00200100, @@ -6863,8 +6861,6 @@ enum { CPU_POWERPC_403GP =3D xxx, #endif /* PowerPC 405 family */ - /* Generic PowerPC 405 */ -#define CPU_POWERPC_405 CPU_POWERPC_405D4 /* PowerPC 405 cores */ #if 0 CPU_POWERPC_405A3 =3D xxx, @@ -6906,7 +6902,6 @@ enum { #endif /* PowerPC 405 microcontrolers */ /* XXX: missing 0x200108a0 */ -#define CPU_POWERPC_405CR CPU_POWERPC_405CRc CPU_POWERPC_405CRa =3D 0x40110041, CPU_POWERPC_405CRb =3D 0x401100C5, CPU_POWERPC_405CRc =3D 0x40110145, @@ -6918,7 +6913,6 @@ enum { #if 0 CPU_POWERPC_405FX =3D xxx, #endif -#define CPU_POWERPC_405GP CPU_POWERPC_405GPd CPU_POWERPC_405GPa =3D 0x40110000, CPU_POWERPC_405GPb =3D 0x40110040, CPU_POWERPC_405GPc =3D 0x40110082, @@ -6979,9 +6973,7 @@ enum { #endif /* Xilinx cores */ CPU_POWERPC_X2VP4 =3D 0x20010820, -#define CPU_POWERPC_X2VP7 CPU_POWERPC_X2VP4 CPU_POWERPC_X2VP20 =3D 0x20010860, -#define CPU_POWERPC_X2VP50 CPU_POWERPC_X2VP20 #if 0 CPU_POWERPC_ZL10310 =3D xxx, #endif @@ -7701,8 +7693,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("Xipchip", CPU_POWERPC_XIPCHIP, 401= ) #endif /* PowerPC 403 family = */ - /* Generic PowerPC 403 = */ - POWERPC_DEF("403", CPU_POWERPC_403, 403= ) /* PowerPC 403 microcontrolers = */ /* PowerPC 403 GA = */ POWERPC_DEF("403GA", CPU_POWERPC_403GA, 403= ) @@ -7717,8 +7707,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("403GP", CPU_POWERPC_403GP, 403= ) #endif /* PowerPC 405 family = */ - /* Generic PowerPC 405 = */ - POWERPC_DEF("405", CPU_POWERPC_405, 405= ) /* PowerPC 405 cores = */ #if defined (TODO) /* PowerPC 405 A3 = */ @@ -7773,8 +7761,6 @@ static const ppc_def_t ppc_defs[] =3D { POWERPC_DEF("405F6", CPU_POWERPC_405F6, 405= ) #endif /* PowerPC 405 microcontrolers = */ - /* PowerPC 405 CR = */ - POWERPC_DEF("405CR", CPU_POWERPC_405CR, 405= ) /* PowerPC 405 CRa = */ POWERPC_DEF("405CRa", CPU_POWERPC_405CRa, 405= ) /* PowerPC 405 CRb = */ @@ -7793,8 +7779,6 @@ static const ppc_def_t ppc_defs[] =3D { /* PowerPC 405 FX = */ POWERPC_DEF("405FX", CPU_POWERPC_405FX, 405= ) #endif - /* PowerPC 405 GP = */ - POWERPC_DEF("405GP", CPU_POWERPC_405GP, 405= ) /* PowerPC 405 GPa = */ POWERPC_DEF("405GPa", CPU_POWERPC_405GPa, 405= ) /* PowerPC 405 GPb = */ @@ -7880,9 +7864,7 @@ static const ppc_def_t ppc_defs[] =3D { #endif /* Xilinx PowerPC 405 cores = */ POWERPC_DEF("x2vp4", CPU_POWERPC_X2VP4, 405= ) - POWERPC_DEF("x2vp7", CPU_POWERPC_X2VP7, 405= ) POWERPC_DEF("x2vp20", CPU_POWERPC_X2VP20, 405= ) - POWERPC_DEF("x2vp50", CPU_POWERPC_X2VP50, 405= ) #if defined (TODO) /* Zarlink ZL10310 = */ POWERPC_DEF("zl10310", CPU_POWERPC_ZL10310, 405= ) @@ -9160,6 +9142,13 @@ typedef struct PowerPCCPUAlias { } PowerPCCPUAlias; =20 static const PowerPCCPUAlias ppc_cpu_aliases[] =3D { + { "403", "403GC" }, + { "405", "405D4" }, + { "405CR", "405CRc" }, + { "405GP", "405GPd" }, + { "x2vp7", "x2vp4" }, + { "x2vp50", "x2vp20" }, + { "RCPU", "MPC5xx" }, /* MPC5xx microcontrollers */ { "MGT560", "MPC5xx" }, --=20 1.6.0.2