From 8c00a9991ae759048c444a6836ce2206e4b0d372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 17 Feb 2013 23:16:09 +0000 Subject: [PATCH] target-ppc: Extract 440 aliases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Färber Signed-off-by: Alexander Graf --- target-ppc/translate_init.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 8a3cf9f91c..fb0a36663e 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7013,17 +7013,13 @@ enum { CPU_POWERPC_440H6 = xxx, #endif /* PowerPC 440 microcontrolers */ -#define CPU_POWERPC_440EP CPU_POWERPC_440EPb CPU_POWERPC_440EPa = 0x42221850, CPU_POWERPC_440EPb = 0x422218D3, -#define CPU_POWERPC_440GP CPU_POWERPC_440GPc CPU_POWERPC_440GPb = 0x40120440, CPU_POWERPC_440GPc = 0x40120481, -#define CPU_POWERPC_440GR CPU_POWERPC_440GRa #define CPU_POWERPC_440GRa CPU_POWERPC_440EPb CPU_POWERPC_440GRX = 0x200008D0, #define CPU_POWERPC_440EPX CPU_POWERPC_440GRX -#define CPU_POWERPC_440GX CPU_POWERPC_440GXf CPU_POWERPC_440GXa = 0x51B21850, CPU_POWERPC_440GXb = 0x51B21851, CPU_POWERPC_440GXc = 0x51B21892, @@ -7922,18 +7918,12 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("440H6", CPU_POWERPC_440H6, 440Gx5) #endif /* PowerPC 440 microcontrolers */ - /* PowerPC 440 EP */ - POWERPC_DEF("440EP", CPU_POWERPC_440EP, 440EP) /* PowerPC 440 EPa */ POWERPC_DEF("440EPa", CPU_POWERPC_440EPa, 440EP) /* PowerPC 440 EPb */ POWERPC_DEF("440EPb", CPU_POWERPC_440EPb, 440EP) /* PowerPC 440 EPX */ POWERPC_DEF("440EPX", CPU_POWERPC_440EPX, 440EP) -#if defined(TODO_USER_ONLY) - /* PowerPC 440 GP */ - POWERPC_DEF("440GP", CPU_POWERPC_440GP, 440GP) -#endif #if defined(TODO_USER_ONLY) /* PowerPC 440 GPb */ POWERPC_DEF("440GPb", CPU_POWERPC_440GPb, 440GP) @@ -7942,10 +7932,6 @@ static const ppc_def_t ppc_defs[] = { /* PowerPC 440 GPc */ POWERPC_DEF("440GPc", CPU_POWERPC_440GPc, 440GP) #endif -#if defined(TODO_USER_ONLY) - /* PowerPC 440 GR */ - POWERPC_DEF("440GR", CPU_POWERPC_440GR, 440x5) -#endif #if defined(TODO_USER_ONLY) /* PowerPC 440 GRa */ POWERPC_DEF("440GRa", CPU_POWERPC_440GRa, 440x5) @@ -7954,10 +7940,6 @@ static const ppc_def_t ppc_defs[] = { /* PowerPC 440 GRX */ POWERPC_DEF("440GRX", CPU_POWERPC_440GRX, 440x5) #endif -#if defined(TODO_USER_ONLY) - /* PowerPC 440 GX */ - POWERPC_DEF("440GX", CPU_POWERPC_440GX, 440EP) -#endif #if defined(TODO_USER_ONLY) /* PowerPC 440 GXa */ POWERPC_DEF("440GXa", CPU_POWERPC_440GXa, 440EP) @@ -9149,6 +9131,11 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "x2vp7", "x2vp4" }, { "x2vp50", "x2vp20" }, + { "440EP", "440EPb" }, + { "440GP", "440GPc" }, + { "440GR", "440GRa" }, + { "440GX", "440GXf" }, + { "RCPU", "MPC5xx" }, /* MPC5xx microcontrollers */ { "MGT560", "MPC5xx" }, -- GitLab