From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MLzae-00077F-Mh
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 09:11:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MLzaZ-0006zN-LU
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 09:11:08 -0400
Received: from [199.232.76.173] (port=34307 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MLzaZ-0006z5-Fr
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 09:11:03 -0400
Received: from mail-pz0-f185.google.com ([209.85.222.185]:49986)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <wangbj@gmail.com>) id 1MLzaZ-0006xc-5Z
	for qemu-devel@nongnu.org; Wed, 01 Jul 2009 09:11:03 -0400
Received: by pzk15 with SMTP id 15so709024pzk.4
	for <qemu-devel@nongnu.org>; Wed, 01 Jul 2009 06:10:58 -0700 (PDT)
MIME-Version: 1.0
Date: Wed, 1 Jul 2009 21:10:58 +0800
Message-ID: <3cdfa5bc0907010610i20660084w9e0a74c36e0fc14c@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/1] target-ppc/translate.c: wrteei fixup
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

the E bit in wrteei is bit 15 in LSB, or 16 in MSB.

--- qemu-0.10.5.old/target-ppc/translate.c      2009-05-21
04:47:01.000000000 +0800
+++ qemu-0.10.5.new/target-ppc/translate.c      2009-07-01
21:06:13.000000000 +0800
@@ -6069,7 +6069,7 @@ GEN_HANDLER(wrtee, 0x1F, 0x03, 0x04, 0x0
 }

 /* wrteei */
-GEN_HANDLER(wrteei, 0x1F, 0x03, 0x05, 0x000EFC01, PPC_WRTEE)
+GEN_HANDLER(wrteei, 0x1F, 0x03, 0x05, 0x000E7C01, PPC_WRTEE)
 {
 #if defined(CONFIG_USER_ONLY)
     gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
@@ -6078,7 +6078,7 @@ GEN_HANDLER(wrteei, 0x1F, 0x03, 0x05, 0x
         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);