From nobody Sun Apr 12 04:24:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771947855; cv=none; d=zohomail.com; s=zohoarc; b=afChy0NEM+fCHc83KazMgBmMXkK3l/uLwP+mmhNcRE90WAaadBJ9b9/93DCJtSbj2KS5STCcxE1VrUzOwgAO6f2kF74XPKaVewmEx/DwI/JUBpJZkgqYHKV/t73duZGO++1I8KsXCIGHdoXQrfFDaU8rTxvI3gKXYbLXjmjuGp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771947855; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RknEFktl1l1nRixJn9Vq+u4/vTHFy/2B7DICOzHIBkQ=; b=c5HnNUG6EZrN/9Pj2+jG33T0NBPi7hEY0uL/BFIdbyMIt/FGfE+FQKgR/Me9c1QqyaG4m37BNYhEWFacUbSZ+EzxkDWB3WWs5KcKznw2DUlZD8Vws411ZEd/2QiAVt8oS3PlNfCuNUFxxzT4Q3SswTbEwdXmUdPGKG4gzXth4vs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771947855023545.5745629387072; Tue, 24 Feb 2026 07:44:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuuZq-0007rs-W5; Tue, 24 Feb 2026 10:43:59 -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 1vuuZl-0007qp-9A for qemu-devel@nongnu.org; Tue, 24 Feb 2026 10:43:54 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuuZj-0006IL-4S for qemu-devel@nongnu.org; Tue, 24 Feb 2026 10:43:52 -0500 Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-65a26c220b6so7283487a12.0 for ; Tue, 24 Feb 2026 07:43:50 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65eaba2f978sm3638841a12.27.2026.02.24.07.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 07:43:48 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4D3B65F8BA; Tue, 24 Feb 2026 15:43:47 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771947829; x=1772552629; 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=RknEFktl1l1nRixJn9Vq+u4/vTHFy/2B7DICOzHIBkQ=; b=cczSN063W1/aEXzWX/w960b89lKSe36X0KhS2Ow60UbrgNBdzLAi+8bzOzmMH/oLFN 0RLVbIMC1BvVADu4elzyCIikiv4epLLC6/AggRaaruqaSBETB45C5PzzzomWIH8A4PEJ SjZQ35whn5OGqvHSymW1crRiGbDMG+caE+FYbuZYr3axNhetEbh0Px7SRbgCFe9tGB6S RtWKq8nYlkAlBBiCiXhxWYcUlPmfkegdiUas5ODLIGr9WNr3t0XW2RyNv66qY1b3WS2J FbADUnvgmTM/dpluGFQpjRYM4fWpLFZESTF+RupSrMnqvyE7nOnQiEid3axeFV28UCtd XySg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771947829; x=1772552629; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RknEFktl1l1nRixJn9Vq+u4/vTHFy/2B7DICOzHIBkQ=; b=a818anVyHzE3S2V8IxpdMnwP/iD2i/O16DiKeM5a42XMakAX8Xi2wLE5f6+/prRNsv RmxMo3EexAiZd4vOwTVTGEaL9lZIj4hvTZDvyGgcd9ggSSov8jUg6kF173QZQeTP8yJ6 TXrTDt6iFhWmr2kKu7/ducxT4gGOr8LjNrFjN1KbfQbwGeTryiK8MGNoN5yRLBIpi9By heroNpdf+ViEiQqNtwzg+h/OwlFqjRZgQ8nG5xeaydGqY2OYGO9xIK15cr1aC1ls040F 9sCBkdmmDow4X7Y8j8vfWuZEK5K34M9qe3u3uF6qZZd8z1oSXgq+DNObe5C0GLj75LGL AQIQ== X-Gm-Message-State: AOJu0YwZ5zpa4iA0OwSBqqO74Htop1PujJO0oO5Ku0zH6y8og1UM6fUY Tq21jUHeT7mWufqnaiX7GpGRCE5lnd5AK/A48qAyHIwXCAdoxkegwcGU7SDL5CDlNb0= X-Gm-Gg: ATEYQzw4X7A9UVef7gRFPxOz7AmxyWZrxQc7NJDU9x+rXlMNoTfpdecfRjvfmqHZTDw 9nPKQ224nJeDNrv/UVS5bDe/uRdqZlEso0GBB4RCHGugu7G7K+QpSG1GOjEvnPyKF7PI/5gH9Gb PsqJJ670ekZuQPlw3OEOaaxArjgPU2fFJX3HkJlx0yK3tweQIdVgj1Dtq6er8cppSLn8ci1GAKJ dRrRs7pCU54h9dX4Yma5XlfWvO+t9sjecA5pupMW4KSYicTEfZ7GRbG9KY89e7syGr8tVT7fT/Q VfncWbGey3embW2WlvluHD79KehRWCGZLC0GE2is2wWTKwS1CBPJMS8QY88mkx7UD5BtrSFxDD6 rJTbH2yae9mV6z7Q4fcWPCmyAoSVq0jYi8i3I7EJ3Y7w3hK6z/c9bLPbSyVedVM1g4TjVp54EFW 2x47hYQaGJ4mTCy2+6XKLhnJ4NwYuGAfDDzw== X-Received: by 2002:a05:6402:354b:b0:65a:cdfb:58a7 with SMTP id 4fb4d7f45d1cf-65ea4ed0c0fmr7219653a12.9.1771947829014; Tue, 24 Feb 2026 07:43:49 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gustavo Romero Subject: [PATCH 1/4] target/arm: set the correct TI bits for WFIT traps Date: Tue, 24 Feb 2026 15:43:43 +0000 Message-ID: <20260224154347.344219-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260224154347.344219-1-alex.bennee@linaro.org> References: <20260224154347.344219-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x531.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771947856017158500 The WFIT trap should be reported as 0b10. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Gustavo Romero --- target/arm/tcg/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 4d708635068..aa14f15eb62 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -448,7 +448,7 @@ void HELPER(wfit)(CPUARMState *env, uint64_t timeout) =20 if (target_el) { env->pc -=3D 4; - raise_exception(env, excp, syn_wfx(1, 0xe, 0, false), target_el); + raise_exception(env, excp, syn_wfx(1, 0xe, 2, false), target_el); } =20 if (uadd64_overflow(timeout, offset, &nexttick)) { --=20 2.47.3 From nobody Sun Apr 12 04:24:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771947921; cv=none; d=zohomail.com; s=zohoarc; b=VE9HaEHeJuihViUCCgCxHGzHvcH01ZkKotRDzVZ8Q6bHsp0zKDFhImeORQQhzM7Kz2Z1PtPAwMuTqVU5Q6gaOE8Xx+gXK2LuAarX1DwC6aP+8jTny9VEMsltRds1HZ1k//+k6bJXIyneaSIxDw6Zs0dUVzars32j3JOquU+Xy3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771947921; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jLxuXw2XnWGwhF/mhX3epGfGgtQaomurSwQWIXwnoKY=; b=SdfFxzCMYOlWaRORxBYuRw3UToB4bATzU5WTGosIfZLg+hmPJt2z/ndTcZEmhdLrxydizjEqYeg4YnshoZoGg8oHCTW7lyNY7pkt7UTafuh4eMfG0ln3aWnZRSnViQ7V8o4yC1YRppzpf2YlirjVIffkTHKGIxX/UqEepmghYf4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771947921685582.9496289060843; Tue, 24 Feb 2026 07:45:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuuZx-0007yY-45; Tue, 24 Feb 2026 10:44:05 -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 1vuuZn-0007rE-7W for qemu-devel@nongnu.org; Tue, 24 Feb 2026 10:43:56 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuuZl-0006IR-1s for qemu-devel@nongnu.org; Tue, 24 Feb 2026 10:43:54 -0500 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-658b6757f7fso119566a12.1 for ; Tue, 24 Feb 2026 07:43:51 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65eaba2db5csm3657446a12.24.2026.02.24.07.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 07:43:48 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 624525F8BC; Tue, 24 Feb 2026 15:43:47 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771947830; x=1772552630; 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=jLxuXw2XnWGwhF/mhX3epGfGgtQaomurSwQWIXwnoKY=; b=vE17HoZ8lvYb0tU2g5N8mBoBqfHJ+DqmXNjuPGtc5jW6WL+H/iwqAFdNL4d8/kSvz4 HLVwT97b64CDm9E36BdRQEAoOlBe7wD3sgNWpuas2rihIXubURSHt/F9iKSWckCbFnZR DvOP68kXXaK0/vm+3lXquwatAyRA0XavS8RDX0DibX9Pb5b25eZzPTTgps/Kk0on04JZ Ebu635vBAvQDUTeFJMIdtgMLRLy9LXSzyt20g72VOyQPHsqcNERP0qTQeWylEJOcFrG+ oW6o/iYcyqxO+2sY+yQhknst8xp3KWaSfHGTAMjuwmZNkjYCTUNq+UQkVTkMmHm63S3h XgWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771947830; x=1772552630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jLxuXw2XnWGwhF/mhX3epGfGgtQaomurSwQWIXwnoKY=; b=QeZKqkLlj7UiunI4sXPTt2rcPGlr7qlH8TGRDtk79xUcijhiqDXl1wSAF30V+7ENcy 9JCP7fJnDitDzL08+UCWeNL7SQ8wQ1G1bhf5R17XfciA71vFR2QxQ+pmCA+Li3wfgwy3 7ro1/AOLKOONY8eMco87mXxX6Mp6Jcp8hx1qrHQob1mMD2n2ZQW8alijGgjuW1yshkkI NLeNEGb65GhHzUImG5upsDHf1AA9WJzNQs00mPOXV34xdk3H7m9uMPumFtD9freSBUQQ rh1wowEzuGTLnGGQts05Csq2ef2OTGqe/F6Vk59++E26LHccv8vwa07gocXkNRrkQIuZ ewGA== X-Gm-Message-State: AOJu0YyYKTFA9xzBL0KOFRiiSd1Lp7WZ8ot46JyWfW8KYqqqyRyV6ytW xzkonWGOugRvwseZgNd3oldrEESAbSqj9R559SKt1HKo/ucI7dJCLyGj8wPj2TQ2cUc= X-Gm-Gg: ATEYQzz7mZ/Fh7WSwrAAw9i1zuJRGQZfq/2t0CGoEgdQLKRlt96+lCLRNBoftt1tQKM Gm5LAvqV6JT7iviyNMtliR4vokEx9QZRk5ZVLO7l3kaTl5Hg65gtNJ6jiFsPp/cf/t1I91R9YRZ mvENUz8mn4PMPbzZLgxsS61lkOqFCCc9LaMB9uVmRUSKdcxTg36zCokI8jCbORAeCMFvJbTWGQ5 vL0es+rekj49ENPK+7LYD0b0Mo1sL660L5eWbC0Dj5pRhOCNhm9AFx9AEYGQX7J5YpkWyye44Xp 846fSANkDAYi4iK26CCqtmp2CMstxs8u0HC7dHvv6BPMAzOory1vkc59ew683KCxuDWqdCKqPxu rjA/8yBc+fTN/8YXtw04xrttQhsDScf/mAoo6Ab9RtkQHm3x0H9Z7pM/38P0mh7p50OVNpWlxZw 5AI34HjTiu3dg4XITPNvftARE= X-Received: by 2002:aa7:d5c2:0:b0:65a:23e6:ae60 with SMTP id 4fb4d7f45d1cf-65f7ba1a129mr180961a12.12.1771947829539; Tue, 24 Feb 2026 07:43:49 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 2/4] target/arm: use FIELD_DP32 instead of open-coding syn_wfx Date: Tue, 24 Feb 2026 15:43:44 +0000 Message-ID: <20260224154347.344219-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260224154347.344219-1-alex.bennee@linaro.org> References: <20260224154347.344219-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771947922155158500 We can use the registerfields API to safely set the individual fields and avoid open coding magic numbers. The EC and IL fields are still driven by defines but we could convert them later. Signed-off-by: Alex Benn=C3=A9e --- target/arm/syndrome.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/target/arm/syndrome.h b/target/arm/syndrome.h index bff61f052cc..86a2d5ea9d0 100644 --- a/target/arm/syndrome.h +++ b/target/arm/syndrome.h @@ -26,6 +26,7 @@ #define TARGET_ARM_SYNDROME_H =20 #include "qemu/bitops.h" +#include "hw/core/registerfields.h" =20 /* Valid Syndrome Register EC field values */ enum arm_exception_class { @@ -352,11 +353,24 @@ static inline uint32_t syn_breakpoint(int same_el) | ARM_EL_IL | 0x22; } =20 +FIELD(WFX_ISS, TI, 0, 2) +FIELD(WFX_ISS, RV, 14, 1) +FIELD(WFX_ISS, RN, 15, 5) +FIELD(WFX_ISS, COND, 20, 4) +FIELD(WFX_ISS, CV, 24, 1) + static inline uint32_t syn_wfx(int cv, int cond, int ti, bool is_16bit) { - return (EC_WFX_TRAP << ARM_EL_EC_SHIFT) | - (is_16bit ? 0 : (1 << ARM_EL_IL_SHIFT)) | - (cv << 24) | (cond << 20) | ti; + uint32_t res =3D (EC_WFX_TRAP << ARM_EL_EC_SHIFT); + + res =3D FIELD_DP32(res, WFX_ISS, CV, cv); + res =3D FIELD_DP32(res, WFX_ISS, COND, cond); + res =3D FIELD_DP32(res, WFX_ISS, TI, ti); + + if (!is_16bit) { + res |=3D ARM_EL_IL; + } + return res; } =20 static inline uint32_t syn_illegalstate(void) --=20 2.47.3 From nobody Sun Apr 12 04:24:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771947876; cv=none; d=zohomail.com; s=zohoarc; b=mxmeSggbUs2yjWwapRlh6a3GjJTzwdD5oz1IXSFXV7p1H0r6NDqh474rZMFtYwDUE6lrda3euo4ZZoPYIkP5bYt/Q2hzwqAeB2TS+cnWkGGyrYPOVYdKaicREPdBwV8xP0CUFXdjxhtJzOSTl0i2hkltoYgNtVvvf2Z/4GclbSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771947876; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7a4s9yfVfg/sM27gpDGwRk6HTs+3jP0sag1g142pnus=; b=Zyl2B8bVzhmJP4tCAnXU75hThjrPra8rowQWxuPqbqdPteiR6r049yFsCSfUuCq9QIaheM9INuCorv28NlxQSHqBiRIev/XOZg/2pyZol9igJg6riRB/ze5FHAHPsNO0gDA6o052IjwdJzSM93jDyy9sJuv7qK7jxauggZS9QuY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771947876313731.5232644211629; Tue, 24 Feb 2026 07:44:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuuZx-0007yp-4C; Tue, 24 Feb 2026 10:44:05 -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 1vuuZp-0007rn-40 for qemu-devel@nongnu.org; Tue, 24 Feb 2026 10:43:58 -0500 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuuZl-0006Im-1w for qemu-devel@nongnu.org; Tue, 24 Feb 2026 10:43:56 -0500 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-b8fa449e618so912901566b.0 for ; Tue, 24 Feb 2026 07:43:52 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b931f81b914sm61831966b.7.2026.02.24.07.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 07:43:48 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 790255F8C1; Tue, 24 Feb 2026 15:43:47 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771947831; x=1772552631; 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=7a4s9yfVfg/sM27gpDGwRk6HTs+3jP0sag1g142pnus=; b=m/Z7tGB+6KATJGyQseJ7LdPCT05GDWvN2LXD/4rLbS2nNPjouIhFLS3SiD+SNaRSOg bp23wxycE2l2lIePy4QiCuYairwinE/wzVxelbxq9TqdgpAVY9MHpWuI2pCZCRtrxF4Q Ht3U+h5D5hgWgsK65mQU3a1aVBRF30IagEOsBXSiMuynRompXjEcs2juQQhzfrmt+Ac+ 6+/wCgPzwoc313Pakdm8h4wc8lgnpq+ZVdfKEgHyq6UKlW+RSwWIk8g/YlgQP4+Xj6/G 4cN1+U58+W7+zLVGI/JER/w8/hVjPLLDHKbfTGZmipEEJjPDazzCK9vDMh1hoOajhIDn Z73Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771947831; x=1772552631; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7a4s9yfVfg/sM27gpDGwRk6HTs+3jP0sag1g142pnus=; b=R5xZzhIgM0eV7FqtSnJDJguHVMduQnnrJGa2JMKZUNal6NmAtVqSRm/sp2yrigbGXS 7acj0ynp71EXFVn0y1w/c9LOuxt/WqfenlMmPHYhQz/5pNIO4uUyLN9B/0ZktqVPWYCq YA20W02R2kXJZII5af2Aen90h2tMrhI78lBOsJEGrqgc4L+2NZwDYjwroHOcQPbvxvYM 3P1Ph0e/o24wusFeuFOS3QkNaGAUDIOoIb6vedDaGrzHZmzqNjKwahgXzVRdirIic9kU gvyRh1AwFLLr184sXlgkHr3A3N+oYjBKWj2Mjqf7MkWTD2nAwO+QWkjUVBLPncFtdRUK cTwQ== X-Gm-Message-State: AOJu0YyB8Hb13FmZgwpa6KiviNw1r34SKG6IAB9vCC0SFOfP+zXn4Ci+ KWbGPQYb+UoWaVY/So4DNjHx39+c1wGuMdXI/lk0zz36Q3tsp/VK3mq+oXAJHs+aoGc= X-Gm-Gg: ATEYQzwSD6uuKLdOvMIuws1RYrByJZmFk81XlekOS7WfZbz/eT1IWuoWeIdlO+E86dZ XRrCuHYWWcWjKYnQwtz/6x6bYkUEtPdQ0cvy0+tE7nUPkhnKRTcbp3x2Wf3IjHy1mcHv8XudjKJ lXvVD8/nbn/r4PJbLofl3svvDoy7GNndhxU2XbizYBu4qSIm96u7MAPFGTcKNr0poznGSnGrMX+ 64ZFXB6/b282ymMhzB0SC95L1COtJMtiYXlTOm7D9s3w6v14CsQyQlkjL4CTcwjFaEW4inM4eJm BwNAzOj2m7/UmRCcM0iTiq7XwZQvi677xXgEaYapbWHFBu36WX4msss1NRt6rSsKsa2DIqPiPv3 yttJKjAC4m4wwRzwfcA/Cus7uJrXDcFbsLAi0qURcCzQpmW0b3ls2rqS0gYzM5vW2y/B14lHSJI S+ZALHACilBLzzmXyIG1nFD+U= X-Received: by 2002:a17:906:209c:b0:b87:1590:d528 with SMTP id a640c23a62f3a-b9081b6d72cmr475534566b.40.1771947830911; Tue, 24 Feb 2026 07:43:50 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 3/4] target/arm: pass rd directly to wfit helper Date: Tue, 24 Feb 2026 15:43:45 +0000 Message-ID: <20260224154347.344219-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260224154347.344219-1-alex.bennee@linaro.org> References: <20260224154347.344219-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x641.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771947877940158500 If we generate an exception for WFIT we could also fill out the rv/rn fields of the ISS. To facilitate this pass the register number directly and read the timeout value in the helper itself. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell --- target/arm/tcg/helper-defs.h | 2 +- target/arm/tcg/op_helper.c | 4 +++- target/arm/tcg/translate-a64.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/helper-defs.h b/target/arm/tcg/helper-defs.h index 5a10a9fba3b..a9a062cf777 100644 --- a/target/arm/tcg/helper-defs.h +++ b/target/arm/tcg/helper-defs.h @@ -55,7 +55,7 @@ DEF_HELPER_2(exception_pc_alignment, noreturn, env, vaddr) DEF_HELPER_1(setend, void, env) DEF_HELPER_2(wfi, void, env, i32) DEF_HELPER_1(wfe, void, env) -DEF_HELPER_2(wfit, void, env, i64) +DEF_HELPER_FLAGS_2(wfit, TCG_CALL_NO_WG, void, env, i32) DEF_HELPER_1(yield, void, env) DEF_HELPER_1(pre_hvc, void, env) DEF_HELPER_2(pre_smc, void, env, i32) diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index aa14f15eb62..28a1c7243ad 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -409,7 +409,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len) #endif } =20 -void HELPER(wfit)(CPUARMState *env, uint64_t timeout) +void HELPER(wfit)(CPUARMState *env, uint32_t rd) { #ifdef CONFIG_USER_ONLY /* @@ -428,6 +428,8 @@ void HELPER(wfit)(CPUARMState *env, uint64_t timeout) int target_el =3D check_wfx_trap(env, false, &excp); /* The WFIT should time out when CNTVCT_EL0 >=3D the specified value. = */ uint64_t cntval =3D gt_get_countervalue(env); + uint64_t timeout =3D env->xregs[rd]; + /* * We want the value that we would get if we read CNTVCT_EL0 from * the current exception level, so the direct_access offset, not diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 5d261a5e32b..073454b9195 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2064,7 +2064,7 @@ static bool trans_WFIT(DisasContext *s, arg_WFIT *a) } =20 gen_a64_update_pc(s, 4); - gen_helper_wfit(tcg_env, cpu_reg(s, a->rd)); + gen_helper_wfit(tcg_env, tcg_constant_i32(a->rd)); /* Go back to the main loop to check for interrupts */ s->base.is_jmp =3D DISAS_EXIT; return true; --=20 2.47.3 From nobody Sun Apr 12 04:24:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771947882; cv=none; d=zohomail.com; s=zohoarc; b=LJZ/skJylxk/+RSYfQiIBDdkeiMv5J1VFiKgeDS5bMJXA2aqdf7ODau8cTsFvRZuRjS2gzlZ7axfMHY87iOvlisgjJ7cyH7njgX2QODaXIKYN2hDDj6y9ynO/ULvA1jQbsLHcjDJjRxS1MAFBOjA/gh+/7XTuMmWH4x+1qHSaeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771947882; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JgHcP//ADNE+xVgcxDYmX1XpBdXs4RC0Pe5Zc7Pw41U=; b=Tm0LChchrmCQnap0BUCr69QA5vfnhROQJGeO+Nlh/H4RfYj6OJkMTQcHSaCTojHQazACFDULh4xj1OhAZ1NSYAB3lMCy2xPbSOhywbleYs3LFSn0151Xa67DZBMtF2M2pAPrOFo56CpJrfvABkL9HriZrKjjBV9zYi0J7/LJvsc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17719478820371003.8106199232237; Tue, 24 Feb 2026 07:44:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuuZz-00084F-LW; Tue, 24 Feb 2026 10:44:07 -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 1vuuZp-0007rm-40 for qemu-devel@nongnu.org; Tue, 24 Feb 2026 10:43:58 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuuZl-0006Ip-29 for qemu-devel@nongnu.org; Tue, 24 Feb 2026 10:43:56 -0500 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-b886fc047d5so906702066b.3 for ; Tue, 24 Feb 2026 07:43:52 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9084c5c514sm434204066b.5.2026.02.24.07.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 07:43:49 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9121F5F8D0; Tue, 24 Feb 2026 15:43:47 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771947831; x=1772552631; 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=JgHcP//ADNE+xVgcxDYmX1XpBdXs4RC0Pe5Zc7Pw41U=; b=J9MQwxX9Bm3vKi6URbchJ0Q4iLEiHvzW6fImfQawvtksGZVi1+99WX04Pi5CCCzihw PpIFAT60XU96qcPXxRql+/x0MK6ZXNaOk5jQw/tDe37P0uQTGUd1eNKBc2kldgGp33zZ 8FXo7rHdwenUsvIa7QdYB4VXgurF4mHWWdB2dE8AkL9XBFoJVVXNz8pfTB/N5lPU9KrX T1d5+vZp6cFcBhKpNnkxRFybp8HlYn4/1CjzZmygM3oulmHDPetOBq/82fizU+v0hxcK /BSGvePr+bBLUi6KOVD8iY1is8pH3NKM4YsHycnmF39e08B1Ls8aH0W0tTJ857yJ0sW1 utaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771947831; x=1772552631; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JgHcP//ADNE+xVgcxDYmX1XpBdXs4RC0Pe5Zc7Pw41U=; b=iRwm9ST6US4p04FhMa63wEIxTkq+LLcQJaQakeap18qz8Zplm/smerwIkfXl6S6yzQ G6ycDgcKh8JpCQENfUoNJEbSUSeNzd0z0uGIrKhpUYhLYBzyjaztMx3mQxwlgGWmm6hy Lfq2qq/wsr21+sho7Az6No26pWPrFph5AbyokQODm/2vbwH/1truogj3F2C4tbedlUgY 094i3GdtevTQlBO79gtR/ZOTrnEaZ0XML/crBA4r0JCv7UpxANq+8qricpnatvvhxG0L Hmbi2ilkfqomSxRoiHsb6mmBS/NFY50fUfAs1btiDQzhrIGzst3hEG1K/GrOAXW9hvMS cEDQ== X-Gm-Message-State: AOJu0Yy5CQ/NoNVxWR5TvWm9I6iTZpBoTaQyoi8ZhN7TMqAG9pG2bK1K efFzB+PQb7D9kejLWCgo/h2YsRLsNXZxc6cVwyQLbgZn4NXIKQHXX9FszbDAoEo8tNY= X-Gm-Gg: AZuq6aJBk8xlo1b3YtAXNcnkkxdciRz1vy7A7PWf9C5r8o+j/sYvcRu2kmxrgwUdMUK fZw6j7x8gNs3uv8yq8icQgv9ifCKfdVPWC5XcbNduRM4yiHiCaC+n79MaHVetbBI2kz4SFeSv8e dRnTirGG4MQJZUEGvptoGtjDgzYWw/hWWWP92jU010x6/esbkUWtpJvqUNFbs6ySO3xxxvLUwIu 5Js6bLsPtdethgO3Nng2NJWP/gdEE0exPfwQ04IMz6dlua2YEyTK3h1MT++gokWLT487ld+J3jZ w6Jo+eMFJ0temKo/MQDVwfotdT/nW7dQrn9bHhKyZY/sSVmFXRPtRU3lLJivmJQ1BneB8oJYmKG LS484OXKDlZfvSTzeB3sphUmzgargq0JHiszIF5BQrU7iNAhAJniOQv8ddyQFTGiHN1+8p4ZJW2 zatpBYn+7q9/isythuOpBEImtNbut4gtVE3A== X-Received: by 2002:a17:907:3d4f:b0:b8f:aa38:70bc with SMTP id a640c23a62f3a-b9081b3e5d4mr853668666b.38.1771947831400; Tue, 24 Feb 2026 07:43:51 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 4/4] target/arm: report register in WFIT syndromes Date: Tue, 24 Feb 2026 15:43:46 +0000 Message-ID: <20260224154347.344219-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260224154347.344219-1-alex.bennee@linaro.org> References: <20260224154347.344219-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771947884038158500 Now we have the register number we can report it in the syndrome. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell --- target/arm/syndrome.h | 4 +++- target/arm/tcg/op_helper.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target/arm/syndrome.h b/target/arm/syndrome.h index 86a2d5ea9d0..086ac76d7f1 100644 --- a/target/arm/syndrome.h +++ b/target/arm/syndrome.h @@ -359,12 +359,14 @@ FIELD(WFX_ISS, RN, 15, 5) FIELD(WFX_ISS, COND, 20, 4) FIELD(WFX_ISS, CV, 24, 1) =20 -static inline uint32_t syn_wfx(int cv, int cond, int ti, bool is_16bit) +static inline uint32_t syn_wfx(int cv, int cond, int rn, int rv, int ti, b= ool is_16bit) { uint32_t res =3D (EC_WFX_TRAP << ARM_EL_EC_SHIFT); =20 res =3D FIELD_DP32(res, WFX_ISS, CV, cv); res =3D FIELD_DP32(res, WFX_ISS, COND, cond); + res =3D FIELD_DP32(res, WFX_ISS, RN, rn); + res =3D FIELD_DP32(res, WFX_ISS, RV, rv); res =3D FIELD_DP32(res, WFX_ISS, TI, ti); =20 if (!is_16bit) { diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 28a1c7243ad..a68cdf6de23 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -399,7 +399,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len) env->regs[15] -=3D insn_len; } =20 - raise_exception(env, excp, syn_wfx(1, 0xe, 0, insn_len =3D=3D 2), + raise_exception(env, excp, syn_wfx(1, 0xe, 0, 0, 0, insn_len =3D= =3D 2), target_el); } =20 @@ -450,7 +450,7 @@ void HELPER(wfit)(CPUARMState *env, uint32_t rd) =20 if (target_el) { env->pc -=3D 4; - raise_exception(env, excp, syn_wfx(1, 0xe, 2, false), target_el); + raise_exception(env, excp, syn_wfx(1, 0xe, rd, 1, 2, false), targe= t_el); } =20 if (uadd64_overflow(timeout, offset, &nexttick)) { --=20 2.47.3