From patchwork Wed May 7 21:12:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 888111 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp587992wrq; Wed, 7 May 2025 14:17:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVAyWXZ0u02Q/s3NZ33rv2TuLBYtFTq9t9VpfCA+qSFTrbz45KDC1t2gSeRLXVFcPL4nf1GUA==@linaro.org X-Google-Smtp-Source: AGHT+IF/yE1sBFPw6LFwc/zIl8o+FHeuP1je4Uguvcy5aTQRhngyVUIfXf1g9JLr3imRfOxEAGJ5 X-Received: by 2002:a05:622a:94:b0:47a:e616:cab2 with SMTP id d75a77b69052e-49225b37d0fmr65016151cf.15.1746652671806; Wed, 07 May 2025 14:17:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746652671; cv=none; d=google.com; s=arc-20240605; b=cpbLWg0RXRCk9Szcul6aWwi3PcIu9+g5Dcpn57LHPiywTOIIr7K/KD6TO+tQY+e/+1 hSESbCSw+XwDX6Qt7KruHDLb24RCScyL+DrRLRJCUtTsTstLCqoMousrIWIlpxXJWZEm uuubhSxEDtH7qd8tDeKOuZyiDBB3nFa6+wFieyIpJgoUrzw1G6zViIHCANM6JGaiPy+W xSIHLhSgdOKSU3QtiFz2Y6ksRV+X2+CgxpMS4AAoKT2nWO6/wltQtPKcBOKg7kjPEsO4 +k5JakK0nDcjJjCjoW6WdcoG+OMSPjm8j4hUwbiWJ+8nq3fDfvmonoprbJ4kLzQMFra0 RXoQ== 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=adKWgBvOzEaae5wZJaPVcOHVkh8QC4Zfl7HlNy4ELvw=; fh=oTVbKRIO4+2hI+bP68B7Af9cjxdBfd9rIDcM9SyAXs8=; b=WLvb0gKrOaSGO3ci+vtZKQjY6g+607cR3CofKxl4HlMbr7hj6A5Nn8QE3C6cg4ZjNq EFI5t0bytulKdi2yVyoD2wRVSRNucgF1u6bC4BpXq6SrF/hwDcGaOrq12UW91iuByuYa eoeAX4+SnrGZGjn6ICU/MCmadRITOy2lXnoPdCZufS1nhbRcxG+7e85fYkVtCchJ+xD5 8677kf0e5U0y+BzK/jIEyz5+hrnQeMdzOxF504W6Ixcu0UNN78s/II1Bt4WHqtAyyPIi bHZ/NNeNanxVtNUTvzIArhvl+uQwfko2uzARzuoNQtLuq4f9nJcXx38jALNf7GybpHg3 7F0Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AHG98q+H; 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-4922126f40asi28437591cf.186.2025.05.07.14.17.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 14:17:51 -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=AHG98q+H; 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 1uCm5C-0006Fj-CT; Wed, 07 May 2025 17:13:38 -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 1uCm4u-0006C6-L6 for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:22 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCm4q-0006Ek-1n for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:17 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso456808b3a.2 for ; Wed, 07 May 2025 14:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746652394; x=1747257194; 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=adKWgBvOzEaae5wZJaPVcOHVkh8QC4Zfl7HlNy4ELvw=; b=AHG98q+HYV17MBQXvBJ7TlYNp6udwWZ4JhgpaTyCNPa20Wudu+/QlIa7Wb3kM2ovOo zxUgRPiNs2jZCHsO4OLAthBp7esf+5y/bWDyjS5AvRmWD6kCMEpKPxTBNVvt2FWUSt1v PMCP8xEMSFt1kXUQbN6V3McnkWgt0QzF1chXJvHatZaBTQubFjBr4irozDXw7XZMBZU6 BH//36gDZMMveEDTDNp0Z07/4/Gn+hT2qiZgfUnQRImedvVXbc8b4iGnETk8sSRET0TZ PsyYSDqkCUVf7IVSB/pcnuDiZhBy1UtcJgQnPk62RiIkuuY1lpAqsLs2ziwEQQyZEIe3 HQDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746652394; x=1747257194; 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=adKWgBvOzEaae5wZJaPVcOHVkh8QC4Zfl7HlNy4ELvw=; b=fijXDxi3FcCLuO805K5EsxEfbbACxqLW69Tu/86i0mLZ/18G45oQvoI9gCPCJB7J3C UbOtZ5RIGQoOgRWXIrgvELZGE6Tf4AsCcj4kYPWtycPnPPpaVtjEhFKq3wg74t1o7TOa wDRVvE79+9ytMzGQ4/D0QfgrjFmJ3UgXj7E+h6hCpHWCe/U3kUWectdh9iFV2evFqNV5 MBj2b47HEdRX4CCCUe+aXVN6d8Dd2eWMvfsho+2WQBYuB2mPv383CXA09BZpN/fxRMgW ABjwGvEl0QwA8ldBhqylrwnrp/WQ+HtLvxMk8wLyqOYeaLgOac3ClJLMS7H06sixokig NhwQ== X-Gm-Message-State: AOJu0YyKpl5ZoMFWt7kqc39zNZNM9S5/a74DWN/Krkwn9ShXB0arNREt Ot/mBAW2yekYFtREKp2olozdwqS/FXjfq7TZ2zTTQjMwxnjMLjHZ6RI2Sr318UueVnkvIYba4QB f X-Gm-Gg: ASbGncvRs5QFxmeJXMC6O4o22Pw1EP3m5NLLFbFzLagpteK6jNfvQ3r+46CPhHLuSIu o6De9nONAWJst4wX04QRgEQ2+UqduzM/Jo8caWYqs/GQWuZbOIZ7sH+qVMaBcqmjh7RgPllwb2Z 7o/WIvcGg8BatUK49nlqdQfocOQixR75QiFJGIQSCIl84faKd1zCYAZvwhUaaO/4Gc2pMd8FBjP sUZR5fnDzlADj84wfl9rbkV/dkYWMQGauQSCNhvWa6Kq/JqnmqjJbxtLgd6G2NblzSj2UIfb1KR 4GBFKXCRffLjJMvkZewTeb5IigcSz2yHHMfns7pqwYex3WmW86ID0cn83RaSSE/UUmXdY69eTyV fYR399cA09Q== X-Received: by 2002:a05:6a21:e91:b0:20e:4f4b:944a with SMTP id adf61e73a8af0-2148d0116ebmr8847839637.32.1746652394540; Wed, 07 May 2025 14:13:14 -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.13 (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 15/24] target/m68k: Remove env argument to gen_store_mode Date: Wed, 7 May 2025 14:12:50 -0700 Message-ID: <20250507211300.9735-16-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::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index ac48329674..dba415acf1 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -844,8 +844,7 @@ static TCGv gen_load_mode(DisasContext *s, int mode, int reg0, int opsize, return ret; } -static bool gen_store_mode(CPUM68KState *env, DisasContext *s, - int mode, int reg0, int opsize, +static bool gen_store_mode(DisasContext *s, int mode, int reg0, int opsize, TCGv val, TCGv addr, int index) { TCGv reg; @@ -1335,7 +1334,7 @@ static void gen_exit_tb(DisasContext *s) #define DEST_EA(env, insn, opsize, val, addrp) \ do { \ TCGv *addrp_ = (addrp); \ - if (!gen_store_mode(env, s, extract32(insn, 3, 3), \ + if (!gen_store_mode(s, extract32(insn, 3, 3), \ REG(insn, 0), opsize, val, \ addrp_ ? *addrp_ : NULL, IS_USER(s))) { \ gen_addr_fault(s); \ @@ -1704,7 +1703,7 @@ DISAS_INSN(abcd_mem) bcd_add(dest, src); - gen_store_mode(env, s, 4, REG(insn, 9), OS_BYTE, dest, addr, IS_USER(s)); + gen_store_mode(s, 4, REG(insn, 9), OS_BYTE, dest, addr, IS_USER(s)); bcd_flags(dest); } @@ -1738,7 +1737,7 @@ DISAS_INSN(sbcd_mem) bcd_sub(dest, src); - gen_store_mode(env, s, 4, REG(insn, 9), OS_BYTE, dest, addr, IS_USER(s)); + gen_store_mode(s, 4, REG(insn, 9), OS_BYTE, dest, addr, IS_USER(s)); bcd_flags(dest); }