From nobody Fri Mar 20 21:57:59 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=1774012189; cv=none; d=zohomail.com; s=zohoarc; b=aTich3kNqB+HxH7eWHD+hsnOPRoMK+4PJn+MAfhFxhuHLUYY6Cn1CW/6ZoPcMI5/x8qRPLTYdg7hqLtG3U0HPPhZDUQYThy+P/quNaXCqaoMGWAvpB5EUwfHy069LB1sUIzLqvIUBWL8RtA6z+M0BUY3hrc+dA7AWRUqLabDuJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774012189; 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=QvS6HtxG4jcfhqka/2gZ2nh+60WKvsSv+L1snlQc09w=; b=BtVrzLlK9VVoAfUuSGwyCNdjLx3ppaWkyXOngj3WtoHB9K9tU7XCb79qi0ptS+IXOjJHMECRX8JXIksDkCWnb+WniNzDa1fRLLOKTV909KUqEX55xIw+fFZqCdm81aeKmgteHVKa52ZxOO23Q0eI6IUxox/yqmhcBW063ZE/whQ= 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 1774012189131240.17704890547907; Fri, 20 Mar 2026 06:09:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3ZYU-0002ts-5N; Fri, 20 Mar 2026 09:06:22 -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 1w3ZYQ-0002pq-DB for qemu-devel@nongnu.org; Fri, 20 Mar 2026 09:06:18 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3ZYM-0005ze-ET for qemu-devel@nongnu.org; Fri, 20 Mar 2026 09:06:16 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-668e55bd36bso624035a12.3 for ; Fri, 20 Mar 2026 06:06:13 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9832f8be14sm165814966b.17.2026.03.20.06.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 06:06:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C7F415F91F; Fri, 20 Mar 2026 13:06:07 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774011973; x=1774616773; 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=QvS6HtxG4jcfhqka/2gZ2nh+60WKvsSv+L1snlQc09w=; b=ter5r22GBdMLXy8XQ0dKPYhT/MNlTX8n3dvZzX2uQah1Ot1o7cUTh+2c5aTFlBCbxv tnTO9rKGVQ3QZD44wqZUIzQTqPPwe3LuXfId0ackrjilsYwzC3Tadmyf1JpTGpNZVU4+ DLnDjTXsmBeffMGSgXqvDl5pPQLXiFHR47ckYC61w12UvHG863xtB90AlMhdMiAOl4TC fndIjKSvVQaLnPV4Djmosi9ZOIcAvcZQm4BGpgTNHIoJbpEdD/LUjvSigWhHvXrVesgO 1G2hpr9az5vJiHGubKAGUCGIiRF7JUQx5cM+AJHq9sLnlrEBUJICbkP22xPFAAXSUWms HD4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774011973; x=1774616773; 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=QvS6HtxG4jcfhqka/2gZ2nh+60WKvsSv+L1snlQc09w=; b=SEVbWRC6WAtU5/U0mUGHrEy78/DY+Ugxy7WY0bxZB0cIaRZGZWPNCg/zU5nVfhFESL Y0uvv1ixeNGhRJQTUGG8x12tem5+vxH6jC23kXVHGxPu5/YTUe4QGVtM1oaxhYgFdAtt ZaalM1wrWU63xEBFS/n9ng+2xbFCr2aDBD0NWx63/4wrMlxIYnb7+gK3hlwufhoR8ctD +rxI/FlZyXL9RJ0sZmXn+HQchf+MzI2l9kajk95Mol9rPx/cPhecCHYiVbeKr55opX2h UOmY9Jml/bkAqFGqNLKPcYAyGu7iUMyRl8QljaL+ukwch7CP07DwfQR+69nKmYI8+yQo 8z3g== X-Gm-Message-State: AOJu0YzJ1y1Wx/90fPyUH8jAfPHPYw2yNryB5v6zix4+HBRCq2Su2Pek iQoi4d25HQoHFR0COefGHvUyPNUTddJLpgDtuJ7VzQEPTMDPlXybcKX2Wmw+AQ46sBA= X-Gm-Gg: ATEYQzxVOcuJScp8LXzBh0/8+/5E8nYOQl+OFdT7RdsUPnsvV4Pwy886SIlFH20emNh gB4X6StbpfONmTYtRs61a5ohPrHVQjILiDrH7HureF7oTTwBiul8IQA/cOxzGHop54RlLixlESB Ji244bxp/v5IkXheHG3rpBvJ+qW1R72o8CmI2A+QLU29xKAeP5w4Wba7P2qJ38ESZq3p+eVuGUa gdirNFS+m7whfk4GQ82f2/VGIvlxjY+/z8mx2EZz3XeRxsolcLAXoS08Nev+dT1txs2A+xviv8+ ThpRqtzqZD1KC8c8q0lQVNQZR9JoN9/1gTII9x3qaBrfohepgIGrPsg/zViJoBr8L65M9XIKVj5 c4FDvKbsAEC/XdRhwpAumAKuAq/mrPyNkFTuqEy554hhXJBR/78ArSJ7ZW2KsHb2B+BP+Mst3lZ qh9jn0NrGqz1c4e4D3FT8FnJo= X-Received: by 2002:a17:907:c8a3:b0:b98:9da:4d94 with SMTP id a640c23a62f3a-b982f38bd3cmr181168366b.48.1774011971057; Fri, 20 Mar 2026 06:06:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Alexander Graf , Peter Maydell , qemu-arm@nongnu.org, Pedro Barbuda , Mohamed Mediouni , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH 04/35] target/arm: migrate eret trap syndromes to registerfields Date: Fri, 20 Mar 2026 13:05:35 +0000 Message-ID: <20260320130607.2071996-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320130607.2071996-1-alex.bennee@linaro.org> References: <20260320130607.2071996-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::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.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: 1774012190603158500 For simplicity keep the OP as a two bit field rather than the two interlinked fields in the docs (ERET/ERETA). Signed-off-by: Alex Benn=C3=A9e --- target/arm/syndrome.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/target/arm/syndrome.h b/target/arm/syndrome.h index 5b5a5cb182e..b145a52769f 100644 --- a/target/arm/syndrome.h +++ b/target/arm/syndrome.h @@ -367,12 +367,21 @@ static inline uint32_t syn_sve_access_trap(void) } =20 /* + * ISS encoding for an exception from an ERET, ERETAA or ERETAB + * instructions. + * * eret_op is bits [1:0] of the ERET instruction, so: * 0 for ERET, 2 for ERETAA, 3 for ERETAB. */ +FIELD(ERET_ISS, OP, 0, 2) + static inline uint32_t syn_erettrap(int eret_op) { - return (EC_ERETTRAP << ARM_EL_EC_SHIFT) | ARM_EL_IL | eret_op; + uint32_t res =3D syn_set_ec(0, EC_ERETTRAP); + res =3D FIELD_DP32(res, SYNDROME, IL, 1); + res =3D FIELD_DP32(res, ERET_ISS, OP, eret_op); + + return res; } =20 static inline uint32_t syn_smetrap(SMEExceptionType etype, bool is_16bit) --=20 2.47.3