From patchwork Sun May 11 20:35:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 889183 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1334674wrr; Sun, 11 May 2025 13:39:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPUc8xDFsr8OkUsnVC9MCgahWjtikE0doFFuhkz+axg4yg01pAfuC1YPxQSkgKxXiTbqBwNQ==@linaro.org X-Google-Smtp-Source: AGHT+IGpsfgo6gJ9bx/FE/P/o/1FZPKhoKy7fDiH88JaSiYOHD8A7oa/AZIwTEPbOCn8c94MNy/6 X-Received: by 2002:ad4:5aa5:0:b0:6d8:9062:6616 with SMTP id 6a1803df08f44-6f6e47cb8cdmr190854456d6.7.1746995988726; 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=PdHi7JkO9qx5sjwta87QN4ak4IMGOgPcjogoPIDmzuyhuOkbNFGl0t9DIYHABfso3q mxJ6iQGU3xckwEPGPiK8OnQoeQiyBg4vkse18zir6Q8XpnbsA0M5kRiTZzI8EQqZaGiq BfzD0YXLbv0+fs37HpCTfWJ2cvKQSMYudSOGyJ9tYqUhBmfAjSXC8/MIejP9EK16KoSK W2NMUgPNw95TLs8jM49mbQmNCT2pb6P6Mopq/tsF3kPkmOkPiVZoUFno1ug0+vtnEX9n fG0qG5+q6lwWnnjpEiQ6giiTSB1tLPu+sZro/u/JQyrifgiAhQsxwatk99VduIb6S3ak eXow== 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=vpTbNPfyDTwnZROaQJM3hL9QPrm4wpK5u5e1FadsZ4Q=; fh=ZKeelGKICHQ9l/9d+e+bGKuo/S/FkjHED8U2Ob+lIbw=; b=ZU17fUXP02Rjgys00Eqq+0fKAkR4D7lybbxfNxaBk3WkY5RkF5TBfNvzrdVYBOtUW2 kITvNyTgX30+Xmoo5bTBHu9uVP5cjKCQqJeJt37bEGAba6roGmDdEcAyoqEtWFRlEsXi hRNmNIZFTL8NlE5wFBR+5/r+UVWjJXNhm8hmBxQ2F/lBDInNyXaeQbMxmAu9cqIXvI6n 0EJMABT2qZfDf2U5iqz47t9BtISTjRW4ORDvt7mD2UBJmOtNLTGZZfPp5VhMK8w7dN2Z Y/u0eOASCXG53GPaWP8YwnwE9glbdBx5EAIjeBUUw89LDRGaqii47Ono6vcuRSe0ReXC xtKg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ZsIWkW/U"; 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-6f6e3a597fbsi74591496d6.446.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="ZsIWkW/U"; 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-0003CU-R6; 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 1uEDOz-0002yq-Qm for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:01 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEDOy-0006Lr-09 for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:01 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-22fac0694aaso27071475ad.1 for ; Sun, 11 May 2025 13:35:59 -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=vpTbNPfyDTwnZROaQJM3hL9QPrm4wpK5u5e1FadsZ4Q=; b=ZsIWkW/UU6GM8nTntSCjhz4fQ7VHqFS6OYwbZvNeJUFnDcRmWpmpGX43EuIMUTplzC VmSYzy7PWB4621uu3nLTK0vYZU+F6XhLRdyInArpuFF4B4viAG7IA2z0WmOnkFYNHqxf kyGSDhFJCQUwkbfeBiO5B5SOFSdx/X+9sMl6/huaweMyWllL+cH+8DLo9ZX2gQlHRYo+ eT/UDsJQVpKi8adj8445tYxayv53r5KjmNlA1jdnC8wiKidOzAiNhT/6BmnPKMgH1f45 MX6dBF8Np6bAcGyhNAhfvghzjtgNHhDEV2+f4h9ROBb3a+ZtYG2EoBKLibR0PKoQb9jW hNZQ== 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=vpTbNPfyDTwnZROaQJM3hL9QPrm4wpK5u5e1FadsZ4Q=; b=mpJFVkN13VvmVbmmtKE99Jhyv9TA29hHnBQRyPkCqCJ5SMTkf1LZpzHw8UVzRq3p0T Zi65F5SJZseUOtCbt+leDL+dd7hWV64ULpBupHGR6j37PRSf2F2OoGmyc5MfUcb5Fnmt CadW8U87HJS6zrA+TX+EW8Iy47mYKl5E0OyLA3YA5GtJvADqvKwulzziIa4a21mH4lar pR9HAm+tVi3S4KZMly+u8IVDzF7aotI4k15ux2rW6bj3Ok5m/Cvy/pQSqrf/vqwll3rf M6b+NWwHiYHuIQUbxG6tfhKhjT7oawt4SLDThP4wXWrnUTrBHRbk6q/tqDFXJlWd5Fri T6xA== X-Gm-Message-State: AOJu0Yzq//UK5NzkTxJ1eKAbfYzis3ZN3NVWBG9f4At7n7oMuEkjWz5k OBp+lryrxTnLOrHvuA3oQNVK/J1mOS4mLqpu/hepVQT/t9/IwjO9yvOGzvZBjq63ytAky1Yfayv W X-Gm-Gg: ASbGnct1NpeZbAy7swg0dklSmyrKSCLfJf5CjxnvrBPxrTSH+j4x9xOjVQovTTCEry2 QdfGt4fa4j/CltmjVCwJbt9VTNHpnkNzV+I2QxFewW81Vo98lL/dYOffAmSrF0NzPeeScso4HQi HoRWjy4YToKgrjJUtD97vl65mN46twdMhpcXMalVMKMC4iIq3rLk6cCk0x3LEM9MsBBZ65NzKBI VJPP8VSPN7glaaPGNqg+MeKfOroTsgaMHxsg4Qu7J4DUMBvpvCWlbBNTh+v01Io+CrkKcLSGGQN DS9bv7cnD50dvxeF35ieIS74zWHOBD+iVpZXg3bhhcEMl+eMtb5ZjWwE3qHIkWBNs9iOFM+bJeX mfkUdjTBUXELYpog1K+48 X-Received: by 2002:a17:903:990:b0:22e:485a:b45 with SMTP id d9443c01a7336-22fc918d07emr168690335ad.46.1746995758624; Sun, 11 May 2025 13:35:58 -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:58 -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 14/24] target/m68k: Remove env argument to gen_load_mode Date: Sun, 11 May 2025 13:35:36 -0700 Message-ID: <20250511203546.139788-15-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::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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 | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index cc37f7a192..c3cf1c9f91 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -776,9 +776,8 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn, * a write otherwise it is a read (0 == sign extend, -1 == zero extend). * ADDRP is non-null for readwrite operands. */ -static TCGv gen_load_mode(CPUM68KState *env, DisasContext *s, - int mode, int reg0, int opsize, TCGv *addrp, - int sign, int index) +static TCGv gen_load_mode(DisasContext *s, int mode, int reg0, int opsize, + TCGv *addrp, int sign, int index) { TCGv reg, ret, addr = NULL; int32_t offset; @@ -799,19 +798,19 @@ static TCGv gen_load_mode(CPUM68KState *env, DisasContext *s, /* Immediate: sign extend values for consistency. */ switch (opsize) { case OS_BYTE: - offset = read_im8(env, s); + offset = read_im8(s->env, s); if (sign) { offset = (int8_t)offset; } break; case OS_WORD: - offset = read_im16(env, s); + offset = read_im16(s->env, s); if (sign) { offset = (int16_t)offset; } break; case OS_LONG: - offset = read_im32(env, s); + offset = read_im32(s->env, s); break; default: g_assert_not_reached(); @@ -1324,7 +1323,7 @@ static void gen_exit_tb(DisasContext *s) #define SRC_EA(env, result, opsize, op_sign, addrp) \ do { \ - result = gen_load_mode(env, s, extract32(insn, 3, 3), \ + result = gen_load_mode(s, extract32(insn, 3, 3), \ REG(insn, 0), opsize, addrp, \ op_sign, IS_USER(s)); \ if (IS_NULL_QREG(result)) { \ @@ -1700,10 +1699,8 @@ DISAS_INSN(abcd_mem) /* Indirect pre-decrement load (mode 4) */ - src = gen_load_mode(env, s, 4, REG(insn, 0), OS_BYTE, - NULL, false, IS_USER(s)); - dest = gen_load_mode(env, s, 4, REG(insn, 9), OS_BYTE, - &addr, false, IS_USER(s)); + src = gen_load_mode(s, 4, REG(insn, 0), OS_BYTE, NULL, false, IS_USER(s)); + dest = gen_load_mode(s, 4, REG(insn, 9), OS_BYTE, &addr, false, IS_USER(s)); bcd_add(dest, src); @@ -1736,10 +1733,8 @@ DISAS_INSN(sbcd_mem) /* Indirect pre-decrement load (mode 4) */ - src = gen_load_mode(env, s, 4, REG(insn, 0), OS_BYTE, - NULL, false, IS_USER(s)); - dest = gen_load_mode(env, s, 4, REG(insn, 9), OS_BYTE, - &addr, false, IS_USER(s)); + src = gen_load_mode(s, 4, REG(insn, 0), OS_BYTE, NULL, false, IS_USER(s)); + dest = gen_load_mode(s, 4, REG(insn, 9), OS_BYTE, &addr, false, IS_USER(s)); bcd_sub(dest, src); @@ -3120,11 +3115,9 @@ DISAS_INSN(cmpm) TCGv src, dst; /* Post-increment load (mode 3) from Ay. */ - src = gen_load_mode(env, s, 3, REG(insn, 0), opsize, - NULL, true, IS_USER(s)); + src = gen_load_mode(s, 3, REG(insn, 0), opsize, NULL, true, IS_USER(s)); /* Post-increment load (mode 3) from Ax. */ - dst = gen_load_mode(env, s, 3, REG(insn, 9), opsize, - NULL, true, IS_USER(s)); + dst = gen_load_mode(s, 3, REG(insn, 9), opsize, NULL, true, IS_USER(s)); gen_update_cc_cmp(s, dst, src, opsize); }