From patchwork Thu May 20 14:52:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [09/10] linux-user: honor low bit of entry PC for MIPS Date: Thu, 20 May 2010 04:52:29 -0000 From: Nathan Froyd X-Patchwork-Id: 53084 Message-Id: <1274367150-26576-10-git-send-email-froydnj@codesourcery.com> To: qemu-devel@nongnu.org Cc: aurelien@aurel32.net Signed-off-by: Nathan Froyd --- linux-user/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 18b52c0..76d443b 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3192,7 +3192,9 @@ 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) {