From patchwork Tue Oct 25 19:03:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 686687 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t3Nkc2XPvz9t0Z for ; Wed, 26 Oct 2016 06:39:04 +1100 (AEDT) Received: from localhost ([::1]:57791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz7Ys-0001x9-7E for incoming@patchwork.ozlabs.org; Tue, 25 Oct 2016 15:39:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz714-0006ER-SC for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bz712-000855-7D for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:06 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:55810) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bz711-00084M-Te for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:04 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0ML865-1byq1e4BKT-000Lqo; Tue, 25 Oct 2016 21:03:36 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2016 21:03:10 +0200 Message-Id: <1477422199-11208-15-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477422199-11208-1-git-send-email-laurent@vivier.eu> References: <1477422199-11208-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:B1pFdDJI7T69AwwJ4ivT7e0S5eFaQ8IAx7d/lKnLl8Inx/Zqrdb IjGQ3pkFgjZ+4KHu0reYJe0PBzKkLaYteLKMSs1PIIvf03DknN3Y5kAIF7Lj/vO8ZpnnnLt QW0PqUtEcuwgFPIJnwn1X6Qbl5Yz2J5Y5/jsxemtQhh2B4kfAItC+YaJ7JFaS7R2a+U0v4T ZDIIje1dMHDcmdZmPQhiQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:qQTxTmsblT8=:5zJbG5BsiXiE9fZ37ssygV 0Bwz43ayMcUqHHxXeKFuXERpbx9kD30Y16uKKJwnlO6SgNzIQYxVSGwRvPdI/OMhjcZaCHDb0 sMynk8vjAEm9kR3GYWjnTKQx48UU6PI6wPwXVeCZhxYkIsfER1r1YBjZxMk7TU62nFq1qB+YY jK3uRYoJpUAf6MoRgEvFG2B7XMx5H67j33CBITc8TWpVwfOAbT2RL5FgP+2MW+77BvNBHfM13 2Qi0/O4Mgk8yUUrkZRJPtL+mTZpkjB9F9NhflHnT5aaVqzNsQs5Nv/2FOlvHV/3oi9/+dvPXd dOrazgvDhoYb7NSGbobA1LbgaCVuoUv+sGrGeqXl/1mtHPlCVguzTSQXUTI9ithfnamVUje9D CyEJtAnEoDt8bprXPo2+aQxVWwoWy4KMStbjfdHwbCm3uk0SipFm86hFPEoApZvv9rvz80ZsY uUoOfUcp4phQ/i7Gr+h+L3AMzI3+j+wVgjj2lpi1Hz8qWUg+21uQzTghvmZYMKdNacjPBGIAz SYT46AQwyj8Yq8q/I3lnidsw9qyBjCGhm1IBQo+WOfu2cziNZIxCkatCpGdTE74QMfoJBvX5L nMkpzQIBHSIG89yvuh3dMjPeVfiXQwHlibYT6fPpanTF+pxbIeS0rGYS6YqLCZd6KeY67aUE1 mAfx6/13qRwyBfRLuNTYupFSHmSAIG3mTXnBTlPPSkFxQS1076l3LQWQBL0eyDdb8TLs= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 14/23] target-m68k: don't update cc_dest in helpers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , gerg@uclinux.org, schwab@linux-m68k.org, agraf@suse.de, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target-m68k/cpu.h | 1 - target-m68k/helper.c | 28 ++++++++++++++-------------- target-m68k/helper.h | 2 +- target-m68k/translate.c | 4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index f055ef6..72a939e 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -158,7 +158,6 @@ M68kCPU *cpu_m68k_init(const char *cpu_model); is returned if the signal was handled by the virtual CPU. */ int cpu_m68k_signal_handler(int host_signum, void *pinfo, void *puc); -void cpu_m68k_flush_flags(CPUM68KState *, int); /* Instead of computing the condition codes after each m68k instruction, diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 92d1ded..0a1ff11 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -132,9 +132,8 @@ void m68k_cpu_init_gdb(M68kCPU *cpu) /* TODO: Add [E]MAC registers. */ } -void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op) +static uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op) { - M68kCPU *cpu = m68k_env_get_cpu(env); int flags; uint32_t src; uint32_t dest; @@ -202,7 +201,7 @@ void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op) flags = 0; src = env->cc_src; dest = env->cc_dest; - switch (cc_op) { + switch (op) { case CC_OP_FLAGS: flags = dest; break; @@ -268,10 +267,9 @@ set_x: SET_FLAGS_SHIFT(int32_t); break; default: - cpu_abort(CPU(cpu), "Bad CC_OP %d", cc_op); + g_assert_not_reached(); } - env->cc_op = CC_OP_FLAGS; - env->cc_dest = flags; + return flags; } void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val) @@ -422,20 +420,21 @@ uint32_t HELPER(subx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2) { uint32_t res; uint32_t old_flags; + int op; old_flags = env->cc_dest; if (env->cc_x) { env->cc_x = (op1 <= op2); - env->cc_op = CC_OP_SUBX; + op = CC_OP_SUBX; res = op1 - (op2 + 1); } else { env->cc_x = (op1 < op2); - env->cc_op = CC_OP_SUB; + op = CC_OP_SUB; res = op1 - op2; } env->cc_dest = res; env->cc_src = op2; - cpu_m68k_flush_flags(env, env->cc_op); + env->cc_dest = cpu_m68k_flush_flags(env, op); /* !Z is sticky. */ env->cc_dest &= (old_flags | ~CCF_Z); return res; @@ -445,20 +444,21 @@ uint32_t HELPER(addx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2) { uint32_t res; uint32_t old_flags; + int op; old_flags = env->cc_dest; if (env->cc_x) { res = op1 + op2 + 1; env->cc_x = (res <= op2); - env->cc_op = CC_OP_ADDX; + op = CC_OP_ADDX; } else { res = op1 + op2; env->cc_x = (res < op2); - env->cc_op = CC_OP_ADD; + op = CC_OP_ADD; } env->cc_dest = res; env->cc_src = op2; - cpu_m68k_flush_flags(env, env->cc_op); + env->cc_dest = cpu_m68k_flush_flags(env, op); /* !Z is sticky. */ env->cc_dest &= (old_flags | ~CCF_Z); return res; @@ -790,9 +790,9 @@ void HELPER(mac_set_flags)(CPUM68KState *env, uint32_t acc) } } -void HELPER(flush_flags)(CPUM68KState *env, uint32_t cc_op) +uint32_t HELPER(flush_flags)(CPUM68KState *env, uint32_t op) { - cpu_m68k_flush_flags(env, cc_op); + return cpu_m68k_flush_flags(env, op); } uint32_t HELPER(get_macf)(CPUM68KState *env, uint64_t val) diff --git a/target-m68k/helper.h b/target-m68k/helper.h index c24ace5..0f5a7cf 100644 --- a/target-m68k/helper.h +++ b/target-m68k/helper.h @@ -45,5 +45,5 @@ DEF_HELPER_3(set_mac_extf, void, env, i32, i32) DEF_HELPER_3(set_mac_exts, void, env, i32, i32) DEF_HELPER_3(set_mac_extu, void, env, i32, i32) -DEF_HELPER_2(flush_flags, void, env, i32) +DEF_HELPER_2(flush_flags, i32, env, i32) DEF_HELPER_2(raise_exception, void, env, i32) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 37faefe..3db7918 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -424,7 +424,7 @@ static inline void gen_flush_flags(DisasContext *s) if (s->cc_op == CC_OP_FLAGS) return; gen_flush_cc_op(s); - gen_helper_flush_flags(cpu_env, QREG_CC_OP); + gen_helper_flush_flags(QREG_CC_DEST, cpu_env, QREG_CC_OP); s->cc_op = CC_OP_FLAGS; } @@ -719,6 +719,7 @@ static void gen_jmpcc(DisasContext *s, int cond, TCGLabel *l1) /* TODO: Optimize compare/branch pairs rather than always flushing flag state to CC_OP_FLAGS. */ gen_flush_flags(s); + gen_flush_cc_op(s); switch (cond) { case 0: /* T */ tcg_gen_br(l1); @@ -1673,7 +1674,6 @@ DISAS_INSN(branch) /* bsr */ gen_push(s, tcg_const_i32(s->pc)); } - gen_flush_cc_op(s); if (op > 1) { /* Bcc */ l1 = gen_new_label();