From e019333864e6ffac472453a05944acb968cb10c4 Mon Sep 17 00:00:00 2001 From: Indu Bhagat Date: Thu, 16 Oct 2025 11:41:19 -0700 Subject: [PATCH] include: sframe: add SFRAME_V2_ prefixed macro names for FDE Such a change for readability only. SFrame V1 is now obsolete, and with newer versions like V3 or later, its likely better to have macro names reflect the applicable version. Add new macro names for FDE information related macros. include/ * sframe.h (SFRAME_V2_FUNC_INFO): New definition. (SFRAME_V2_FUNC_FRE_TYPE): Likewise. (SFRAME_V2_FUNC_FDE_TYPE): Likewise. (SFRAME_V2_FUNC_PAUTH_KEY): Likewise. (SFRAME_V2_FUNC_INFO_UPDATE_PAUTH_KEY): Likewise. --- include/sframe.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/sframe.h b/include/sframe.h index d2a3c8390bf..d90440330cd 100644 --- a/include/sframe.h +++ b/include/sframe.h @@ -227,6 +227,18 @@ typedef struct sframe_func_desc_entry_v2 #define SFRAME_V1_FUNC_INFO_UPDATE_PAUTH_KEY(pauth_key, fde_info) \ ((((pauth_key) & 0x1) << 5) | ((fde_info) & 0xdf)) +/* SFrame V2 has similar SFrame FDE representation as SFrame V1. */ + +#define SFRAME_V2_FUNC_INFO(fde_type, fre_enc_type) \ + (SFRAME_V1_FUNC_INFO (fde_type, fre_enc_type)) + +#define SFRAME_V2_FUNC_FRE_TYPE(data) (SFRAME_V1_FUNC_FRE_TYPE (data)) +#define SFRAME_V2_FUNC_FDE_TYPE(data) (SFRAME_V1_FUNC_FDE_TYPE (data)) +#define SFRAME_V2_FUNC_PAUTH_KEY(data) (SFRAME_V1_FUNC_PAUTH_KEY (data)) + +#define SFRAME_V2_FUNC_INFO_UPDATE_PAUTH_KEY(pauth_key, fde_info) \ + SFRAME_V1_FUNC_INFO_UPDATE_PAUTH_KEY (pauth_key, fde_info) + /* Size of stack frame offsets in an SFrame Frame Row Entry. A single SFrame FRE has all offsets of the same size. Offset size may vary across frame row entries. */ -- 2.47.3