From patchwork Wed May 7 21:12:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 888109 Delivered-To: patch@linaro.org Received: by 2002:a5d:4683:0:b0:38f:210b:807b with SMTP id u3csp587954wrq; Wed, 7 May 2025 14:17:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXQf0w6aA7r4RUsjukWLIRYsy2xwSZIOHEJaD9kuA3vByRmaVMV+kg1+yvuV3fk2E/Gg08VIA==@linaro.org X-Google-Smtp-Source: AGHT+IEYJdB+ctFDvYTngNeh4RtvFr527iAva1qAJugHrMlNK7CsgAGphjrgsXwJ7OR6ZiZY+S9M X-Received: by 2002:ad4:5dc3:0:b0:6f5:38a2:52dd with SMTP id 6a1803df08f44-6f542aa2aebmr88352946d6.31.1746652664824; Wed, 07 May 2025 14:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746652664; cv=none; d=google.com; s=arc-20240605; b=df5FlJr7kVfkk5324LsNJ+WgohRCwvm9lb16toz0kccr8iXNOJZAJ5rPl5mLCptDWr pZVl9hUTvvNoFrToYI6G2aRiqGw8QLpJs/OfJh+ND0DXkHGi9x2toQGR5MKmMz3S++HP e4kWmRnai9SWffulvSKyP3FT88FI9S06c1slntFn2gZeaMTp61XKkly8ou8xlLWtFfbw Y+BAtvbhyUa78fqFXGGwnfBKm9dbtYcwqxEWldnSY9G/UDRfRtafBqqlHyz7fEspx/zN 5JKz5VPOekvOPIxZG1etFKB5nROC6teZof5L0HLC9CAn18y8/NZzb5QW9EKyKcRz2BoJ 5G+g== 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=Lm1A/KV4J4dNi7kdLun9oFplRSfgSn/54CeFBMpi4Ws=; fh=oTVbKRIO4+2hI+bP68B7Af9cjxdBfd9rIDcM9SyAXs8=; b=LJ5NdF8XHPXtnNQYDmdZZdPtxi48k85Elb9DGejwnDfQBNEdKjOtVqiQU9+8ImDT0G wvzb7Fk1Zdh4AMZnpK8mryoajr3Nz6ubQxrZWbtZNoUJUmkGcVl3RTBGDsXDlR/Xv1ua hKI15fUilhWKRPGRGiDkXMZeQoBlJdxlYm99vPuQQPauhCu//bdu48y1rW904NJd9CJh AhlrvkkS5s0JwfPI/72TKqwS3mzY3cfYvQ+xTkcpBzkcUqf8vHmS/5FuPybC6NYFFN39 UWZLPKsEi1gRU/+Lm/IaZKO8WufGsnLHUrWdkGeBhc+BFyvvFC5KaLFLb93NFYPxv0qZ prcQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YPnkW7LF; 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 6a1803df08f44-6f5427a6d32si29343066d6.271.2025.05.07.14.17.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 May 2025 14:17:44 -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=fail header.i=@linaro.org header.s=google header.b=YPnkW7LF; 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 1uCm5A-0006FR-Rm; Wed, 07 May 2025 17:13:38 -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 1uCm4w-0006CO-Nj for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:23 -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 1uCm4u-0006FG-De for qemu-devel@nongnu.org; Wed, 07 May 2025 17:13:22 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7394945d37eso305432b3a.3 for ; Wed, 07 May 2025 14:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746652397; x=1747257197; 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=Lm1A/KV4J4dNi7kdLun9oFplRSfgSn/54CeFBMpi4Ws=; b=YPnkW7LFm4DfxiNyVibp6KgE724bzBul1/D+Lq3Vh6oq9gvxdmTAuI3ZWe2UcFvVvT KroV90A7Ujc8S2E7Z0wZyaf7pU2yhUydMeYbAQfBHfg3ytKH4lhDpEm/CtxTeONBYTKd prrFb9bZxIc6RnPb9Qe3VwZKiJ0ssIAaWbL1gH1yK1YFdnZec951VDmlp6aL8AX5QV4E GSEH2Ozo3fMqMscf0sA0btoTMTmFAlAGUfV+2K/1WlGFpdIcpvsP1monfdk7PXKwoSev ta92XLl3zKU+Xmfr5HrlnDLzexjV0BdmWXeGDMK7DJKYMimUPHl6lBUGN5FoRcxLm8d2 QL+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746652397; x=1747257197; 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=Lm1A/KV4J4dNi7kdLun9oFplRSfgSn/54CeFBMpi4Ws=; b=N9TgEd0Y+ub9LwylfpoL0IHf3oshVU67qmHjIcOIqdX9CRM1UaKGhPAsKoez7farSD nhyonTNKmvPFlHttyao8u1A/D0GVyg9DbK/GiIEst9CfFq0UO9affZRvzbfGkNgieL/F 02FVwi+hc70KWLXwAie+QZH30vMZPmS/XVL1Vjgu1kRNwlgu+sekJDf2RKuGBOT029Dd 0VF3SUaeS/RmgQsowgVw17ZxNmdK1pytD43ng83/6qN8wpfoNPCQFGmPLDUc18tvVneD YVHwdoH1lO5vW12vf0itBwjhUjiKc6h5vkak5jWq5aEZ8Jff8pEunvNuIH2tbQmMAv4h uO8g== X-Gm-Message-State: AOJu0Yw8cyQChG3mF/k74oexirXVzlKouKOG2pmSwL7Htb83ttE9fmGc HJB4OS0g1hS1tsqKS/tT0nMaZ+pTL167wFHuEIbsdwFkNOXIdCAPvdHvtqQoJjAay4Uwd1uHkC9 e X-Gm-Gg: ASbGncvK8YAT0oKejygZEjJdQ5MYhbJ3G+pQY3iasyL719HMj/a8/B+0jxJ+xx8fJkh 9lGHJIF978OfUn0CM6Fnp4S9kWWSqqj1kQzitH5PEmzZZmIm90r2vm5ddMrf+No+ywMyc8rBoNq EyAPgZaqVvBHprt+EPPNQfUKBfl63ug72Tzri4yqD0zNNpNTZQSJy750HzFvw6o/eIH1d9dwEVo BgV2xbjtiyxHTnCXvP0Bky1CvBohUp0PgZpommEvmecwlwVYavmFahGeg1mZZZCCpg9oRUKAROn fMAuCDwqLawpVRsDWkA8Q2LYnpS/+VvKvADQztVBHPaVq8YhKxrkxUGnUTnJKg05yJY1uIBmH20 = X-Received: by 2002:a05:6a21:478b:b0:1f5:9016:3594 with SMTP id adf61e73a8af0-2148b714690mr7627258637.18.1746652396930; Wed, 07 May 2025 14:13:16 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 14:13:16 -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 18/24] target/m68k: Move gen_addr_fault into gen_{load, store}_mode_fp Date: Wed, 7 May 2025 14:12:53 -0700 Message-ID: <20250507211300.9735-19-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 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 a6afde7f49..642e80857c 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 {