From patchwork Tue Feb 12 10:13:00 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: 219784 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 C01A92C0325 for ; Tue, 12 Feb 2013 21:53:05 +1100 (EST) Received: from localhost ([::1]:58157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsW-0004hL-LY for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 05:14:20 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Cs8-0004KJ-3z for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:13:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5Cs5-0003Kl-GR for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:13:56 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42781 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Cs5-0003KZ-6f; Tue, 12 Feb 2013 05:13:53 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id BF289A520C; Tue, 12 Feb 2013 11:13:52 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:13:00 +0100 Message-Id: <1360664012-16824-8-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360664012-16824-1-git-send-email-afaerber@suse.de> References: <1360664012-16824-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 07/39] 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 | 25 +++++++------------------ 1 Datei geändert, 7 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index ac146fa..0177c86 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7015,17 +7015,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, @@ -7924,8 +7920,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 */ @@ -7933,10 +7927,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 @@ -7945,10 +7935,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 @@ -7957,10 +7943,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 @@ -9154,6 +9136,13 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "405GP", "405GPd" }, { "x2vp7", "x2vp4" }, { "x2vp50", "x2vp20" }, + /* PowerPC 440 EP */ + { "440EP", "440EPb" }, + /* PowerPC 440 GP */ + { "440GP", "440GPc" }, + { "440GR", "440GRa" }, + /* PowerPC 440 GX */ + { "440GX", "440GXf" }, /* Codename for MPC5xx core */ { "RCPU", "MPC5xx" }, /* MPC5xx microcontrollers */