From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54679 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OM5R3-0000rR-9S for qemu-devel@nongnu.org; Tue, 08 Jun 2010 16:30:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OM5R0-0004nG-Ny for qemu-devel@nongnu.org; Tue, 08 Jun 2010 16:30:08 -0400 Received: from mail.codesourcery.com ([38.113.113.100]:54654) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OM5R0-0004mk-FU for qemu-devel@nongnu.org; Tue, 08 Jun 2010 16:30:06 -0400 From: Nathan Froyd Date: Tue, 8 Jun 2010 13:30:02 -0700 Message-Id: <1276029003-10158-8-git-send-email-froydnj@codesourcery.com> In-Reply-To: <1276029003-10158-1-git-send-email-froydnj@codesourcery.com> References: <1276029003-10158-1-git-send-email-froydnj@codesourcery.com> Subject: [Qemu-devel] [PATCH 7/8] linux-user: honor low bit of entry PC for MIPS List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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) { -- 1.6.3.2