From patchwork Wed Oct 13 02:45:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515697 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp6088406ime; Tue, 12 Oct 2021 20:03:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVy/Do18LJUL7v4ACyFlP4HmS0YaVuc4h8P9IA2YoG38D9NZKTMjO9hNWBUYfEBfJzfZhB X-Received: by 2002:ab0:7a53:: with SMTP id a19mr18963018uat.126.1634094238114; Tue, 12 Oct 2021 20:03:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634094238; cv=none; d=google.com; s=arc-20160816; b=quCi9dYw4c2IdHz6xnL7DOSDyMCemGXsWOVMztaFr6LPCVUgX8+EW31sV82/N0/A5q d3akhc+//BNuNyMeFHH2nomeJdQNr59WrSTZrPKnEuoxOovhnikVY9psAIKIx0ajJ3M0 LA7F1vO9nxteuar4dR6zkhxjMnb2sfRU/qZSBFnofnqayJAiCrpFyVtpCRXsdBMpinUk xe9nGue0hzNUY1LWwAZ9+OAE1wcyyG+TGjxTse2dJxOmNW7oMesz/N7misRfk8nkYgMn FaOvz0XZu1zpdpC7fJsNY7I8x2toHTWqFWYx8ww1PEqKozGTGIHs7BeA6Oj+rcQKoYjI /QRw== 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=ou9TZeIkVFlPgVg0RJ88Oh2ksyVGkR6IUoehchstShA=; b=vuJLudoRixUNvw26L8Ns1dKOdjlV7op9V8d06N2RI8oSlJdPQ1GWmOPpEZhrAj3UyG oUSn8XLA3lNy+pJoQ95xSYVmUuCS4FsJCcRYxjYUsZW1yDzOw3+4wcZkVyYkAjzptloa P86XCg4/IXI1CxjlGtfZo0IucG3kBWrhvL2epkc5dD9GBPfO2gF8Wa9j+nypHyOvAexx 8xEWZkAG6OzSGDEpMK5uvDm1/YGNlgqE2+CGe21qMM3OhM13O/Vwg9NWYGJXpwUpj9UU pBBMxD1eJKEBhIC22n3zKlU8oRJ15HeD8nqwQpGRQXlXh7tMnlyun70pLN0SmGkuqEme xp8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UGwFSpju; 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 p197si5447751vke.82.2021.10.12.20.03.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Oct 2021 20:03:58 -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=UGwFSpju; 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]:39144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1maUYf-0007re-7s for patch@linaro.org; Tue, 12 Oct 2021 23:03:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maUHv-0004vD-91 for qemu-devel@nongnu.org; Tue, 12 Oct 2021 22:46:40 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:43698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1maUHs-000541-TQ for qemu-devel@nongnu.org; Tue, 12 Oct 2021 22:46:38 -0400 Received: by mail-pg1-x535.google.com with SMTP id r2so870418pgl.10 for ; Tue, 12 Oct 2021 19:46:36 -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=ou9TZeIkVFlPgVg0RJ88Oh2ksyVGkR6IUoehchstShA=; b=UGwFSpjuT2sipPdArEKXbNaaG6OMAitioeoMThq23Z0N9iPMzlbsS8Ihu7Dqo5bg+V zVv4yOtOetSRDFEngWVou4TM2TrtjVxf6dGD3cyV45mnFQkujUnrBFflmNo2TaSgtjaj eKBjeauLhTyRFlBjZtSO49oPliPtQBEC6ImtAW9aDMisu/AbiAjLFdw4XR9wce1wbpu9 6em9BpU5E91KrXnthhMXuqE0zDoWNX01O72zi7AnKshRX7hGgPaTrhFoi8fs2eBhKUAC 8x+1QhlBfmIswENFPwvpQvSVnPmNGSjSLdRD8KE0vRu7s+0+qOcAN2xBkL3QXFLq1DMa 6R6g== 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=ou9TZeIkVFlPgVg0RJ88Oh2ksyVGkR6IUoehchstShA=; b=vQBYte3rMiN3TTCFU6IoPW2mvH0LXyPn+CJFT/ziWdsF+GW4x1jIBlF92uYrF56L/F OHltskXbHVWTn1G2kTvzVGLjuZ5Gsb9OuSFmBjYk98OuVDTcBL/sXqLaUJXxb/YxmTyt zZiqB/7QtbCeF/uophjhjfoeB27NCbcEwJgSvEK3QIMJWaRPuPV64AuhtcqoB3ZsTp9M 7KPdPaWxaOnqvUNaGozzRXKub0RK/7Fcw+rCQmmiqwdmjaWTRTPxchq9rGUlkwwrkKI+ ifr8OWuGoqi5hZ/a9IETgcmsuKpwxBhPVI2abutYX72XsfM51COXZOKwnAHN8wPHza0W 9bJQ== X-Gm-Message-State: AOAM530InOXQMC0ztwfD+XD3WF/z3ZSRrW15zkmw3GZOhdnJN2/HdNzx tODFOfzXFC/QDxPB56vPkb05cH2lLohiUA== X-Received: by 2002:aa7:8042:0:b0:44c:78ec:c9a9 with SMTP id y2-20020aa78042000000b0044c78ecc9a9mr34827330pfm.45.1634093195348; Tue, 12 Oct 2021 19:46:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id qe17sm4855014pjb.39.2021.10.12.19.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 19:46:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 26/48] target/s390x: Use cpu_*_mmu instead of helper_*_mmu Date: Tue, 12 Oct 2021 19:45:45 -0700 Message-Id: <20211013024607.731881-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211013024607.731881-1-richard.henderson@linaro.org> References: <20211013024607.731881-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.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 f50c3f88a2..362a30d99e 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -241,13 +241,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); } } } @@ -283,7 +283,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 @@ -317,7 +317,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 }