From patchwork Mon Oct 16 17:25:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 115958 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3953193qgn; Mon, 16 Oct 2017 10:48:59 -0700 (PDT) X-Received: by 10.55.113.70 with SMTP id m67mr1537108qkc.23.1508176139035; Mon, 16 Oct 2017 10:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508176139; cv=none; d=google.com; s=arc-20160816; b=NhocW0brdLlwuI/f8VF6lWbiPv0Eppzg7zwQC+EjH3+wCkEbm/JoY046AMa9xmZPlz agEsgjLnuZW7TFOhvuAqWCF4vf6Cspde30AiMBbq461QxTqEQ3SV6UgSDi7D5N5kpFhA /EV2NY/qfv/m+l222czl2/h5Lc7GHihz+9JOqrl7hBsumt/IJPXj5sy7WckVmA5ygbYL G1VurMdkPDYtyBiELc6vmUKGAoLX8lIARKbA9o0yqB1kghlKTwQUVGHAHhd74xM5klUf vijghm0KKe8IhhZP5oRPrsFCLgvq3BQMqTKQB1ruIVC3Pf5EntJxQxZXhNxxQQb/YpgF 2ZWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=fqWJKypEERna3DL8OZNR6W8KwfaZwhXECLG28bhJ+UM=; b=UEiFALd0wmdBf7pmDL8IAl6dTUYvqttguLs9Y7iZ9jCguTLeMooSUbE0M38s3RTq+N yYU7e+ZqwQ279iqPs+2DqraOXqP+H9PjYqO5xbo5SBAtLqzDr6OODQk7YQo5v6a0shwk XHJwB4SQMbuhkTVo2onO72ohu3cYH/z+Z+p4quHjSBqY00zOJWKZ5FfRPbpjDq/6d6zv 8Zz++uirks3pXgOOL24Ddw/1NB3SVXZ+qPwbId7YXbU1cTb7H2L3Xkufv/cfs9f3mO9v HCLHchxu0nUvPmMjObbjXLw1q4bsXCJ7J3LIsX8J0CeDVW7v9bRQnt63YV3Hka3F+IzY /kIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=E/0o1Ngy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 11si185114qkn.237.2017.10.16.10.48.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Oct 2017 10:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=E/0o1Ngy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34384 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e49VY-00041T-Vb for patch@linaro.org; Mon, 16 Oct 2017 13:48:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e49AG-0002WF-OZ for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e49AF-0003hq-OM for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:56 -0400 Received: from mail-pg0-x22b.google.com ([2607:f8b0:400e:c05::22b]:54130) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e49AF-0003hR-Ic for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:55 -0400 Received: by mail-pg0-x22b.google.com with SMTP id s2so7347008pge.10 for ; Mon, 16 Oct 2017 10:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fqWJKypEERna3DL8OZNR6W8KwfaZwhXECLG28bhJ+UM=; b=E/0o1Ngy+HLRwWAOtYNs3QJkHMsdixhOFQvlcMw+BKY52rAfeTg5NRyhe2S5t/MpbS yKBDTy2FjKnAKv6OKL3CbBbTKmVZwAdvCdXiJUhzhmXcpZCEg7ffT0JEectl+8VJAXop DEZ5oPUbNTA5raXvOjoEOnUmuFqZUAMz8SgvA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fqWJKypEERna3DL8OZNR6W8KwfaZwhXECLG28bhJ+UM=; b=QqNi+BQpXkwiAaPSy31aM0Vl7feTU9jYf00YdYmTSafwTLkybJtFZugZEq3QU79ndD FXCpJura8wq9GVSYlY6BQKcTQDTKIrd4ZyUXTYwOqxnKwkw5P0punbUee2X7bSuJ7qT2 bJXDreO9O++wB1RD/yixBOOF1iBfw7Ne4iAwUiuAf9CZxiDGRuKGkelM0sH9iNleE/N+ DObaBsA7l+aDWVvb+W7DcwZhYULpU7RqmvTcQ5hVGW/SNDRIrN/HBPWeZ+wHiVTOv+Gc h053uWQReBrBJD4GMzM4qKdjSkfqOPiXz08DGYotkfXPTBoZQnbX35rW96oDgwNMB7zt Q/5Q== X-Gm-Message-State: AMCzsaWYBRUZ8xU9XKLWHPGy8Naol7x2bEeGt49QdC1VwVHNr+IXCQlE v8Em89klqqRgUiLjFp3S6GwQHIr/EsA= X-Google-Smtp-Source: AOwi7QBYkSqCqytaGyVIeD2Lugrqs7cTpIcLU372eMHXVKb+jMuC+eyUT3sS5zlxrdZB7NLsXtEfHw== X-Received: by 10.98.35.18 with SMTP id j18mr9436391pfj.37.1508174814448; Mon, 16 Oct 2017 10:26:54 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-104-76.tukw.qwest.net. [97.126.104.76]) by smtp.gmail.com with ESMTPSA id i187sm5594249pfc.96.2017.10.16.10.26.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Oct 2017 10:26:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 16 Oct 2017 10:25:48 -0700 Message-Id: <20171016172609.23422-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171016172609.23422-1-richard.henderson@linaro.org> References: <20171016172609.23422-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::22b Subject: [Qemu-devel] [PATCH v6 29/50] target/i386: check CF_PARALLEL instead of parallel_cpus 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: cota@braap.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Thereby decoupling the resulting translated code from the current state of the system. Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota --- target/i386/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.13.6 diff --git a/target/i386/translate.c b/target/i386/translate.c index f60582082e..6663cd1db8 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -5265,7 +5265,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) if (!(s->cpuid_ext_features & CPUID_EXT_CX16)) goto illegal_op; gen_lea_modrm(env, s, modrm); - if ((s->prefix & PREFIX_LOCK) && parallel_cpus) { + if ((s->prefix & PREFIX_LOCK) && (tb_cflags(s->base.tb) & CF_PARALLEL)) { gen_helper_cmpxchg16b(cpu_env, cpu_A0); } else { gen_helper_cmpxchg16b_unlocked(cpu_env, cpu_A0); @@ -5276,7 +5276,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) if (!(s->cpuid_features & CPUID_CX8)) goto illegal_op; gen_lea_modrm(env, s, modrm); - if ((s->prefix & PREFIX_LOCK) && parallel_cpus) { + if ((s->prefix & PREFIX_LOCK) && (tb_cflags(s->base.tb) & CF_PARALLEL)) { gen_helper_cmpxchg8b(cpu_env, cpu_A0); } else { gen_helper_cmpxchg8b_unlocked(cpu_env, cpu_A0);