From patchwork Tue Jun 8 20:30:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Froyd X-Patchwork-Id: 55030 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5635AB7D59 for ; Wed, 9 Jun 2010 06:35:24 +1000 (EST) Received: from localhost ([127.0.0.1]:47981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OM5Se-0000sZ-Pq for incoming@patchwork.ozlabs.org; Tue, 08 Jun 2010 16:31:48 -0400 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 Received: (qmail 5422 invoked from network); 8 Jun 2010 20:30:05 -0000 Received: from unknown (HELO localhost) (froydnj@127.0.0.2) by mail.codesourcery.com with ESMTPA; 8 Jun 2010 20:30:05 -0000 From: Nathan Froyd To: qemu-devel@nongnu.org Date: Tue, 8 Jun 2010 13:30:02 -0700 Message-Id: <1276029003-10158-8-git-send-email-froydnj@codesourcery.com> X-Mailer: git-send-email 1.6.3.2 In-Reply-To: <1276029003-10158-1-git-send-email-froydnj@codesourcery.com> References: <1276029003-10158-1-git-send-email-froydnj@codesourcery.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 7/8] linux-user: honor low bit of entry PC for MIPS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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) {