commit 0fddbbf2559579ab6274c50819001f4eb9896b2a
author Nathan Froyd <froydnj@codesourcery.com> Tue Jun 08 13:30:02 2010 -0700
committer Aurelien Jarno <aurelien@aurel32.net> Wed Jun 09 16:10:51 2010 +0200
tree debf9addff44394d6e2a7aba20ee3a2f6badd18d
parent bbfa8f72e99baa0514b2b39e671830cf9a3adc44

linux-user: honor low bit of entry PC for MIPS

Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

linux-user/main.c

diff --git a/linux-user/main.c b/linux-user/main.c
index 0f23fc9..ad292f1 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3271,7 +3271,10 @@
         for(i = 0; i < 32; i++) {
             env->active_tc.gpr[i] = regs->regs[i];
         }
-        env->active_tc.PC = regs->cp0_epc;
+        env->active_tc.PC = regs->cp0_epc & ~(target_ulong)1;
+        if (regs->cp0_epc & 1) {
+            env->hflags |= MIPS_HFLAG_M16;
+        }
     }
 #elif defined(TARGET_SH4)
     {