From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KJAIG-000599-5o
	for qemu-devel@nongnu.org; Wed, 16 Jul 2008 12:55:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KJAIF-00058q-NS
	for qemu-devel@nongnu.org; Wed, 16 Jul 2008 12:55:55 -0400
Received: from [199.232.76.173] (port=37723 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KJAIF-00058m-FY
	for qemu-devel@nongnu.org; Wed, 16 Jul 2008 12:55:55 -0400
Received: from savannah.gnu.org ([199.232.41.3]:42764 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <blauwirbel@gmail.com>)
	id 1KJAIF-0001G2-Bk
	for qemu-devel@nongnu.org; Wed, 16 Jul 2008 12:55:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <blauwirbel@gmail.com>) id 1KJAID-0007oF-Ph
	for qemu-devel@nongnu.org; Wed, 16 Jul 2008 16:55:53 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1KJAID-0007o6-DT
	for qemu-devel@nongnu.org; Wed, 16 Jul 2008 16:55:53 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1KJAID-0007o6-DT@cvs.savannah.gnu.org>
Date: Wed, 16 Jul 2008 16:55:53 +0000
Subject: [Qemu-devel] [4880] Fix MMU miss traps
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

Revision: 4880
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4880
Author:   blueswir1
Date:     2008-07-16 16:55:52 +0000 (Wed, 16 Jul 2008)

Log Message:
-----------
Fix MMU miss traps

Modified Paths:
--------------
    trunk/target-sparc/cpu.h
    trunk/target-sparc/helper.c

Modified: trunk/target-sparc/cpu.h
===================================================================
--- trunk/target-sparc/cpu.h	2008-07-16 13:06:53 UTC (rev 4879)
+++ trunk/target-sparc/cpu.h	2008-07-16 16:55:52 UTC (rev 4880)
@@ -50,7 +50,6 @@
 #define TT_TRAP     0x80
 #else
 #define TT_TFAULT   0x08
-#define TT_TMISS    0x09
 #define TT_CODE_ACCESS 0x0a
 #define TT_ILL_INSN 0x10
 #define TT_UNIMP_FLUSH TT_ILL_INSN
@@ -61,12 +60,13 @@
 #define TT_CLRWIN   0x24
 #define TT_DIV_ZERO 0x28
 #define TT_DFAULT   0x30
-#define TT_DMISS    0x31
 #define TT_DATA_ACCESS 0x32
 #define TT_DPROT    0x33
 #define TT_UNALIGNED 0x34
 #define TT_PRIV_ACT 0x37
 #define TT_EXTINT   0x40
+#define TT_TMISS    0x64
+#define TT_DMISS    0x68
 #define TT_SPILL    0x80
 #define TT_FILL     0xc0
 #define TT_WOTHER   0x10

Modified: trunk/target-sparc/helper.c
===================================================================
--- trunk/target-sparc/helper.c	2008-07-16 13:06:53 UTC (rev 4879)
+++ trunk/target-sparc/helper.c	2008-07-16 16:55:52 UTC (rev 4880)
@@ -655,7 +655,7 @@
 
 #ifdef TARGET_SPARC64
 #ifdef DEBUG_PCALL
-static const char * const excp_names[0x50] = {
+static const char * const excp_names[0x80] = {
     [TT_TFAULT] = "Instruction Access Fault",
     [TT_TMISS] = "Instruction Access MMU Miss",
     [TT_CODE_ACCESS] = "Instruction Access Error",
@@ -699,7 +699,7 @@
         static int count;
         const char *name;
 
-        if (intno < 0 || intno >= 0x180 || (intno > 0x4f && intno < 0x80))
+        if (intno < 0 || intno >= 0x180)
             name = "Unknown";
         else if (intno >= 0x100)
             name = "Trap Instruction";