From patchwork Mon Feb 18 09:16:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 221228 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 31A882C02AA for ; Mon, 18 Feb 2013 21:42:16 +1100 (EST) Received: from localhost ([::1]:55173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Mrq-0003g9-FC for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 04:18:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Mqn-0002Rh-8T for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7Mqh-0003t3-Rt for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:17:29 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45040 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Mqh-0003sj-HQ; Mon, 18 Feb 2013 04:17:23 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0C09FA4E0C; Mon, 18 Feb 2013 10:17:23 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 10:16:09 +0100 Message-Id: <1361179011-7226-11-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361179011-7226-1-git-send-email-afaerber@suse.de> References: <1361179011-7226-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH ppc-next v2 10/52] target-ppc: Extract 440 aliases X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 23 +++++------------------ 1 Datei geändert, 5 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index b70341c..f239e9c 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,8 +7918,6 @@ 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 */ @@ -7931,10 +7925,6 @@ static const ppc_def_t ppc_defs[] = { /* 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) #endif @@ -7943,10 +7933,6 @@ static const ppc_def_t ppc_defs[] = { 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) #endif @@ -7955,10 +7941,6 @@ static const ppc_def_t ppc_defs[] = { 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) #endif @@ -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" },