From patchwork Tue Feb 12 10:13:02 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: 219788 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 4AAD42C0326 for ; Tue, 12 Feb 2013 22:06:45 +1100 (EST) Received: from localhost ([::1]:59697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Csv-0005eL-Ms for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 05:14:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsC-0004WC-AU for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5Cs8-0003LS-1l for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:00 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42783 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5Cs7-0003LN-Oi; Tue, 12 Feb 2013 05:13:55 -0500 Received: from relay2.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 406C2A520C; Tue, 12 Feb 2013 11:13:55 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:13:02 +0100 Message-Id: <1360664012-16824-10-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 09/39] target-ppc: Extract 74x7[A] 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 | 18 ++++++++---------- 1 Datei geändert, 8 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index cb30eb3..cbf13f2 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7370,11 +7370,9 @@ enum { CPU_POWERPC_74x5_v32 = 0x80010302, CPU_POWERPC_74x5_v33 = 0x80010303, /* aka F: 3.3 */ CPU_POWERPC_74x5_v34 = 0x80010304, /* aka G: 3.4 */ -#define CPU_POWERPC_74x7 CPU_POWERPC_74x7_v12 CPU_POWERPC_74x7_v10 = 0x80020100, /* aka A: 1.0 */ CPU_POWERPC_74x7_v11 = 0x80020101, /* aka B: 1.1 */ CPU_POWERPC_74x7_v12 = 0x80020102, /* aka C: 1.2 */ -#define CPU_POWERPC_74x7A CPU_POWERPC_74x7A_v12 CPU_POWERPC_74x7A_v10 = 0x80030100, /* aka A: 1.0 */ CPU_POWERPC_74x7A_v11 = 0x80030101, /* aka B: 1.1 */ CPU_POWERPC_74x7A_v12 = 0x80030102, /* aka C: 1.2 */ @@ -8931,10 +8929,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("7445_v3.4", CPU_POWERPC_74x5_v34, 7445) /* PowerPC 7455 v3.4 (G4) */ POWERPC_DEF("7455_v3.4", CPU_POWERPC_74x5_v34, 7455) - /* PowerPC 7447 (G4) */ - POWERPC_DEF("7447", CPU_POWERPC_74x7, 7445) - /* PowerPC 7457 (G4) */ - POWERPC_DEF("7457", CPU_POWERPC_74x7, 7455) /* PowerPC 7447 v1.0 (G4) */ POWERPC_DEF("7447_v1.0", CPU_POWERPC_74x7_v10, 7445) /* PowerPC 7457 v1.0 (G4) */ @@ -8945,10 +8939,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("7457_v1.1", CPU_POWERPC_74x7_v11, 7455) /* PowerPC 7457 v1.2 (G4) */ POWERPC_DEF("7457_v1.2", CPU_POWERPC_74x7_v12, 7455) - /* PowerPC 7447A (G4) */ - POWERPC_DEF("7447A", CPU_POWERPC_74x7A, 7445) - /* PowerPC 7457A (G4) */ - POWERPC_DEF("7457A", CPU_POWERPC_74x7A, 7455) /* PowerPC 7447A v1.0 (G4) */ POWERPC_DEF("7447A_v1.0", CPU_POWERPC_74x7A_v10, 7445) /* PowerPC 7457A v1.0 (G4) */ @@ -9212,8 +9202,16 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "Vger", "7450" }, /* Code name for PowerPC 7445/7455 */ { "Apollo6", "7455" }, + /* PowerPC 7447 (G4) */ + { "7447", "7447_v1.2" }, + /* PowerPC 7457 (G4) */ + { "7457", "7457_v1.2" }, /* Code name for PowerPC 7447/7457 */ { "Apollo7", "7457" }, + /* PowerPC 7447A (G4) */ + { "7447A", "7447A_v1.2" }, + /* PowerPC 7457A (G4) */ + { "7457A", "7457A_v1.2" }, /* Code name for PowerPC 7447A/7457A */ { "Apollo7PM", "7457A_v1.0" }, #if defined(TARGET_PPC64)