Patchwork [7/8] linux-user: honor low bit of entry PC for MIPS

login
register
mail settings
Submitter Nathan Froyd
Date June 8, 2010, 8:30 p.m.
Message ID <1276029003-10158-8-git-send-email-froydnj@codesourcery.com>
Download mbox | patch
Permalink /patch/55030/
State New
Headers show

Comments

Nathan Froyd - June 8, 2010, 8:30 p.m.
Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>
---
 linux-user/main.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

Patch

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 @@  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)
     {