From patchwork Fri Apr 23 09:44:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 50803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8BBD3B7D11 for ; Fri, 23 Apr 2010 19:50:06 +1000 (EST) Received: from localhost ([127.0.0.1]:43363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5FT1-0000DE-27 for incoming@patchwork.ozlabs.org; Fri, 23 Apr 2010 05:46:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5FR2-0000AY-PA for qemu-devel@nongnu.org; Fri, 23 Apr 2010 05:44:32 -0400 Received: from [140.186.70.92] (port=33769 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5FR0-00008A-Vc for qemu-devel@nongnu.org; Fri, 23 Apr 2010 05:44:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5FQz-0003mX-8B for qemu-devel@nongnu.org; Fri, 23 Apr 2010 05:44:30 -0400 Received: from smtp2a.orange.fr ([80.12.242.140]:26502) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5FQz-0003mL-0r for qemu-devel@nongnu.org; Fri, 23 Apr 2010 05:44:29 -0400 Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2a18.orange.fr (SMTP Server) with ESMTP id D53F78003C44 for ; Fri, 23 Apr 2010 11:44:26 +0200 (CEST) Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2a18.orange.fr (SMTP Server) with ESMTP id C3E7F8003C58 for ; Fri, 23 Apr 2010 11:44:26 +0200 (CEST) Received: from localhost.localdomain (LPuteaux-156-15-47-90.w82-127.abo.wanadoo.fr [82.127.74.90]) by mwinf2a18.orange.fr (SMTP Server) with ESMTP id 8E6D08003C44 for ; Fri, 23 Apr 2010 11:44:26 +0200 (CEST) X-ME-UUID: 20100423094426583.8E6D08003C44@mwinf2a18.orange.fr From: Thomas Monjalon To: qemu-devel@nongnu.org Date: Fri, 23 Apr 2010 11:44:26 +0200 Message-Id: <1272015866-18544-1-git-send-email-thomas_ml@monjalon.net> X-Mailer: git-send-email 1.7.0.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH] target-ppc: exception model of 603e inherits from 603 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Thomas Monjalon It appears that the exception handling of 603e is the same as 603. So it could be removed safely. Signed-off-by: Thomas Monjalon --- target-ppc/cpu.h | 2 -- target-ppc/helper.c | 3 --- target-ppc/translate_init.c | 5 +---- 3 files changed, 1 insertions(+), 9 deletions(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 2ad4486..ba266cb 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -134,8 +134,6 @@ enum powerpc_excp_t { POWERPC_EXCP_602, /* PowerPC 603 exception model */ POWERPC_EXCP_603, - /* PowerPC 603e exception model */ - POWERPC_EXCP_603E, /* PowerPC G2 exception model */ POWERPC_EXCP_G2, /* PowerPC 604 exception model */ diff --git a/target-ppc/helper.c b/target-ppc/helper.c index c28223b..c290f77 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2385,7 +2385,6 @@ static inline void powerpc_excp(CPUState *env, int excp_model, int excp) switch (excp_model) { case POWERPC_EXCP_602: case POWERPC_EXCP_603: - case POWERPC_EXCP_603E: case POWERPC_EXCP_G2: goto tlb_miss_tgpr; case POWERPC_EXCP_7x5: @@ -2404,7 +2403,6 @@ static inline void powerpc_excp(CPUState *env, int excp_model, int excp) switch (excp_model) { case POWERPC_EXCP_602: case POWERPC_EXCP_603: - case POWERPC_EXCP_603E: case POWERPC_EXCP_G2: goto tlb_miss_tgpr; case POWERPC_EXCP_7x5: @@ -2423,7 +2421,6 @@ static inline void powerpc_excp(CPUState *env, int excp_model, int excp) switch (excp_model) { case POWERPC_EXCP_602: case POWERPC_EXCP_603: - case POWERPC_EXCP_603E: case POWERPC_EXCP_G2: tlb_miss_tgpr: /* Swap temporary saved registers with GPRs */ diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index f3e266d..c88762e 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -4519,7 +4519,7 @@ static void init_proc_603 (CPUPPCState *env) PPC_SEGMENT | PPC_EXTERN) #define POWERPC_MSRM_603E (0x000000000007FF73ULL) #define POWERPC_MMU_603E (POWERPC_MMU_SOFT_6xx) -//#define POWERPC_EXCP_603E (POWERPC_EXCP_603E) +#define POWERPC_EXCP_603E (POWERPC_EXCP_603) #define POWERPC_INPUT_603E (PPC_FLAGS_INPUT_6xx) #define POWERPC_BFDM_603E (bfd_mach_ppc_ec603e) #define POWERPC_FLAG_603E (POWERPC_FLAG_TGPR | POWERPC_FLAG_SE | \ @@ -9589,9 +9589,6 @@ int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def) case POWERPC_EXCP_603: excp_model = "PowerPC 603"; break; - case POWERPC_EXCP_603E: - excp_model = "PowerPC 603e"; - break; case POWERPC_EXCP_604: excp_model = "PowerPC 604"; break;