From patchwork Sat Mar 6 21:35:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 394560 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp550601jai; Sat, 6 Mar 2021 13:40:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlnV9thnqO7vE6F+UinIybGKf7iM3FPhcabrje72c2oZXjt8Hw0X1Knw0S60cKE+uL/CCJ X-Received: by 2002:a02:a691:: with SMTP id j17mr16762941jam.14.1615066835490; Sat, 06 Mar 2021 13:40:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615066835; cv=none; d=google.com; s=arc-20160816; b=iC+7rf+gvNpaq6UPUWXGLIYbNQPcdVBjokpyFTemkSeG+0k6K71UYKsPNhzu+iApGn fbyvx8NuB0zEZfuO+IP4zW5n5ueKuvnMR2ocQZ3jTtf3RoCzpd7hBLwmIUsXHd6RmxUD 9FYVAULPJwokOKdjsAkJsMQFPjyVFYpSf8NYPUER9qd9Rd3xSc5ETkDl5omBr5Q3VKkP /PLnlM/FYwhhs3ehKd/M+HKr+Qp1S4TRZB57BC9wsnrny4C2a8vFyCLSiiuE9JGq2Axj 4Qui34/VFEOf+4Or+VWXvQDM7sX3IXC1zdUEFKw3JJgntu2QPM97wgIBxuH0htz3IkwH 6rsA== 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=qXvTR6xq0CezXE1eROwLDPe0hk6sXQteYv5BD9wz3/8=; b=VQaI+mtOZCZ75SBSTP+o0LDlLv1cdHxV4EWwSmbkho/2NM/2AQDNrfAbTqYWhE4C0K lKfFpDfTrFPqdtW8HP+csvyne9zGm1gCPq7yGzE3Mfn0Kfx0du1spIUVM2dTR5UQUeVr XhYx+VXlZxVUuGGtS9W0W8wbLdDNFnzROu5uvE+XTWT1DtXD3qe55eFdTn5uWIuNSBEP f/ap8xZ0xB7MWAN7FNvcQpFXeVb56bXHI8JiZFEP9LEyrFgNNyhZEKqluvb5KR0M+wG7 TrfSASMErGPiAsuwE3mRktqQy1BUdnveu+US/RNAgvyTvVtgXS/x7Wrk82+3utJEypFc 4ISA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Deo7r2jK; 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 t26si6044915jan.106.2021.03.06.13.40.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 06 Mar 2021 13:40:35 -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=Deo7r2jK; 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]:35692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIef4-0005QP-TO for patch@linaro.org; Sat, 06 Mar 2021 16:40:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIeb5-0006w5-1Q for qemu-devel@nongnu.org; Sat, 06 Mar 2021 16:36:27 -0500 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:34301) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIeaz-0002wh-65 for qemu-devel@nongnu.org; Sat, 06 Mar 2021 16:36:26 -0500 Received: by mail-pg1-x52d.google.com with SMTP id l2so3801219pgb.1 for ; Sat, 06 Mar 2021 13:36:20 -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=qXvTR6xq0CezXE1eROwLDPe0hk6sXQteYv5BD9wz3/8=; b=Deo7r2jKBt95/Hkqus9IbqI/M9yoj0kjLiLb3zPCJzM5cdpYlbJG+m2rGfZl2osm13 sCvLmkffNEKLeZXVdpDDd20YQfYYmj0YOj1nwKf9quk6g5bvIpAVwlXWLCwJM14EFoqR s/sNWE6i8i9y7TRZ5M3LXykHD7cypFTl6+eaHC1hdFdcPqqShJJ/8o64RNrWBkEQCe1w Z/OLLKDiBdmMB7DnOD8bmeEo/COp716zhQI6MyrYyVwL9Nw68l19Y94E1mxcDVGFJ4Nz pJhxGFvimL0H5TiBu8p876Pi6a0GWQ7C7PzHapJm2t99qrd2UFyBNzQ+w2crHKwjmF1R PlCQ== 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=qXvTR6xq0CezXE1eROwLDPe0hk6sXQteYv5BD9wz3/8=; b=Bqw9F4H1vx3h9r2ANr87Wt9b1BUgxeuTEtGUgRjE5v15R5QWSY9Fw6nMtaKLEoSNux reGfanvR1x0h5liXIIKXZrKCVc8btBs64TCQHGpHMLdHUk2lex0NLxuKKG90T79TgAU+ kTk9mu7fzGdHP0gKyem/1JZZebKbAZ353Ls+oOycjLhIMZwynkcM61xsUr45HQSxvO3c wq1+T6oNHn+qVOryAr0bPL0xMtk6uVLYxZdckgxZxh2yj+YBn4Nk7urdEzpJtnXbBebM qb55xAnSiFWJquRKt9EMN68YrBZzMlmDHjjwGte+3m0TCG98i6UZeAT6fRKSrNicJwUt vJcg== X-Gm-Message-State: AOAM530+6KJxiKtpXLf3o94dV5mFpkNcH8MOc64qohA22vG5RKlQo/vO ZatFYYQY85p78oAZFC2HBUEXO/R58Z/j+w== X-Received: by 2002:a63:7a4b:: with SMTP id j11mr14175097pgn.369.1615066579868; Sat, 06 Mar 2021 13:36:19 -0800 (PST) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id r30sm6365616pgu.86.2021.03.06.13.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 13:36:19 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 04/27] tcg/tci: Use exec/cpu_ldst.h interfaces Date: Sat, 6 Mar 2021 13:35:50 -0800 Message-Id: <20210306213613.85168-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210306213613.85168-1-richard.henderson@linaro.org> References: <20210306213613.85168-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52d.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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use the provided cpu_ldst.h interfaces. This fixes the build vs the unconverted uses of g2h(), adds missed memory trace events, and correctly recognizes when a SIGSEGV belongs to the guest via set_helper_retaddr(). Fixes: 3e8f1628e864 Tested-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/tci.c | 73 +++++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 45 deletions(-) -- 2.25.1 diff --git a/tcg/tci.c b/tcg/tci.c index fb3c97aaf1..1c667537fe 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -346,51 +346,34 @@ static bool tci_compare64(uint64_t u0, uint64_t u1, TCGCond condition) return result; } -#ifdef CONFIG_SOFTMMU -# define qemu_ld_ub \ - helper_ret_ldub_mmu(env, taddr, oi, (uintptr_t)tb_ptr) -# define qemu_ld_leuw \ - helper_le_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr) -# define qemu_ld_leul \ - helper_le_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr) -# define qemu_ld_leq \ - helper_le_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr) -# define qemu_ld_beuw \ - helper_be_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr) -# define qemu_ld_beul \ - helper_be_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr) -# define qemu_ld_beq \ - helper_be_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr) -# define qemu_st_b(X) \ - helper_ret_stb_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) -# define qemu_st_lew(X) \ - helper_le_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) -# define qemu_st_lel(X) \ - helper_le_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) -# define qemu_st_leq(X) \ - helper_le_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) -# define qemu_st_bew(X) \ - helper_be_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) -# define qemu_st_bel(X) \ - helper_be_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) -# define qemu_st_beq(X) \ - helper_be_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) -#else -# define qemu_ld_ub ldub_p(g2h(taddr)) -# define qemu_ld_leuw lduw_le_p(g2h(taddr)) -# define qemu_ld_leul (uint32_t)ldl_le_p(g2h(taddr)) -# define qemu_ld_leq ldq_le_p(g2h(taddr)) -# define qemu_ld_beuw lduw_be_p(g2h(taddr)) -# define qemu_ld_beul (uint32_t)ldl_be_p(g2h(taddr)) -# define qemu_ld_beq ldq_be_p(g2h(taddr)) -# define qemu_st_b(X) stb_p(g2h(taddr), X) -# define qemu_st_lew(X) stw_le_p(g2h(taddr), X) -# define qemu_st_lel(X) stl_le_p(g2h(taddr), X) -# define qemu_st_leq(X) stq_le_p(g2h(taddr), X) -# define qemu_st_bew(X) stw_be_p(g2h(taddr), X) -# define qemu_st_bel(X) stl_be_p(g2h(taddr), X) -# define qemu_st_beq(X) stq_be_p(g2h(taddr), X) -#endif +#define qemu_ld_ub \ + cpu_ldub_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_ld_leuw \ + cpu_lduw_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_ld_leul \ + cpu_ldl_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_ld_leq \ + cpu_ldq_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_ld_beuw \ + cpu_lduw_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_ld_beul \ + cpu_ldl_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_ld_beq \ + cpu_ldq_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_st_b(X) \ + cpu_stb_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_st_lew(X) \ + cpu_stw_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_st_lel(X) \ + cpu_stl_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_st_leq(X) \ + cpu_stq_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_st_bew(X) \ + cpu_stw_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_st_bel(X) \ + cpu_stl_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr) +#define qemu_st_beq(X) \ + cpu_stq_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr) #if TCG_TARGET_REG_BITS == 64 # define CASE_32_64(x) \