From patchwork Sun May 11 20:35:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 889184 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1334675wrr; Sun, 11 May 2025 13:39:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWkYemacnMdolbRqq9UTjeRcEBl7DKIxBym3ZeKFV4zRPj2MbNskDoF5KFdZbQOjMGer29f2w==@linaro.org X-Google-Smtp-Source: AGHT+IHZdrek/B4wIjx81FJ1aA9KyvRnx7DXYu+Ni8GDnI7TDUFSVAAAbRTQwOlGFrGdTIrYXrjR X-Received: by 2002:ac8:59c5:0:b0:47a:e13f:2569 with SMTP id d75a77b69052e-494527d4be4mr170372581cf.35.1746995988800; Sun, 11 May 2025 13:39:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746995988; cv=none; d=google.com; s=arc-20240605; b=Ux9UsrLKPf8lgC1uO5RxHJ12vOVjH1f9VcV1BTSPbuIq8yRARKPmeCp9zT/DJNyddt Ocf7F5e72lRCjC7TtJrdkar1iGdUHFW3oswidR7fNycrQB8o9aWvZmhDHAn5PiWJImiN N3c7tAGgw/CKeKq9LVpDagtotXLW2TYuIAkJwkPRlHdBHIrc7wEdvtLzT5riILUVns51 xIGsf9j5H002jvt+N/mhZTH9bofXlF9/3gNHErNmfwH4PvJHasOYUUy/jMt1ot+KQ0dc b1F8WX8ZMlLSrDAyXdIfKNcnmsQ9Y/nIOOJ7M5KnEvpeIspn5HMY4xSntnUYm233LDVw GwcA== 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=+47xY6VgImnNTtip66i9o8+87NnKPnRUllE3fysFtMc=; fh=ZKeelGKICHQ9l/9d+e+bGKuo/S/FkjHED8U2Ob+lIbw=; b=e03VfZMuDHxYWL+vPkxSdvLQErm+YLayWqwwi8SHAbx4E5p+HOPicai4aYu0tmI0Zk nHxnSWnIkT/m6/f/LZKjED/3pKCYSH62qtNdVL6zJXWAxC0yvjwUbfPpmhptiQ9jQWK0 tDzq5CY3rUZMwXIK7mtet3+yRKR9+IU3+yUrkmA4reF/RiRMDxDeTYomjBulVsYqZsIM KN3G8/eGrKShFITZfX7Vb4M7Qlxbmfs8f6/RraPZFNQWyNGUMsvWt3EBFX15+yW7G9sJ ga+HSuo/YL5TwBvpJB+pfKDiSbJxhEd1XF//04CTlwRsKzvOE/yu1F7UrnYIjkHKszOI aydg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="L/RI92aW"; 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-49452479642si75835231cf.191.2025.05.11.13.39.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 May 2025 13:39:48 -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="L/RI92aW"; 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 1uEDP2-0003A7-A8; Sun, 11 May 2025 16:36:04 -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 1uEDP0-00032N-Hz for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:02 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEDOy-0006M3-Uc for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:02 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-7fd581c2bf4so3134641a12.3 for ; Sun, 11 May 2025 13:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746995759; x=1747600559; 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=+47xY6VgImnNTtip66i9o8+87NnKPnRUllE3fysFtMc=; b=L/RI92aW195uuoBbiLA5tPPEqaSb32ljH90dOK7doMnSR7MtXA+o34L6W+t/jzTlHq e/x/eVbC70+2OKGqAiL32AbFwhTO7b6IvUZ5d45b6+eF4B0tIlsRpdZ6wSd2/Mn6/gYI t/nh5iNEH/mTvQBL6kGuBX7SyQz0PBcKUAXpgjf/YuF5wPGbZbUhj26sD5I/p5kakdGi eTgj3wQXE1cSsvseowfNSRsncY7TcR1OuD156rNrBtfJXN1t30KtYa2MN9vljvYxWHw5 YVsmI7cOtcMHnk12MXuvuMwsVLD5xKn+ulwCLP7+J4Mia3y/WbqnEDwIvJTDWQO7zRov EIKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746995759; x=1747600559; 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=+47xY6VgImnNTtip66i9o8+87NnKPnRUllE3fysFtMc=; b=e9tYTyUZBBk7OMSPiEwzoyaBBRt8p/xfET+2f0CUO0eqlQeN4LQdTrl0MDOvMzOnKa bX5Le2AeDBUH5ZpG7/l8ZTlKBoin0hnDqnMoyEFEvPvBfqzNdtYUWZTfK6P4ePzqyre6 jz9IeP9qbKN13QJDnnqWxaV4i7OFwTT4lcRCnCpAPwgQi14/Nov5xt8DSNWaUoBSEvqT krJKkJihPkDWf3L+hyvdkgcEQGDmhIO2+oYCkAqd2ynlPW18nDLGMLTSuGWUFnA4o3TT V36186+u4XUh4GVHFrCcJKwehbXcbfy0BUHnIBYHsj7gdjmf3V3/9q/jj0XJcy8IvcbQ zoNg== X-Gm-Message-State: AOJu0Yyk9vb+O13EvmVdKSup+MCBSE76nNJge3hSACdt9kMG3gifQ83h HC3tPZOeNR9bB30WuqhJXhvC9pUST/lLO5jEblaUK29azosTBOYqDiVf2qa2taQ4BoIF9nzeQ8z G X-Gm-Gg: ASbGncu3BC1voecaVD9blQK/c6fRLTJfQnkAAm+X0+uCsWPtYAmOdyUPH1Hv1c2+as+ f7P7uouJ0tiq/OCwSsab9gKkpeayuovnBSDOSysm1kPzrUaRTUZWXtJ6VrwYg9e7SnrI+XmIknR k/RbtO8FQNkU20lT/uBfGfQGdKQOLFOYNUPCaehMKmVoeyXRO374APiqjF0TozHTn4Pj6IeImyr txl9cWX68T638xMrN2PUrRSHwnxcOVtIHWCn1UNb+X3fHeTeCHy2lIbPP/SBi8fc2ywBqlmk9ci jJULsZXpuULAlEVCl+gv3OPSithPeVaotIV9RU0FHPUsyir4MM2sAOLOu4UlSN4MBt5BJe/GJyx RXltrFYGYNg== X-Received: by 2002:a17:902:d492:b0:21f:bd66:cafa with SMTP id d9443c01a7336-22fc8b40cb9mr160315155ad.17.1746995759394; Sun, 11 May 2025 13:35:59 -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.58 (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 15/24] target/m68k: Remove env argument to gen_store_mode Date: Sun, 11 May 2025 13:35:37 -0700 Message-ID: <20250511203546.139788-16-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::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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 c3cf1c9f91..2c2d83e61b 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); }