From patchwork Sun May 11 20:35:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 889171 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1334349wrr; Sun, 11 May 2025 13:38:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgiosBHryjU39bqX4LnsY2AWTyVXvaTy0J0iRODgOYuNH1jGKhVEgtHjydje+g+Tlbd4GNrg==@linaro.org X-Google-Smtp-Source: AGHT+IHZ7cuNDvv3ADtrUKVc2LwZOkegrhQtPEu5QNux6SgViU6Fw/AXp3ZBUxdqNe5h+ap5r/8f X-Received: by 2002:ac8:578c:0:b0:480:9ba4:3022 with SMTP id d75a77b69052e-4945273580cmr157108951cf.17.1746995883082; Sun, 11 May 2025 13:38:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746995883; cv=none; d=google.com; s=arc-20240605; b=CUGDsabEJT6iQuiXvV2L/U5A8SRyvO75X+BuTI3Y4jbo/ejVE5z82Utd+y5omWO+sT JOc2wNB+e5tmmZT6tXKO6dMXFwNmyoyx3/ExtedanwA9uzvosLmg8VSMk4U/HgNd9BLH P63r0/xRigpUUMHlZDPQZfYAwnw6vDH2+lFaF19YQWOkBE5AGn4vQho8gmFTkHghdIKp gARHQSdOHPMUVQ4X7LS5f9uHtoV+PZ3YHvCAIncJr8eBgACHrQFNpZ2auU40kk6Joasq cjqiy8ESwrfT2jSISNg00pfy0GZfJO0AtlcFbeOQZnwnpxBf/kcUtvDQs3PDpepsY336 MW7Q== 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=vP/tqNEXhh7xq2lmGpddVDaMuSRJdXzb5jFSxGcQeLk=; fh=ZKeelGKICHQ9l/9d+e+bGKuo/S/FkjHED8U2Ob+lIbw=; b=TCCv0GkQabhZ8ZanroMrrGmVtS0QNj3VlZqg0gxPSIetTt/qunXt7QyMQzCEDqrXXz WKXCsfltTl/VPDFOwR4/Zj+L6xn/4QlHA3aDojLlNUJHPjAdbgLaB9PBzT686fOi4Hah 37vv2FPOZmv26S4PNQ5lKzWU2yRySUjhdv7eq6PmhMI75yU9UbRPRzzSuXo7zU4Z769N K5fprHFyTaeub9AyG1gCbhwkQZCvdGvKwJ+Dw+T+zSvzKyW6Hg4VdM4QawXAFDRJ+vv1 uOuTnxK1KYg+saS6fL0Eo6GMt+QZAk5raRVRJgqLI0GyJp0eS6tDrZGocvOplATkLbxB vbyg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UWl3iP4O; 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 d75a77b69052e-494525812bfsi71010001cf.406.2025.05.11.13.38.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 May 2025 13:38:03 -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=UWl3iP4O; 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 1uEDP6-0003XD-TH; Sun, 11 May 2025 16:36:08 -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 1uEDP3-0003EG-17 for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:05 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEDP1-0006Mc-9M for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:04 -0400 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-b1fb650bdf7so2271026a12.1 for ; Sun, 11 May 2025 13:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746995762; x=1747600562; 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=vP/tqNEXhh7xq2lmGpddVDaMuSRJdXzb5jFSxGcQeLk=; b=UWl3iP4OHozsrz1J9qpFjZ3fvZcALKeNVcuGZ178GhFBk2ijT7ZOX0yyL9mSZjon/R QiBlPJUQy7/+dntp6TI+Lvh+iNMUAB2vDy4ztUqGJjRzXuChKB3HAKgLPjR46TBDhOO7 lBfi3krsccClMIzpYNMwUZtasWB5wIH3JckSk/XJ88s/cTrNlCpXKMyE+7+qZT9nQZDJ yZJP/51Fm7trETVPdprpdcUP5T9UG39KPzfq4Q9NBecTSFmbBRwio5gKMTOVtvFZOfBo TSy0XRCDgLo2DQA2zLGqkBpUDfmbVYde4SU6KgXkHr3CBRHi8n5WQVU+4r1Tj+n2sLtV PcwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746995762; x=1747600562; 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=vP/tqNEXhh7xq2lmGpddVDaMuSRJdXzb5jFSxGcQeLk=; b=n//SMjtihl1p5MY0XGBcAQ1ui7s2yl6Kof6ZT/kLv090aekRKM7WTmTHlahTr5Dg45 V5gP7lm5V77A6vvTz8ZWTaEiLC5C0YPRX7zBkmwumddgX9Fezgc8RcFRpzKPi9r4Q/h/ ZBCWN5TOsOKhFEiewXl0iuZWCpyEeNJFeGKfQdblvDrE5dQQY6TYX7fZZe1lnnYk73x6 V37Mzf7fjf0bVU1Tyz7ib4Nxx1VcdAszK/pSN6r52IbrjLys/4pdo78CFCjjz5WebeBv eVqfc9l1MAp3L1OBd/mzptDSIabXkBh0NNJmVI3B5JQjSjC40GJHKw21XGNpT8QOi+Lw 74uA== X-Gm-Message-State: AOJu0YzoKVL+FIoTBF6QfA+TjOCEuSytboU4i4DpJRm6vVLhbMjEnYQC CB5BzFGVcYr/SWOwSkWKLlDZ4AzYSSETYv7O0bfmtIz5zoLkvhbHHfu4lhVucbPIUSBSj94jgrU + X-Gm-Gg: ASbGncvi8UbyTpf7bidtcu/u1VyaaR8kn2aQA+kd26BRgfX2Er2wWRumbiM97hOqx02 wIifWtL2l7pziggnhbAJe87GLQG4QJO0K9s2nXcUEmm8hnArNoRdmNZtqSf0iW+j+/mxzs3vKeq x5nhwDZHRbYbxw+yOTqmy3ZvL2DTuE+im5biHaZ/cD7hyAyIRrv9Szz3PjzSYEZkV4QaHghL7qJ Tg5HuFAHqK+dex3UNfNBBrA+C2EOH/eLZdpKXEM6X477TXbHv6EcbUyV3SYZwGKsNtrcaZafsHB 30fhzBoA+ScY4aQcnTiR5Y+AdNfb4MqdxgXJJVFOZkt8SRRHNBsWni5KIMSeMeDyoRqcuET/sNk qY9gPS5nIZw== X-Received: by 2002:a17:902:ecc6:b0:22f:c19c:810c with SMTP id d9443c01a7336-22fc91a20b3mr144529855ad.51.1746995761854; Sun, 11 May 2025 13:36:01 -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.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 13:36:01 -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 18/24] target/m68k: Move gen_addr_fault into gen_{load, store}_mode_fp Date: Sun, 11 May 2025 13:35:40 -0700 Message-ID: <20250511203546.139788-19-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::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.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 da3293d762..ab6db2cd57 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 {