commit 8549850891b3e0714cdb01aecf3e08a746c1b361
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Jul 02 15:34:05 2005 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Jul 02 15:34:05 2005 +0000
tree 6a4d0ba58c29e1b1beaca3f608e54eefe261ad91
parent 7a962d3087d24fa0ea377cbde39ab97f81457ff6

fixed c0_context in tlb exception (Ralf Baechle)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1480 c046a42c-6fe2-441c-8c8c-71466251a162

target-mips/helper.c

diff --git a/target-mips/helper.c b/target-mips/helper.c
index 2381496..aa97e82 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -263,10 +263,10 @@
         }
         /* Raise exception */
         env->CP0_BadVAddr = address;
-        env->CP0_Context =
-            (env->CP0_Context & 0x00000FFF) | (address & 0xFFFFF000);
+        env->CP0_Context = (env->CP0_Context & 0xff800000) |
+	                   ((address >> 8) &   0x007ffff0);
         env->CP0_EntryHi =
-            (env->CP0_EntryHi & 0x00000FFF) | (address & 0xFFFFF000);
+            (env->CP0_EntryHi & 0x000000FF) | (address & 0xFFFFF000);
         env->exception_index = exception;
         env->error_code = error_code;
         ret = 1;