From patchwork Wed Apr 30 16:48:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886064 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp957061wrq; Wed, 30 Apr 2025 09:50:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWuorud7DEsc+LauUYF5pZMWxB5aluf27dARzNbJgIFWzn+rRUPdFtGteaAH9lWxAzPjSsAxw==@linaro.org X-Google-Smtp-Source: AGHT+IFgny0SiIT29148/ZS9bTr1ttdpuaKVRaa1RguUpxw0i3/VcsTtLOM10kALO6DkvhiG5BbJ X-Received: by 2002:a05:6214:2584:b0:6e8:fb92:dffa with SMTP id 6a1803df08f44-6f4fe081236mr49090256d6.25.1746031801702; Wed, 30 Apr 2025 09:50:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746031801; cv=none; d=google.com; s=arc-20240605; b=Me6bz4F4y/w464jXmyvetT9s2z5caaF9eS+A96Nwx5Hcamy0OFIhJPE8DHifWLOZ0L Qstb20QRMUiQH4UphWJZN+FdnTdsgGNjXeyuAt0U+EmiVc6E0ylErKHoyGZotYv61h2j cS7FqXbMcXnO+rBHc9pHe8xPy8XNcri3QVj+CD/fd7NgMQjapQaf/TTV7wytTffq+ta5 UMMnTJORhJksv7cGw31h81MFWAFQn6W/SR17ukaaORz9NcSTiweDrEJBkATLeFG/WOpU Xy8YfTd4ai70rqe3mGa7RGabRKlwDr91f+2/0JkoncpdXWk+86mYOUnsJqWBgI4ecjoP O7Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=3OA/Cegqwe9p0yD6ikSN7G53T07JOQms4URcLJNl+RA=; fh=6c3iePwzSVcIevU/n11cXtkmPbvvYSh1prLosaYzn/o=; b=izHlUQ/dIxqVcZt7JHRoqyhYU7W3mz2P6sYFKmI/vNn1JzhtleVgKB1Tl/aI3I6lNY 2Op1XUlfpk6+qL6OZt5vNakCxAu3kd0p4IH9Gt9VaEodX0xZXDKZlJOZm0t9hJu0B61o /f6NaZA1ZXxVNOhDlnsj5Zl7HTrl0zD7DqIqUKKijHkNbCH6OmvWVtPRNslI0VfN4MuZ TZ15E30OCNRs3hVChcscyptTPVdNn64FJygoi65ykXvnvHLetQNgYOs3IOmeAndoKl92 zm6M+vZlTVq5kTg76s/08ajheRm8EHKx/Yi5oZsQ4wcAFeejnyJc6Hp2v+c8hthtls3j 7YEA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sbq1nLre; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4fe8301aasi19669016d6.511.2025.04.30.09.50.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 09:50:01 -0700 (PDT) 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=sbq1nLre; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAAcf-0005au-Id; Wed, 30 Apr 2025 12:49:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAAcR-0005AN-Aj for qemu-devel@nongnu.org; Wed, 30 Apr 2025 12:49:14 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAAcN-0001vO-I1 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 12:49:09 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2295d78b45cso1186975ad.0 for ; Wed, 30 Apr 2025 09:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746031746; x=1746636546; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3OA/Cegqwe9p0yD6ikSN7G53T07JOQms4URcLJNl+RA=; b=sbq1nLre1TDYiSDkDFl+7gFSk4M0gb+DuZj/mmne5Ah5wzor26ZZFb7dL8fRY0iMb1 19GLjAhX/8ViQPvxF6lklfnx//MNHOUgt2XFxkMXGTodadLn89j1RVPGRvb99BbaHEfE HdScgt+JRZdG5Ybd9Cf5iv/9qEMvzQSxl6OA7/yrNFFLdsnZ5w2ruVQbVkWQIRTvXxn3 OWpYjWM9KyYILfdSeWKrMC+38iH4cRlh7A7+cwaVplptz3NQRTCWZRsZqnOPmuEG9FNf FcfM5sX9dpciS7ITFobrCiSUp5OSGNt2DGo36P7EzN7rd1BjgiXOS/MGuq2rwKWNjQzB mW5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746031746; x=1746636546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3OA/Cegqwe9p0yD6ikSN7G53T07JOQms4URcLJNl+RA=; b=iiaL+BMHWhYKbi5kMaRjhCvwH5q4g07dQAWtrg3tTzKt7+CxgIyPzJbgpPm62mMQTA eDoP2CAj754HVeMa9+3STkLH9yPD6hOz/gvW9FjOhudICLiKah9OCWtQYiJc+qKRFLLP ZTSyQsl+7MUkyvufBURQvSThy+HE+Ad5OBvitaNOBCKnBVLChL4kOZYz50Y/mqgSqIJq Y5x23fmMT6fW8Jf4Wv4fAqNS/j4UHEKqYVthkvmWjqsYYTkNdOgNJB2v5kEngcoCLKrX nPdkvzEI5oBQyYFxUZXg+TT8Pzi9arJXAHXr0BBOPTdgFuhqkX3CbaqQsK3iz6PgrTlT pk1Q== X-Gm-Message-State: AOJu0YxlVQ9Se+dfn6HZ2Mxrandw9RPMCZO/htjS9A6eDlDzNzHJ9Bz3 2VoPFdN8yoqb35GSSJOHoMrguozkSpl1IwG22XcDERL992pPEKYM76XGcegNXzQpPoQAffNmQ3e 0 X-Gm-Gg: ASbGncuC8pazUMFkdRKRFjcF1DcRTwbklSPpI9fPmcvhAFyQwXfwEVfagE+w/8ulaUp 3Dv+nNPXNX7Brolh2SfOkIoCU9bFVoyy/+y7VW8+Bmdkj2VY3ourR4wD400JHgLL2BTDNQgNyBK saYko0KmaXnQY1yV5vZpjps487qFlPUd2ZrXlXZ2kVOL8jSzhDF+KNSxnKoDXZ1G4f8FaF73dP2 VvvdTfrJy+UIu7etJZo5VPoB628VymMEN1DBZ+PAbr1Vuq6HBCsIsKh6WjFJIEISiMXuM5ZX//A WqegrPft2FU+xeas5n6s6vNH3c0OpMTgEzuAQxbeJiTP5rZ7pId1HnPQwOjgukrLFwBPYlCpW/A = X-Received: by 2002:a17:902:e88d:b0:223:f928:4553 with SMTP id d9443c01a7336-22df5836c5emr52767025ad.44.1746031746084; Wed, 30 Apr 2025 09:49:06 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b15f76f580asm9129704a12.2.2025.04.30.09.49.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 09:49:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pierrick.bouvier@linaro.org, philmd@linaro.org Subject: [PATCH v2 13/16] accel/tcg: Use TCGTBCPUState in struct tb_desc Date: Wed, 30 Apr 2025 09:48:51 -0700 Message-ID: <20250430164854.2233995-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250430164854.2233995-1-richard.henderson@linaro.org> References: <20250430164854.2233995-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/tcg/cpu-exec.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 8e6899950e..4ad84c2db8 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -150,12 +150,9 @@ static void init_delay_params(SyncClocks *sc, const CPUState *cpu) #endif /* CONFIG USER ONLY */ struct tb_desc { - vaddr pc; - uint64_t cs_base; + TCGTBCPUState s; CPUArchState *env; tb_page_addr_t page_addr0; - uint32_t flags; - uint32_t cflags; }; static bool tb_lookup_cmp(const void *p, const void *d) @@ -163,11 +160,11 @@ static bool tb_lookup_cmp(const void *p, const void *d) const TranslationBlock *tb = p; const struct tb_desc *desc = d; - if ((tb_cflags(tb) & CF_PCREL || tb->pc == desc->pc) && + if ((tb_cflags(tb) & CF_PCREL || tb->pc == desc->s.pc) && tb_page_addr0(tb) == desc->page_addr0 && - tb->cs_base == desc->cs_base && - tb->flags == desc->flags && - tb_cflags(tb) == desc->cflags) { + tb->cs_base == desc->s.cs_base && + tb->flags == desc->s.flags && + tb_cflags(tb) == desc->s.cflags) { /* check next page if needed */ tb_page_addr_t tb_phys_page1 = tb_page_addr1(tb); if (tb_phys_page1 == -1) { @@ -185,7 +182,7 @@ static bool tb_lookup_cmp(const void *p, const void *d) * is different for the new TB. Therefore any exception raised * here by the faulting lookup is not premature. */ - virt_page1 = TARGET_PAGE_ALIGN(desc->pc); + virt_page1 = TARGET_PAGE_ALIGN(desc->s.pc); phys_page1 = get_page_addr_code(desc->env, virt_page1); if (tb_phys_page1 == phys_page1) { return true; @@ -201,11 +198,8 @@ static TranslationBlock *tb_htable_lookup(CPUState *cpu, TCGTBCPUState s) struct tb_desc desc; uint32_t h; + desc.s = s; desc.env = cpu_env(cpu); - desc.cs_base = s.cs_base; - desc.flags = s.flags; - desc.cflags = s.cflags; - desc.pc = s.pc; phys_pc = get_page_addr_code(desc.env, s.pc); if (phys_pc == -1) { return NULL;