linux-user: honor low bit of entry PC for MIPS
authorNathan Froyd <froydnj@codesourcery.com>
Tue, 8 Jun 2010 20:30:02 +0000 (13:30 -0700)
committerAurelien Jarno <aurelien@aurel32.net>
Wed, 9 Jun 2010 14:10:51 +0000 (16:10 +0200)
Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
linux-user/main.c

index 0f23fc9..ad292f1 100644 (file)
@@ -3271,7 +3271,10 @@ int main(int argc, char **argv, char **envp)
         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)
     {