From patchwork Mon Feb 24 17:14:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 867938 Delivered-To: patch@linaro.org Received: by 2002:a5d:47cf:0:b0:38f:210b:807b with SMTP id o15csp1661906wrc; Mon, 24 Feb 2025 09:21:53 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVHXCG73UNijWlgS4uZzpeWnEveuVvGIfbEzipnOrMajrw44usN8lg/0ET0fP3DATacW+GNyA==@linaro.org X-Google-Smtp-Source: AGHT+IEvOE57zk7OxxwzlFtGSPc5bf30l53Q+Wud7rwIndN55pTY9PwAGwN2HhP5/ca8Hc95qw84 X-Received: by 2002:a05:6214:4119:b0:6d8:af2d:2a44 with SMTP id 6a1803df08f44-6e6ae98e485mr186775986d6.32.1740417713237; Mon, 24 Feb 2025 09:21:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740417713; cv=none; d=google.com; s=arc-20240605; b=dKridvaqG36LqcFI3+lDnPuXhDEY0dlNYmnPCRgjIKYXQBZj2nRHFnyJBuYRWo+/jc HtW4UNCGFurk+mXJVU4cC5x8WaQSUHm2hEph/jYdNALZaQ4JGraAl9L/aJ3zKvcIWgX5 ZopX00h/LTFEbmm7XLOCnQiB1BlxoKahPfAcl8HP5VjLVtoGS5HuV3qeSZ8Sth0Fe/+8 TaBww3D7pfqTnhevJnCSVLiBig4d3dzyikdMvQlteRruWFxmDILuFdaiFqI1mahUu3ge sg/6BWFZ1AbdXKXjXc1xikR/Ms9/L8Iz+Z/zmDA97MBj9TFU1l8m/6XWsrZ3aZJE6XF4 O/qw== 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=zu7LgByTLkm57wi4I6iwTMStawHq/LqzM76f9LTUk5c=; fh=oTVbKRIO4+2hI+bP68B7Af9cjxdBfd9rIDcM9SyAXs8=; b=DpoD0URNs7A35WVz0WxpIZIYUxX3G4C7bNPNJN+rzuYtTNvRNupOTHVSFfYZ/Uw7qt E+RYTfgz4+5rwcD9IIfvVTH/IDqiVxXDp+1Gdi0I8td1QwCsM1z0JNNqGgoLDI1tqHN0 OYCoKGPsW/JveEl15cnmwFdsnL67mFSqsUf8oy8tOT6RoFq2zh9PAmf+Y/fRquo2HzCD ju6RSfmtQnKq4bB5Rdyhqh86y5wnQ2apTO7/ig15yKy3NKj1s8x58HIAu46l6cccN/Pa mCcUZOWlVGBesQisbl2UrYFpEIUDmvzaAdnq72WAEm90K2NIOpgNI03W/ymU/ruAT5bD Q9jA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Enx62qk2; 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-6e6b9c8d340si55872376d6.457.2025.02.24.09.21.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Feb 2025 09:21:53 -0800 (PST) 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=Enx62qk2; 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 1tmc3D-000772-Nm; Mon, 24 Feb 2025 12:15:27 -0500 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 1tmc34-000757-Fi for qemu-devel@nongnu.org; Mon, 24 Feb 2025 12:15:18 -0500 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmc2y-0005mr-VU for qemu-devel@nongnu.org; Mon, 24 Feb 2025 12:15:15 -0500 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2211acda7f6so104548965ad.3 for ; Mon, 24 Feb 2025 09:15:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740417309; x=1741022109; 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=zu7LgByTLkm57wi4I6iwTMStawHq/LqzM76f9LTUk5c=; b=Enx62qk2pbq5qGA5Ww+9qfa6XOl3G3YoRnYnGUw8dIjlfoH6RRETse8d0N4OOhllHM j5tmIiLUIh7sufU3EfjUDELWpWA9m3DhLD0DAZ9f1wBBEslawLk2fOmub/FICTXWqjIa Y5trb8NdOuKZ4z0J9CrlJB3c7PeSVSnufisk0PjW4l8klH21xdqje9F8o3WGX7FFiIZf LA+w4ikony08t0kAPv6wbNAaBkAbKnXMbSExeBfOIDuOm/r2reFr/9Nm3ikdR4lB/8Tr yj80OhdFkTw4TiCyarpTprwoI+9OAr9/AcCMkhGX1CP/JeVY9yEz0zXqyjG4PEy0TSXN zbsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740417309; x=1741022109; 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=zu7LgByTLkm57wi4I6iwTMStawHq/LqzM76f9LTUk5c=; b=u5J8R8H+h4V+GB6yNHRitxvkeqImFSfm4MyWdFsHCwU/T+/uc+C+m+AE3BpL5M+ygj P1drP8bANCeq12IUhog5ec6pKA5XkUzwv8YuspFlFUmaKX8ARnj6oYT/UdcCc4fxcJsb ON9SWPxUxh/GMb27FwIQ7QGNs4FBp1CytvZPxAP90HniiyONTpLCt+bwkufAjdEZ6fTO KeaKpeaVCJ3mDUDf2rboY/+TetyFKPTCjZFQOpBYTupCX8feW9FFpGALlDrEuy5jP+Xn YcfB7SUuFgXCMDsYk0UCoasJ9YUCpUrkRJTaj4aNJfPHEZ4pYOjOdCxBl8BC8BJTFr7m Hybg== X-Gm-Message-State: AOJu0Yxh9Ovxh5G2287I3zTve8uTU3Jj7kBAFOqI78pzEglUu0wXIShx 8b6lwVjwRJkaRu+LAuV3VlAVU9a9zbAsOzBt9cGODC/R+sSmKsr+fWeldOEN4mJknnh4q2JhT6B l X-Gm-Gg: ASbGncsDdj3/XGTMn3HnETHszAuU8SEFO1t/Xi6Vf27t30UtU1z/CpI6/Ds7Qes1dJ2 hcKh1kEnc0/wwoiiRA13EX5dlAWigMEsAsJMVnvNzAf0oE22Ej4nUYuZhDMC4QwempbWedCBF5B oSf0Z8FaK75ZvIjeI+6lCKL4VADKNY5bWPFZVzRv1KwH3MmA1dfj0DrIODFJJFTOPpLvLbZ9nvD O2lD3nPasoS5rT2gK0GIIrVJe59WVoVN7yvYJsvNAj6dyGwx+gw0c3Yh4JnP2PYZ1Kjo2U3ChKU zwhOLsXSYaxyx/BPZGcD1qBWttt3rPWKOM0= X-Received: by 2002:a05:6a00:2e87:b0:732:2269:a15c with SMTP id d2e1a72fcca58-73426d8f207mr20425669b3a.20.1740417309388; Mon, 24 Feb 2025 09:15:09 -0800 (PST) Received: from stoup.. ([2607:fb90:c9e2:d7e3:c85c:d4f0:c8b8:8fa7]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-732425466besm20580780b3a.9.2025.02.24.09.15.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 09:15:09 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 17/24] target/m68k: Split gen_ea_mode_fp for load/store Date: Mon, 24 Feb 2025 09:14:37 -0800 Message-ID: <20250224171444.440135-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224171444.440135-1-richard.henderson@linaro.org> References: <20250224171444.440135-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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 Replace with gen_load_mode_fp and gen_store_mode_fp. Return bool for success from the new functions. Remove gen_ldst_fp and ea_what as unused. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/m68k/translate.c | 125 +++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 60 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 368188ce28..78d9f24970 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -330,12 +330,6 @@ static inline void gen_store(DisasContext *s, int opsize, TCGv addr, TCGv val, } } -typedef enum { - EA_STORE, - EA_LOADU, - EA_LOADS -} ea_what; - /* Read a 16-bit immediate constant */ static inline uint16_t read_im16(CPUM68KState *env, DisasContext *s) { @@ -1002,60 +996,38 @@ static void gen_store_fp(DisasContext *s, int opsize, TCGv addr, TCGv_ptr fp, } } -static void gen_ldst_fp(DisasContext *s, int opsize, TCGv addr, - TCGv_ptr fp, ea_what what, int index) -{ - if (what == EA_STORE) { - gen_store_fp(s, opsize, addr, fp, index); - } else { - gen_load_fp(s, opsize, addr, fp, index); - } -} - -static int gen_ea_mode_fp(DisasContext *s, int mode, int reg0, int opsize, - TCGv_ptr fp, ea_what what, int index) +static bool gen_load_mode_fp(DisasContext *s, uint16_t insn, int opsize, + TCGv_ptr fp, int index) { + int mode = extract32(insn, 3, 3); + int reg0 = REG(insn, 0); TCGv reg, addr, tmp; TCGv_i64 t64; switch (mode) { case 0: /* Data register direct. */ reg = cpu_dregs[reg0]; - if (what == EA_STORE) { - switch (opsize) { - case OS_BYTE: - case OS_WORD: - case OS_LONG: - gen_helper_reds32(reg, tcg_env, fp); - break; - case OS_SINGLE: - gen_helper_redf32(reg, tcg_env, fp); - break; - default: - g_assert_not_reached(); - } - } else { - tmp = tcg_temp_new(); - switch (opsize) { - case OS_BYTE: - case OS_WORD: - case OS_LONG: - tcg_gen_ext_i32(tmp, reg, opsize | MO_SIGN); - gen_helper_exts32(tcg_env, fp, tmp); - break; - case OS_SINGLE: - gen_helper_extf32(tcg_env, fp, reg); - break; - default: - g_assert_not_reached(); - } + tmp = tcg_temp_new(); + switch (opsize) { + case OS_BYTE: + case OS_WORD: + case OS_LONG: + tcg_gen_ext_i32(tmp, reg, opsize | MO_SIGN); + gen_helper_exts32(tcg_env, fp, tmp); + break; + case OS_SINGLE: + gen_helper_extf32(tcg_env, fp, reg); + break; + default: + g_assert_not_reached(); } - return 0; + return true; + case 1: /* Address register direct. */ - return -1; + return false; case 7: /* Other */ - if (reg0 == 4 && what != EA_STORE) { + if (reg0 == 4) { switch (opsize) { case OS_BYTE: tmp = tcg_constant_i32((int8_t)read_im8(s->env, s)); @@ -1097,7 +1069,7 @@ static int gen_ea_mode_fp(DisasContext *s, int mode, int reg0, int opsize, default: g_assert_not_reached(); } - return 0; + return true; } /* fall through */ @@ -1108,20 +1080,55 @@ static int gen_ea_mode_fp(DisasContext *s, int mode, int reg0, int opsize, case 6: /* Indirect index + displacement. */ addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { - return -1; + return false; } - gen_ldst_fp(s, opsize, addr, fp, what, index); - return 0; + gen_load_fp(s, opsize, addr, fp, index); + return true; } g_assert_not_reached(); } -static int gen_ea_fp(CPUM68KState *env, DisasContext *s, uint16_t insn, - int opsize, TCGv_ptr fp, ea_what what, int index) +static bool gen_store_mode_fp(DisasContext *s, uint16_t insn, int opsize, + TCGv_ptr fp, int index) { int mode = extract32(insn, 3, 3); int reg0 = REG(insn, 0); - return gen_ea_mode_fp(s, mode, reg0, opsize, fp, what, index); + TCGv reg, addr; + + switch (mode) { + case 0: /* Data register direct. */ + reg = cpu_dregs[reg0]; + switch (opsize) { + case OS_BYTE: + case OS_WORD: + case OS_LONG: + gen_helper_reds32(reg, tcg_env, fp); + break; + case OS_SINGLE: + gen_helper_redf32(reg, tcg_env, fp); + break; + default: + g_assert_not_reached(); + } + return true; + + case 1: /* Address register direct. */ + return false; + + case 2: /* Indirect register */ + case 3: /* Indirect postincrement. */ + case 4: /* Indirect predecrememnt. */ + case 5: /* Indirect displacement. */ + case 6: /* Indirect index + displacement. */ + case 7: /* Other */ + addr = gen_lea_mode(s, mode, reg0, opsize); + if (IS_NULL_QREG(addr)) { + return false; + } + gen_store_fp(s, opsize, addr, fp, index); + return true; + } + g_assert_not_reached(); } typedef struct { @@ -4880,8 +4887,7 @@ DISAS_INSN(fpu) case 3: /* fmove out */ cpu_src = gen_fp_ptr(REG(ext, 7)); opsize = ext_opsize(ext, 10); - if (gen_ea_fp(env, s, insn, opsize, cpu_src, - EA_STORE, IS_USER(s)) == -1) { + if (!gen_store_mode_fp(s, insn, opsize, cpu_src, IS_USER(s))) { gen_addr_fault(s); } gen_helper_ftst(tcg_env, cpu_src); @@ -4902,8 +4908,7 @@ DISAS_INSN(fpu) /* Source effective address. */ opsize = ext_opsize(ext, 10); cpu_src = gen_fp_result_ptr(); - if (gen_ea_fp(env, s, insn, opsize, cpu_src, - EA_LOADS, IS_USER(s)) == -1) { + if (!gen_load_mode_fp(s, insn, opsize, cpu_src, IS_USER(s))) { gen_addr_fault(s); return; }