From patchwork Thu Jan 4 01:28:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855319 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBqxJ17JZz9s7s for ; Thu, 4 Jan 2018 12:30:28 +1100 (AEDT) Received: from localhost ([::1]:44664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuMU-0000ra-5D for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:30:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLR-0000p9-Kp for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLO-00073N-Dv for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:21 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:60041) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLO-00070P-4P for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:18 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M72xB-1erU2I2os9-00wmxL; Thu, 04 Jan 2018 02:29:15 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:28:57 +0100 Message-Id: <20180104012913.30763-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:um/WSB40AujNAFG7cBhWkK+5H7ZQTbh74yPUwOBkQ580cqB5Id0 G9VDJUqWSZRW0RzLetyTiw9dCPAYncuRc0SoBfmb5DemVfjCllMG0nW8iWCiirqiebe+QRQ 4nKUVNizrL30FqZZXboWbNyw+AH0HvDm3u+qdvFV1vmaybDXmhQ4j9apxoCwSYNkKYTvIlT RQaz59+2ao/ylri8rnfAA== X-UI-Out-Filterresults: notjunk:1; V01:K0:LPx6E7Qpg7w=:rXI02TmRCV4McSzdNndVgU jWuBaE2OA9AIuwWqw58yArqwPg/kAP/IXIYKgg7aXrYI2tyjfJGb4s2WMLvjRbix6VVNKIrt8 Bh839SSwT+c+R4x1MQ0CxtEFC77EWtk2sOgC28LE8wTrDDPdqZQ8S+K1Gv4CUsAsCNYGb41Ln QUHS+MOtY9uIXENYbgjkTmT1xpWOTFYGc7wcwur/VQ0rVq2wJdLazbmyepGEuaNm98XWHX6fP Q3wxWnzfXiiSZinrSFxsQMwnsYKfjnzX4K9Gn5uWmWxkyYXgH6tRorgdH/H0wYJV9sKWgRmtS MA5QCRdhYsbT+9mFCozG3NyQUGeRT6w1q5KlpbS0jhSoegOJBVLU/MA0HJK1C4luuhFy9F4Vg 72vFlHJRq7dvIFGlGxaK5goikYjTdmnJ7ghDiR3QSDuBGhPEy033NTuP2m4NWaS+LZIWu/XrE GYj+SVtMX1B+vaDaaaIJoyN+0X0ZEBTgaR41ZlPy6yD8UBqGkrGKIZFRyL3p5hV2A7y+Ap+vw yWWV71zDXaPnWlOaVcl/RgwYHMIgl9tFb6SE2wpVP2lv4088v0vSlZk4tKUfQirxYsXkcacy1 lZk4pv5BenUgjuhbr1ZyI83tsk97nMf9f7Xn8nNtkw91S8ZzdwV7ZsO1ol1k116Niixqx4GQh XgzVN7GPucTebcsHHOQwkAVksd9WLNDt/rBH6YnpynbYR0U0AORcRNmGVpk8F5StiLuR3S8Hj S+FGpl9tTaQoNtDBLDvXSsEQpwlibFt60YeTWg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v7 01/17] target-m68k: sync CC_OP before gen_jmp_tb() 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: Thomas Huth , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" And remove update_cc_op() from gen_exception() because there is one in gen_jmp_im(). Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index bbda7399ec..0e9d651a2a 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -270,7 +270,6 @@ static void gen_raise_exception(int nr) static void gen_exception(DisasContext *s, uint32_t where, int nr) { - update_cc_op(s); gen_jmp_im(s, where); gen_raise_exception(nr); } @@ -2897,6 +2896,7 @@ DISAS_INSN(branch) gen_jmp_tb(s, 0, s->pc); } else { /* Unconditional branch. */ + update_cc_op(s); gen_jmp_tb(s, 0, base + offset); } } @@ -4875,6 +4875,7 @@ static void gen_fjmpcc(DisasContext *s, int cond, TCGLabel *l1) DisasCompare c; gen_fcc_cond(&c, s, cond); + update_cc_op(s); tcg_gen_brcond_i32(c.tcond, c.v1, c.v2, l1); free_cond(&c); }