From patchwork Tue Dec 15 13:43:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 41189 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 836C8B6F17 for ; Wed, 16 Dec 2009 00:44:51 +1100 (EST) Received: from localhost ([127.0.0.1]:52382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKXho-0001s9-4s for incoming@patchwork.ozlabs.org; Tue, 15 Dec 2009 08:44:48 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKXgu-0001iN-9E for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:43:52 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKXgp-0001el-Gr for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:43:51 -0500 Received: from [199.232.76.173] (port=47371 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKXgp-0001eZ-7f for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:43:47 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:58815) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKXgo-0005U1-Lr for qemu-devel@nongnu.org; Tue, 15 Dec 2009 08:43:47 -0500 Received: from flocke.weilnetz.de (p54ADF71A.dip.t-dialin.net [84.173.247.26]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Lu0Dy-1O0rDF25eo-011eVi; Tue, 15 Dec 2009 14:43:43 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.69) (envelope-from ) id 1NKXgk-00022X-Kf; Tue, 15 Dec 2009 14:43:42 +0100 From: Stefan Weil To: Nathan Froyd , Aurelien Jarno , QEMU Developers Date: Tue, 15 Dec 2009 14:43:40 +0100 Message-Id: <1260884620-7810-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.6.5 In-Reply-To: References: X-Provags-ID: V01U2FsdGVkX18uw480ETlsjleYtI4Vt1kSGFDV9ZxUjlTxncL qrcIdBWbM4GV3MSdg//ZOaWcXP7eRNsxVn4e48zm0G7jXXF6VR sXyWH4MrwH7mgxLmmAG5MSO7EK8bWhOamdx05azqGG4p4qxqRl t9w== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] target-mips: 4Kc, 4KEc cores do not support MIPS16 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 4Kc, 4KEc cores do not support MIPS16, so not only the CP0_Config1 had to be fixed (see previous patch), but also MIPS16 instructions must not be executed. (Hint from Nathan Froyd, thanks). Signed-off-by: Stefan Weil --- target-mips/translate_init.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-mips/translate_init.c b/target-mips/translate_init.c index b710979..b79ed56 100644 --- a/target-mips/translate_init.c +++ b/target-mips/translate_init.c @@ -115,7 +115,7 @@ static const mips_def_t mips_defs[] = .CP0_Status_rw_bitmask = 0x1278FF17, .SEGBITS = 32, .PABITS = 32, - .insn_flags = CPU_MIPS32 | ASE_MIPS16, + .insn_flags = CPU_MIPS32, .mmu_type = MMU_TYPE_R4000, }, { @@ -157,7 +157,7 @@ static const mips_def_t mips_defs[] = .CP0_Status_rw_bitmask = 0x1278FF17, .SEGBITS = 32, .PABITS = 32, - .insn_flags = CPU_MIPS32 | ASE_MIPS16, + .insn_flags = CPU_MIPS32, .mmu_type = MMU_TYPE_R4000, }, { @@ -198,7 +198,7 @@ static const mips_def_t mips_defs[] = .CP0_Status_rw_bitmask = 0x1278FF17, .SEGBITS = 32, .PABITS = 32, - .insn_flags = CPU_MIPS32R2 | ASE_MIPS16, + .insn_flags = CPU_MIPS32R2, .mmu_type = MMU_TYPE_R4000, }, {