From patchwork Tue Apr 27 15:31:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 51089 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 BEF66B7D43 for ; Wed, 28 Apr 2010 01:42:04 +1000 (EST) Received: from localhost ([127.0.0.1]:48519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6mvC-0006DB-0g for incoming@patchwork.ozlabs.org; Tue, 27 Apr 2010 11:42:02 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O6mky-0002NF-Cv for qemu-devel@nongnu.org; Tue, 27 Apr 2010 11:31:28 -0400 Received: from [140.186.70.92] (port=41036 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6mks-0002JR-1N for qemu-devel@nongnu.org; Tue, 27 Apr 2010 11:31:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O6mkj-0001sj-05 for qemu-devel@nongnu.org; Tue, 27 Apr 2010 11:31:21 -0400 Received: from smtp27.orange.fr ([80.12.242.94]:50445) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O6mki-0001ri-Mh for qemu-devel@nongnu.org; Tue, 27 Apr 2010 11:31:12 -0400 Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2728.orange.fr (SMTP Server) with ESMTP id 873D21C0065E for ; Tue, 27 Apr 2010 17:31:11 +0200 (CEST) Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2728.orange.fr (SMTP Server) with ESMTP id 79F061C00605 for ; Tue, 27 Apr 2010 17:31:11 +0200 (CEST) Received: from tmonjalo-laptop (LPuteaux-156-15-47-90.w82-127.abo.wanadoo.fr [82.127.74.90]) by mwinf2728.orange.fr (SMTP Server) with ESMTP id 232E81C0057F for ; Tue, 27 Apr 2010 17:31:11 +0200 (CEST) X-ME-UUID: 20100427153111144.232E81C0057F@mwinf2728.orange.fr From: Thomas Monjalon To: qemu-devel@nongnu.org Date: Tue, 27 Apr 2010 17:31:08 +0200 Message-Id: <85ae2646dc5239ed80cf37e5e31a72d448070efd.1272382040.git.thomas@monjalon.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH v2 3/5] 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 in the code that the exception handling of 603e is the same as 603. If there is addon like SRR1[KEY], it is handled without special case for it. 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 a5479c4..3d843b5 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2391,7 +2391,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: @@ -2410,7 +2409,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: @@ -2429,7 +2427,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;