From patchwork Fri Jan 13 18:36:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 9516215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6F3EF601E5 for ; Fri, 13 Jan 2017 18:42:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EC15286B6 for ; Fri, 13 Jan 2017 18:42:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5006B2875D; Fri, 13 Jan 2017 18:42:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CDC81286B6 for ; Fri, 13 Jan 2017 18:42:40 +0000 (UTC) Received: from localhost ([::1]:44701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS6oB-00054T-Dx for patchwork-qemu-devel@patchwork.kernel.org; Fri, 13 Jan 2017 13:42:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS6ib-0008TS-Q8 for qemu-devel@nongnu.org; Fri, 13 Jan 2017 13:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cS6iY-0008H1-CR for qemu-devel@nongnu.org; Fri, 13 Jan 2017 13:36:53 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:65106) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cS6iY-0008Gc-1y for qemu-devel@nongnu.org; Fri, 13 Jan 2017 13:36:50 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MFLHA-1cG1Le0Ve8-00EKq8; Fri, 13 Jan 2017 19:36:38 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 13 Jan 2017 19:36:30 +0100 Message-Id: <1484332593-16782-3-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484332593-16782-1-git-send-email-laurent@vivier.eu> References: <1484332593-16782-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:cppWUFymFXCKKN10M/giL6tUZepoBNt2iRYyQY4lBc+nhV6luoh QPYCUpTjVLPfD5gx1R+wOjmfeP7qShasiFot7/4+4XcBpi4QlmTYnOJvemsm7aJ7ylowovt XjySZm8lEnEQRdgYfQZ+WoaJTEE6iIADVERdR+9/6m4Xq2EAy0FjWFkxDRRdmSeMbyPkG2s M60iZ5C7LtJ8UozlivBFQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:z3Ofr9Pjff4=:G7drS4HH4QDtcgzteL2Tnn xcF86OZaUhW6vklb4ajKeznbE/iaEbbtOpZnv7R7etIzZDF62ym+GCeie49xeujyDGWLE3Wiz /5PfugDAbDhbsuYLLmAlhoiFq9w9zeOjVAsMhGJBA7GVdA0C32c472MGNE/5eYhpyP4E3Y3Ka XBMh/MB7v0TO+xc5OPxoP2VwcqgPSmu+ONjwaa+Nx1nHmSocxgUR2hEsamLe6KIDS2v9HflCQ YEeSMM9EltSNZHgxVMyQw+jg3iCDTG/HAS6gzVY8VaZR4qb4zUqEUwRmvjdjEydMLzRCTlWEW 7YYMG6qRsv3jqI0O+MS1efgsaFHLUSD8SZM99VZ/O7joqLi7ah+7VkJS4EjAZV9WnTTPJx5sE /k4QU1IwPaiBAKcfydK1oYc6hA92CMfNVuXVAS38ksh5EaQTLCWuyZzdh856vKD+nbM9Lx1iS 3hQYx5LaRvfzIUWCQNMyagYmP0jfHVc3hO7IKu7IdsYRo5bGd3NIZC0ml7gYJfyVsZpmRB8Mx RiPL6iX/TP/HjR4SHhqx65vplNLCfTWzSuySiYPVpF5WmtwpH8+wF0VNKQE7pCswvOPBVSX6y G8AIlqTLHpH3J2lN2frzUMIIY1i892Sb5QNoyKaCUJ9CDIWgdSMJv60HOsosVbajJTbY7h991 MbN0hVgNGEIS6kN4xgBcpsX1v9nNMwAOz/2mtfQ2vT7oW3NhWOi6rRTP9k2xwiB8UeSE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PATCH v3 2/5] target-m68k: fix gen_flush_flags() 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 , Laurent Vivier , rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP gen_flush_flags() is setting unconditionally cc_op_synced to 1 and s->cc_op to CC_OP_FLAGS, whereas env->cc_op can be set to something else by a previous tcg fragment. We fix that by not setting cc_op_synced to 1 (except for gen_helper_flush_flags() that updates env->cc_op) FIX: https://github.com/vivier/qemu-m68k/issues/19 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 410f56a..0e97900 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -595,18 +595,19 @@ static void gen_flush_flags(DisasContext *s) case CC_OP_DYNAMIC: gen_helper_flush_flags(cpu_env, QREG_CC_OP); + s->cc_op_synced = 1; break; default: t0 = tcg_const_i32(s->cc_op); gen_helper_flush_flags(cpu_env, t0); tcg_temp_free(t0); + s->cc_op_synced = 1; break; } /* Note that flush_flags also assigned to env->cc_op. */ s->cc_op = CC_OP_FLAGS; - s->cc_op_synced = 1; } static inline TCGv gen_extend(TCGv val, int opsize, int sign)