From patchwork Tue Jun 8 20:30:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [7/8] linux-user: honor low bit of entry PC for MIPS Date: Tue, 08 Jun 2010 10:30:02 -0000 From: Nathan Froyd X-Patchwork-Id: 55030 Message-Id: <1276029003-10158-8-git-send-email-froydnj@codesourcery.com> To: qemu-devel@nongnu.org Cc: aurelien@aurel32.net Signed-off-by: Nathan Froyd --- linux-user/main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) 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) {