From patchwork Mon Feb 24 17:14:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 867926 Delivered-To: patch@linaro.org Received: by 2002:a5d:47cf:0:b0:38f:210b:807b with SMTP id o15csp1660042wrc; Mon, 24 Feb 2025 09:18:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVuD/CdSluXi8oWgkT/Qc+xBFs3I87Xf3as1COaFOj2LjW9eDKx5ajXKcGlTuOmIO3ZPHzCSw==@linaro.org X-Google-Smtp-Source: AGHT+IE25bWDvBbAERqpky//BxAEcgpnxYZfoqzdOdKQRFgQqoWsgBlgWOJdTLyklOilZi0n2x6s X-Received: by 2002:a05:620a:269b:b0:7c0:a431:6c5e with SMTP id af79cd13be357-7c0cef1313amr1750049885a.31.1740417508234; Mon, 24 Feb 2025 09:18:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740417508; cv=none; d=google.com; s=arc-20240605; b=YUbl3uxy65bc8PapEExiP0QaVY//iv6O7BY7BPDl7h5YcbGyAb8zaZUX8Jg97BhlQC PSI7vs+WFpV7aaRud+ER6c+OPgramf67YZMLPQFNYdbPHL37RMIbozdhO3hWhimbh4pL X0SMb5Gc8aDu9b35uZSXnZl05B/4WfwOmWnvUpsaRogEbi9gtWEVWpLrolLKz+J5Y+4b GSuMlto2gZ5hUvx52tqg9d6FcHL86REcbxOj/R0GFZqTkder2TdWm2J7+LeQF6xw+1n8 XgyG8w94cHn4qWQpI5NsIphxUCoG9FaJoaZS/AUQqEaobAp67Hw23IaatTjVpkLguAYF pPCg== 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=o/fuvX0Geq5HX68xaNi0dQ8A11vAQj55SFQvqBIm3QM=; fh=oTVbKRIO4+2hI+bP68B7Af9cjxdBfd9rIDcM9SyAXs8=; b=H4hL+JA6RLciYdcpaHRe/UUrEwOnxoJNKnrBdQNP4OFio5pB702srKJVq21kH0cDla ri3SG5ddRlE1wQNBTyl8JqmMfw34z0svkY4PcVV2zT7+LwDaRaRlOxCcLAocVJA0USX9 uxlUkD0cVTEP+G6mjkEmbNDh2yJS6cx89Q2p616unm9q+hkan4aCUg1BXGfD1Pf+oW4K lnTjdwNqs+TXXLiYZqMzIgBtA4GPXy8zrtXFpU1NatteM4WPF1eDM3Pdv/0GnSiPsttO jI0ChwThGfYWlMzzSpbzGMidmJt1/zaQkk4AuaneCGrznaY9ooByOuiMtDJ4g5R/rsIA /PTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X4EA1BJm; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail 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 af79cd13be357-7c0a6cec6f1si1286114285a.363.2025.02.24.09.18.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Feb 2025 09:18:28 -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=fail header.i=@linaro.org header.s=google header.b=X4EA1BJm; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail 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 1tmc3J-0007CL-3P; Mon, 24 Feb 2025 12:15:33 -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-000754-FE for qemu-devel@nongnu.org; Mon, 24 Feb 2025 12:15:18 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmc30-0005mw-AV for qemu-devel@nongnu.org; Mon, 24 Feb 2025 12:15:16 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-221206dbd7eso96056005ad.2 for ; Mon, 24 Feb 2025 09:15:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740417310; x=1741022110; 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=o/fuvX0Geq5HX68xaNi0dQ8A11vAQj55SFQvqBIm3QM=; b=X4EA1BJmdTjsCCe+uvhxge3U/augpFWHHYCIwBHOoMYMh46R2Tqk1hwjvH0PvvVO7e iBOlesrv6U7EEumSAq9xBVUrUt6gXY0xtD3sPUSy9+OKwRUKIbQ9bd0BFF5C9+zRtl3x wH4OgKY7jMiqnOxpFiRIiumzPbheKVvovQJ+yDK3BNAAenKprroBFi9LHl0pu154kh0U m6JKhsao0tc7mghn5q05LNVOlyLR32ke0fPikFFoFAmtO4o/ttYRbzGYwm/0CG+YHkBE OsVtLQds3h8XX2iyyR1f2h3b1c1UDmujP6Q02rM5sl1zdczicE9OgoF8H7IPRltru7ea LurQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740417310; x=1741022110; 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=o/fuvX0Geq5HX68xaNi0dQ8A11vAQj55SFQvqBIm3QM=; b=U2ODFpg/jAro/Mf4m5SfLidUbxceJYJyVAmXQ7929BUT+ww5PfBNvFpnqtrDRt9RFC iSzk7+rMPEBAAaZna7NDektZvkLFp1Th2RPqR2EdTotgH1QGJ4L8owf3XDovzsfIDWtg TZT2RFVYogZpTVWkIEZGVk+q6XmGiJeqEL2qz67gNSbKrciUJ6TDXqkEmkpvms5RGb8V RirUOvlo7V1SlJ8Aqgu4pmKU2Goo3LsDX7M0v+pz5EX9k4FE3TguMIBlrpZEI2PwiiZ4 WteaBDbD6X98F9PKf3CAwvw59swE77GBz9n3CLMTI6A9IVZiCQ4TmelIhA3uH/ntwaxS w/bw== X-Gm-Message-State: AOJu0Yy55mzUhJy5TR01N0ND7rWeip9p1oLRER9cI0hT8mKdqWjbd8wH 5Hseo03HVD/+MAsQPYudyY7lTywvq9A56i/g/JgGes4Xpana6OyUgEImJDHY1cPVXINQVsC3MPN t X-Gm-Gg: ASbGncs7qz1i1SAJ4GlkwQPXbdSTAUNjZTZ+Wcy6IF637thh1XlUnaONTjCDywOfZ4R KRnptmSQjwtWLFalZAMPdxvzcAQUlJfCDTkHrQijeUo0Z01jRyAVktt7Pua0+a51nnltbgOqrBO FtEhwqBNyHRAV2zcVPu4ptl9Tqcmc7hXtXOVW5FrEoXrgKvoWU6Ch3eu+1jNN+ORj64LPlu6Y8W rHcFdZFxxgHApnP9QXjCdD25xJelwsDzapArGtpHqrYVJqYz6m/HsSuqV8Qhm2pgsX7X+ddgHKW IGAEjhRNg8Rx5LZMsUdq94taLQLyor7Opys= X-Received: by 2002:a05:6a00:21cc:b0:730:794e:7ad6 with SMTP id d2e1a72fcca58-73426ce84d6mr22330132b3a.14.1740417310522; Mon, 24 Feb 2025 09:15:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 09:15:10 -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 18/24] target/m68k: Move gen_addr_fault into gen_{load, store}_mode_fp Date: Mon, 24 Feb 2025 09:14:38 -0800 Message-ID: <20250224171444.440135-19-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::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.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 Move the exception to be raised into the helpers. This in preparation for raising other exceptions, and still wanting to return failure. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/m68k/translate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 78d9f24970..69e1118aa1 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1024,6 +1024,7 @@ static bool gen_load_mode_fp(DisasContext *s, uint16_t insn, int opsize, return true; case 1: /* Address register direct. */ + gen_addr_fault(s); return false; case 7: /* Other */ @@ -1080,6 +1081,7 @@ static bool gen_load_mode_fp(DisasContext *s, uint16_t insn, int opsize, case 6: /* Indirect index + displacement. */ addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { + gen_addr_fault(s); return false; } gen_load_fp(s, opsize, addr, fp, index); @@ -1113,6 +1115,7 @@ static bool gen_store_mode_fp(DisasContext *s, uint16_t insn, int opsize, return true; case 1: /* Address register direct. */ + gen_addr_fault(s); return false; case 2: /* Indirect register */ @@ -1123,6 +1126,7 @@ static bool gen_store_mode_fp(DisasContext *s, uint16_t insn, int opsize, case 7: /* Other */ addr = gen_lea_mode(s, mode, reg0, opsize); if (IS_NULL_QREG(addr)) { + gen_addr_fault(s); return false; } gen_store_fp(s, opsize, addr, fp, index); @@ -4887,10 +4891,9 @@ DISAS_INSN(fpu) case 3: /* fmove out */ cpu_src = gen_fp_ptr(REG(ext, 7)); opsize = ext_opsize(ext, 10); - if (!gen_store_mode_fp(s, insn, opsize, cpu_src, IS_USER(s))) { - gen_addr_fault(s); + if (gen_store_mode_fp(s, insn, opsize, cpu_src, IS_USER(s))) { + gen_helper_ftst(tcg_env, cpu_src); } - gen_helper_ftst(tcg_env, cpu_src); return; case 4: /* fmove to control register. */ case 5: /* fmove from control register. */ @@ -4909,7 +4912,6 @@ DISAS_INSN(fpu) opsize = ext_opsize(ext, 10); cpu_src = gen_fp_result_ptr(); if (!gen_load_mode_fp(s, insn, opsize, cpu_src, IS_USER(s))) { - gen_addr_fault(s); return; } } else {