From patchwork Fri Apr 5 10:24:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 786241 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1101:b0:343:f27d:c44e with SMTP id z1csp94275wrw; Fri, 5 Apr 2024 03:30:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVdjFmyl2Wdk8l+BDbAEaDre3e6X4c8W1IYefa33yElxNgCBmd9+iCRq4N29HwIFvxVDfkXhjnF/fv7OHQwaYWV X-Google-Smtp-Source: AGHT+IHoeZV1v6m47m9p3XSuFBElMLur0MKvkLjN/XTFaMiWUgXbZUtY2O30Q/AHQ50mdJZSk9XK X-Received: by 2002:a05:6870:e994:b0:22e:de2d:8c00 with SMTP id r20-20020a056870e99400b0022ede2d8c00mr554901oao.24.1712313058463; Fri, 05 Apr 2024 03:30:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712313058; cv=none; d=google.com; s=arc-20160816; b=PCBrczGYVg5g2GDBt6E35FYfIEgqBOIQVWCk3LLjZdZ7LpI0glVbH3hiEnRZDjCyza LByp9w5po1oPCgwRYUS1j+CBshR6ubBPAE3mgR/iZS/+HHSTQgsH/EzwOhrxsvL3Jfbv OxD6F8WJ1RofQfugQZTXf6Zjj6BqbVB4mRc6Vo6z5WuW2GmZJqOHEtziebrJgnOA0ggb y8BeC3MLafZgY8CQ+bQ4LgXwqEMgtgcz3/I3kQ4NWmayM+0+notJogc8iey/pmelWrPP 4injs3XKFmhZ7ONGpq815c7FhymN1PbRbRvDhrTVjBb5kNxgXHCyOdaEWyo9+upQt0VB r30Q== 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=1wv+sXT5wyXDzAXP3RgOrCGl/NGDrvrLpRUdogc33UA=; fh=CYNKLrQn3/SkOzHVC+Oxp/KpGWhDzIr0x67bL1yAbP0=; b=kwp1iBKURwo06xyRmfmVsvNUbByOHNfDUiMuHml0ojiDc52teGeJ0MvmVpsvuq/FUx 9E0wq5ko84R5w9J/QNLylwpc+/bPdd5EthCYQc15keL92E/LUCo7GD8CGuvg5iK/Un5f 1X/k+FuRNFi5Fw2x5qjQsOQlMgoNF3PVAq7CPBHTkcMMJxTSB0N6QxJjQveQ486O6RSR esOps2MD5FFlF3E+1fUNpWsETuoEiw5OnwFydTERiI0RLW7oBC3+ebkaJ8+dYAiuk6zA vrcqlL1iJKnMzLijYQ9OFkwJiqQd/gqQ0yjISc68b19cETdu55t/aRy5LJAzwvgvGcKw V/Kw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QoEr5cvP; 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 bj30-20020a05620a191e00b0078a5dd4165bsi1667352qkb.130.2024.04.05.03.30.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2024 03:30: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=pass header.i=@linaro.org header.s=google header.b=QoEr5cvP; 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 1rsgm7-0006tH-OI; Fri, 05 Apr 2024 06:26:23 -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 1rsglU-0006Bo-ME for qemu-devel@nongnu.org; Fri, 05 Apr 2024 06:25:45 -0400 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsglT-0004q7-3R for qemu-devel@nongnu.org; Fri, 05 Apr 2024 06:25:44 -0400 Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6e69a9c0eaeso1286098a34.3 for ; Fri, 05 Apr 2024 03:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712312742; x=1712917542; 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=1wv+sXT5wyXDzAXP3RgOrCGl/NGDrvrLpRUdogc33UA=; b=QoEr5cvPn/Rv+E5ZkdOC3Picqa65m1pHXtO7gNgYFZWwJ41WMo2KlUksRHCCW9OfHP IxvwvdxbSDoESA0wQbF6iysGQXNu6r34vUq8NpciYt/88DewyzcY+Zp6GE1KrC2iTt+v MF2bQlsSDDTUgzBIlYgOecXaNv1LRKH24av/+NveyoFBZDCmexEMMgr710Blo5FYASuR wzGh/dewGcInA2OJPvMupGT9uEOPf/49EAD3/BUTuthC4RurlGaGo/ZmRQichyRnF7av EBmFajuMPOQXgmY3C93ABdM2aEBjUCAEh1wEhyiv49eD4YX6+fxb4m6wz3OocCVTYu9n 9xyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712312742; x=1712917542; 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=1wv+sXT5wyXDzAXP3RgOrCGl/NGDrvrLpRUdogc33UA=; b=aopizQrZT9O7RcFQXjKFuTxZ3Z4nqwkKJwN1q41U7qh9qZFKu3p0jmkUcki0tNbme9 gsedfhO0AFHlhOy3AgZovTaSdhT2qUKBp5SgTmpEalK+/Iu+YMVxl7oHDE7ff7E8x8YN 4J710S3Odu42pU84QFmKav11dE0cO6mDf+7/2dTQ0os24qBCJxDNB6/u/fgLSTj/U7DW 4oCQJfzyxISU/2k8qHHZcHwTQ6sLCdV73l2lKvVcmXleJZYG0bFr8k1l/pvP5Ijgpv5L XmlExERKz8TACc+6DR0kkBaIsPW6tXYvKDBSrf5ISnO1JcaiqHaH3hbHnguJ9dH9ALko LYEg== X-Gm-Message-State: AOJu0Yw1yFsC5gFa9yYLcjAmloI7lI0pOTKOrcG2P4kan+AE27yKRjeV MycrwPmpAFXgeMT+bXebjVs49ooLT5nB8auOG7CcJTVZM5R0Unc1EzG09867HxtID5VVrFsjfTh C X-Received: by 2002:a05:6359:100c:b0:17b:5fda:a544 with SMTP id ib12-20020a056359100c00b0017b5fdaa544mr1290157rwb.24.1712312741962; Fri, 05 Apr 2024 03:25:41 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id h10-20020a63f90a000000b005e438fe702dsm1104304pgi.65.2024.04.05.03.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 03:25:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Max Filippov Subject: [PATCH 31/32] target/xtensa: Use translator_ldub in xtensa_insn_len Date: Fri, 5 Apr 2024 00:24:58 -1000 Message-Id: <20240405102459.462551-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240405102459.462551-1-richard.henderson@linaro.org> References: <20240405102459.462551-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32c; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x32c.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 Cc: Max Filippov Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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); }