From patchwork Sun May 11 20:35:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 889182 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1334465wrr; Sun, 11 May 2025 13:38:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUF/VQZxZrmWvB3ctkFXtY9Dy4HLNcuXy7ZrZVab4OECtWWgH6eG1zZIdgMp4YhHDmv5DQ+3g==@linaro.org X-Google-Smtp-Source: AGHT+IE06BeyCnGEdLHbOIXwfO1Wp+FxrpsuDSgZFOxQ259XKBiP3alXqHba72fTMOnEs9P6TQU2 X-Received: by 2002:a05:6214:300e:b0:6e4:442c:288b with SMTP id 6a1803df08f44-6f6e47baf46mr169373616d6.11.1746995922496; Sun, 11 May 2025 13:38:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746995922; cv=none; d=google.com; s=arc-20240605; b=IIMtM7XYCLe+cXnd9uoMSOn7+iw7LUrNdL8RVFPPPYFQ+N0yXtbS9LQa9+oxRyVUih /DpK9J9xt2kceMoG9Xqr5Fya4KCvKOtI0Hfd+02j4xZqpsXBUVZ3INwos+FZDMHr7Adt ZfNfG4UbNxI8nCbSRd8bdf22U9ODMKjmYpwrpuashR4ASbUFqp6ANcBnGpaS6Ea8eDEZ DE/LlpBBcCYEgRRNPOF+rPLkvcJ6ewfg5ENGJ7io95aFdcTMFH0+axj4MaNeBs3Zs/Rc OCKpTMxW09QudGI/JSjP5Sqp8W4/F9OeZDoDcSjuM54G/gM6NymwnGWTAKNn8is0ThM6 p0WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=q5FWppD/cbhMUZHBjw12HnH7OS5qQsdQuaNDHpmu3f4=; fh=ZKeelGKICHQ9l/9d+e+bGKuo/S/FkjHED8U2Ob+lIbw=; b=Je5p8wRaMT/e+HDTU2XeITMG7T8ncASCK7xWp7aeVkgdgvjN8fZC6SyoeL3xz5dwaC WmzMgEXhcaYLx3Nqituy9EzW41e9KerEtF4y9wTVcxfxpOxzC/gPsFR8dkfq0vquA+0p kM1pATPr5CC2joDzmY/DwdEYe8Hze/ivY3VXfFPS3GMCPmPyUt3m5im/JJH2wOJwrvRF JmWxKllT2wjNmx0ZpvCL+mT95h7FOcZ9QMZdFCfiYkLnQ5ksOSy2IO0JrWTV725NKAQz bTU3E4ITvr637BS8ksW7bc6xxF2+59MmMj/bltSvUrx0PTq6EQt66DZ7ZN7ZnnrmdGaJ pzpg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QYc2YbXQ; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a42e7esi79011466d6.185.2025.05.11.13.38.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 May 2025 13:38:42 -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=QYc2YbXQ; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEDP1-00034p-Dc; Sun, 11 May 2025 16:36:03 -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 1uEDOy-0002pX-8t for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:00 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEDOw-0006LW-Cg for qemu-devel@nongnu.org; Sun, 11 May 2025 16:35:59 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-22fcf9cf3c2so22769065ad.0 for ; Sun, 11 May 2025 13:35:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746995757; x=1747600557; 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=q5FWppD/cbhMUZHBjw12HnH7OS5qQsdQuaNDHpmu3f4=; b=QYc2YbXQb/QsVR3QO2FREW/kUELbO0fVcpjpU4t/hGAO2wkahbPB/rFEJ5U0UwmMlX XGDZVdSXGx+48LNaoK2K/MZKy8rFX9FZPey0IhXDdBY7AgSNe9PRGw2D62t2PoZ9N30S RXPJ9bHJr4teNMqI8exQOAo33FUa2/sAPbnjw7yXF6QDNC2SMhfIk9Q0B8UlRABxUs+W hdimxTxga2uJ9N4NOI8duVRwdoWq1jNd2H/rJHiDMqP4xkeGol0mrn9zBsyjLQFzoy1y Awnv15+/Ybseb52OueDG7RNC2GJkAN4Ed3SQcVmP6GB4RvjfxfXe1p52pQNNaegu4fVK sTSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746995757; x=1747600557; 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=q5FWppD/cbhMUZHBjw12HnH7OS5qQsdQuaNDHpmu3f4=; b=mzSeAhMJKwFeHdr7cujQBb1bwEc9D65I/H9MrM+OAZ+DwqZ8dTRF3VbgguaQ6QROso NiRBw0fYVPo2i41la3/ZZPOhe1YJ3zLhzOnGDKTAylethDf5MnYepqDfXreCYnq/czBH ENrO4ufIk57rNqHxf+Mtm3eRY8mG/LjZEGSsvBfdXn4zamp//l93Ioa9MwBt1HV48xwo YvthjOIiZ4N6Q7ts3GY3Skol0N67xSOZXckz1yz/rOCA9j0UTAMYsBYXq9ey3L9Ph/kk 6P+2SYujj6u76Ioug4py+I+yDLUo3iXriAs/nTyRee1mgNZSGbfnss/xYsFS9fAOp75l b+lA== X-Gm-Message-State: AOJu0Ywc3e4wd+Ltsnui6hJUgxyKCCIOWm5/FLRCfKVBqYkf6wwYPFF7 iOQweSFBGl63nskUz6WEuwixIV2ylAXPC3haIITCm8mlOw7QqQVfupOWSS4Gnl6D2pRWF6yT+02 O X-Gm-Gg: ASbGncuHuoOlDiydGQXnJhtB0yzfhH7s3gzqCVV9TIwCuSBWQ0epa3zoX8fi85oqs4N I6Prtek4dzuGtQGN3PgmCgYqBVtNORQIcBsxsUSRefyaSOo400r5CIYIjqVg6lleRNKE1gh54Li OzVdoMJ4d19CzX2WcA/5FyEcBSUtMOGZpozZtLj+Lp36osQlAsEiFXbEaS3Kk9wCIBuxK+3fYM7 YAkY1BvyzVzDnaoXIUVtwJclCVQvqYuatKiIpjwQA/aDTYWn4l/PAEVhph6OveKVJyjECLo6sHK JZlFmsd7sOPT1aM9mpHWJ2pBnPnxrYELz4AqeLptdbav6AsLcl2+ie/b4J7lklfZePUadUxBUSc y9+zTnILTfA== X-Received: by 2002:a17:902:f70a:b0:227:e709:f71 with SMTP id d9443c01a7336-22fc8c8ccf0mr166381225ad.29.1746995757149; Sun, 11 May 2025 13:35:57 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc7544d86sm49955095ad.47.2025.05.11.13.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 13:35:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, schwab@linux-m68k.org, =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PATCH v6 12/24] target/m68k: Remove env argument to gen_lea_indexed Date: Sun, 11 May 2025 13:35:34 -0700 Message-ID: <20250511203546.139788-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250511203546.139788-1-richard.henderson@linaro.org> References: <20250511203546.139788-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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 Use the env pointer in DisasContext. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/m68k/translate.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index c16925670d..1a589874db 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -392,7 +392,7 @@ static TCGv gen_addr_index(DisasContext *s, uint16_t ext, TCGv tmp) * Handle a base + index + displacement effective address. * A NULL_QREG base means pc-relative. */ -static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) +static TCGv gen_lea_indexed(DisasContext *s, TCGv base) { uint32_t offset; uint16_t ext; @@ -401,7 +401,7 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) uint32_t bd, od; offset = s->pc; - ext = read_im16(env, s); + ext = read_im16(s->env, s); if ((ext & 0x800) == 0 && !m68k_feature(s->env, M68K_FEATURE_WORD_INDEX)) return NULL_QREG; @@ -419,9 +419,9 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) if ((ext & 0x30) > 0x10) { /* base displacement */ if ((ext & 0x30) == 0x20) { - bd = (int16_t)read_im16(env, s); + bd = (int16_t)read_im16(s->env, s); } else { - bd = read_im32(env, s); + bd = read_im32(s->env, s); } } else { bd = 0; @@ -467,9 +467,9 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) if ((ext & 3) > 1) { /* outer displacement */ if ((ext & 3) == 2) { - od = (int16_t)read_im16(env, s); + od = (int16_t)read_im16(s->env, s); } else { - od = read_im32(env, s); + od = read_im32(s->env, s); } } else { od = 0; @@ -738,7 +738,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, return addr; case 6: /* Indirect index + displacement. */ reg = get_areg(s, reg0); - return gen_lea_indexed(env, s, reg); + return gen_lea_indexed(s, reg); case 7: /* Other */ switch (reg0) { case 0: /* Absolute short. */ @@ -752,7 +752,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, offset += (int16_t)read_im16(env, s); break; case 3: /* pc index+displacement. */ - return gen_lea_indexed(env, s, NULL_QREG); + return gen_lea_indexed(s, NULL_QREG); case 4: /* Immediate. */ default: return NULL_QREG;