From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MMgS3-0004Ey-KT
	for qemu-devel@nongnu.org; Fri, 03 Jul 2009 06:57:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MMgRy-00044r-Gb
	for qemu-devel@nongnu.org; Fri, 03 Jul 2009 06:57:06 -0400
Received: from [199.232.76.173] (port=49367 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MMgRx-00043w-MZ
	for qemu-devel@nongnu.org; Fri, 03 Jul 2009 06:57:01 -0400
Received: from mail-px0-f201.google.com ([209.85.216.201]:60096)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <wangbj@gmail.com>) id 1MMgRw-0006hL-RL
	for qemu-devel@nongnu.org; Fri, 03 Jul 2009 06:57:01 -0400
Received: by pxi39 with SMTP id 39so105387pxi.4
	for <qemu-devel@nongnu.org>; Fri, 03 Jul 2009 03:56:57 -0700 (PDT)
MIME-Version: 1.0
Date: Fri, 3 Jul 2009 18:56:57 +0800
Message-ID: <3cdfa5bc0907030356j63ad154cx895b4373dd6fcaa1@mail.gmail.com>
From: Baojun Wang <wangbj@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [patch 1/2] ppc tcg: fix wrong bit/mask of wrteei
	(resend)
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Signed-off-by: Baojun Wang <wangbj@gmail.com>

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index a14d197..446ad9e 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -5935,7 +5935,7 @@ static void gen_wrteei(DisasContext *ctx)
         gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
         return;
     }
-    if (ctx->opcode & 0x00010000) {
+    if (ctx->opcode & 0x00008000) {
         tcg_gen_ori_tl(cpu_msr, cpu_msr, (1 << MSR_EE));
         /* Stop translation to have a chance to raise an exception */
         gen_stop_exception(ctx);
@@ -8150,7 +8150,7 @@ GEN_HANDLER2(tlbre_440, "tlbre", 0x1F, 0x12,
0x1D, 0x00000001, PPC_BOOKE),
 GEN_HANDLER2(tlbsx_440, "tlbsx", 0x1F, 0x12, 0x1C, 0x00000000, PPC_BOOKE),
 GEN_HANDLER2(tlbwe_440, "tlbwe", 0x1F, 0x12, 0x1E, 0x00000001, PPC_BOOKE),
 GEN_HANDLER(wrtee, 0x1F, 0x03, 0x04, 0x000FFC01, PPC_WRTEE),
-GEN_HANDLER(wrteei, 0x1F, 0x03, 0x05, 0x000EFC01, PPC_WRTEE),
+GEN_HANDLER(wrteei, 0x1F, 0x03, 0x05, 0x000E7C01, PPC_WRTEE),
 GEN_HANDLER(dlmzb, 0x1F, 0x0E, 0x02, 0x00000000, PPC_440_SPEC),
 GEN_HANDLER(mbar, 0x1F, 0x16, 0x1a, 0x001FF801, PPC_BOOKE),
 GEN_HANDLER(msync, 0x1F, 0x16, 0x12, 0x03FFF801, PPC_BOOKE),