From patchwork Wed May 7 21:12:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 888108 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp587544wrq; Wed, 7 May 2025 14:16:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUSxyf2qKNey1UOFYapZOUKGJ4dXYGV7rQei9oMv3XdbWxGHyO9joODOOhwoNG+Hy0dTC3ZHg==@linaro.org X-Google-Smtp-Source: AGHT+IFKlWaLX6xJ11RsTmr8Jkk8LM1a1dp6lLB6a5x2ZInVqkKdEhswnhZ3tQIFMvSEeWV/VBQX X-Received: by 2002:a05:6214:c29:b0:6d9:ac3:e730 with SMTP id 6a1803df08f44-6f54b9e9548mr18547656d6.5.1746652589179; Wed, 07 May 2025 14:16:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746652589; cv=none; d=google.com; s=arc-20240605; b=AtsnUtt49gMPgzDSS4BJawu4dcbAQ4fToUSm6IkVHmVCzV4hwKbtuDQLV0vM0vQCIz f+kCsbhOW3EphVBkMdPkPpr1jxAMRd0ZJbUDB2B3EboMD9p+jCfd/hLTzv1XyI1+KY12 1kVwhKjuuu919uWdlxVhYajKX6gdtPsrAZ8qXtYGp+nPa0BSY2xlQkEag6tY3clE2q9Q krWng9+rOb8Nx7PqeudTlFx10eJYc7UUdPhk8PQevqM9X6G6D7Vd4fyZEjvtJ5D0gp+R Vm3+/PUe5XGKwRh2hyesb6h9L/8hGWSU8LUS9j+vfLZdAQG8XXvdQYwJ0uRitGJriAbA yEjw== 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=mBax0cC3ZufDDhGNQHmjQs1Q+pCQRm4ULGyIRNgSwMs=; fh=oTVbKRIO4+2hI+bP68B7Af9cjxdBfd9rIDcM9SyAXs8=; b=gLGXPJwUEKOY7cCGZJbQtTnJVJxtEMweaVQQuIF2to47yUyhTU4ttfJArZUUwBP7O0 qv/W1mVah50dMKaW60SCUjCfmGbsHqQBQKWjdhTipBECAr32u0EfgwDkbptmB3fSHWLs u0afvkF11kiMvOZi3ekbcxrscVJiAI8qTBmb6DicV3KIiED/yzLbA/V81IYogsMjMOSw PAHIBPIwQ9vXpDyi3NAQ6A0//NEiJrEiSDt4x9PAm0tcWpyc0IEKujBq/743zQ7gEy35 b+KCD54AP3pMLTldJQJ2ROJTgQJeB256huoKAXJtKVAeEf3bsdLwbKTcOYRZ5iO8MLiU qIUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=px+oLuFZ; 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-6f54278b803si27779846d6.239.2025.05.07.14.16.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 14:16:29 -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=px+oLuFZ; 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 1uCm52-0006E9-AB; Wed, 07 May 2025 17:13:29 -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 1uCm4p-0006Am-Ag for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:15 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCm4n-0006EN-KP for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:15 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-7398d65476eso332471b3a.1 for ; Wed, 07 May 2025 14:13:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746652392; x=1747257192; 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=mBax0cC3ZufDDhGNQHmjQs1Q+pCQRm4ULGyIRNgSwMs=; b=px+oLuFZvozpcRD1Md7w+LAgyzchvfnPYO8Kfqvo+MBPGmJrdhvffegO+olAf1B8TD Ht/0pbyYPOavYcOg+O/h+Uk2O4aMf4v7oUz5AQTdTHO77mgr6riEa+IirMFs/6bAe444 +tc/kJJ3iVABPlvySlVKyalumAM+PT8/KaMIx4H3oJz96Zb1oDjmMSH6toAhzSM+7X5y lIMpPgVpiJ0t/Y/1ScONZ8iGC6DfqYok3wEM/TipYA3X25fQ07xti0cNNyf5XjSl+0Gs SS1eTBrvpLSodp7DBsgT3KTsO6pnaOiYlOHXhPlBHSYGl0kHCXkUB20CUPuuleF6Glwp 5i+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746652392; x=1747257192; 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=mBax0cC3ZufDDhGNQHmjQs1Q+pCQRm4ULGyIRNgSwMs=; b=SLgopLgIU50KZxSlPPqo62pwGbMyjfk4Teb0ebTmUc4eky0FM0E7RexNB+hNeN+afb 5rxhG5p8ixMJSwrdLgCoed/z/ulybOgRba5xZpxUx+mrvlZWq5oAC3zk1cfbaPy6ks1e xQD8rpFda+coNjPTdAgEG9OvD1wox8p22aT+j5V1YowxzX4ESWkrWbKS2oHZR/jzScx1 mmoxlyjtj9XJcjr5pmm85gzHMH7FmcG2xkMqh2oEXZOYbSCX7lYj40XFCYUK19M2IqGW 1YN2+l0iGKsmxJN5oMo27jCOum14F74i+6KDVzIuf8VkLP07JNs4xhxpVIEx33y4Kx7N dpNA== X-Gm-Message-State: AOJu0YymyX6XmrxzFFwlnGMqfOR4Hmy7yKLAmi7mnn6C35pCtz4Jrp1f qsiROYrdDhYcHvufJuRW8dLTh8e6Ro8fv7ZEMnmXsdt/rJZhlhHrm8ipge52PXYAjiwzUJNpgvq + X-Gm-Gg: ASbGncuXpe07DWPu2zJ0RD/2ePC8GYhYaSc4zjboiW8a5XMYokwn1KrkIyupSq/Xf8d TbUhEpMa1aBa7yImATPyZnneUZWNdMd1WQBmzbaxSynsZImRLyNmvxf2eD+iFL+82BJJjrIlOUS gEVBpdZJWLQ+Kj+YYvvDlhcffrpWtzfayxQ8w9+1cqNzBjZfXv3A5JGe1wU7RaN3tIzyB8CIAdZ EL+F5WEeGuuiV3PV21IW9Zo+iP85s98XX4pGJyoi7ejFzIEsOcFXYZTAnwpFoLgfsVKQjF2v7RY SzvQyGzMmnNjorxJMgiaNfG+7K1jy5l+8uIYXK+a/17ZrdEgnVjIOlcpLjF+J8KdMuJJOYD9w2k = X-Received: by 2002:a05:6a00:4296:b0:736:4d05:2e35 with SMTP id d2e1a72fcca58-740a92f97bfmr1403215b3a.3.1746652392154; Wed, 07 May 2025 14:13:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 14:13:11 -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 12/24] target/m68k: Remove env argument to gen_lea_indexed Date: Wed, 7 May 2025 14:12:47 -0700 Message-ID: <20250507211300.9735-13-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::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.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 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 0abdb1673a..532b050ffa 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -392,7 +392,7 @@ static TCGv gen_addr_index(DisasContext *s, uint16_t ext, TCGv tmp) * Handle a base + index + displacement effective address. * A NULL_QREG base means pc-relative. */ -static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) +static TCGv gen_lea_indexed(DisasContext *s, TCGv base) { uint32_t offset; uint16_t ext; @@ -401,7 +401,7 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) uint32_t bd, od; offset = s->pc; - ext = read_im16(env, s); + ext = read_im16(s->env, s); if ((ext & 0x800) == 0 && !m68k_feature(s->env, M68K_FEATURE_WORD_INDEX)) return NULL_QREG; @@ -419,9 +419,9 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) if ((ext & 0x30) > 0x10) { /* base displacement */ if ((ext & 0x30) == 0x20) { - bd = (int16_t)read_im16(env, s); + bd = (int16_t)read_im16(s->env, s); } else { - bd = read_im32(env, s); + bd = read_im32(s->env, s); } } else { bd = 0; @@ -467,9 +467,9 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) if ((ext & 3) > 1) { /* outer displacement */ if ((ext & 3) == 2) { - od = (int16_t)read_im16(env, s); + od = (int16_t)read_im16(s->env, s); } else { - od = read_im32(env, s); + od = read_im32(s->env, s); } } else { od = 0; @@ -738,7 +738,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, return addr; case 6: /* Indirect index + displacement. */ reg = get_areg(s, reg0); - return gen_lea_indexed(env, s, reg); + return gen_lea_indexed(s, reg); case 7: /* Other */ switch (reg0) { case 0: /* Absolute short. */ @@ -752,7 +752,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, offset += (int16_t)read_im16(env, s); break; case 3: /* pc index+displacement. */ - return gen_lea_indexed(env, s, NULL_QREG); + return gen_lea_indexed(s, NULL_QREG); case 4: /* Immediate. */ default: return NULL_QREG;