From patchwork Sun Feb 28 23:23:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 388612 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp2934085jap; Sun, 28 Feb 2021 16:11:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJz4KHTBpz7pNis1iOtIm1DP+5qxRyCQwchlwSdPmawv+htMo0Gath0ChJGO+J1XdQUZuxVB X-Received: by 2002:a05:6e02:1ca2:: with SMTP id x2mr11692552ill.243.1614557487182; Sun, 28 Feb 2021 16:11:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614557487; cv=none; d=google.com; s=arc-20160816; b=jjAJQsfonZxNzVWc2Z/SabuAd++hY6asXNgMMw20nkukTSb1zqWCJTWWMGeqRpmqIR 3yqLfArVNKs7reNvxjlgXd5QB+RHUgnUkyvxFfbD21qB4dZKJu+Pgsa4wEj4m1SyBlzA s2/zminRl4Gn4utgbsf7Jl9jbX20EISXEq7XM1UOrqdA7tceIuAg1/HQ7F24E4fnWnl3 EE6AqNaq05faL/1YGhLIufG8V0src3Vn8XiZsh4JLdvVqRXmWLbvYpHn0fJVdSzCkT4x mJNR9J2TiBgNmZOYbvnHGL5aQPAnim7viJEjXyldzI1b1VNWFE6YOQrnKSi3+kH7Ah7Z jCCg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=49Cd1j1K/38NZkLjnlIs6/b9Bf5vlKLKhEhBcwBUlbI=; b=tFBSNzgbHOb143r1bY/hAwo01d+sAR27zy4qkBirZDy/B/cti9W7dEG2EKPlwr2F7I 5YZwfiroTxqdh5PvOznuxxvcf0mjKVtVPsMs8bzwKzoAmLVLzy4lGYLNBnW9rrivVugk 5ha8nl1xh56Edd07ro8VW3bp1paOue526TS9UxZHYWRHK1vSuWtPyPgMTGQDCPcNf/OT 4lqmyQDaXpa83S185wzSQ6kinesWFjxPFtM2ybepiac465C20URUdAgnxCHl2cjKTCXL jBN2xnG6jh7apzz7HmsVhLG0yiQ7b0aHmCuT59JqysS/r/OUAwmvW2ago/AKx1jYNR1s 5iBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G8KiXVnV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e16si11137154jam.51.2021.02.28.16.11.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Feb 2021 16:11:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G8KiXVnV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGW9m-0000xb-Ly for patch@linaro.org; Sun, 28 Feb 2021 19:11:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGVPw-0005tB-HD for qemu-devel@nongnu.org; Sun, 28 Feb 2021 18:24:04 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:54016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGVPm-0007mT-35 for qemu-devel@nongnu.org; Sun, 28 Feb 2021 18:24:04 -0500 Received: by mail-pj1-x1031.google.com with SMTP id c19so9855786pjq.3 for ; Sun, 28 Feb 2021 15:23:53 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=49Cd1j1K/38NZkLjnlIs6/b9Bf5vlKLKhEhBcwBUlbI=; b=G8KiXVnVwc3anNnMfOFv0bZwkZzyOaS1MmlWqccK/HmJz+/A4QBsDQVzwqoH9y9lON lLds6AOv4XJvqZWQ/fdCT3oquu+bgPHuyEATk7bXwteC4g4awRpy9HibgqyCF+c2ipY5 PgDRW7CWZ+mqA9/Ez/exNu2wd+DB29tBFv2aAK/Gz2b5qt0KRkOVEi3fYtPvlKgikBYd tpeVBSPhIHo7nGajUfye7DdXBddIeU51yHZiskz8w6Li2b8O6Lq1z3897Knx4wNvs8KQ XxhqWLfoAqpH8F7ZceagK91CEM6I0e8mF7CqvJYTUvdXFBYgtpXtSbR44gvMY/usM/Yr 9hBA== 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:mime-version:content-transfer-encoding; bh=49Cd1j1K/38NZkLjnlIs6/b9Bf5vlKLKhEhBcwBUlbI=; b=Zu42kCsIYdHRHWdCXmYgkLnuconpGTkkpYmdnBMWoTP+YkOnPGLSIvd1+8I/pXi5KX yQctwQ3VMx4nLbgLZ412UlMCyqJem/GBTa0HgI2O/A0tIjA8A9aw+GKLDZnCgI3MeqfD QYHwW/tZxoJLOG+nU7swBk3hNJunYL/CYeZBAFCBzluUCRNSe2Udv5bZGmQ36Dwvt2ST Hoqnuhk4TmYS6aJW73B4JjqN6bTjVx2K9Vfg5tih2NGTI2TsAMRZg+lAgyvvcQk9S3E1 M94utAiLVUtDB24EJglQJXnOCrTT/DUYL7GCDpqfYirjTS/JfRplqnNeN+fZglLeaki+ pvIQ== X-Gm-Message-State: AOAM530zr+fR+rFwx5xX0wZXn2aI/KbF3lF74MuiqseL+OVRPJl+kLHB qrFQ/WsYeL4fF4egjLM0n3fgi/YuFTufxg== X-Received: by 2002:a17:90a:ce0c:: with SMTP id f12mr3133064pju.11.1614554632778; Sun, 28 Feb 2021 15:23:52 -0800 (PST) Received: from localhost.localdomain (174-21-84-25.tukw.qwest.net. [174.21.84.25]) by smtp.gmail.com with ESMTPSA id d24sm16257400pfn.54.2021.02.28.15.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 15:23:52 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 36/50] target/i386: Tidy svm_check_intercept from tcg Date: Sun, 28 Feb 2021 15:23:07 -0800 Message-Id: <20210228232321.322053-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210228232321.322053-1-richard.henderson@linaro.org> References: <20210228232321.322053-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cfontana@suse.de Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The param argument to helper_svm_check_intercept_param is always 0; eliminate it and rename to helper_svm_check_intercept. Fold gen_sve_check_intercept_param into gen_svm_check_intercept. Signed-off-by: Richard Henderson --- target/i386/helper.h | 2 +- target/i386/tcg/sysemu/svm_helper.c | 5 ++--- target/i386/tcg/translate.c | 16 ++++------------ 3 files changed, 7 insertions(+), 16 deletions(-) -- 2.25.1 diff --git a/target/i386/helper.h b/target/i386/helper.h index f794d1c7c7..86484a4ec4 100644 --- a/target/i386/helper.h +++ b/target/i386/helper.h @@ -107,7 +107,7 @@ DEF_HELPER_2(inl, tl, env, i32) #ifndef CONFIG_USER_ONLY DEF_HELPER_FLAGS_4(bpt_io, TCG_CALL_NO_WG, void, env, i32, i32, tl) -DEF_HELPER_3(svm_check_intercept_param, void, env, i32, i64) +DEF_HELPER_2(svm_check_intercept, void, env, i32) DEF_HELPER_4(svm_check_io, void, env, i32, i32, i32) DEF_HELPER_3(vmrun, void, env, int, int) DEF_HELPER_1(vmmcall, void, env) diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/svm_helper.c index ca5a781a7e..86a0b3c4be 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -517,10 +517,9 @@ void cpu_svm_check_intercept_param(CPUX86State *env, uint32_t type, } } -void helper_svm_check_intercept_param(CPUX86State *env, uint32_t type, - uint64_t param) +void helper_svm_check_intercept(CPUX86State *env, uint32_t type) { - cpu_svm_check_intercept_param(env, type, param, GETPC()); + cpu_svm_check_intercept_param(env, type, 0, GETPC()); } void helper_svm_check_io(CPUX86State *env, uint32_t port, uint32_t param, diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index c135be9063..cbc0cc3ccc 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -197,7 +197,7 @@ STUB_HELPER(clgi, TCGv_env env) STUB_HELPER(invlpga, TCGv_env env, TCGv_i32 aflag) STUB_HELPER(set_dr, TCGv_env env, TCGv_i32 reg, TCGv val) STUB_HELPER(stgi, TCGv_env env) -STUB_HELPER(svm_check_intercept_param, TCGv_env env, TCGv_i32 t, TCGv_i64 p) +STUB_HELPER(svm_check_intercept, TCGv_env env, TCGv_i32 type) STUB_HELPER(svm_check_io, TCGv_env env, TCGv_i32 port, TCGv_i32 p, TCGv_i32 a) STUB_HELPER(vmload, TCGv_env env, TCGv_i32 aflag) STUB_HELPER(vmmcall, TCGv_env env) @@ -2423,9 +2423,8 @@ static inline int svm_is_rep(int prefixes) return ((prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) ? 8 : 0); } -static inline void -gen_svm_check_intercept_param(DisasContext *s, target_ulong pc_start, - uint32_t type, uint64_t param) +static void gen_svm_check_intercept(DisasContext *s, target_ulong pc_start, + uint32_t type) { /* no SVM activated; fast case */ if (likely(!GUEST(s))) { @@ -2433,14 +2432,7 @@ gen_svm_check_intercept_param(DisasContext *s, target_ulong pc_start, } gen_update_cc_op(s); gen_jmp_im(s, pc_start - s->cs_base); - gen_helper_svm_check_intercept_param(cpu_env, tcg_const_i32(type), - tcg_const_i64(param)); -} - -static inline void -gen_svm_check_intercept(DisasContext *s, target_ulong pc_start, uint64_t type) -{ - gen_svm_check_intercept_param(s, pc_start, type, 0); + gen_helper_svm_check_intercept(cpu_env, tcg_constant_i32(type)); } static inline void gen_stack_update(DisasContext *s, int addend)