From patchwork Sun May 11 20:35:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 889165 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1334237wrr; Sun, 11 May 2025 13:37:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUNUCL4nRKKtXD/tXBQ7R58h0XXNFWxBRBvdLVIw6V0xcPwpijVt6f6R+ExC5nPKGIjE5rUpA==@linaro.org X-Google-Smtp-Source: AGHT+IFGU3qIcvU62yAJrZKdRFeRUtMmTYXYDAeOnx7dRSmOt1emO5J6ubmeyPQzT0fOLOhuIXi3 X-Received: by 2002:a05:622a:1a90:b0:477:4df:9a58 with SMTP id d75a77b69052e-4945272e868mr190592801cf.18.1746995854149; Sun, 11 May 2025 13:37:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746995854; cv=none; d=google.com; s=arc-20240605; b=UEbDqI+uSEO/ViNxUclVlEZNoHN0/IeUgcYpgA3W7lSkukBD4BbaHE+P6IO91Rjncp WJDr8cVPUkfhL3tGygTLMp7FI3gsechYNTeTLlSMAxejbEJIghArL1Um4Yy37KU3wUuO XL2+MLm5O4RvP8EfwIQF1QHE2nZjtRcQaqeTFkz0DpZhf4KA33La9f4EDI0oUosm1ZK5 tJIyG9qDSs2ManoWQixbchUKJK8IVBxyD/BGKDy7P8SHMXnBQ+87Z4ToXYHq9gdXPlTd nb/oKwpw8O6Qa4pl7sU2/5UMIUS/CKH7ykJCrlDO1a9lEjqtjZa4guetqimTkzD6WfAY F5Eg== 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=QWbmGVAs1ZD9rubpd6cvwq4CGTb/LrxmBUpkdFa6TBU=; fh=ZKeelGKICHQ9l/9d+e+bGKuo/S/FkjHED8U2Ob+lIbw=; b=AxDby8qORPHwDbP/Yz0biGXGcx3kSANPq7kgK+rXqm00qebY6LUXsi8iKV3IWNRPlB ElD69kgtqGa37xsaY7zkGNjnfKg0xXZ68oIt4AT4GDGEr6OvIxti0LR+cBvKSf+ucYH9 javfJjhvvivIgm0NJpGN62JrES02wTnVujyPv0/hQNeLh5R6ad3EMKk/Xo1Lal5i4Fwr GK24vdRDJTb0h/0Vn9w8L9VmZdRxb9O9LfIbyGqzmX2+ergGl5aE3FU3MeLGSNUdDKLO p4clWnLo8HfJQMnrX7HyNHM/ab1dScA/fDXHYtW7aNi9YNVY+L9ahYXTmo7I5LzPRfSM VbUw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hHN3Oq7m; 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 d75a77b69052e-49452555679si73763391cf.218.2025.05.11.13.37.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 May 2025 13:37:34 -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=hHN3Oq7m; 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 1uEDP3-0003F4-Cg; Sun, 11 May 2025 16:36:05 -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 1uEDP1-00036G-HJ for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:03 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEDOz-0006MJ-O8 for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:03 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-22fb33898bbso45013775ad.3 for ; Sun, 11 May 2025 13:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746995760; x=1747600560; 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=QWbmGVAs1ZD9rubpd6cvwq4CGTb/LrxmBUpkdFa6TBU=; b=hHN3Oq7mbTi6t301VvogwtjROzHtBsgHOMFWz++JYp+Sazk2qAPsDn+5mCQLp1xhsh 3Ch/3iB29HTjXuX2Om+ilbuSR1sFIzkPMfaORvb0U9t5of3iZ5SNy5fz1xJV5Mv0+GU1 nlRBW24EFJAzbn7uAnmyg/NLZWHiURHurJOfO1KQGzwa0/dj+O3pHNHfqxRX73nGR+Ow PDdbza3/W233CoSJYoqVzHJ8JDzQwn/9Swbb5AEKdvsmogv8cj6mLZhX/+3JkZPoIn2V UY3Cx2/pcCGD1Hj/ZtZJsBUoTrMPBOT1FpzHeQUs3SjsZYnaNbxW7XwbtfMlkLIxv5Xz 9BiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746995760; x=1747600560; 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=QWbmGVAs1ZD9rubpd6cvwq4CGTb/LrxmBUpkdFa6TBU=; b=q1LMNqB4Lj+M+JiSz/03d4Xp8eeJv+TmB9E/bP8lj1K5BlmlP6tRY7nxczc4mhWRM7 n2J4ZE/vkkQV8RR8INWD/tXpwAz5S1+HvFMgUHa65NI99YHczxM3EEIw+XDJHJ81w2lR 7tbeVpgfbtXgsDUaz08nTh+z7yz/AeCw4lAA3LcsS5OY0zHF/R+BYb2MMkUyzWcUXRC7 AbIsRL0tg3hvUKGdz/h3CSpFh92hD1t2l74uDjg3xvPzyxMQxLMY2syeHshM+TZ1MfMy BPsggjrdq5ngNoRhMHWhHAtj2ImkeuCK9eGncb4/VTtI32UsonVTE3hltcU76O/UxWUY W6Rg== X-Gm-Message-State: AOJu0Yx4cXyBaqDL+5i1ZSSzpfQj67EAiYMcZ7jS3gYiWEr6JntwvHK7 1w30aTMvMhA6aSaEc1QTCZwN+KsSSz03CxfNG/bQzU/mnXiJa1MOn7IPAYMYFd8iwtBu18kEmtE P X-Gm-Gg: ASbGncsFXLZrhejdb29nnoEJDX/uOscEoyy0vY2aFoRGQHWTkQfMFjxoeyrlHAOsdCz EF8R8EUhDf4nFm3yGbcyZ2DNzlQ5U11BRCwt5xXVD2OrXG02MFdOAzmXO1XzjWy/mfxuzENpt1/ EtM611jt1Iz1n94+eebiqBUmexmNgld+aEmEn8CigJdqk/JyNSJyw9l2GeV/dICt79/ykaNXYxI YPrtx8FvsTbJLqaGLgmaotUpR50RhY2mRu+8Go+LtBFRRYA/f2RHjRnBYpDqfRwTaZSIBR737G+ 1dN9Cm8El49BSn6INMXuHAinM9GZlYOIQP6xq0gjS5VNaZ9lhyYLt9oki14me6Uhx0ERGtI/ty4 yCT+vNPp5rw== X-Received: by 2002:a17:902:ce11:b0:223:5c33:56a8 with SMTP id d9443c01a7336-22fc9185dffmr189726695ad.35.1746995760290; Sun, 11 May 2025 13:36:00 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 13:35:59 -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 16/24] target/m68k: Remove env argument to gen_ea_mode_fp Date: Sun, 11 May 2025 13:35:38 -0700 Message-ID: <20250511203546.139788-17-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::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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 | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 2c2d83e61b..779890d3d3 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1012,9 +1012,8 @@ static void gen_ldst_fp(DisasContext *s, int opsize, TCGv addr, } } -static int gen_ea_mode_fp(CPUM68KState *env, DisasContext *s, int mode, - int reg0, int opsize, TCGv_ptr fp, ea_what what, - int index) +static int gen_ea_mode_fp(DisasContext *s, int mode, int reg0, int opsize, + TCGv_ptr fp, ea_what what, int index) { TCGv reg, addr, tmp; TCGv_i64 t64; @@ -1059,23 +1058,23 @@ static int gen_ea_mode_fp(CPUM68KState *env, DisasContext *s, int mode, if (reg0 == 4 && what != EA_STORE) { switch (opsize) { case OS_BYTE: - tmp = tcg_constant_i32((int8_t)read_im8(env, s)); + tmp = tcg_constant_i32((int8_t)read_im8(s->env, s)); gen_helper_exts32(tcg_env, fp, tmp); break; case OS_WORD: - tmp = tcg_constant_i32((int16_t)read_im16(env, s)); + tmp = tcg_constant_i32((int16_t)read_im16(s->env, s)); gen_helper_exts32(tcg_env, fp, tmp); break; case OS_LONG: - tmp = tcg_constant_i32(read_im32(env, s)); + tmp = tcg_constant_i32(read_im32(s->env, s)); gen_helper_exts32(tcg_env, fp, tmp); break; case OS_SINGLE: - tmp = tcg_constant_i32(read_im32(env, s)); + tmp = tcg_constant_i32(read_im32(s->env, s)); gen_helper_extf32(tcg_env, fp, tmp); break; case OS_DOUBLE: - t64 = tcg_constant_i64(read_im64(env, s)); + t64 = tcg_constant_i64(read_im64(s->env, s)); gen_helper_extf64(tcg_env, fp, t64); break; case OS_EXTENDED: @@ -1083,9 +1082,9 @@ static int gen_ea_mode_fp(CPUM68KState *env, DisasContext *s, int mode, gen_exception(s, s->base.pc_next, EXCP_FP_UNIMP); break; } - tmp = tcg_constant_i32(read_im32(env, s) >> 16); + tmp = tcg_constant_i32(read_im32(s->env, s) >> 16); tcg_gen_st16_i32(tmp, fp, offsetof(FPReg, l.upper)); - t64 = tcg_constant_i64(read_im64(env, s)); + t64 = tcg_constant_i64(read_im64(s->env, s)); tcg_gen_st_i64(t64, fp, offsetof(FPReg, l.lower)); break; case OS_PACKED: @@ -1122,7 +1121,7 @@ static int gen_ea_fp(CPUM68KState *env, DisasContext *s, uint16_t insn, { int mode = extract32(insn, 3, 3); int reg0 = REG(insn, 0); - return gen_ea_mode_fp(env, s, mode, reg0, opsize, fp, what, index); + return gen_ea_mode_fp(s, mode, reg0, opsize, fp, what, index); } typedef struct {