From patchwork Wed May 7 21:12:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 888097 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp586735wrq; Wed, 7 May 2025 14:14:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXHDxi56INZ3bHM4GFqNMykVLUUrz5DQz9+HiONeJi4NVDzE33BUdHMowL6UvHUcH2lf10wmQ==@linaro.org X-Google-Smtp-Source: AGHT+IEG0CzXEsO41ST6vNeXkrk9Z+/9Th7CkikVjxfmP2+iqUlCSG8MK6uX+g52jpOGVTRZscp2 X-Received: by 2002:ad4:5768:0:b0:6e8:f464:c9a9 with SMTP id 6a1803df08f44-6f5429aed19mr76437566d6.2.1746652449649; Wed, 07 May 2025 14:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746652449; cv=none; d=google.com; s=arc-20240605; b=lhCllCd7TSQCQK1myHa58oANzQCjFoynK1FmrE8z7LVdwL40Nw+MIqClxcvm+Ne84u PVl5UJGM7EDI0xgfSAxriPLhJJTLsUMWDpAXhETPgsfG12+usMSNkvwLddq28Kr//xnt +9eNRkUdIcm3ebbY29792O0DaXCRaNjWU0tVU2a8EN9LYoPZrE81tN5je2wnoxEMrPpK WuQzQ6+GJEfsc9m1Weg0a3TbcmCxxmqJQ8ZwZm6u3Y1meCutoR49nFrtz4fFPc91hipN KGhKlXHUz8XrUE01qAQZXP5Awg9mKmjg9bf77TpZIM3sSCrMEBTLnrPjeyO+wPLnshCn ng3Q== 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=V28X/B7HKspQXCAbFSu75wLrZk2W+uEoRdz2oWfmGic=; fh=oTVbKRIO4+2hI+bP68B7Af9cjxdBfd9rIDcM9SyAXs8=; b=LTZjfkQRTXK9Hv8S8/2yuXijB+2JTspvOj2WY8LT3Pk4DXgdIg6lDijgs99V4w/Zxj 64fUuHUxLHhL9NHwwbnqEHI0OGhH2U4hd783EijBY7iOC8+xkssfg5/lcNus9GhTKogV JjO1yM+ZTcSq0erzFtypZY2hDWkDJvmDqVHxw1JeOwAHrlFvOgbS8G2cBz2Npmo36w+s x0TJW89rHExKk6nl0QlAma8EiSe+emh3IK3Yyuk1RXUbQ+afOUkwNvWQm26W6tuDGoax wp3hy9RuPtJuiYA0avys2fpKvee6+DUbnTBgFNoDJ+dqYdWUUJUSjSB/GeAT5mHT1Lh5 iJeQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SNgoFLk4; 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-6f5427c74bbsi27958436d6.339.2025.05.07.14.14.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 14:14:09 -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=SNgoFLk4; 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 1uCm51-0006DA-EP; Wed, 07 May 2025 17:13:28 -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 1uCm4r-0006Bm-5i for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:17 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCm4o-0006ET-LX for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:16 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-736bfa487c3so337620b3a.1 for ; Wed, 07 May 2025 14:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746652393; x=1747257193; 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=V28X/B7HKspQXCAbFSu75wLrZk2W+uEoRdz2oWfmGic=; b=SNgoFLk4Lj7X/Ad7ET+u1PQvinr/BwKp9XzuxEegss4f9+TGQJKh/wGaQWevU3z4z8 Ser+EFtrl8fr36T41DIRYFf6RlfjVFJ7vXGVv2QtZqGUqozj15bHTBfohIvc16LEqSyG y/uKpuoqCDOw7IPsnumXAoFBx45mYVP8WJD24qk37s1+hhljWzi5FzUfIXtJL+sJVTVt OU7TZ3jyCVGpjntdHVlvDyg0C5MoKUGhExeIsKmyVf7+/XAX8a9wpKpyss7hW4wFH1ao +ca97yZP0XFM7eHegFCtbFo6YN5eezh3KegJNAGbbARwPbhEp5JOa1xekhKoFKK4300B nJkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746652393; x=1747257193; 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=V28X/B7HKspQXCAbFSu75wLrZk2W+uEoRdz2oWfmGic=; b=Aqsia7IcaljVmAbsLIg8QRqiHpfX9H8fepiON4UMpjIVY4Hll7snRflxwsDzY0/yro klsxdyoGbU5P8EHxqSGrqblnDvipo/WJEaWBKVsPomMZraRd4oBra+tHcQ2Wz8dzx+gM NXHdqIkglkx0Fu7u/bybwSjYsAznuP4yQobLJ4xX7HuV1k5Y4tshF2dZ2amsGuRObUOb mg38mAR3lrx3hCRgrHKBGinwmW/hj3natX2k27pEObiMFNfjYjjkJTbdTxsfjfVa24bD K7pH/l8/gptN+CkgGOI2PHKKkYyLLlp8BomWSAmO/Y7+8sv9kLud+BPAbSIGS9MSBt5S GZ3A== X-Gm-Message-State: AOJu0YybD4kEqrzxtXb1h6qIfd/qbP1AZh+e5HWUBkgPZOgO3g/cyL8M 9zKd0mHUWaRThT4+jmi+yMnTi9JulqgIJ6cDeLDLp/23OmfRckkjLSU3V2SLrGA5P5teLzcgU9r 7 X-Gm-Gg: ASbGnct6pyEHJFkZ8uKe6VqRVUxVE/Jpacz8Pgs2N1M/W8QhyzCXskC+61+M0CgvkcG m7B2JX6swo8A4IZFtbHLvno/DsadMAMOpOKaoaSkKj/5tIyVhI5vo8JJ7MZ+Q8bndIfKCUGT7nV Vxw0xFrTOWv1bjFOrHe0+CZa5yJAT0wtKwRKqxODbP4wP07hYiNcnc9nehVtu100AvnBN9zePgo P8AOBjPjuD6x+TLDEhe315dnsgNZsrxT4J+EgCbKvn1TzALmKjk81m53odG7gyqCIxVD3UF1HmG 4Dd75vFJmABeTueMqBKmuzxYMtYgRrCoNTwmRuLj1jZXOwEKeG7kXPS4wuKtoRVTXUQZ2TKCe+0 = X-Received: by 2002:a05:6a00:e8b:b0:736:6ecd:8e34 with SMTP id d2e1a72fcca58-7409cff5cb7mr7155216b3a.18.1746652393020; Wed, 07 May 2025 14:13:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 14:13:12 -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 13/24] target/m68k: Remove env argument to gen_lea_mode Date: Wed, 7 May 2025 14:12:48 -0700 Message-ID: <20250507211300.9735-14-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::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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 | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 532b050ffa..e0482bdbec 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -694,8 +694,7 @@ static int addr_inc_size(DisasContext *s, int reg0, int opsize) /* * Generate code for an "effective address". */ -static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, - int mode, int reg0, int opsize) +static TCGv gen_lea_mode(DisasContext *s, int mode, int reg0, int opsize) { TCGv reg, addr, tmp; uint16_t ext; @@ -733,7 +732,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, case 5: /* Indirect displacement. */ reg = get_areg(s, reg0); addr = tcg_temp_new(); - ext = read_im16(env, s); + ext = read_im16(s->env, s); tcg_gen_addi_i32(addr, reg, (int16_t)ext); return addr; case 6: /* Indirect index + displacement. */ @@ -742,14 +741,14 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, case 7: /* Other */ switch (reg0) { case 0: /* Absolute short. */ - offset = (int16_t)read_im16(env, s); + offset = (int16_t)read_im16(s->env, s); break; case 1: /* Absolute long. */ - offset = read_im32(env, s); + offset = read_im32(s->env, s); break; case 2: /* pc displacement */ offset = s->pc; - offset += (int16_t)read_im16(env, s); + offset += (int16_t)read_im16(s->env, s); break; case 3: /* pc index+displacement. */ return gen_lea_indexed(s, NULL_QREG); @@ -769,7 +768,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn, { int mode = extract32(insn, 3, 3); int reg0 = REG(insn, 0); - return gen_lea_mode(env, s, mode, reg0, opsize); + return gen_lea_mode(s, mode, reg0, opsize); } /* @@ -827,7 +826,7 @@ static TCGv gen_load_mode(CPUM68KState *env, DisasContext *s, case 4: /* Indirect predecrememnt. */ case 5: /* Indirect displacement. */ case 6: /* Indirect index + displacement. */ - addr = gen_lea_mode(env, s, mode, reg0, opsize); + addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { ret = addr; addr = NULL; @@ -870,7 +869,7 @@ static bool gen_store_mode(CPUM68KState *env, DisasContext *s, case 6: /* Indirect index + displacement. */ case 7: /* Other */ if (!addr) { - addr = gen_lea_mode(env, s, mode, reg0, opsize); + addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { return false; } @@ -1110,7 +1109,7 @@ static int gen_ea_mode_fp(CPUM68KState *env, DisasContext *s, int mode, case 4: /* Indirect predecrememnt. */ case 5: /* Indirect displacement. */ case 6: /* Indirect index + displacement. */ - addr = gen_lea_mode(env, s, mode, reg0, opsize); + addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { return -1; } @@ -1931,7 +1930,7 @@ DISAS_INSN(movem) break; default: - tmp = gen_lea_mode(env, s, mode, reg0, opsize); + tmp = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(tmp)) { goto do_addr_fault; } @@ -2673,7 +2672,7 @@ DISAS_INSN(tas) } else { TCGv src1, addr; - addr = gen_lea_mode(env, s, mode, reg0, OS_BYTE); + addr = gen_lea_mode(s, mode, reg0, OS_BYTE); if (IS_NULL_QREG(addr)) { gen_addr_fault(s); return;