From patchwork Wed May 7 21:12:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 888095 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp586670wrq; Wed, 7 May 2025 14:13:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUAISPf9M7VVEq/osqV1e+GIzPPlpTLm0Hk1Q8PqxF4PBvReOg0mc15kLI9E0uDllyJ5D1XgQ==@linaro.org X-Google-Smtp-Source: AGHT+IGaDIVgoe3s6933WBc+78g5Vm9AUZZfEoiBOfJxFvzH8HsyHYRlcXyLxLPlntc0Tap7a06X X-Received: by 2002:ac8:574a:0:b0:47b:3a2:ff14 with SMTP id d75a77b69052e-494495da0e0mr12456061cf.25.1746652435279; Wed, 07 May 2025 14:13:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746652435; cv=none; d=google.com; s=arc-20240605; b=FPAvjpRzxa5uI6W70Nw4rKcEId0wNncUbV29QuB57QU9FA2KCl6tnFP80Va26b3WZa V876LStmBs/D36QWJ0inVnIw977doVekyLb2VMv7gftD5aeUhRszMCJK62mE5vTM+bYk DOi1iZRwHA2V7vcMc/PSuajw0YBKXtphZPTIhtk45KaY8r4jZpV6DuRA2tr0UVx9pkoR 7ptsBkJ4h3UZymuEN9w2Gd12l8v7hhtryVNZhv1f/dhI20C4M1eamgj+LeLsEYEtDcNO H8+2DZVvKzrCCI2t+7tFvS8mkPwMF51KZZsjlpw3/ACkZaEQkBrfXf8KgdwG+sROaT5l nWoQ== 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=EprzNqSDVLOk3XX3wLzyS3Mr8if5bv8/i0zNJtnFHWU=; fh=oTVbKRIO4+2hI+bP68B7Af9cjxdBfd9rIDcM9SyAXs8=; b=JghTg5IK0/VKcKciEHYhoeZRmc+ymIkX+t7j5BYHV3dz8NFR2lwqwSQ0EzP9zf4JJy s+9ax0UcwiGeIcYyi4J1Ez7fCHpiyNZ5O8AGZnn2LIHdXDesJ27EeozxqIUWJ4wMAn+C KDaDFMFFsSzsKhMPRspIozk+JT5rXwiQMlMdzUrzkXz71PdIWQuuQZatSoA9y2ZDB4gY yxWcdedu6G6Dz2iWoDNyqOIJzsJJyxa4LqKdqJ+JdYSXWzmNfOwzfpIkXi3qL5eFnsKl EGDVKgAKR4iSVQcIixA0hS/8TovPVaeEsajR/ZfMuVSWXPsB++630n43DUlkCTg1pMOn qH4g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dQT6qzKF; 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-492229a5e6fsi30635821cf.247.2025.05.07.14.13.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 14:13:55 -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=dQT6qzKF; 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 1uCm4w-0006CM-KI; Wed, 07 May 2025 17:13:22 -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 1uCm4l-000694-4b for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:11 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCm4j-0006Cg-DE for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:10 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7376dd56eccso372747b3a.0 for ; Wed, 07 May 2025 14:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746652388; x=1747257188; 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=EprzNqSDVLOk3XX3wLzyS3Mr8if5bv8/i0zNJtnFHWU=; b=dQT6qzKFNaylsnAuZhEuNMPUiMXjONyLbpCQh3nDreNTCnGLmriUMy3SbwoOWpuNPX QR5gSxCxJKIOXllvDqL6zUAL8mWfBP40LBi1VBExLn1hDj4NP0aY/FwZbHLGuZCObpr7 PFlipGHY9Ply/qDsUn3hiCk7CK4hhwNWPjoH92rbWwc09X/eijdQi99yo1goj07mcmNV zGBQleV9sYqH+kvJvxksWwMjMam13lUm0yiK0qwMmhCmOrcJOokfjC4bd/1nb21wNvaJ FpZiGAFeU20MsKZNiLZ/FRdWQPJ2CYCt2j6cf2IqLXJwiz3LMJLTnuBEFUPkNh8cQRgc g2WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746652388; x=1747257188; 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=EprzNqSDVLOk3XX3wLzyS3Mr8if5bv8/i0zNJtnFHWU=; b=IH5oDtDKeaUyBSKZ8Bk78uR8CftkQlLNlvFKuNE6qzcG7DxKd10aSgi/LOUYFgHCwp 0T2aX7rwOOFM51JYznE1kGQJsHZqYuieiXNYpOgyv77gj/jkDhqt9jPPyVN4VEngagFk w/ByZENwkvOCgdyoHBPcf4bfDqhxuG4SnrBohPFWnNu6K4fvawriz1NACvCAjJ2RcNOt sboJOBTNSnhkL68hrMMQrbpE7ac5yWpxcaWzxtIeC4vVS7ftg/Z7ekIL12SrF2tE3JKB scjpxjzUQ6zbvmTmfw3RQTjuAHyJT/ObKOU/3NLqpaHyuLXreqJGaKAF0l28ZSHnKg/X kbUg== X-Gm-Message-State: AOJu0YyaD3Z9eYVZ5DCTZ6fu4XuSFh+nZfbxIJ0Loq4ukwQCfJikPCrO X1Zl9ukrGtbIKISa4uAbza8IDufEeKAacBEXqhgVMXtLqiZ2C7pkNwLup6QHOgRsJ2FV0z+V0cI 9 X-Gm-Gg: ASbGnctHEFVcy9MGNJV+N9XZ86EG3op3Mcqkz8EhWb/HFd53o6E7oxAi+eXL/I+0zm3 60V63jtexTqAFDazWpPxRI8531mdd+DqGirRvdDTFNRGuBr/SgjAQGsfbHzIjQOtdBRL9uulhZs YWJGlW7rd+UV7jWu2w4Ti46wkCgScaZMU0H4j2utg//+KZvVBfk6iWitDsOFHg49X7RNhXiDOF/ zg7F5bUvBDKqsKO0oyXWyX9Klwi/QMIEZuA/Z5XdXSDqKO57Gl7VE6HjYO/l1y8Cze8fqL9Ur4G aEshbd+TB/1EiNMr0s4YI6lNHginAgOpYBpWQExMcMWzZ4oQfjSEsK132pewEF8eOvuDycljgBY = X-Received: by 2002:a05:6a00:35c6:b0:732:a24:7354 with SMTP id d2e1a72fcca58-740a99638a6mr1176389b3a.4.1746652388021; Wed, 07 May 2025 14:13:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 14:13:07 -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 07/24] target/m68k: Merge gen_ea into SRC_EA and DEST_EA Date: Wed, 7 May 2025 14:12:42 -0700 Message-ID: <20250507211300.9735-8-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::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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 This will enable further cleanups further down the call chain. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/m68k/translate.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 340d72bc4f..b9633e06da 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -897,14 +897,6 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContext *s, int mode, int reg0, return NULL_QREG; } -static TCGv gen_ea(CPUM68KState *env, DisasContext *s, uint16_t insn, - int opsize, TCGv val, TCGv *addrp, ea_what what, int index) -{ - int mode = extract32(insn, 3, 3); - int reg0 = REG(insn, 0); - return gen_ea_mode(env, s, mode, reg0, opsize, val, addrp, what, index); -} - static TCGv_ptr gen_fp_ptr(int freg) { TCGv_ptr fp = tcg_temp_new_ptr(); @@ -1368,18 +1360,22 @@ static void gen_exit_tb(DisasContext *s) s->base.is_jmp = DISAS_EXIT; } -#define SRC_EA(env, result, opsize, op_sign, addrp) do { \ - result = gen_ea(env, s, insn, opsize, NULL_QREG, addrp, \ - op_sign ? EA_LOADS : EA_LOADU, IS_USER(s)); \ +#define SRC_EA(env, result, opsize, op_sign, addrp) \ + do { \ + result = gen_ea_mode(env, s, extract32(insn, 3, 3), \ + REG(insn, 0), opsize, NULL_QREG, addrp, \ + op_sign ? EA_LOADS : EA_LOADU, IS_USER(s)); \ if (IS_NULL_QREG(result)) { \ gen_addr_fault(s); \ return; \ } \ } while (0) -#define DEST_EA(env, insn, opsize, val, addrp) do { \ - TCGv ea_result = gen_ea(env, s, insn, opsize, val, addrp, \ - EA_STORE, IS_USER(s)); \ +#define DEST_EA(env, insn, opsize, val, addrp) \ + do { \ + TCGv ea_result = gen_ea_mode(env, s, extract32(insn, 3, 3), \ + REG(insn, 0), opsize, val, addrp, \ + EA_STORE, IS_USER(s)); \ if (IS_NULL_QREG(ea_result)) { \ gen_addr_fault(s); \ return; \