From nobody Mon Nov 25 11:51:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1715760017; cv=none; d=zohomail.com; s=zohoarc; b=SKBP/MW41fJ5FVVheAZIuqIq0zXFSRQB2WmyqU7+OHwd6W99l4REz+DspiiR1vhPzAK56nRQx/Pk6kJIa7wznfn99mvaqGgDn19pkEhvhElCw74oJ/KghFtl51sMnHdMGTkoQU/uRX/XjmaaqiEdXHzv/2HVQOuIacFDLmHrEDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715760017; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+OfPp6+r7Zf3NKTXpMRuMvIJCtMgZRIBNwDS9FcnyZQ=; b=Lx5V9urliUDYv2apm0hINzOs2uj03COB4JUIlzavSerUPrQk4MJql6K75P6LWuMiT9N6j6MeHJiekUWJC2W94zm6T3zuuYsWry3h84yqz8m50NkCRmBOO0dMWyigc9itbY+UTj5ajk7vR5/RoQPwkMHkBqrGfc7HVnoMqKdWTTU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1715760017517527.512124434428; Wed, 15 May 2024 01:00:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s79S0-0004eg-4K; Wed, 15 May 2024 03:53:24 -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 1s79Rv-0004Ty-HM for qemu-devel@nongnu.org; Wed, 15 May 2024 03:53:19 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s79Rq-0001de-4Q for qemu-devel@nongnu.org; Wed, 15 May 2024 03:53:16 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-41fd5dc04e2so39976405e9.3 for ; Wed, 15 May 2024 00:53:08 -0700 (PDT) Received: from stoup.. ([149.14.240.163]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9292sm222611855e9.37.2024.05.15.00.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 00:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715759588; x=1716364388; 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=+OfPp6+r7Zf3NKTXpMRuMvIJCtMgZRIBNwDS9FcnyZQ=; b=WMqI9hQGNOVFL0sLwB/CM+TcgedPegvmOgyjvW/8qhuYztSmSuLSSC79zMPbxf1Qmn 7TOOrl7uUOFEMVOQpOpJEq0YHqd3cTppBi+CGu0IjDtrk9R26hkYO1PDAyc9Dp6lVlMf VvN3gT4bQ5TzMr8M4QH1gNnBltFNkacVELe6gQVUuEBb4SL1s3mKLMVKVA1lj7cKEtbX F6pSM2dP1YA10eMaPUE3IN7brdjwBTDomMwsXV7ZKfROnDohbRSI0QlSlkbgzR2mIU5S R0FK1m0Ae4u30e44CfnKAsGKBtJbewHuar5FBheCNqtcvr/xXN39WtnEitFfp7sxLk7+ XxRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715759588; x=1716364388; 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=+OfPp6+r7Zf3NKTXpMRuMvIJCtMgZRIBNwDS9FcnyZQ=; b=f/Rz2o+e7z2eoAAbVFFb55D7b0cSY89YRGI3va45JXYoHF5l8EZ6jSnn9mUF0zyEMj K2LG9az3yZ1SoKdFBTtoKXLMe7Byeug0QJ+sUyBDwBnvkAm0hgD3iJOM/yUptIgXNUDZ nDIY60HvnjCWOp0U/UvEUej8pBXHcDQspum2JEO2m2R/nWjblB72N2JXGxefB9IVWWJf /dS3Yj7Xd2q/vMRx8kRB8mW5nA9l2zsJiq0R+7C2hBkqhG1LWLo0JDrhE2kVB6fvBJuu qQ9rWVXE5dy+JwUKTU2kVaotNee1qgdnZa494/9e52rqb5Y9/NKizdg1c9BajqY/e6KI FilQ== X-Gm-Message-State: AOJu0Ywq8SV8/3RHOvhbsCHYP1pEOjP6hw8fuAcCLau4Idua7Y/KH1WN cb9dyfAgUV/osSxcnNbVLsnQ7P6LAxMKzy3OvQr+PIvgT2KuSoJ9WHFE91M5/GEotlJ2MHp/G/M luzc= X-Google-Smtp-Source: AGHT+IEQlDkr5WuAu1lurJV8ROi5DlydtsypbGiyYlSDnqLyo52JUi9WmuPvuwcqZPD0Q2Z3sdWiHA== X-Received: by 2002:a05:600c:5718:b0:41b:3c4c:211b with SMTP id 5b1f17b1804b1-41feab42a67mr102889535e9.22.1715759587870; Wed, 15 May 2024 00:53:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 29/34] target/riscv: Use translator_ld* for everything Date: Wed, 15 May 2024 09:52:42 +0200 Message-Id: <20240515075247.68024-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515075247.68024-1-richard.henderson@linaro.org> References: <20240515075247.68024-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x336.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1715760018267100018 Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/riscv/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index c999e942e1..2c27fd4ce1 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -20,7 +20,6 @@ #include "qemu/log.h" #include "cpu.h" #include "tcg/tcg-op.h" -#include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" @@ -1082,7 +1081,7 @@ static uint32_t opcode_at(DisasContextBase *dcbase, t= arget_ulong pc) CPUState *cpu =3D ctx->cs; CPURISCVState *env =3D cpu_env(cpu); =20 - return cpu_ldl_code(env, pc); + return translator_ldl(env, &ctx->base, pc); } =20 /* Include insn module translation function */ @@ -1243,7 +1242,8 @@ static void riscv_tr_translate_insn(DisasContextBase = *dcbase, CPUState *cpu) unsigned page_ofs =3D ctx->base.pc_next & ~TARGET_PAGE_MASK; =20 if (page_ofs > TARGET_PAGE_SIZE - MAX_INSN_LEN) { - uint16_t next_insn =3D cpu_lduw_code(env, ctx->base.pc_nex= t); + uint16_t next_insn =3D + translator_lduw(env, &ctx->base, ctx->base.pc_next); int len =3D insn_len(next_insn); =20 if (!is_same_page(&ctx->base, ctx->base.pc_next + len - 1)= ) { --=20 2.34.1