From patchwork Wed May 7 21:12:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 888102 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp587188wrq; Wed, 7 May 2025 14:15:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWHDfoMYr2G/sC/+cVbdK4RJ6TFCGjMyVdJmen7fGY9JSL51YA1iiP+aTe/dS5sKO4h+mBuFA==@linaro.org X-Google-Smtp-Source: AGHT+IEvciT0war7bBu1y6YT51/5BcSsMQ78Op/Nd7OJhYWx5OYGjwmNfTGt6iyJYJWmlTzRtxJV X-Received: by 2002:a05:620a:25c6:b0:7ca:f36c:b92 with SMTP id af79cd13be357-7caf739fab4mr700940985a.16.1746652524442; Wed, 07 May 2025 14:15:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746652524; cv=none; d=google.com; s=arc-20240605; b=AR4TRqGh2PBbxAtKWjum82RtgXecicq/mGq3K0NVUojzXy0oG1Dp/uqx21Wz/5haNw LC2iYZrWaMAhfLs4okcp2KZwe2xt1LYpgavVKWJ1WOgEDbod2FZpF4OgM1hDHrJwiRtu X5cJKMaKItSdiL1yiYf0R947CIq9OaaI8xrj/t4JalqNzv2fpT1ZK13Me7cOGwlq+pat vQsVL+CezXMG5MPYUCn/B+wd1MAde2PtwG2ODu7++Zip3EKH3loZdY2cPhclB6UeaOwU U1HEatsm6LkPRUlvTxdJOdbW12TVIbp8WDrWfpKW7tgKVT70AVMgNU/osOat/X/hnFXx KFfg== 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=bxfiiPxt49JXkREiZvO4xdKZkNdecV2hsS2X2asILJM=; fh=oTVbKRIO4+2hI+bP68B7Af9cjxdBfd9rIDcM9SyAXs8=; b=To0jTxImSNUwrdHE9VCmk1xduD1oVbj2wOzPROkgtrfYXBVM4pm6p4ah8npVhRKXcu UaDCH6S9R1u4e+oATenfT7KlWLQCbdqS+O9LZAs+w8kf/OAgFOEe0lk0fq81chlhbfhu er224FiwP7DGyHpfIW+aOMLYBBJX/tRUU8plj3LaWmPGS7b+VqkMxSn4E2dZ4p63M4gP cbLB/PDh9sMKJFEXeQOU8H7Jw5xxp3iiejSlJUjSgBGfX/zStI1NrqnXHLhEOoZCBVbq CuwjxjcJq35Y0Eb8PqT1xts+abeV0erzyjIYpyhNqBmNqTF8euzykRbPrqhJFYQpmRjz bDhg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rmlosf/R"; 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 af79cd13be357-7caf75b2719si281210185a.410.2025.05.07.14.15.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 14:15:24 -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="rmlosf/R"; 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 1uCm5U-0006Vk-Nk; Wed, 07 May 2025 17:13:56 -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 1uCm4z-0006D8-0p for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:26 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCm4q-0006F1-U7 for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:24 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-73bf1cef6ceso441887b3a.0 for ; Wed, 07 May 2025 14:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746652395; x=1747257195; 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=bxfiiPxt49JXkREiZvO4xdKZkNdecV2hsS2X2asILJM=; b=rmlosf/RYP++w51tbJy77dzK27AU2u/lgJr8B+YucWiCQvs8kFQKLEaOlX1gICPFp6 7DPWMFM/WLXUd25RlDr9VAwMuHcFUWtBVXHWelLCapTybDrVbg+mLZ7CoYZ1i0YZLZ8y FmnEoi/GHUR6bWy4HlDK42BKUJunxri0W0WgED9ESuiHs4LyqkZ1J2M/mIsoZWjHHHq/ Ut/ivgEkOrVYwJsUfpsH/dD5A1cLAoHvSoeyvZ9dJh83lMxoE2CQPAeq1h+bSjxCrtQe Ukqn0dYiGDJYy2/RkPCdmH792x+7x1qIxRtjemOpgeo0y58h2jQ2xH8qfFA4TKhpdCNU iHXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746652395; x=1747257195; 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=bxfiiPxt49JXkREiZvO4xdKZkNdecV2hsS2X2asILJM=; b=uMMWtA0mPaH7Vi70jpmVubb3sEO/ftizpn38fX/nVbXv4PiHoVMkVSSdurXfCtqiAk sJPwIq5ULDMhuFFsjC7wnZEHSGF27Ei5+cWqQW5oGXQ2E4eoFFbNZPqjx75gcVWhP87Q EoX4dfF5u+IqkT1D62jjuzl7uARW1v8/Wq01R3r217uPVqunW0y+rlANB0C+QC5pwAeB 4GvFIoDWFQ1ZG8robfF3PV6c0ODo/95R57SEe8DInnqU0IgVfmFrIrOCZR/TMp93biMz 7cxFfmPkzEhFIsii4VejNgl3gdjO6UZqqvWJcexfz75rjW2XG6GwsMW0YTfsInyUyT9y zLmQ== X-Gm-Message-State: AOJu0YzFbtbXqkuwRHzy7sWQxQvtFiRFZDBgP+gWCX9yLGeSdkHbn0sp vALXLMXnO6WMV/OC+wsOvpRfYpETQrRta9LzWH+rx2BGNiAGWY0H6GKNf82dzuLJaD6JD9hBE/v 5 X-Gm-Gg: ASbGnct4UEmJNmRm5/5/eUyN4R27WjoEPXrmIe/RjbGSP0W6SF+bzvR7fYgjSPZMwmf HaHUbUdGpJeFafLaS6B1Ruh/bpS5lRtvP7eiibncT0gOlUk9HObyavQ4lA40OOvBV3P2CutgDfJ t7oma+UB1llnSO49Nt7CGkxdAjuIFzN6P6mw7Mx2m9u4/jBXiNvXHQWUJmq8dnGXYc6vebMPlzc VqAhCjz0VcbxBGZ2zD8HGONsLTOykRX9ShEh9vxqxit1cNiXcXTkPorlmFi85TiALVZj7RWTGB8 s9eva4xVzcPbMbHOk4yOkLOQW1QdE/zKVqH91wqudRqR8jG3dkUZw3fJJ6af+jxyWj/any8yZM4 = X-Received: by 2002:a05:6a00:2985:b0:736:8c0f:7758 with SMTP id d2e1a72fcca58-7409cefdfb0mr6689320b3a.10.1746652395370; Wed, 07 May 2025 14:13:15 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7405902154dsm12255251b3a.90.2025.05.07.14.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 14:13:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 16/24] target/m68k: Remove env argument to gen_ea_mode_fp Date: Wed, 7 May 2025 14:12:51 -0700 Message-ID: <20250507211300.9735-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250507211300.9735-1-richard.henderson@linaro.org> References: <20250507211300.9735-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.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, T_SPF_TEMPERROR=0.01 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 dba415acf1..2694620375 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 {