From patchwork Wed Oct 13 18:22:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515741 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp124414ime; Wed, 13 Oct 2021 11:30:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhdhSnLXmF4uJUwi25Hqs9XxrWffUjilpsEIlvPk2KyxcFt/Acg7hik0wLGEwP1WgAXA6y X-Received: by 2002:a37:9c13:: with SMTP id f19mr801595qke.398.1634149805154; Wed, 13 Oct 2021 11:30:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634149805; cv=none; d=google.com; s=arc-20160816; b=znB85XJ2sLpGJQQAJJGQxQw6Lm3gZB0gnrjh3uV1vdh+Iwp8hUGBGcbtyUVUSiLB70 y0+S2+K+4LkvKe46yKTvN+7p8J3b5Awbrp9EFub37UTwOgeeyYS8SqywR2IztTmhmz8x ZFPQzY6guv7cYjhk7Qscp4YZ5HVJrlMPfONJQMiBPr0hPt8rIxFVe5tRmHHX0EJ1FJrP t+BX/f/jo0OPyvzcnTVCsSLyBF3zaDFD66m0BE7syaBwUXkPS+QGSotN5LBFHmfNOKuC NbSADyWLBlr9mzHLnnW7Qw4hWjbh9Y57uDkcUoGq5dmzFWv9znjZRilY6IOOFw7KvwI8 K6JQ== 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=/jngJbg9Yk2oQyeCGWWfZ1SY/lNGas159Ze4XodtNZI=; b=wl64UCHFPLXlSL3RPbV3XUxFaFRb7zsbEyG+iqkv6Vl7ckgGlt9GNpF+YsNkU/uUmd n1/hx7ZKI9OeyjJKMQNVh6br024Ztg9/xlTRSO4xLKRtmm9wpfd97rGE6bRYOypO8odS QU8cV3h/9sYZ0LCTwLrLvPd9KC7Hs46w0z5NG4pPrOxILmlkPqibLAp7QWhCG4Zg5g2E QXTCaQH6CGmlDoMoD0tE1egbvS4t4w2af2FEsM4GcPdMmIadzr3OpD7MtCVuNv2SPwie zffRWjXT1P/ERxYFfZs2c8cPdoaOXccq+WHpdZOxTAcT+vli1nATxlohivheaTcYNG6v 6fRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LX9JjXs5; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b1si136480qkl.293.2021.10.13.11.30.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Oct 2021 11:30:05 -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=LX9JjXs5; 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 Received: from localhost ([::1]:60420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1maj0u-0006hS-Lt for patch@linaro.org; Wed, 13 Oct 2021 14:30:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maiu4-00048M-4k for qemu-devel@nongnu.org; Wed, 13 Oct 2021 14:23:00 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:43753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1maiu1-00036P-0K for qemu-devel@nongnu.org; Wed, 13 Oct 2021 14:22:59 -0400 Received: by mail-pg1-x52b.google.com with SMTP id r2so3120570pgl.10 for ; Wed, 13 Oct 2021 11:22:56 -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=/jngJbg9Yk2oQyeCGWWfZ1SY/lNGas159Ze4XodtNZI=; b=LX9JjXs5OdD9O5dOtMLDa4hVKd7C7mJaam8jlsIKccoOQyNjP9PDfvUytiqA6xLpgd HbybRAOIHg1LrD/f3x3rgwI4dTCFIAapmQtUly2lfcOjUjGRM3Tkcl2GgzyO7e1cuB0i S8AZYQmikoZNas/edN1H6vg21erLJApGiV3vi1FL16AU00yMwAm8FIswMGRNvzNjRKxv ik6W6YTLin2aN4h7kzcXqOCt7NBPccEsh4E60qHNhvFdNnnng4JE0A+8WWOYVOzRPswH ZYuuZ7RdOv6u6KxADCUuNO553cUXgW63BCQ4q8LF13d1tPt83SBPodBrQF8ESIUxg0FW Z4lA== 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=/jngJbg9Yk2oQyeCGWWfZ1SY/lNGas159Ze4XodtNZI=; b=k1j/ZTpFvgpRK5hM4Z67SAHJURPlPFkbUdlqHUj/3YGGzL+Gt2anGGqLexZOrelwb0 rYQZWnrb71oBJRPc9/7rCn/jUw3ojPj2oNkKz1By/54QJLrGDn6KB0evZTTV/MZMHRca L7uzydZVhPPritlh86H1SApHW2gBKlUiJ4MPG1gi/tztg6q+ObQtfKkIoFZMvQiZFhmw CAfCfO3rR4ZIUM8Iog5psJBIDtsaSqc82AbvsyqFDyDKSaFg64IKk+6YNh3fEvKDqOYp GAzBSzCa+KD1DOFdFdm6ZhR7pYytYg8Pey5ONK+Vag9aXFdOpikA+VD7opOtMSYUlLoy gyCg== X-Gm-Message-State: AOAM5311nYnvlabKALiIRKX2LXTzG/UF0k6Xe8DHzkbJJD/8pGf00nuz 5lgQVCD7abYC8Ji/xExtE+SdypFaAa8Txw== X-Received: by 2002:a63:4766:: with SMTP id w38mr629323pgk.104.1634149375638; Wed, 13 Oct 2021 11:22:55 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id z2sm177140pfe.210.2021.10.13.11.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Oct 2021 11:22:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 12/15] target/sparc: Use cpu_*_mmu instead of helper_*_mmu Date: Wed, 13 Oct 2021 11:22:36 -0700 Message-Id: <20211013182239.991127-13-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::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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: Mark Cave-Ayland , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= 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: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/sparc/ldst_helper.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c index abe2889d27..bbf3601cb1 100644 --- a/target/sparc/ldst_helper.c +++ b/target/sparc/ldst_helper.c @@ -1333,27 +1333,27 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr, oi = make_memop_idx(memop, idx); switch (size) { case 1: - ret = helper_ret_ldub_mmu(env, addr, oi, GETPC()); + ret = cpu_ldb_mmu(env, addr, oi, GETPC()); break; case 2: if (asi & 8) { - ret = helper_le_lduw_mmu(env, addr, oi, GETPC()); + ret = cpu_ldw_le_mmu(env, addr, oi, GETPC()); } else { - ret = helper_be_lduw_mmu(env, addr, oi, GETPC()); + ret = cpu_ldw_be_mmu(env, addr, oi, GETPC()); } break; case 4: if (asi & 8) { - ret = helper_le_ldul_mmu(env, addr, oi, GETPC()); + ret = cpu_ldl_le_mmu(env, addr, oi, GETPC()); } else { - ret = helper_be_ldul_mmu(env, addr, oi, GETPC()); + ret = cpu_ldl_be_mmu(env, addr, oi, GETPC()); } break; case 8: if (asi & 8) { - ret = helper_le_ldq_mmu(env, addr, oi, GETPC()); + ret = cpu_ldq_le_mmu(env, addr, oi, GETPC()); } else { - ret = helper_be_ldq_mmu(env, addr, oi, GETPC()); + ret = cpu_ldq_be_mmu(env, addr, oi, GETPC()); } break; default: