From patchwork Tue Feb 12 10:13:10 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: 219772 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 B1A9C2C0089 for ; Tue, 12 Feb 2013 21:16:07 +1100 (EST) Received: from localhost ([::1]:33763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CuD-0006yX-Qa for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 05:16:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsN-00053t-LP for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5CsH-0003Pd-6l for qemu-devel@nongnu.org; Tue, 12 Feb 2013 05:14:11 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42793 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5CsG-0003PC-QI; Tue, 12 Feb 2013 05:14:05 -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 602F0A520F; Tue, 12 Feb 2013 11:14:04 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2013 11:13:10 +0100 Message-Id: <1360664012-16824-18-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 17/39] target-ppc: Extract 750 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 | 30 ++++++++++++------------------ 1 Datei geändert, 12 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 30bcfdd..eba2513 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7278,15 +7278,12 @@ enum { CPU_POWERPC_750E = 0x00080200, CPU_POWERPC_7x0P = 0x10080000, /* XXX: missing 0x00087010 (CL ?) */ -#define CPU_POWERPC_750CL CPU_POWERPC_750CL_v20 CPU_POWERPC_750CL_v10 = 0x00087200, CPU_POWERPC_750CL_v20 = 0x00087210, /* aka rev E */ -#define CPU_POWERPC_750CX CPU_POWERPC_750CX_v22 CPU_POWERPC_750CX_v10 = 0x00082100, CPU_POWERPC_750CX_v20 = 0x00082200, CPU_POWERPC_750CX_v21 = 0x00082201, CPU_POWERPC_750CX_v22 = 0x00082202, -#define CPU_POWERPC_750CXE CPU_POWERPC_750CXE_v31b CPU_POWERPC_750CXE_v21 = 0x00082211, CPU_POWERPC_750CXE_v22 = 0x00082212, CPU_POWERPC_750CXE_v23 = 0x00082213, @@ -7297,18 +7294,15 @@ enum { CPU_POWERPC_750CXE_v31b = 0x00083311, CPU_POWERPC_750CXR = 0x00083410, CPU_POWERPC_750FL = 0x70000203, -#define CPU_POWERPC_750FX CPU_POWERPC_750FX_v23 CPU_POWERPC_750FX_v10 = 0x70000100, CPU_POWERPC_750FX_v20 = 0x70000200, CPU_POWERPC_750FX_v21 = 0x70000201, CPU_POWERPC_750FX_v22 = 0x70000202, CPU_POWERPC_750FX_v23 = 0x70000203, CPU_POWERPC_750GL = 0x70020102, -#define CPU_POWERPC_750GX CPU_POWERPC_750GX_v12 CPU_POWERPC_750GX_v10 = 0x70020100, CPU_POWERPC_750GX_v11 = 0x70020101, CPU_POWERPC_750GX_v12 = 0x70020102, -#define CPU_POWERPC_750L CPU_POWERPC_750L_v32 /* Aka LoneStar */ CPU_POWERPC_750L_v20 = 0x00088200, CPU_POWERPC_750L_v21 = 0x00088201, CPU_POWERPC_750L_v22 = 0x00088202, @@ -8703,14 +8697,10 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("740p", CPU_POWERPC_7x0P, 740) /* PowerPC 750P (G3) */ POWERPC_DEF("750p", CPU_POWERPC_7x0P, 750) - /* PowerPC 750CL (G3 embedded) */ - POWERPC_DEF("750cl", CPU_POWERPC_750CL, 750cl) /* PowerPC 750CL v1.0 */ POWERPC_DEF("750cl_v1.0", CPU_POWERPC_750CL_v10, 750cl) /* PowerPC 750CL v2.0 */ POWERPC_DEF("750cl_v2.0", CPU_POWERPC_750CL_v20, 750cl) - /* PowerPC 750CX (G3 embedded) */ - POWERPC_DEF("750cx", CPU_POWERPC_750CX, 750cx) /* PowerPC 750CX v1.0 (G3 embedded) */ POWERPC_DEF("750cx_v1.0", CPU_POWERPC_750CX_v10, 750cx) /* PowerPC 750CX v2.1 (G3 embedded) */ @@ -8719,8 +8709,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("750cx_v2.1", CPU_POWERPC_750CX_v21, 750cx) /* PowerPC 750CX v2.2 (G3 embedded) */ POWERPC_DEF("750cx_v2.2", CPU_POWERPC_750CX_v22, 750cx) - /* PowerPC 750CXe (G3 embedded) */ - POWERPC_DEF("750cxe", CPU_POWERPC_750CXE, 750cx) /* PowerPC 750CXe v2.1 (G3 embedded) */ POWERPC_DEF("750cxe_v2.1", CPU_POWERPC_750CXE_v21, 750cx) /* PowerPC 750CXe v2.2 (G3 embedded) */ @@ -8741,8 +8729,6 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("750cxr", CPU_POWERPC_750CXR, 750cx) /* PowerPC 750FL (G3 embedded) */ POWERPC_DEF("750fl", CPU_POWERPC_750FL, 750fx) - /* PowerPC 750FX (G3 embedded) */ - POWERPC_DEF("750fx", CPU_POWERPC_750FX, 750fx) /* PowerPC 750FX v1.0 (G3 embedded) */ POWERPC_DEF("750fx_v1.0", CPU_POWERPC_750FX_v10, 750fx) /* PowerPC 750FX v2.0 (G3 embedded) */ @@ -8755,16 +8741,12 @@ static const ppc_def_t ppc_defs[] = { POWERPC_DEF("750fx_v2.3", CPU_POWERPC_750FX_v23, 750fx) /* PowerPC 750GL (G3 embedded) */ POWERPC_DEF("750gl", CPU_POWERPC_750GL, 750gx) - /* PowerPC 750GX (G3 embedded) */ - POWERPC_DEF("750gx", CPU_POWERPC_750GX, 750gx) /* PowerPC 750GX v1.0 (G3 embedded) */ POWERPC_DEF("750gx_v1.0", CPU_POWERPC_750GX_v10, 750gx) /* PowerPC 750GX v1.1 (G3 embedded) */ POWERPC_DEF("750gx_v1.1", CPU_POWERPC_750GX_v11, 750gx) /* PowerPC 750GX v1.2 (G3 embedded) */ POWERPC_DEF("750gx_v1.2", CPU_POWERPC_750GX_v12, 750gx) - /* PowerPC 750L (G3 embedded) */ - POWERPC_DEF("750l", CPU_POWERPC_750L, 750) /* PowerPC 750L v2.0 (G3 embedded) */ POWERPC_DEF("750l_v2.0", CPU_POWERPC_750L_v20, 750) /* PowerPC 750L v2.1 (G3 embedded) */ @@ -9161,6 +9143,18 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = { { "G3", "750" }, /* Code name for PowerPC 740P/750P (G3) */ { "Conan/Doyle", "750p" }, + /* PowerPC 750CL (G3 embedded) */ + { "750cl", "750cl_v2.0" }, + /* PowerPC 750CX (G3 embedded) */ + { "750cx", "750cx_v2.2" }, + /* PowerPC 750CXe (G3 embedded) */ + { "750cxe", "750cxe_v3.1b" }, + /* PowerPC 750FX (G3 embedded) */ + { "750fx", "750fx_v2.3" }, + /* PowerPC 750GX (G3 embedded) */ + { "750gx", "750gx_v1.2" }, + /* PowerPC 750L (G3 embedded) */ + { "750l", "750l_v3.2" }, /* Code name for PowerPC 750L (G3 embedded) */ { "LoneStar", "750l" }, /* Generic PowerPC 745 */