From: Nathan Froyd <froydnj@codesourcery.com>
Date: Tue, 8 Jun 2010 20:30:02 +0000 (-0700)
Subject: linux-user: honor low bit of entry PC for MIPS
X-Git-Tag: v0.13.0-rc0~338
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fddbbf2559579ab6274c50819001f4eb9896b2a;p=thirdparty%2Fqemu.git

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>
---

diff --git a/linux-user/main.c b/linux-user/main.c
index 0f23fc9cd9c..ad292f16e44 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -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)
     {