From patchwork Sun May 11 20:35:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 889160 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1334050wrr; Sun, 11 May 2025 13:36:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUaWIDaHiC8CBQ1kgi7OqfpRB9JuNM/zdOnjFAk9G11Uc78DWBJAeT2o7diur7+iWPZ4fA3vQ==@linaro.org X-Google-Smtp-Source: AGHT+IEonIv14XpMhq77VvWOpV0D9p8rlMrxXJZDiMIX2F5+edAYEqgFoBJZStM82wWBPDeeuMSg X-Received: by 2002:a05:6214:1bc8:b0:6e6:591b:fa62 with SMTP id 6a1803df08f44-6f6e47977b7mr176575946d6.5.1746995802677; Sun, 11 May 2025 13:36:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746995802; cv=none; d=google.com; s=arc-20240605; b=EGFGORwU3LNIiFSz2qz8WXda70D0EqbXG3khD9IFCzR5FBVfSkwbHZkZesV5azCJsJ YULI3kgWRrK7vYgAAUGam8epd/OY2DRUt2zgQHqC9I+VLfGLWf67Qp6lCRH+X14vsMjy h5N1UGl7d1vnWVOso9GML5yMNO+6P7BF6dlQrstC/qO1JsBSzDnHWM0rF1UigX9wrubv MAinAOe/baUHROWoRUK/7vTS7NonLX8MzNMtnZ5xJJT2zYrHnjvO5hJ9YJMaYtZSYorJ HAYvZJ4kfoO9dGNdvqsb2DJlzINr5oDpCFlu75oQTItW5UAXR4UGohraOzYB1UI2Scm1 6HRw== 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=ZKeelGKICHQ9l/9d+e+bGKuo/S/FkjHED8U2Ob+lIbw=; b=MtBSPPOs/eSGZrFw6tyNtH+4Xfwj7uT3brjwvrbeeF6as0yEvySrGj2EwDNfecxpcm Ys6xLSh5kny68Z0VJB7+mJJyVD3whSGSXT6/nJKbMWs60iHzvmXFtUcOLyYHRCqm1e6V tnvlZ6RR6dwwXeI10vFVIfXSa3e7iuwJLBINh512ojgI6P2RjmkQYuQaAUuBnNFKTp7y RHN7pAAvnn5tIdvSezT9MinaGkGXKLLeHM1Yrfuav01MYeHfWXV4JzN3egHeUlBJgPgj nvEgS1piM/dSK59WWa7Vpnw2psu4CweWe0wLgNktU4cquj7d1zCRz7gp6OmxqutGAv0W omXw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G0qLZVxn; 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-6f6e3a4b6c7si73860696d6.288.2025.05.11.13.36.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 May 2025 13:36:42 -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=G0qLZVxn; 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 1uEDP0-00032x-Md; Sun, 11 May 2025 16:36:02 -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 1uEDOu-0002Uw-J3 for qemu-devel@nongnu.org; Sun, 11 May 2025 16:35:56 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEDOs-0006Kf-Pt for qemu-devel@nongnu.org; Sun, 11 May 2025 16:35:56 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-b170c99aa49so2464171a12.1 for ; Sun, 11 May 2025 13:35:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746995753; x=1747600553; 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=G0qLZVxnZfyFUtlyLVH7xa3RCTedxfb/INRTokgNxOX/e6xgWKNAL7Nzhf+e49VETx TwZK/5IgDQ4uUVYwUBNXaWxjh5W+OLiTcVMOWX96wc03F7wRhk1uC8lsdcAsO9k0D0A4 72GshtJNTVPPwpscgNaFOCuD99gdogAyGhnDcd9pdMyIMRIlrqscdytbT2Wy+7kQz2GX dvivdpdwOCKgEX/ExBGY7LUohMtutvDtCGPnDJ+3I4+pxvzCtuyHf6CCoNmE+2PDPmot QLrJFW+yevAz3mOdGxwh6BNDmH2gdtaiEsuCp2w9KlwwHv2J7QoKesnalydsjJN7zhSS FxOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746995753; x=1747600553; 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=pinhFWbVtTcsIp+beCIm5DkK53vituPt0OVVhZbxB+F9XjFVk24gDjg1a2xJ5J69GX xFHwA8CZUK7NhheNt51INuXhB7bbkMYatUI3isl6+N5Bn42T6/43bXyPNMvLm2WhkH+q S+owUpsTttvuUgvA1oWXro9+sGHWWRGslazrpnHAov2PHlsmlIQpjPEKN+RK7NmW7keW eq7O7mr87xj+JUkdxD6E9Ydx/1/9XIS9cXf9rNh2d8Y7sC7DEG0ayWXJRiadjMRCwPpA ZJ8wTqA2Sam3N3hGN8GhP/j+0clW8eHdrst12mmyDUFAclYic4JdA/UIxQNZCL1j2gFX wSew== X-Gm-Message-State: AOJu0YzavfsiRAT4JNXfi7k/vkr5PQzsjmHcOjJiCW6dRu/347qBbPRr Ww8G2LnqggQMwB8+1IuUWM9iMFc/gtQEyEB60BStNcRQMype4FUatL0c6hXDFsEhWVJhXLphg0+ K X-Gm-Gg: ASbGncuilBArEAVYuqOuhpvF8tozavxhImFi99Vr066ioPg2IJYk/4hzjtE5bfjiROp GGsyi23YgSSBWFHucFR32K4SqkXHyppyYqAxMqf1tiZKmWdfhmxyRSQqBFClr7xkKjk7wupvf1n LTFFSqa4UaZiEzcSmpqNeqlb+nQYymF3gDP00+QgtHiPWiK/6Zgb2ZfJtOLpyTEx2gxZ/13iPJX i3ffwFONREhwjVKGXZPCqmCVJ6zp262c9ntP8VMB5LIzxdg7DcJxj1fGuM5orrGjcdXCCFOhsFg WaMD1iIX8Q+uFmh2kRdcE7j1xQ9yd0UZovd4LJIiPXuEEnFafooaxyIO6YEmoKEbFuU3DS8KHrF vtdWtCFexCA== X-Received: by 2002:a17:903:2f89:b0:224:1eaa:5de1 with SMTP id d9443c01a7336-22fc8b51ac5mr129235385ad.18.1746995753236; Sun, 11 May 2025 13:35:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 13:35:52 -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 07/24] target/m68k: Merge gen_ea into SRC_EA and DEST_EA Date: Sun, 11 May 2025 13:35:29 -0700 Message-ID: <20250511203546.139788-8-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::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.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; \