From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FfRpd-0006yn-E0
	for qemu-devel@nongnu.org; Sun, 14 May 2006 21:25:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FfRpc-0006y3-LU
	for qemu-devel@nongnu.org; Sun, 14 May 2006 21:25:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FfRpc-0006y0-GU
	for qemu-devel@nongnu.org; Sun, 14 May 2006 21:25:08 -0400
Received: from [193.7.176.20] (helo=bender.bawue.de)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.52) id 1FfRru-0008SK-Jg
	for qemu-devel@nongnu.org; Sun, 14 May 2006 21:27:31 -0400
Received: from lagash (88-106-136-76.dynamic.dsl.as9105.com [88.106.136.76])
	(using TLSv1 with cipher DES-CBC3-SHA (168/168 bits))
	(No client certificate requested)
	by bender.bawue.de (Postfix) with ESMTP id C9B7444B8F
	for <qemu-devel@nongnu.org>; Mon, 15 May 2006 03:25:05 +0200 (MEST)
Received: from ths by lagash with local (Exim 4.62)
	(envelope-from <ths@networkno.de>) id 1FfRpS-0004eQ-IT
	for qemu-devel@nongnu.org; Mon, 15 May 2006 02:24:58 +0100
Date: Mon, 15 May 2006 02:24:58 +0100
Message-ID: <20060515012458.GH800@networkno.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
From: Thiemo Seufer <ths@networkno.de>
Subject: [Qemu-devel] [PATCH 4/8] Mips improvements
Reply-To: qemu-devel@nongnu.org
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

Hello All,

This patch fixes wrong bitmasks for CP0_Context and CP0_EntryHi.


Thiemo


Index: qemu-work/target-mips/helper.c
===================================================================
--- qemu-work.orig/target-mips/helper.c 2006-05-07 23:41:39.000000000 +0100
+++ qemu-work/target-mips/helper.c      2006-05-07 23:43:38.000000000 +0100
@@ -231,7 +231,7 @@
         env->CP0_Context = (env->CP0_Context & 0xff800000) |
                           ((address >> 9) &   0x007ffff0);
         env->CP0_EntryHi =
-            (env->CP0_EntryHi & 0xFF) | (address & 0xFFFFF000);
+            (env->CP0_EntryHi & 0xFF) | (address & 0xFFFFE000);
         env->exception_index = exception;
         env->error_code = error_code;
         ret = 1;
Index: qemu-work/target-mips/op_helper.c
===================================================================
--- qemu-work.orig/target-mips/op_helper.c      2006-05-07 23:41:39.000000000 +0100
+++ qemu-work/target-mips/op_helper.c   2006-05-07 23:43:38.000000000 +0100
@@ -342,7 +342,7 @@
         rn = "EntryLo1";
         break;
     case 4:
-        val = (env->CP0_Context & 0xFF000000) | (T0 & 0x00FFFFF0);
+        val = (env->CP0_Context & 0xFF800000) | (T0 & 0x007FFFF0);
         old = env->CP0_Context;
         env->CP0_Context = val;
         rn = "Context";
@@ -366,7 +366,7 @@
         rn = "Count";
         break;
     case 10:
-        val = T0 & 0xFFFFF0FF;
+        val = T0 & 0xFFFFE0FF;
         old = env->CP0_EntryHi;
         env->CP0_EntryHi = val;
        /* If the ASID changes, flush qemu's TLB.  */