From nobody Mon Feb 9 16:34:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499240131268562.7205811103606; Wed, 5 Jul 2017 00:35:31 -0700 (PDT) Received: from localhost ([::1]:44578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeqO-00071q-Uy for importer@patchew.org; Wed, 05 Jul 2017 03:35:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeX8-000535-Vx for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSeX8-0007uL-01 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:34 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34711) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSeX7-0007tH-PW for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:33 -0400 Received: by mail-wm0-x242.google.com with SMTP id p204so30536215wmg.1 for ; Wed, 05 Jul 2017 00:15:33 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id y35sm22202793wrc.51.2017.07.05.00.15.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:15:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TXvAuNcgwgxxJBGPvDW90MkfsBvHau0DCDQH/1qh6u8=; b=HaFDAGdHb1/AMq9S9chF38a089Sy4Q3YeU97xj1P8aYtENmtd76EhTaYEd4kcaYLu5 ZIrcxzIc6GskUVAcBmdYqfQ75fesWOlvXkzBAwqF4i1vL/yhc6Eri7QwoODeZdc8QGCc JK3OrBHwVWxGYZjy33A4LfiHFnpSSVigNB0fMTN95G8H2hkLXrhItAwG5p2/ZAgK5RZQ /b53pUunNUkVPlcLENJuCa7vy9Bgdk5Rt/0kZvFVIUXQY7vLShHX7q6k7EFXD93lgY0C v/r0vhWvDcuW3sgcj8JCflL2BcjAUBKU0d3lLNp/WOfMQLuFvn3AmD4PSdiIai59HFQi uo6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=TXvAuNcgwgxxJBGPvDW90MkfsBvHau0DCDQH/1qh6u8=; b=WfEZCdMJTTevPrWH1F7SwGlnI4yBYta9ibANnzVzXUo3XS6t/wqkjsySaAsJ2H8plq RJku/MeXMmInw0wLUDplVCPexO79wA4B8yV6CsEwqJSqxht+GLsblwOl7OxKamqggaPe bMQhoy21m8dChOyLE/1XvTg5I2/JwS1DQDlCVzzgFNfB/H3aF8gwc1cWBBuOBvxJ9L6F NvoWODppj75QzRp5IqxB6gb1FKcYCIodz1DH1JMJfhfSNv2IIxgIr1o6J4rjvQ9A3jrL b3KVnbu/sgRp3A5v/H+M/rQ66WMMxZ/tOg3nEajqeUPArZLDzVHIrkuE6cvybmhIjXdY Ct0A== X-Gm-Message-State: AIVw113BU7MxWRGUa6TZlGLIBDtpbZ37mqKS0dKh71jbxItYstzHA+RN 5rxnehnr6KxDa15clhU= X-Received: by 10.28.7.18 with SMTP id 18mr11005967wmh.20.1499238932664; Wed, 05 Jul 2017 00:15:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 5 Jul 2017 09:14:40 +0200 Message-Id: <1499238885-26161-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> References: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 37/42] target/i386: move cpu_sync_bndcs_hflags() function 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: Yang Zhong Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong Move cpu_sync_bndcs_hflags() function from mpx_helper.c to helper.c because mpx_helper.c need be disabled when tcg is disabled. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini --- target/i386/helper.c | 30 ++++++++++++++++++++++++++++++ target/i386/mpx_helper.c | 30 ------------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/target/i386/helper.c b/target/i386/helper.c index ef05059..4d584b5 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -29,6 +29,36 @@ #include "hw/i386/apic_internal.h" #endif =20 +void cpu_sync_bndcs_hflags(CPUX86State *env) +{ + uint32_t hflags =3D env->hflags; + uint32_t hflags2 =3D env->hflags2; + uint32_t bndcsr; + + if ((hflags & HF_CPL_MASK) =3D=3D 3) { + bndcsr =3D env->bndcs_regs.cfgu; + } else { + bndcsr =3D env->msr_bndcfgs; + } + + if ((env->cr[4] & CR4_OSXSAVE_MASK) + && (env->xcr0 & XSTATE_BNDCSR_MASK) + && (bndcsr & BNDCFG_ENABLE)) { + hflags |=3D HF_MPX_EN_MASK; + } else { + hflags &=3D ~HF_MPX_EN_MASK; + } + + if (bndcsr & BNDCFG_BNDPRESERVE) { + hflags2 |=3D HF2_MPX_PR_MASK; + } else { + hflags2 &=3D ~HF2_MPX_PR_MASK; + } + + env->hflags =3D hflags; + env->hflags2 =3D hflags2; +} + static void cpu_x86_version(CPUX86State *env, int *family, int *model) { int cpuver =3D env->cpuid_version; diff --git a/target/i386/mpx_helper.c b/target/i386/mpx_helper.c index 7e44820..ade5d24 100644 --- a/target/i386/mpx_helper.c +++ b/target/i386/mpx_helper.c @@ -24,36 +24,6 @@ #include "exec/exec-all.h" =20 =20 -void cpu_sync_bndcs_hflags(CPUX86State *env) -{ - uint32_t hflags =3D env->hflags; - uint32_t hflags2 =3D env->hflags2; - uint32_t bndcsr; - - if ((hflags & HF_CPL_MASK) =3D=3D 3) { - bndcsr =3D env->bndcs_regs.cfgu; - } else { - bndcsr =3D env->msr_bndcfgs; - } - - if ((env->cr[4] & CR4_OSXSAVE_MASK) - && (env->xcr0 & XSTATE_BNDCSR_MASK) - && (bndcsr & BNDCFG_ENABLE)) { - hflags |=3D HF_MPX_EN_MASK; - } else { - hflags &=3D ~HF_MPX_EN_MASK; - } - - if (bndcsr & BNDCFG_BNDPRESERVE) { - hflags2 |=3D HF2_MPX_PR_MASK; - } else { - hflags2 &=3D ~HF2_MPX_PR_MASK; - } - - env->hflags =3D hflags; - env->hflags2 =3D hflags2; -} - void helper_bndck(CPUX86State *env, uint32_t fail) { if (unlikely(fail)) { --=20 1.8.3.1