From patchwork Thu May 1 21:20:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886401 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp519890wrq; Thu, 1 May 2025 14:24:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9ciy5cjC0UAYMBC2Z+lHggwpqlyhi/3QiLPlP4agtE0fHWkvKSDT0SKCMoqpbvBqIcix/jA==@linaro.org X-Google-Smtp-Source: AGHT+IH/3bvYlqMSc/R9CEtr8JRF1rrWQMaQ3h9IL2LqzowVYn6XvCNGiKiGlQkWrRwWAGy8skjP X-Received: by 2002:a05:620a:bd5:b0:7c5:60c7:339 with SMTP id af79cd13be357-7cad5b23c32mr90387185a.9.1746134672229; Thu, 01 May 2025 14:24:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746134672; cv=none; d=google.com; s=arc-20240605; b=HYQVmXnrRwICHPhmVFut3XAExObQ9iXMDdYQWQgx4PzC2OuOVdWDUlBNJ0gP7oNI4T utxIlidto6JTEaFSJXuyK3Onub5hfpEW5tF5TZhuT9GfidIZ1dKQwjy4fqXn9YYGLztW obo7QUzlHa1FFxj0OxkocLHvIy9tBT/6/6kGZVvk8jFVNoDpC4NDgwHpSuU/krU+0nu9 MrH2PPkELcSRKW7QfM51PcD27HDBGL3EL6RwLzywguWbjgMNV9PlkaDuFSFkrnX5Um2X 3X6Ukqf9ejSMWsTukkOVoGo0uK8MJrWLAABJROeR9sZbUOA2q9kl2sIdXI0LA+ZP8Xxu k3NQ== 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=/BWKAEDoduJo+vm6H9IfI7womewKXVIoZxey+PglUhc=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=Z1CYDdDZ9G4jucxCcYwqtCZRJqAJB5DF0tvGhxYneBHw5F4hY5bQTwExHbm+0RWgET ZwY35ST2mrOyI7lwf2LNPPF6oWJzEv5aU+ho+SPVV5GIQ9N29sNg/9ToPWWqojhhs9Hx MZSXLFHI5wPfkvPdkjQUHxuZhUB4+KDxB1IV/tgqvvmEncmv01NRQILgtfOJ8xKvSA5c M6LuMmRtkgbNg+cMsoW7v6hSNeOB5VqviyupaL0q+e09WEMUMS5P8MiRv0PIA7fTdaAv 61yuGg+vpiIAOiVJGG15r6voNVonpzW3zRBXhWQyaN5scKsYmkcUq/+dv0UE9mUlCXFP xLOA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MJGDxJOA; 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 af79cd13be357-7cad23b9e8fsi151401685a.15.2025.05.01.14.24.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:24:32 -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=MJGDxJOA; 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 1uAbLw-00016G-7u; Thu, 01 May 2025 17:21:56 -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 1uAbLo-00011P-5E for qemu-devel@nongnu.org; Thu, 01 May 2025 17:21:48 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAbLm-0001aL-9k for qemu-devel@nongnu.org; Thu, 01 May 2025 17:21:47 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-b1396171fb1so906522a12.2 for ; Thu, 01 May 2025 14:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746134504; x=1746739304; 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=/BWKAEDoduJo+vm6H9IfI7womewKXVIoZxey+PglUhc=; b=MJGDxJOA/n83hS5OhDMX7g/sINtWgI0g11D51+ErTfXehh+BGm3/0M/TRXqDfsDlMz x6mbH38SLYMbH31NKABcfqE/1+kqQWQSXDEf+ita5mo/URMqU1RK80DLj0b8uHMulxrG snEvbGkm4jszsZXvfMnVaCGpU5aloW0SVkxVByxQ88zUW7jRnGdOOz7OA1pHwkf2QNji 7eRbsqDlByw4PtURGKG0Px41d3rnN6B/5rcyB+6LAs0Upgo0AnYxztV2FGjAABTS18Hg SKwaJM7b0plZ80xqhGrGJIFHgrmu8ephkAD1oECGaeKWTDdCbYQy1DkOYIudrys9yya0 bZHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746134504; x=1746739304; 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=/BWKAEDoduJo+vm6H9IfI7womewKXVIoZxey+PglUhc=; b=khCenCoZuiHTeMiv3rr1CtNBSail2b3tebL6gq3P8//tYzuoN1bcKojxfYtQb76M/D w4Th7XdHpzWkitReXYIlShF1enkp5lVgEcImHuGx9RQeIdd5x6pi4EQa2yuGCrO3fB9H cHBeR9l+UJ5mZf2Hb39+RwP8R19xG+rxd0mzE6tIAgDqTJ8p0TUdlgVlJYU3k9O0J0T/ /j7FEqYNx/dQ1oMy8R8cQNJtTt3Gi4AiyF3ndf43TqipliilN628wackUM7aW+busU+Q 6FcqxKOSgITv+/pVjzVJvHY2IDy/EsxwcvAgcoMIKfP/N2qQ8ZZuClbNOygCE9AL5z03 04TQ== X-Gm-Message-State: AOJu0YxKnjKa+VjYKY5vaNhBCHEBzpoiXgn87/EgK8sd1JgQalrymYjP Wv5Ol6SKNHGMdcU2Xc0yeaWep633kA2eKwDyTPt37OoYeQ/Aob49e+ZQ+rhtaZBw+Kc3YtJh4/5 a X-Gm-Gg: ASbGncsY0TY2kapsCzbp9A3G4z4fG9Zp6GtkQ/LYstIx2rZ2NlQTtg2SACtcRrVGoSq T/1977KDjpjEuGAfns7dp/c7EqzJ1SgPuHyitscglAJ1sFx/zvQxytGiEqv9sgFWihh6Qg9m1Vk fkSqlEHC2lPv/6g2vxZzXkSwJppj0IJYO3V0ghXk6wZ8ySqk1ndnrZvJSdSi+3h7LhWJTxPSVai hD2XNr71un7fjSkIH6nmD1J31C7sIqeCz0EuIYciJe5VnFrPpoWO+JUmpjzqsKp62ORFZCE/09A ZADUe6mQ+/x8UjCXdkhE+PfyhwdIs+qV3c/O/lEDrQ9e3DByF+uwfCU3LcDMwG7ade2Y9kSRzEs = X-Received: by 2002:a17:90b:5208:b0:2ee:741c:e9f4 with SMTP id 98e67ed59e1d1-30a4e5b2c3fmr986404a91.11.1746134504454; Thu, 01 May 2025 14:21:44 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a476267e0sm1384573a91.39.2025.05.01.14.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 May 2025 14:21:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 36/59] accel/tcg: Use TCGTBCPUState in struct tb_desc Date: Thu, 1 May 2025 14:20:50 -0700 Message-ID: <20250501212113.2961531-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250501212113.2961531-1-richard.henderson@linaro.org> References: <20250501212113.2961531-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.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 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- 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;