From patchwork Fri Jan 13 12:52:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 715029 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3v0MyC0Bbkz9t15 for ; Fri, 13 Jan 2017 23:53:55 +1100 (AEDT) Received: from localhost ([::1]:40694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS1Me-0007A7-MZ for incoming@patchwork.ozlabs.org; Fri, 13 Jan 2017 07:53:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS1LB-00061L-55 for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cS1L7-0002NX-85 for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:21 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:58740) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cS1L6-0002NJ-TF for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:17 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LrsLe-1ca5UV2Fyw-013iWo; Fri, 13 Jan 2017 13:52:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 13 Jan 2017 13:52:00 +0100 Message-Id: <1484311923-28637-3-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484311923-28637-1-git-send-email-laurent@vivier.eu> References: <1484311923-28637-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:hqI9QXqEDVsz0Z7VmErqXnL+TZVRr0k38dwR29o9H4GRN2i0YNo OhzYvVjBXoxIVsSj6Gn2S3Fx56IvWCunt+9uS6FHujV0XVnwNB2bdQC5tlxeJZlySrQuDCl VGiqySoeopWKyxImlBYG1eLxL/Y+2Eo4F28tIJKWdUOZI9HljdbqYTJup2M53SCSgSc7TXU cjg9EAAdeO580/631MbXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:4CRYbxz+mrk=:IPDq1q/Ii3NNxE7MqjgduR E9T/D6ibjUAmBWv78kuvm1qseAYePSzuo6/oKUPNMjSf2LRepAwOUNyTDR18UbtHfTo0HtZtL 8iU4paI5+embDZN3eJUQn0jvPPrXcUIZJCRJg3BtmGEPdHoe3clykMf+IYB1iHMFycHeqNzZg c8ffTj2Sf1gVDkj/mYBkre9JMTx8Eopq1V8yXB777tkECCvkwPOtwZV4ZARey7Dr/DEhwsCg6 CJzZQKHJxuzYUolIgB7CdkF+c4dalt/rbGEsf5BPWLrRZSkpwZ25ak8Gwx79VAkNO14JRNS/2 bBrYJdzL5a5YF+82yQUvVtAAlZWw2zTxD03/WrfYjG3B/4pOH4QwQK9tfIyBVdl/r4qT/aBM/ BQp/9+Nb4xIRXZsMLg7X+t5WXq7zCJSJ04GihvQ+TOR6loewkogstsYImAogXbMmILjk0mKpR n1/B7jmTMuteSI7dKiiSHe6ALSNTckb0Sfl3YxgbP+3JeUQlBMcph/cxrMnYTiZma3fcQm+xw GZzfCREfxBllFTko9cfm0l1j4HA6d0ht8Vnn2L4gypTpW8MQvpoaFGb7Q46cskmwcHDS3nTKj uLe4KCskgjoWajYTh8oErYPYCLLE8AOGI/iVT5q4f4KH+TcMDakGkCx4tG6tbfC/TgQ/cxTeC Pg1FB41kndorn7IJNjtYy/5V4ND/e1s4kd8XqjIIOMPwH91GL6+zLUPGAlX2DsT3DmE4= 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 v2 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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)