From patchwork Thu Jan 4 16:42:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855708 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 3zCDGc5PJgz9t32 for ; Fri, 5 Jan 2018 03:46:47 +1100 (AEDT) Received: from localhost ([::1]:49956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX8fE-0002j3-4h for incoming@patchwork.ozlabs.org; Thu, 04 Jan 2018 11:46:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX8ba-0007Xt-EA for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:43:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX8bX-0003Ua-4U for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:42:58 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:54921) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX8bW-0003Sy-P6 for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:42:55 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lv6gg-1ex5ih1RAI-010OLF; Thu, 04 Jan 2018 17:42:53 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 17:42:35 +0100 Message-Id: <20180104164251.26494-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104164251.26494-1-laurent@vivier.eu> References: <20180104164251.26494-1-laurent@vivier.eu> X-Provags-ID: V03:K0:f+CAuWudvwr/qeLknfDOBSRZW0Y3rlodXmYI7NYhLnXDW3NCwLn vi8D+opdLcrhv4bEklmf11L+sB3mGCrwUD0YeKJ6xpoOhggyPkHJwUSKKABXvu6pHE9sYji WJzPRbbvgZx0RRSC89SNF0KAOmmb0cVmCFsA0rVChJa+cb5GRxsY/bijCg0VrZFMYlG8JI5 rqt4CG2kgbiFBkHz2nbrA== X-UI-Out-Filterresults: notjunk:1; V01:K0:tRpSw6QsGwY=:WngvitCtovn3vArh98jFOH 8RC6hyQPxqS3/YUEVFA/6rXPAstjBiUvmCdc3ZG2yqRzf+s6HoHvPa2gGBZgkjHBhD76UW7r5 rJEPqqxovp1FewPghXtJJoae5RBQ9rWGnUYi1GPJQPbhZph+YwjQimtJFVa9+/51XasxrY0wY lwjmOHlGdBG71P15YWrFQy56AfdvsKXb3hGYSWyJ8YNDxMLq783b2g2ZjlPQk5+G3hHm6Dcon kJCWKtM54X/lEq3W4XOwwjIC4uahO4rBi5eCxT5Uggneq2FV1xmB7vw4zaIJ0jdig4F0RRBOv CfXw3x6StzVpfmtpmeqhczxO3jXjJuiYeWY1hqlJE5Q+r0Pp+ZP4CviYQzQIwuXnP626Msv5e hChZso/PZPqXuktK+3x4PjbC4arB9GnPUPebTd0YVzAYDLNEi5mPCj3R+vAXzSegnekiK7cD/ Gwe1/h0Bnm/ORRLtrxpwxVX81MAR2qeBdE7T+KyukbIUqL6HPUrxq2x9kUVj3u1u3jmPYsApJ X/vHDpf0XiEnfGH/AzIkrtwk28Klf/Dndzep13wrJumKDFoGHGrKvBZV0yoTkdWNFxiHBJyst rl+nm3BrHXLHe+m2XzBzXqqQ9z6a94o77CMYcaFfWDdnAG/oV6pocrmLHWeONZWc2Hb8b8V3w Ze2aEVd77n3YUbDu5xVqqSm49YPk0l6afz+JQBmGildvZk6hwJdKMSSPLZuRKI9U7nF5THPha 08hHBGKqHefSblWh2+Gext+lr/qkszVcnrEfAK64aSMuhm8b/Gy607EBBiU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 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: 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 Message-Id: <20180104012913.30763-2-laurent@vivier.eu> --- 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); }