]> xenbits.xensource.com Git - qemu-xen-unstable.git/commitdiff
target-mips: correct DERET instruction
authorLeon Alrae <leon.alrae@imgtec.com>
Tue, 14 Jul 2015 10:08:13 +0000 (11:08 +0100)
committerLeon Alrae <leon.alrae@imgtec.com>
Wed, 15 Jul 2015 13:07:25 +0000 (14:07 +0100)
Fix Debug Mode flag clearing, and when DERET is placed between LL and SC
do not make SC fail.

Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
target-mips/op_helper.c

index d457a29f3e7fdbab45987c320a2fae8eec7517b1..9c28631dc1ac9622b761fd6ab044c38779c9b5b0 100644 (file)
@@ -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 */