From patchwork Wed Oct 13 18:22:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515746 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp130405ime; Wed, 13 Oct 2021 11:37:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEQ2T/fJjB7RtxWYkG0k9g6vvpYxVqTdGQ8ceo/q19jEB8E+MR++nxK/gU//VGsd4xdeu1 X-Received: by 2002:a37:9445:: with SMTP id w66mr844126qkd.410.1634150235183; Wed, 13 Oct 2021 11:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634150235; cv=none; d=google.com; s=arc-20160816; b=HU1avFES7VjO5ZzEqomkzgJnEfH5QVCbzJGGwLtpQDOH9gwkg/TDMejum8i9wGllIw VbZnqkYGf757BmK6UP/dmGxCZz9m9OylR5UZe9BN5YdOF6yfM0chc4eaa9E9RcdGlXTz EGlxN6xgcpj91ulnL5LTtAQq1CTlCvVt9LFiFk8mq45zK3wrVvRQxTVZ+37xBGTG1jEU nDBf6C/YAXfgrL+NzAThUxwneYiwiPXgIUnVdyj9xP2mh+5Yq+nxh+8/sOvIRtRp8J/c wU8wjkEtF5h7x+Dv6ec/ow2PeZz4/r7DEahvOFeQPdzvgFm/tPVupvZsvw/2C13fszC9 3HpA== 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=Lyfgi2ONrOj/+YzbGSRpxf/dd8yNNIAG41Iz34Hu60w=; b=S6atkffuuYSznWB45JAEUFvhyUnpMxGDVGRmRbAUCL4R3uoLOIVCagsVWkP5E9Svma iKktdO4dY2/pqmlMvVS/JtDgetUYcy+sKgeZJoB/5+1yoqEHhD9F5MDt1QHTxSQ34gPW J/Td/x2yp8B83wl3vdm7i+AwDHtP1unvlU9b9Q/Rzyt0anjwD7RyT3mdWGKs7uPH+3n+ bL3im+3khwoK9PKmmJ8ou51AZ+Or1rN3cw60bI/D/TnJngpHBObj80jBgS8pIjR0hk0f wTJVeStvPiJFTfG1i60lMEfAvcf8D7f6/VOvasdJFMX3BG+xVqc3ER8swMB0oeTJgh8s 6VEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zPkiLj2m; 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=fail (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 w22si326256qtk.368.2021.10.13.11.37.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Oct 2021 11:37:15 -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=fail header.i=@linaro.org header.s=google header.b=zPkiLj2m; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1maj7q-0005aj-Nc for patch@linaro.org; Wed, 13 Oct 2021 14:37:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maiu3-00044R-9J for qemu-devel@nongnu.org; Wed, 13 Oct 2021 14:22:59 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:44641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1maiu0-00035u-9A for qemu-devel@nongnu.org; Wed, 13 Oct 2021 14:22:58 -0400 Received: by mail-pl1-x629.google.com with SMTP id t11so2396112plq.11 for ; Wed, 13 Oct 2021 11:22:55 -0700 (PDT) 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=Lyfgi2ONrOj/+YzbGSRpxf/dd8yNNIAG41Iz34Hu60w=; b=zPkiLj2mzvwKVJ58tztNeslkFEBtx7Pyn8uHG66Ut/hjZlvf7xGNCuvj+soHCOv1C6 p7CR4Wz1JsUgKDqvTgG3tngdOy0vX9YyZuu31+iM3yp7qCDh0B+36AxAyx7xvFfmUEx0 rwk4mIwq2PZXM4qRzTmGm3lYj9cSCocE6J11Rh8DK9NREjGKKb4Qmpytmpa4ZrECZ/MM K61iSPC0BdS0q5UPfQfJ8HN+iNRNWKHiTyEEtqzmjUzHHhXZNJAs0l6gJnHKS0Z1eQeH LMBNxDK1Jo1IJaa3zU4I7Ju/EBIYbrtsKYpkKxY9SnQtWNnhgfvhxz559B4sDLUP5OTd O74w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lyfgi2ONrOj/+YzbGSRpxf/dd8yNNIAG41Iz34Hu60w=; b=CnjnwnvON/vuHlZnNON1pSTWv4La4s1O5jKjOYYx/1kTnYMh40KqZkwKD2mhRNBzKU c7xf4s+N8zBgu/cRPJ5JLuQJ0PhMPlzJ6/MxBAR3hOP7gZvqx0S2QM1qwMwuDigaAS0R o6CbnTR1FHQV7OGDwtetw58mMt9ZgibiTTqKdZSgGmW8jIJt0qN+EGKAYhHnuQ+cSik0 XOGg/lnp7j+2XL6qY/BErKrlpciEw2yVSngnxdWkhlcGtanavDpgSZ30I9+Ka9KM63e+ XkEX2VXdBKC+ifU+IsX92lqLPKI3X6WvnXguKIbs6Lmraf+snz6b70qmrrV00Gs3baI6 reHA== X-Gm-Message-State: AOAM533s+I1U9wcL5ZyYIvr3/HDzCIHBAEHg72UFb3SMkwEj4rZ2A4PJ +XIALXfct4TLse6nDtwGbEeXwkKKSgeQWg== X-Received: by 2002:a17:902:f703:b029:12c:982:c9ae with SMTP id h3-20020a170902f703b029012c0982c9aemr751338plo.20.1634149374894; Wed, 13 Oct 2021 11:22:54 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id z2sm177140pfe.210.2021.10.13.11.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Oct 2021 11:22:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 11/15] target/s390x: Use cpu_*_mmu instead of helper_*_mmu Date: Wed, 13 Oct 2021 11:22:35 -0700 Message-Id: <20211013182239.991127-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211013182239.991127-1-richard.henderson@linaro.org> References: <20211013182239.991127-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The helper_*_mmu functions were the only thing available when this code was written. This could have been adjusted when we added cpu_*_mmuidx_ra, but now we can most easily use the newest set of interfaces. Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/s390x/tcg/mem_helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 251d4acf55..17e3f83641 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -249,13 +249,13 @@ static void do_access_memset(CPUS390XState *env, vaddr vaddr, char *haddr, * page. This is especially relevant to speed up TLB_NOTDIRTY. */ g_assert(size > 0); - helper_ret_stb_mmu(env, vaddr, byte, oi, ra); + cpu_stb_mmu(env, vaddr, byte, oi, ra); haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_STORE, mmu_idx); if (likely(haddr)) { memset(haddr + 1, byte, size - 1); } else { for (i = 1; i < size; i++) { - helper_ret_stb_mmu(env, vaddr + i, byte, oi, ra); + cpu_stb_mmu(env, vaddr + i, byte, oi, ra); } } } @@ -291,7 +291,7 @@ static uint8_t do_access_get_byte(CPUS390XState *env, vaddr vaddr, char **haddr, * Do a single access and test if we can then get access to the * page. This is especially relevant to speed up TLB_NOTDIRTY. */ - byte = helper_ret_ldub_mmu(env, vaddr + offset, oi, ra); + byte = cpu_ldb_mmu(env, vaddr + offset, oi, ra); *haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_LOAD, mmu_idx); return byte; #endif @@ -325,7 +325,7 @@ static void do_access_set_byte(CPUS390XState *env, vaddr vaddr, char **haddr, * Do a single access and test if we can then get access to the * page. This is especially relevant to speed up TLB_NOTDIRTY. */ - helper_ret_stb_mmu(env, vaddr + offset, byte, oi, ra); + cpu_stb_mmu(env, vaddr + offset, byte, oi, ra); *haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_STORE, mmu_idx); #endif }