From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFeN4-0001aR-2f for qemu-devel@nongnu.org; Thu, 16 Jul 2015 04:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFeN2-00071d-Up for qemu-devel@nongnu.org; Thu, 16 Jul 2015 04:18:22 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:55848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFeN2-00071R-Ol for qemu-devel@nongnu.org; Thu, 16 Jul 2015 04:18:20 -0400 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 64F69A9901210 for ; Thu, 16 Jul 2015 09:18:18 +0100 (IST) From: Leon Alrae Date: Thu, 16 Jul 2015 09:17:33 +0100 Message-ID: <1437034657-31026-6-git-send-email-leon.alrae@imgtec.com> In-Reply-To: <1437034657-31026-1-git-send-email-leon.alrae@imgtec.com> References: <1437034657-31026-1-git-send-email-leon.alrae@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PULL 5/9] target-mips: correct DERET instruction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Fix Debug Mode flag clearing, and when DERET is placed between LL and SC do not make SC fail. Signed-off-by: Leon Alrae Reviewed-by: Aurelien Jarno --- target-mips/op_helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index d457a29..9c28631 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -2154,10 +2154,9 @@ void helper_deret(CPUMIPSState *env) debug_pre_eret(env); set_pc(env, env->CP0_DEPC); - env->hflags &= MIPS_HFLAG_DM; + env->hflags &= ~MIPS_HFLAG_DM; compute_hflags(env); debug_post_eret(env); - env->lladdr = 1; } #endif /* !CONFIG_USER_ONLY */ -- 2.1.0