From patchwork Wed May 15 07:52:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 796884 Delivered-To: patch@linaro.org Received: by 2002:a5d:452e:0:b0:34e:ceec:bfcd with SMTP id j14csp2854059wra; Wed, 15 May 2024 00:55:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwqDZ+xMu/Z8LVYcjOESrXp+2gmZFtiVoNVSPkNah57c0zI/mJGJj5an6wHa/davd3/UQQHFiLTKmPUd02UqY9 X-Google-Smtp-Source: AGHT+IGiZ/O80RAgqD8wWJUydWFmTNSLFylGhPvl5LocMAW4NZEwsiTjbdf4t9WOUgmcNQhqvU2L X-Received: by 2002:a05:620a:55ba:b0:792:c473:f645 with SMTP id af79cd13be357-792c75ffbb3mr1554591585a.54.1715759726199; Wed, 15 May 2024 00:55:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715759726; cv=none; d=google.com; s=arc-20160816; b=k2UUtBjL1LTBWArq8Wq6fplbq4uhV5vrEgLo7QAatvKaRQHWDaL5IRdtznqiNalwrh 2AO07+2ilKbSpTSeAiY6No6BJTZZWW/XZK14wPK5TTJHAPFzAzao8Xx3s9O6GPE68SXg qjVW0zeLgsYo/dhFkxIW1xgdVwkIVUzFLqJmhC/tTQSP2AJYOc/DMNFgqOKyV8UZdGSA ybrIemS5Ag4WD6eTohFBzKzSCSlzPKCYRdY1pMniVCP4Nu6Pi/cYQlmI9CM7uVR8Avez +jsnrj+zffgONBT8eCxWDUE0B0zmn5WLy/XGuR6QpKpXcCp621tSFYMtUkIDCGk9nNnC Xkng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=QiNkoAsgvTetR5YHMAeB2w6OV5e9o48b6mfaDP+sgJw=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=PdwouuX+N5aoyAnkbVgOrZJhBu9aV/GdRh5Cv1709cNA/7g2bNZGPbxWUKyPJ08KgK eHjSvHwI1VrasRFkd8AU0tOofZWpPUTkzCT/y4OzZl6PUbOk5oQJDYwaCu8vDkr163zZ sHhbL/BEIO2RnmTKpJHziCP+U4awE6TlYnO0qzG7ne3Pb15tgwhCEEQvSoEfCQyKiF9O N/HEH5qFUhl4Q+8FW2YYbjOHhBLV6Blx7NMSx7z2etttzo7B7OdohD0ad8mWOFKzB0SW nu7oEf+2fAM7jpPAvtBV9t9a5JZQG36ZM/bpOnZ0esfXGA8daVPQ9gklyay1lMwc8hAe YrFw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bH4iHFd0; 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 af79cd13be357-792d7f288d9si841532285a.192.2024.05.15.00.55.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 May 2024 00:55:26 -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=bH4iHFd0; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s79S7-0004hx-QO; Wed, 15 May 2024 03:53:32 -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-0004SK-6f for qemu-devel@nongnu.org; Wed, 15 May 2024 03:53:19 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s79Rq-0001dw-4Z for qemu-devel@nongnu.org; Wed, 15 May 2024 03:53:16 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-34dc9065606so3632448f8f.1 for ; Wed, 15 May 2024 00:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715759589; x=1716364389; 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=QiNkoAsgvTetR5YHMAeB2w6OV5e9o48b6mfaDP+sgJw=; b=bH4iHFd0WylPXXm7lSk2zxin8zZ+RH2Va+pcmE90CUEF/iY6FCxYYW+uci8U4M/UJd 3zW0+3MQdYzxlBq3dhb7/P8/xazgfeZbVUDyS4+F+t4TPOYiMzT7EtYTnuNU+HMtLT5P bg/aPPaaUfkcMrVwOZcLMh9XBcH41ImlFPke6/GXSl47djkZhpQfcwwBGzgEQBzcGQbr KaqfJ0sf1BYaa8GAKw9wgXY37lTMRPKYCsc4LoZ0k81LpSoxlvo+F98iiC89H/CZJaKY nMUTlrFag44uVe0Hk0jUqVlPCDsMumIDLCa8s7eRHIYqlSdtOdNgBTSAdQMPlAUCFQC1 DKwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715759589; x=1716364389; 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=QiNkoAsgvTetR5YHMAeB2w6OV5e9o48b6mfaDP+sgJw=; b=hKSfkl9HCk7AO9EKoYpL7rn7RPj4cIt/sR+Xu01+azN5Fl+JBdNfhVPCCRSXQYHds2 6O0UwpbvRYpCo8JnRMSHvPaKf4DQMZdwED9KYFP7qjIKhOnghN2sIGwHvReOdrDRc/sW aLmj5zNmAhG6s2wApldlZsOipAeIZiqxAk2MuWR/dIUamvHp7D3aba1//OQ27SD1sFkg pYZWPA/mHr3wW8isCsVDEX1GQiCU2nUsHdoH/03K4mO3hXPOSdaFkNU87TeFN3NY+R2H ixGEJbzKEhR+sNJ0ILmJF1/aSdxHbUJoTSAlHqEltZ1I+nMa00TBlrO2eW6HjJiJMQd7 /mQQ== X-Gm-Message-State: AOJu0Yw3QvDcuM4VPECdXCP55ly48KWx9CCuAkwP7bGUFnpJvlpTnya3 16hHJilmr9dXPO51dEKxEPt5QX8BXMD8PyEkKlsOOBrHUm9oxBlpq9/MJRDYhWYJ0fNuX7o8Tgt Uus0= X-Received: by 2002:adf:e256:0:b0:34e:3d3a:e144 with SMTP id ffacd0b85a97d-35017fe1ed2mr14763582f8f.2.1715759589089; Wed, 15 May 2024 00:53:09 -0700 (PDT) Received: from stoup.. ([149.14.240.163]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9292sm222611855e9.37.2024.05.15.00.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 00:53:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 31/34] target/xtensa: Use translator_ldub in xtensa_insn_len Date: Wed, 15 May 2024 09:52:44 +0200 Message-Id: <20240515075247.68024-32-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 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x434.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 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/xtensa/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 42109d33ad..75b7bfda4c 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -35,7 +35,6 @@ #include "tcg/tcg-op.h" #include "qemu/log.h" #include "qemu/qemu-print.h" -#include "exec/cpu_ldst.h" #include "semihosting/semihost.h" #include "exec/translator.h" @@ -1118,7 +1117,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) static inline unsigned xtensa_insn_len(CPUXtensaState *env, DisasContext *dc) { - uint8_t b0 = cpu_ldub_code(env, dc->pc); + uint8_t b0 = translator_ldub(env, &dc->base, dc->pc); return xtensa_op0_insn_len(dc, b0); }