From patchwork Thu Feb 23 13:44:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meador Inge X-Patchwork-Id: 142623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 68209B6EEE for ; Fri, 24 Feb 2012 00:44:43 +1100 (EST) Received: from localhost ([::1]:35898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0YyK-0007xl-1H for incoming@patchwork.ozlabs.org; Thu, 23 Feb 2012 08:44:36 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0YyB-0007xN-Ng for qemu-devel@nongnu.org; Thu, 23 Feb 2012 08:44:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0Yy5-0004DF-NN for qemu-devel@nongnu.org; Thu, 23 Feb 2012 08:44:27 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:41848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0Yy5-0004D2-Hx for qemu-devel@nongnu.org; Thu, 23 Feb 2012 08:44:21 -0500 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1S0Yy0-0000p6-GG from meador_inge@mentor.com ; Thu, 23 Feb 2012 05:44:16 -0800 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 23 Feb 2012 05:44:13 -0800 Received: from dhalsim.gateway.2wire.net (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.1.289.1; Thu, 23 Feb 2012 05:44:15 -0800 From: Meador Inge To: Date: Thu, 23 Feb 2012 07:44:14 -0600 Message-ID: <1330004654-428-1-git-send-email-meadori@codesourcery.com> X-Mailer: git-send-email 1.7.7.6 MIME-Version: 1.0 X-OriginalArrivalTime: 23 Feb 2012 13:44:13.0099 (UTC) FILETIME=[3A384FB0:01CCF231] X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 192.94.38.131 Cc: agraf@suse.de Subject: [Qemu-devel] [PATCH v1 1/1] ppc: Correctly define POWERPC_INSNS2_DEFAULT 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 'POWERPC_INSNS2_DEFAULT' was defined incorrectly which was causing the opcode table creation code to erroneously register 'eieio' and 'mbar' for the "default" processor: ** ERROR: opcode 1a already assigned in opcode table 16 *** ERROR: unable to insert opcode [1f-16-1a] *** ERROR initializing PowerPC instruction 0x1f 0x16 0x1a Signed-off-by: Meador Inge --- target-ppc/translate_init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 6253076..6cb5fad 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -6713,7 +6713,7 @@ static void init_proc_620 (CPUPPCState *env) #if defined (TARGET_PPC64) && 0 // XXX: TODO #define CPU_POWERPC_DEFAULT CPU_POWERPC_PPC64 #define POWERPC_INSNS_DEFAULT POWERPC_INSNS_PPC64 -#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS_PPC64 +#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS2_PPC64 #define POWERPC_MSRM_DEFAULT POWERPC_MSRM_PPC64 #define POWERPC_MMU_DEFAULT POWERPC_MMU_PPC64 #define POWERPC_EXCP_DEFAULT POWERPC_EXCP_PPC64 @@ -6725,7 +6725,7 @@ static void init_proc_620 (CPUPPCState *env) #else #define CPU_POWERPC_DEFAULT CPU_POWERPC_PPC32 #define POWERPC_INSNS_DEFAULT POWERPC_INSNS_PPC32 -#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS_PPC32 +#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS2_PPC32 #define POWERPC_MSRM_DEFAULT POWERPC_MSRM_PPC32 #define POWERPC_MMU_DEFAULT POWERPC_MMU_PPC32 #define POWERPC_EXCP_DEFAULT POWERPC_EXCP_PPC32