From patchwork Thu Jan 12 20:18:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 714643 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 3tzy0K6ykrz9t1L for ; Fri, 13 Jan 2017 07:24:17 +1100 (AEDT) Received: from localhost ([::1]:36511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRlux-0001C2-OM for incoming@patchwork.ozlabs.org; Thu, 12 Jan 2017 15:24:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRlpG-0003xm-Ll for qemu-devel@nongnu.org; Thu, 12 Jan 2017 15:18:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRlpD-0004v3-DX for qemu-devel@nongnu.org; Thu, 12 Jan 2017 15:18:22 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:55168) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cRlpD-0004tu-1j for qemu-devel@nongnu.org; Thu, 12 Jan 2017 15:18:19 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MgOZS-1c44GP2m2g-00Nidh; Thu, 12 Jan 2017 21:18:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 12 Jan 2017 21:18:01 +0100 Message-Id: <1484252284-29291-3-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484252284-29291-1-git-send-email-laurent@vivier.eu> References: <1484252284-29291-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:DzgkD0Xw+tBKB+KUNSjKROdp1A0dGgZWCbQvcEM5NJZ2ebNr4ig R7LQ05xENwLF77h1wcbOJ+Zvf1qq2i979T9+Nkh193W9ks4dkVAyEr/iwo0GGaLbtqoLILB 5ifMM4Ii5uesazANNvRczDx15V5QyUIGNYju0FNkTj/ZnAmbkHvnnjuxfJFpFSAlFAQ6SAx h1Zm/nwjHWTA/AqS4zpcg== X-UI-Out-Filterresults: notjunk:1; V01:K0:FPTYaZwerI0=:ome/wTibs/JpO6bq33u7Pe pGqZWcugxuzj0RSY6TMCLPhc+57l+3ImtwAX00jknu81L1j6Jylg+iKtySWzZ5yZ/hjiNK7RQ V/cdezKrOeNcryPJCvlyCpeyhN6MnFDoZ+3+BQPv+p7n0sgt3FvoqHW6XyIGwNVGffvwtgoWo iDzNqXxrsrjpjmsg+a4+LoP12FLDxloMesfrhXA/oA/RfPkwboaDB+Z5F7CvrETGQsWGd76Xt WTYs/hKPF30GYTANq/05mHiRroQUNqivU1EvsI0A8gnEgRH/SUawZNKMu2VU7q7HC9x0DPBSu hbETiqPrw5XPArf5jeI96MzVf9iQE+w6zS3mk4kPa/2rIsxTYXHd+ZiR5NKFp0aZi89jE27LN SZqvaMQOXnqyvKOBtNWkey6cwYOCAGNWnvBhVDp/4JwwZxncdblCnUPmW8OOD1p3WM6fSwtxL z6uR49ObiSOCFY1mLQeVxVXDITr6qRTp7V1sdOaHIjro7bXHCuhRYvCMTHczdiRvtI/HpcwCC 4sKIla/ZuOr0ER3GTqIaiz8pNjI1qGpY3ztS3f1EpwAL3sK1Q5iS7sVHrpOCZnbIXGXXq85DA Y0GBv8db5ZdK8NCwEuM3pk56ao/3qEcK5nC3FHGccL0kMONzQu+MFwsUTF34SgVALEI5bfgn9 8SaAXaIRNz0ecuE6+g3FpXr0oDIami3UxWTrZ6U2WLrnm0mDkrJyradKVYZNYZoNtVnk= 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 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: 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 --- 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)