From patchwork Wed May 15 07:52:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 796902 Delivered-To: patch@linaro.org Received: by 2002:a5d:452e:0:b0:34e:ceec:bfcd with SMTP id j14csp2855549wra; Wed, 15 May 2024 01:00:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6dzZfO9YusTHt56koPJoh7eOw4JhXF/GeiTNzLpdVS9p45EYacz1Umov9LbYTeIITDXLmR22+ai9YhtssS4Hw X-Google-Smtp-Source: AGHT+IH4iqOI6fHcyOX6GgvS4N6oFgwj5Ok5tXr/uapZlAGA6R3E3NxRQqXurMTSb6RgI8Dv1IhO X-Received: by 2002:a05:6122:310a:b0:4d4:2398:51a2 with SMTP id 71dfb90a1353d-4df882ca873mr12326679e0c.8.1715760024185; Wed, 15 May 2024 01:00:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715760024; cv=none; d=google.com; s=arc-20160816; b=gleFWndG9pyqexsRBkafIj0iPqbwD0SnTEkbgUJTJKkXCjRptyjst93aLTg8o1Ly9/ 4d0lxRnXA7NKKtkeA5FwY0pfw4Oye0OldX+sJB3WXRB8X5mNM14VEN9efNVbOe03Umrt coLMHvJRciK5A1hGsqKJ7gWKTPkVFZvE04KWCb7mvlmZwvcP239kqHtdMjl7C9o+sX66 Z6GUGQ7ivpAR5HsA7QvLNN3Mson35r4kcy04Z2IdggF+PHrNXnq3th20IBHIcKNKv+G6 erdT2MQ2aBWmggbVwO3TFyJnlrssKrXEY5awJiv6O8W6ubKofYge5a10uxtTg0AGNPMr QrFA== 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=w1Iksx0xg6rkS7/ro1+ykm+RdeutCXftoxj1EQCWqvE=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=YsKstCEMCHfDMet0sjiOzqpUcxEHrSzV9+qtXnCcEKD+7afGS59brkLCWDQMFQqo6C BosgaAUg8+KcLW/INexhcdgr1FXifAPT5rtRiqgxnSOGEHanv1cLr/Jm9SOOAKqy9MOc ykrRPkr57rPoz2UZyQLvweUqhaVfTngFM0GY6jtf46i1z/qWA/kowijiLPKru/Y3U0M8 rPmvp8UiArIjT8iD+QrS7PnZrflhsAF5TlZtNTag1sdge26g0d46faMw7FjsnZhBXq93 JD79V62KnsJCB7AqT4iwof3hnExHBnQs9qsntv9IQoz/FTAl2X3kIuDUYCCXsp0MkjlM wDiQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AcTCks7Z; 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 71dfb90a1353d-4df98d59037si1322054e0c.88.2024.05.15.01.00.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 May 2024 01:00:23 -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=AcTCks7Z; 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 1s79Rw-0004Z3-VN; Wed, 15 May 2024 03:53:21 -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 1s79Rt-0004Iw-Dt for qemu-devel@nongnu.org; Wed, 15 May 2024 03:53:17 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s79Rn-0001cl-9M for qemu-devel@nongnu.org; Wed, 15 May 2024 03:53:15 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-420180b5898so18898685e9.2 for ; Wed, 15 May 2024 00:53:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715759585; x=1716364385; 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=w1Iksx0xg6rkS7/ro1+ykm+RdeutCXftoxj1EQCWqvE=; b=AcTCks7ZXlrRoD6k9NYRDtlSlg4MJxXVO3AE/H59mRhvEDIgPu5n+9MGsYjVYfxdsp 8zPPO12HemaNvjg7iLr6zsfIjdiRL7CUpTxiVzSBeFKHl0UDOitEKBki56KZ1hEfPjzd MNWpVcpQA3UIfExMUqozfkrDqKypCLoxrJdXe/p0ZwNq+lksnchkRTEm5BeMUavGjwap cJJYzSKxDBIAFcyfLcoyG68otni5AdFvN1gATRIpuGnhzAbR8XBYH/adX2E+SiOdKwVD 71aBhDQbkxMhGyDX89UVJsXb4VVzVTjgWcDXtwCuWHHVbIAB80SiDUTbLA+BHvDJLLZD K1tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715759585; x=1716364385; 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=w1Iksx0xg6rkS7/ro1+ykm+RdeutCXftoxj1EQCWqvE=; b=L2OgMa/AE0NC+1OzQdNQJ81N+g9vKT3DjhLZ14hXYJ4LilD8JsmCCK/Z4MOD6g97aP gMZtrNhDwz+6G42mAxsqibBATyF2fmppy5VUixYlGkpvAmaGPDAEuWNMYZ4SQker1HSr RPNXBbpbCTCYCy2co7i5gR2QABNUIC6GyZQMN+aAwyTUEYo7r+dy3krknjFmBTCb2lye M1HY8L+c3FF2RDmXwomlA82fvzbONlipdM1pEnmj/hitI0Y5ThpZVj7PFzvLEszUfYPD 5iwFcRZrLAUjRJwMofJBm9Wf+9+AtjWpiQZftA6cuNkV7Rbr0dpc1bUmyDjTtmFsJLZ4 rVgw== X-Gm-Message-State: AOJu0YzAa7xMfk0E1y+fYKCvldFZOqZIFiGOO7UPFmuFupYMmRK5mRG+ ZltoUQRVr8excnnA2DAI2cVsNxLJoSFHqtQQg5FtG4jGsxLgBeRZGh91BWNWAIyS2RSLGGG1uhi alhM= X-Received: by 2002:a05:600c:3582:b0:418:29d4:1964 with SMTP id 5b1f17b1804b1-41fea539b5amr109852045e9.0.1715759585480; Wed, 15 May 2024 00:53:05 -0700 (PDT) Received: from stoup.. ([149.14.240.163]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9292sm222611855e9.37.2024.05.15.00.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 00:53:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 25/34] target/i386: Use translator_ldub for everything Date: Wed, 15 May 2024 09:52:38 +0200 Message-Id: <20240515075247.68024-26-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::32b; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32b.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/i386/tcg/translate.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index ed601474a9..76be742580 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -23,7 +23,6 @@ #include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" -#include "exec/cpu_ldst.h" #include "exec/translator.h" #include "fpu/softfloat.h" @@ -1579,9 +1578,8 @@ static uint64_t advance_pc(CPUX86State *env, DisasContext *s, int num_bytes) * This can happen even if the operand is only one byte long! */ if (((s->pc - 1) ^ (pc - 1)) & TARGET_PAGE_MASK) { - volatile uint8_t unused = - cpu_ldub_code(env, (s->pc - 1) & TARGET_PAGE_MASK); - (void) unused; + (void)translator_ldub(env, &s->base, + (s->pc - 1) & TARGET_PAGE_MASK); } siglongjmp(s->jmpbuf, 1); } @@ -2177,7 +2175,7 @@ static void gen_unknown_opcode(CPUX86State *env, DisasContext *s) fprintf(logfile, "ILLOPC: " TARGET_FMT_lx ":", pc); for (; pc < end; ++pc) { - fprintf(logfile, " %02x", cpu_ldub_code(env, pc)); + fprintf(logfile, " %02x", translator_ldub(env, &s->base, pc)); } fprintf(logfile, "\n"); qemu_log_unlock(logfile);