From patchwork Sun May 4 20:57:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 887217 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1753483wrq; Sun, 4 May 2025 13:59:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxxkoZiTVhMZZBsexEEgZoanlkxDwT1le8s/3lgYp0SW+F3unYQJxM6GkGdEiM04L8IUOIcQ==@linaro.org X-Google-Smtp-Source: AGHT+IHdLwXs711cYnDS7P6IM4ImLaTmaCEfbMJCJhezi2ZzIl/iadGUIA26ywHk1OQVbQX4vnwa X-Received: by 2002:a05:622a:a1a:b0:471:f5bd:d88f with SMTP id d75a77b69052e-48b1bc0cbe8mr218639271cf.16.1746392378007; Sun, 04 May 2025 13:59:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746392377; cv=none; d=google.com; s=arc-20240605; b=iuCuWIn4FQ7AtT0fJGQq/xhsJn5eR+zBeJGwnpEi9ig4Kv2vUwEFPy1V5h41v4Ugna 6SvMTe4WFxj5lfjJZ/81N4KPDLLLXVDgnaD9iyr3o60Zg91WfWLTiP25bxUnlaWIsnJV ANm3zuC/P6RZLE/IOKCQNoKHanJi5qAcNfduSl43AxLzQ6/H+lZUU+G6XqRChKAosOyr tHW1semP6jt2fnkxlCwX2+WP/fW9UVqhpyfzvHRtQQtVwPtggkW8Yc+zJ8ohoK0Kyo4I qchUir/2X27WrpQ6+4wKPNVOIfbC+GIh+PMmkDiXcBA/M5kX8+87qvxT6zb+0YIa68AO riWQ== 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=dEuwy7Yf4FVl52jtCV243O0AMcyw9q5dI/6CqAcLAgQ=; fh=gFoDGlaj3dawgo7dxL4ZkFEZ9I6wTEAQ53WU9VogRKw=; b=CYNH1l8oIi/9xO1UQR/RMox7OvLFjIhByFm9OXo8CHw/VwzICQwlBxPrskD9f9Tlub 46g9VwY7C6PKB4B86l8MpG2GB/6Teszdrt4vO8wCdiyCRoCj9wBOtsuJPJvaovViJfvK V1PLR5PdNh6GleBSy0EaOthlTnc8Ylw1uco+2ciu2IxJjaVINoyiYqUb1wFWJnuWHHav ujXRB+lsrWUTJ91IlrRvcSI7CwEQHwbjdg4RUEVliAETWW8MiBEHXu4vbdUpoRYMsrdM AgCBYPSCo1bWMlLfxJIahmQk4gHSwZamZPJh6ZrGCh1rOnrx6UfWScrw9RNgfKETqrbf e/lg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PF36/yNu"; 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 d75a77b69052e-48b960cf676si75820961cf.42.2025.05.04.13.59.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 May 2025 13:59:37 -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="PF36/yNu"; 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 1uBgP2-0008SJ-49; Sun, 04 May 2025 16:57:36 -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 1uBgOv-0008P7-VA for qemu-devel@nongnu.org; Sun, 04 May 2025 16:57:31 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBgOs-0006xh-Tc for qemu-devel@nongnu.org; Sun, 04 May 2025 16:57:28 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-223f4c06e9fso33443015ad.1 for ; Sun, 04 May 2025 13:57:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746392245; x=1746997045; 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=dEuwy7Yf4FVl52jtCV243O0AMcyw9q5dI/6CqAcLAgQ=; b=PF36/yNusP7IHlK0QWwX7eal12L7+qrcOyI9EpbKugCb9SeAXVeBdjfqjOamZ30q0M fSF/lBQeCqYm7wtQNR2pTApZVDKFHfnyGcqFoUj1LQk3wsQxMxybYWy/5+xmaJLNvTsV /67iSmLZClEk8c+Bjk+Bnm2vL/RrVPyzZwCNKrVmf/20bo7HUm4jmUZ4QWTFoNRhXh2K MrQEP97WyAq0Hz9meWhMT5VJ0C7HMfnw6kPxAVr3EIyDW3WL3IGlO+llr+h5TmI+4O6B vDK2FcaN0WIAqeYVhTg6tE/GafScgwMKlBsWFxmrXW/rzFA7gK+VkruSD4kHy+C3MtD/ 2Wtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746392245; x=1746997045; 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=dEuwy7Yf4FVl52jtCV243O0AMcyw9q5dI/6CqAcLAgQ=; b=Eav6Q3efuG1fna0ilOGVBJGYP3LW6OChdrH4yn0mRv7UzaF45NscaHChzDflDZ0GkI f64hIe5LQmATz9LlvfkI3B7SzfXpnZ/bjwPqgzMPvKk1z1OkrX6zzPVsO+YrnLm40YY2 GlOdEEQCKcTeyzq6t29mr6cmEeveBbtxUxypQ13thfYJ42UzGYXpOqH0fijqFdUx4mRj cHaCAcAwdayzWVvB3KysMSgIorMdaiWJn2FMtHEd4EmHokwFEYoqwfvKKw6RyfwyiRMg BAibJCdMQrys7CPmNKj51C+OI39sz38unfy09rkQndvqBBdo5EiotL14a8B43tyD36yc DgWQ== X-Gm-Message-State: AOJu0YyPu7qzpK5ssEFphNHcJBv46C5qhvfPgT0rdwtMJRWA393E31dX nJQRdBMvjLX1mKtu0qQUJSvU4U+rbs3Uc5s8Wzs+W6lXPfMz8YkLdMfzeCuZmctdMCKRIDfrunb Y X-Gm-Gg: ASbGncs7gi5N0Lt/7LlZPNf5o7tIaFhi7YuUVren13Iqi5jSFht73BgEmBKT5CqyF3i FPEAUkahmqD2HxXVCGKjUjj9Cx1Gm4qWfXPhDfznfP72HDR0dF0U+2JQs6KJu6dcB8Ta/17+RHP r35xCtpoprPyUsxfmgNRbn3jcB9pst6NpfBB4WJ4t7jv8gf/a0PQZaxA3gQw7quHiinpt0eXEvT BRPRncLik8aUApn8A2ClhFe2OLZIWSooYtsb3SpN1ZotaYU6ZomW1xw08um2koU1xYSbuk9nBNJ /ZTnCspQTOFzA4az1ATXtSDpUjyJ1KKq/F8NvKzhfY8FODJQjaoo+yGCrBkiER/8JqdeI5/qGm0 KBZZ7APtCrQ== X-Received: by 2002:a17:902:c40a:b0:223:4d5e:7592 with SMTP id d9443c01a7336-22e0864839amr228974265ad.21.1746392244989; Sun, 04 May 2025 13:57:24 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e150eadfcsm41346425ad.32.2025.05.04.13.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 13:57:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: foss@percivaleng.com Subject: [PATCH 12/12] accel/tcg: Assert TCGCPUOps.pointer_wrap is set Date: Sun, 4 May 2025 13:57:13 -0700 Message-ID: <20250504205714.3432096-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250504205714.3432096-1-richard.henderson@linaro.org> References: <20250504205714.3432096-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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 All targets now provide the function, so we can make the call unconditional. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- accel/tcg/cpu-exec.c | 1 + accel/tcg/cputlb.c | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index cc5f362305..713bdb2056 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -1039,6 +1039,7 @@ bool tcg_exec_realizefn(CPUState *cpu, Error **errp) assert(tcg_ops->cpu_exec_halt); assert(tcg_ops->cpu_exec_interrupt); assert(tcg_ops->cpu_exec_reset); + assert(tcg_ops->pointer_wrap); #endif /* !CONFIG_USER_ONLY */ assert(tcg_ops->translate_code); assert(tcg_ops->get_tb_cpu_state); diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 022d555f48..b49f0dcc29 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1773,11 +1773,8 @@ static bool mmu_lookup(CPUState *cpu, vaddr addr, MemOpIdx oi, l->page[1].size = l->page[0].size - size0; l->page[0].size = size0; - if (cpu->cc->tcg_ops->pointer_wrap) { - l->page[1].addr = cpu->cc->tcg_ops->pointer_wrap(cpu, l->mmu_idx, - l->page[1].addr, - addr); - } + l->page[1].addr = cpu->cc->tcg_ops->pointer_wrap(cpu, l->mmu_idx, + l->page[1].addr, addr); /* * Lookup both pages, recognizing exceptions from either. If the