From f3508439480869d8cea86692443674d58059f1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 16 Sep 2021 23:28:47 +0200 Subject: [PATCH] [SDK:ASM] OK these definition entries are #if 0'ed out, but close the parentheses anyway to not mess up with editors' code-folding functionality. --- sdk/include/asm/ksamd64.template.h | 86 +++++++++++++++--------------- sdk/include/asm/ksarm.template.h | 4 -- sdk/include/asm/ksx.template.h | 8 +-- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index db36c5767bc..0f3a16d6209 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -758,49 +758,49 @@ OFFSET(TrPreviousIrql, KTRAP_FRAME, PreviousIrql), OFFSET(TrFaultIndicator, KTRAP_FRAME, TrP1Home), OFFSET(TrExceptionActive, KTRAP_FRAME, TrP1Home), OFFSET(TrMxCsr, KTRAP_FRAME, TrP1Home), -OFFSET(TrRax equ 0FFFFFFB0H -OFFSET(TrRcx equ 0FFFFFFB8H -OFFSET(TrRdx equ 0FFFFFFC0H -OFFSET(TrR8 equ 0FFFFFFC8H -OFFSET(TrR9 equ 0FFFFFFD0H -OFFSET(TrR10 equ 0FFFFFFD8H -OFFSET(TrR11 equ 0FFFFFFE0H -OFFSET(TrGsBase equ 0FFFFFFE8H -OFFSET(TrGsSwap equ 0FFFFFFE8H -OFFSET(TrXmm0 equ 0FFFFFFF0H -OFFSET(TrXmm1 equ 00000H -OFFSET(TrXmm2 equ 00010H -OFFSET(TrXmm3 equ 00020H -OFFSET(TrXmm4 equ 00030H -OFFSET(TrXmm5 equ 00040H -OFFSET(TrFaultAddress equ 00050H -OFFSET(TrDr0 equ 00058H -OFFSET(TrDr1 equ 00060H -OFFSET(TrDr2 equ 00068H -OFFSET(TrDr3 equ 00070H -OFFSET(TrDr6 equ 00078H -OFFSET(TrDr7 equ 00080H -OFFSET(TrDebugControl equ 00088H -OFFSET(TrLastBranchToRip equ 00090H -OFFSET(TrLastBranchFromRip equ 00098H -OFFSET(TrLastExceptionToRip equ 000A0H -OFFSET(TrLastExceptionFromRip equ 000A8H -OFFSET(TrSegDs equ 000B0H -OFFSET(TrSegEs equ 000B2H -OFFSET(TrSegFs equ 000B4H -OFFSET(TrSegGs equ 000B6H -OFFSET(TrTrapFrame equ 000B8H -OFFSET(TrRbx equ 000C0H -OFFSET(TrRdi equ 000C8H -OFFSET(TrRsi equ 000D0H -OFFSET(TrRbp equ 000D8H -OFFSET(TrErrorCode equ 000E0H -OFFSET(TrRip equ 000E8H -OFFSET(TrSegCs equ 000F0H -OFFSET(TrLogging equ 000F3H -OFFSET(TrEFlags equ 000F8H -OFFSET(TrRsp equ 00100H -OFFSET(TrSegSs equ 00108H +OFFSET(TrRax equ 0FFFFFFB0H), +OFFSET(TrRcx equ 0FFFFFFB8H), +OFFSET(TrRdx equ 0FFFFFFC0H), +OFFSET(TrR8 equ 0FFFFFFC8H), +OFFSET(TrR9 equ 0FFFFFFD0H), +OFFSET(TrR10 equ 0FFFFFFD8H), +OFFSET(TrR11 equ 0FFFFFFE0H), +OFFSET(TrGsBase equ 0FFFFFFE8H), +OFFSET(TrGsSwap equ 0FFFFFFE8H), +OFFSET(TrXmm0 equ 0FFFFFFF0H), +OFFSET(TrXmm1 equ 00000H), +OFFSET(TrXmm2 equ 00010H), +OFFSET(TrXmm3 equ 00020H), +OFFSET(TrXmm4 equ 00030H), +OFFSET(TrXmm5 equ 00040H), +OFFSET(TrFaultAddress equ 00050H), +OFFSET(TrDr0 equ 00058H), +OFFSET(TrDr1 equ 00060H), +OFFSET(TrDr2 equ 00068H), +OFFSET(TrDr3 equ 00070H), +OFFSET(TrDr6 equ 00078H), +OFFSET(TrDr7 equ 00080H), +OFFSET(TrDebugControl equ 00088H), +OFFSET(TrLastBranchToRip equ 00090H), +OFFSET(TrLastBranchFromRip equ 00098H), +OFFSET(TrLastExceptionToRip equ 000A0H), +OFFSET(TrLastExceptionFromRip equ 000A8H), +OFFSET(TrSegDs equ 000B0H), +OFFSET(TrSegEs equ 000B2H), +OFFSET(TrSegFs equ 000B4H), +OFFSET(TrSegGs equ 000B6H), +OFFSET(TrTrapFrame equ 000B8H), +OFFSET(TrRbx equ 000C0H), +OFFSET(TrRdi equ 000C8H), +OFFSET(TrRsi equ 000D0H), +OFFSET(TrRbp equ 000D8H), +OFFSET(TrErrorCode equ 000E0H), +OFFSET(TrRip equ 000E8H), +OFFSET(TrSegCs equ 000F0H), +OFFSET(TrLogging equ 000F3H), +OFFSET(TrEFlags equ 000F8H), +OFFSET(TrRsp equ 00100H), +OFFSET(TrSegSs equ 00108H), #endif SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), diff --git a/sdk/include/asm/ksarm.template.h b/sdk/include/asm/ksarm.template.h index bfffbf01f8c..0d300d2784c 100644 --- a/sdk/include/asm/ksarm.template.h +++ b/sdk/include/asm/ksarm.template.h @@ -559,7 +559,3 @@ CONSTANT(PF_ARM_EXTERNAL_CACHE_AVAILABLE), #define KEXCEPTION_ACTIVE_EXCEPTION_FRAME 0x1 #define KEXCEPTION_ACTIVE_SERVICE_FRAME 0x2 - - - - diff --git a/sdk/include/asm/ksx.template.h b/sdk/include/asm/ksx.template.h index b434717f382..35f9837242f 100644 --- a/sdk/include/asm/ksx.template.h +++ b/sdk/include/asm/ksx.template.h @@ -926,10 +926,10 @@ OFFSET(IbWow64CfgBitMap, PS_SYSTEM_DLL_INIT_BLOCK, Wow64CfgBitMap), OFFSET(IbMitigationOptionsMap, PS_SYSTEM_DLL_INIT_BLOCK, MitigationOptionsMap), HEADER("Extended context"), -OFFSET(CxxLegacyOffset 0x8 -OFFSET(CxxLegacyLength 0xc -OFFSET(CxxXStateOffset 0x10 -OFFSET(CxxXStateLength 0x14 +OFFSET(CxxLegacyOffset 0x8), +OFFSET(CxxLegacyLength 0xc), +OFFSET(CxxXStateOffset 0x10), +OFFSET(CxxXStateLength 0x14), HEADER("Enclave call dispatch frame"), OFFSET(EcEnclaveNumber, ???, EnclaveNumber),