From nobody Sat Nov 15 10:37:14 2025 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=1754178999; cv=none; d=zohomail.com; s=zohoarc; b=PbIfJrlLSarC6ASwgOV+O/1g207y9h6TlUWBxzXr4lVB04ZJIa/hJh35YO1ow7cQoupW6kboiu/5VL4X6LJMKzGxJK0I/lu11w7TFeF0WR5+tLi3gvE/+xqIfUsBTbsUon8QlwTwWF6+LY2FqSu2mXx3JRQLDJxTE7jE5MSvuXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754178999; h=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=NR3W5du9ZFi4qPy6YJwkknWURFd+s6CJ6eRMr5OXqWE=; b=b9Y2AqqS0R5uSKCj1QRClTUQ4/v+JbcW8izgWj2TaOwc5BXpbw0wCZQBsXFWm2w6u7Ti9rkaotUok+1Ampj0MhraJ3ka7CDWdTGXxhmexdobnc8tYLStiYP3dmXfU5WUYo/yYQbqbjRJPcpdHRhy7AwOVDouv0onr5RtYarxe0g= 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 175417899933362.32290165738959; Sat, 2 Aug 2025 16:56:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiLjl-0005HD-2w; Sat, 02 Aug 2025 19:34:01 -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 1uiLhe-0008OW-8a for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:31:54 -0400 Received: from mail-oa1-x2a.google.com ([2001:4860:4864:20::2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiLhc-000569-TJ for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:31:50 -0400 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-30174a93186so2672590fac.3 for ; Sat, 02 Aug 2025 16:31:48 -0700 (PDT) Received: from stoup.. ([172.58.111.133]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-30b8e3c9b32sm71031fac.24.2025.08.02.16.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 16:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754177507; x=1754782307; 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=NR3W5du9ZFi4qPy6YJwkknWURFd+s6CJ6eRMr5OXqWE=; b=NT9xT0zncpoYCgpt+cP0ZCPct1QsOXG0V3zbxmzV5L0zbmiooomVF3SaFrnawA7KDg 8pIGxWqNFuynYffQWogifF3QanXKmfVCwZ1DY55bDEZpHmoblIFK41+/p76N8S2+elen uvKJopGRnTxpqzuOaAfEVuC0CedJFgQZuRAJHIhPERZDhPy8bB6qaUkVHB8zQJD9s5Xj DPCGl2BB0R8ARd+g+lzWdY3YyLPW6nMyJJ+jy9PscnGjRXZWDu3URVYlTzfNZGaYTdeM DnkAkFfT4MLlQjDA40be4vZ4o51K2gVXcNbU2npmOljhR384GDdaiWc2ZwklsGb7uX80 x6mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754177507; x=1754782307; 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=NR3W5du9ZFi4qPy6YJwkknWURFd+s6CJ6eRMr5OXqWE=; b=mbWqD8J4LBYOV3NstoLC/Bmu3T0xhArIML8blv95dmgK+YGohViiVORf4h8Xcx/1MZ p8hwWJcd+V2i5fmnQdtFTGgc+rCHZ/Q02ikwb9E+gQ6+FlLGqGCl9Flp9I3iXFS7BGg3 qJpBjuxAuq7jb+6sx3Xu2ey365MZfi8Yde8y46uBwrSasCDjznnwIYKUNLeIARPA4hIi h49mXVg+PD7mgtV18juTMKriqtqFTZ//dRFwhzRAXf4tbkp3eJUU9uv1oGvywBQaXSKn 4fW/U/DlXl7CE+wIBDXmw8QMI3jByGnTCqafgLPR59CeL/V9iKCXEONqlPuUPOCyMamM 6Epw== X-Gm-Message-State: AOJu0YzMLwjfoDOUBuY+REaCTcyqa5l/h7mG/eQBPD4IGkqeNLKRhOhl JEQNcUm/uPoAMQCvNdF7TusYir4EoFZ9uP5QAO2sDPwa7rdBHaqI0oNSxjKja+SyX3jOqS6eIzI fglLRkVc= X-Gm-Gg: ASbGnctdTg7Thhs9TnB8MeLMNZKEuBoRLJtHklYqZXwblPsGn9DhYxtVOKFAsq3/lU/ 0yjPSKqYcwGUQn/+73oQHKkrO/fq2U092KsiwlDxBBbKPyO7irRCPJT2z+E5H8qkgd2W4iSlopX /U9CI8FsypjtHIL6cf/Pfr7kLfrX5vpxtjLGrdAk/5e9St8WAr51fodYQ6P2BCA35cct4LGKVYU g/Dzta2sZsA8rJcQUh5MJ3OJmHIQbunFarZJwhLpWRZmeWxz5l8CztwQNnto9ZA58+a7LX3Di3J vDSWUOJwkski3QskTTHS7OvYHlZVQdNKQRdhUCoGpF6UY2CYdJiNvZi3oFYPZtnji4GBgzUQGHg NuiQhMNDIADicE5RYeQ2tuGj1A+feZhBzntDtimxrO01EFJh4NZDK X-Google-Smtp-Source: AGHT+IGJMnEvtsvIBqloejw81L8/1dMitVLEcq4M/I1eq0MXKlQ4VMhdYJBeYpOUnEQZvfKa8Of4dA== X-Received: by 2002:a05:6870:d32f:b0:307:bba1:d09f with SMTP id 586e51a60fabf-30b6768a30dmr2446653fac.15.1754177507685; Sat, 02 Aug 2025 16:31:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v2 22/85] target/arm: Expand CPUARMState.exception.syndrome to 64 bits Date: Sun, 3 Aug 2025 09:28:50 +1000 Message-ID: <20250802232953.413294-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250802232953.413294-1-richard.henderson@linaro.org> References: <20250802232953.413294-1-richard.henderson@linaro.org> MIME-Version: 1.0 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=2001:4860:4864:20::2a; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754179000012116600 Content-Type: text/plain; charset="utf-8" This will be used for storing the ISS2 portion of the ESR_ELx registers in aarch64 state. Re-order the fsr member to eliminate two structure holes. Drop the comment about "if we implement EL2" since we have already done so. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/cpu.h | 7 ++----- target/arm/helper.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index fb87fcc3e6..4940bd6a45 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -644,13 +644,10 @@ typedef struct CPUArchState { * entry process. */ struct { - uint32_t syndrome; /* AArch64 format syndrome register */ - uint32_t fsr; /* AArch32 format fault status register info */ + uint64_t syndrome; /* AArch64 format syndrome register */ uint64_t vaddress; /* virtual addr associated with exception, if a= ny */ + uint32_t fsr; /* AArch32 format fault status register info */ uint32_t target_el; /* EL the exception should be targeted for */ - /* If we implement EL2 we will also need to store information - * about the intermediate physical address for stage 2 faults. - */ } exception; =20 /* Information associated with an SError */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 168557b08f..9447d7ba59 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9438,7 +9438,7 @@ void arm_cpu_do_interrupt(CPUState *cs) new_el); if (qemu_loglevel_mask(CPU_LOG_INT) && !excp_is_internal(cs->exception_index)) { - qemu_log_mask(CPU_LOG_INT, "...with ESR 0x%x/0x%" PRIx32 "\n", + qemu_log_mask(CPU_LOG_INT, "...with ESR 0x%x/0x%" PRIx64 "\n", syn_get_ec(env->exception.syndrome), env->exception.syndrome); } --=20 2.43.0