From patchwork Sun May 11 20:35:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 889178 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1334435wrr; Sun, 11 May 2025 13:38:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWWoE9ysB1uRt4iCyjYHwZdlrhEtYt2Pu9Cw/5cLvcFVITXPdAKDGTPWOSibX6Cpg7xrWxHkA==@linaro.org X-Google-Smtp-Source: AGHT+IEsMa2H5n1Nx4hL2xS8gOFWHveom5jtKygVYJtS5Oms7EjihsKQ+YIQyIY1hwHN5Nd8D6WG X-Received: by 2002:a05:6214:202d:b0:6f2:b14e:46e6 with SMTP id 6a1803df08f44-6f6e47c33bbmr185477156d6.17.1746995907254; Sun, 11 May 2025 13:38:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746995907; cv=none; d=google.com; s=arc-20240605; b=RM8ZaR0akNIwbk14goCyFnTHVmpWW+6UOevWfKE5bVdiesqcDvvBm5KRIFeaWU26/f rQGvjNuVsjiNyAhztjR92jBV1ALKj4Mmpq0tF/GXzP3PuzznykF6pH7kQ6HJkPiTpJrr /3JZXZIomI+1ov6NcMWOYY38o3o6ugAqpwGFuyNm90o8drEbxCC1dqXJyRHEPRPmXHjm 4beiUoJ522Y5GOgOY9IkDGfW5idCe48I8z7fxVSVYnEEW3B580/xRRHxGgDyghEgE81H 7ggG6IRjSdbObP9FFYCyaWcq9cc7Ush1+dtYT9eMiGv/kShICfeBzjPv+1J0I/0U3BmR M71w== 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=PscqTjzHZ6K3OgttLOrZJ3TLkWj4T6L/JjeMXtn1crA=; fh=ZKeelGKICHQ9l/9d+e+bGKuo/S/FkjHED8U2Ob+lIbw=; b=hI53UgWmoaLgtGKho7E/uQbB9uo0/uhkrg0NNNrQW1xCe7zrVw+NkI8gR20nKMMBc6 20rC1ElPNjRAwfzUIKsxFqKrzc/CkoxrsrQ2o3K5nkLf4Z33qdd0ZYHEnR92njJlUleB j6NIsCBC9Wm0xkhVrCBvvvZEg5m5wLZWoJW/B/KKsCnFHZA4KPHuDZNi+ejXtMwH2xVp jBuLWCEZGh5P/PYZaHzvQdcG5hh7moF5ZrUcJzy34LPKLQbkTja+sC+voi5uaSBBAvGX 7DED6CkvhrPFkde4iLanTOuKdtfDMw95Jo1xXp2savxuK0QGP8XN47aqaxGy5cqZykDP TJwQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DpLBBLV7; 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-6f6e3a42c36si73680736d6.249.2025.05.11.13.38.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 May 2025 13:38:27 -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=DpLBBLV7; 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-00038T-VB; 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 1uEDOz-0002t2-0h for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:01 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEDOx-0006Lm-57 for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:00 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-22fa28c761dso26663785ad.2 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=1746995758; x=1747600558; 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=PscqTjzHZ6K3OgttLOrZJ3TLkWj4T6L/JjeMXtn1crA=; b=DpLBBLV7rpZSsE6eN8bMOJKZYSdtrp3YjJEkDRuSK6XK+IaGWA3G68md3ZPkO/6DBd LRXKx8tR1Pisp8N/ltgRqIDWr3kI7Ha1u3QfKuuQ9DgqF5vTPhjkKqgvCWyvSvXeNWuK gF+TO4269F+MgH503uIvuu8SwIsdl2vtt5g8D/dr34ZYhvT1+S+GgFxBEoKP0dZajQny i6eEldJpEOFm4r1/1NvbTS5CMeWDKCN5ycMlSZobpc+EBEUPFlLwUE/SHaW+Lo9ttsvo LGxKR59I4Z/TlyBJIrrPywOveopDhtx1UZQrwCzE4S1uZksoywzZ0yuDqtXVLesShCEG weow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746995758; x=1747600558; 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=PscqTjzHZ6K3OgttLOrZJ3TLkWj4T6L/JjeMXtn1crA=; b=q/me0pHzyJ5Zbl3AVHocy48qP3jwy8T5Iy7rLEQlzSZvqlrR+cOxtrw6oqc7VBjwa1 d6Bscnjoq9DeAroRctC9NJPYFr8n2CWSBslhIOHotSbKcFQeuSOBVSn8bASWwqwptw0C uUTXGH3edOyl6I8YxUj5v3Drom3xS53kVyVmzaTwC5J7u6Q2K+o0w0IFaampu2xPpHxK 9gIrqaxJWgTrYe0cSzEFEw1xTPsDllAFNoWfHwJZHlWZDzsWTpHuBTnZyFuW0w7Sn3X1 O22EbuN32acNkSq4ZNrsx+OQSAFEsC40vacFAOReuswnucmiw92ZuVpF+XY3yak8+YK4 dsng== X-Gm-Message-State: AOJu0YzWgPJrGOIaoPWxk3FLyQopErmNkAVr0L5QjFEiwqj9DmqZhJyw /9kFKGiv+GO08SRx7slg9mT9lhhcEBvtgtLPSDPCqkpbNyVP8ZRnbUpldF2ANCqby3FEs1WMi68 q X-Gm-Gg: ASbGncsYGd+RiX+WClL0FzDkTZSqvfcyu1v0EWUj9cJY6OmgWSBJDki509boTERbH/y OjEQq9TeYo+bRNryEuhyfZZZ9+d3ausdfY6iMuzACU01WHZJD2CDsVDeZM2yF20DWQI80zT0VkH btnst54eiblFUogVN4aG55SQGGcHInAE/+mT2RZiPPXsvFvhVVua1sHiTUHIEU9BCAh3pKJEw/D edH/G4OoOT6/u9XKo6ugUPaYfqgILobelRQ/GeBGHj+L+6QT5lqnRcDZFQ9ephKnFkJ/YnLq4Hw FR7VSqb2kIWFL9beGa+DVHqblH/VcvIA69L6jFLYVwMXoWQ8KRetO30US5uEH7knobpWv84cW8i Cu66kOnrh6w== X-Received: by 2002:a17:902:f705:b0:224:c76:5e56 with SMTP id d9443c01a7336-22fc8c7b512mr155473085ad.27.1746995757782; 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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 13:35:57 -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 13/24] target/m68k: Remove env argument to gen_lea_mode Date: Sun, 11 May 2025 13:35:35 -0700 Message-ID: <20250511203546.139788-14-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::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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 | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 1a589874db..cc37f7a192 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -694,8 +694,7 @@ static int addr_inc_size(DisasContext *s, int reg0, int opsize) /* * Generate code for an "effective address". */ -static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, - int mode, int reg0, int opsize) +static TCGv gen_lea_mode(DisasContext *s, int mode, int reg0, int opsize) { TCGv reg, addr, tmp; uint16_t ext; @@ -733,7 +732,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, case 5: /* Indirect displacement. */ reg = get_areg(s, reg0); addr = tcg_temp_new(); - ext = read_im16(env, s); + ext = read_im16(s->env, s); tcg_gen_addi_i32(addr, reg, (int16_t)ext); return addr; case 6: /* Indirect index + displacement. */ @@ -742,14 +741,14 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, case 7: /* Other */ switch (reg0) { case 0: /* Absolute short. */ - offset = (int16_t)read_im16(env, s); + offset = (int16_t)read_im16(s->env, s); break; case 1: /* Absolute long. */ - offset = read_im32(env, s); + offset = read_im32(s->env, s); break; case 2: /* pc displacement */ offset = s->pc; - offset += (int16_t)read_im16(env, s); + offset += (int16_t)read_im16(s->env, s); break; case 3: /* pc index+displacement. */ return gen_lea_indexed(s, NULL_QREG); @@ -769,7 +768,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn, { int mode = extract32(insn, 3, 3); int reg0 = REG(insn, 0); - return gen_lea_mode(env, s, mode, reg0, opsize); + return gen_lea_mode(s, mode, reg0, opsize); } /* @@ -827,7 +826,7 @@ static TCGv gen_load_mode(CPUM68KState *env, DisasContext *s, case 4: /* Indirect predecrememnt. */ case 5: /* Indirect displacement. */ case 6: /* Indirect index + displacement. */ - addr = gen_lea_mode(env, s, mode, reg0, opsize); + addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { ret = addr; addr = NULL; @@ -870,7 +869,7 @@ static bool gen_store_mode(CPUM68KState *env, DisasContext *s, case 6: /* Indirect index + displacement. */ case 7: /* Other */ if (!addr) { - addr = gen_lea_mode(env, s, mode, reg0, opsize); + addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { return false; } @@ -1110,7 +1109,7 @@ static int gen_ea_mode_fp(CPUM68KState *env, DisasContext *s, int mode, case 4: /* Indirect predecrememnt. */ case 5: /* Indirect displacement. */ case 6: /* Indirect index + displacement. */ - addr = gen_lea_mode(env, s, mode, reg0, opsize); + addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { return -1; } @@ -1931,7 +1930,7 @@ DISAS_INSN(movem) break; default: - tmp = gen_lea_mode(env, s, mode, reg0, opsize); + tmp = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(tmp)) { goto do_addr_fault; } @@ -2673,7 +2672,7 @@ DISAS_INSN(tas) } else { TCGv src1, addr; - addr = gen_lea_mode(env, s, mode, reg0, OS_BYTE); + addr = gen_lea_mode(s, mode, reg0, OS_BYTE); if (IS_NULL_QREG(addr)) { gen_addr_fault(s); return;