AdvLoggerPkg/SecDebugAgent: Update for 64-bit

Allows the module to be built for 64-bit SEC. Signed-off-by: Michael Kubacki <[email protected]>
microsoft · Jan 20, 2024 · d19b1ee · d19b1ee
1 parent a6a9f87
commit d19b1ee
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 5 deletions.
diff --git a/AdvLoggerPkg/Library/DebugAgent/Sec/AdvancedLoggerSecDebugAgent.h b/AdvLoggerPkg/Library/DebugAgent/Sec/AdvancedLoggerSecDebugAgent.h
@@ -57,7 +57,7 @@ UINT32 *
 EFIAPI
 AsmRepLodsd (
   IN UINT32  *Address,
-  IN UINT32  Length
+  IN UINTN   Length
   );
 
 #endif // __ADVANCED_LOGGER_SEC_DEBUGAGENT_H__
diff --git a/AdvLoggerPkg/Library/DebugAgent/Sec/AdvancedLoggerSecDebugAgent.inf b/AdvLoggerPkg/Library/DebugAgent/Sec/AdvancedLoggerSecDebugAgent.inf
@@ -22,16 +22,19 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32
+#  VALID_ARCHITECTURES           = IA32 X64
 #
 
 [Sources]
   AdvancedLoggerSecDebugAgent.c
+  RamForSEC.c
 
-[Sources.Ia32]
-  ia32/RamForSEC.c
+[Sources.IA32]
   ia32/AsmRepLodsd.nasm
 
+[Sources.X64]
+  X64/AsmRepLodsd.nasm
+
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec

diff --git a/...g/Library/DebugAgent/Sec/ia32/RamForSEC.c → ...gerPkg/Library/DebugAgent/Sec/RamForSEC.c b/...g/Library/DebugAgent/Sec/ia32/RamForSEC.c → ...gerPkg/Library/DebugAgent/Sec/RamForSEC.c
diff --git a/AdvLoggerPkg/Library/DebugAgent/Sec/X64/AsmRepLodsd.nasm b/AdvLoggerPkg/Library/DebugAgent/Sec/X64/AsmRepLodsd.nasm
@@ -0,0 +1,42 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) Microsoft Corporation. All rights reserved.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
+;
+; Module Name:
+;
+;   RepLodsd.nasm
+;
+; Abstract:
+;
+;       Executes a rep lodsd (repeated load dword string instruction).  While there is no valid
+;       data at the address, this allocates entries in the cache with the correct address tags.
+;
+;  @param  Address The pointer to the cache location.
+;  @param  Length  The length in bytes of the region to load.
+;
+;  @return Value   Returns the next address to be touched (to verify the rep lodsd operation)
+;
+;------------------------------------------------------------------------------
+
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; UINT32 *
+; EFIAPI
+; AsmRepLodsd (
+;   IN UINT32  *Address,      // rcx
+;   IN UINTN   Length         // rdx
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(AsmRepLodsd)
+ASM_PFX(AsmRepLodsd):
+     push    rsi
+     xchg    rcx, rdx
+     mov     rsi, rdx
+     shr     rcx, 2
+     cld
+     rep     lodsd
+     mov     rax, rsi
+     pop     rsi
+    ret
diff --git a/AdvLoggerPkg/Library/DebugAgent/Sec/ia32/AsmRepLodsd.nasm b/AdvLoggerPkg/Library/DebugAgent/Sec/ia32/AsmRepLodsd.nasm
@@ -26,7 +26,7 @@
 ; EFIAPI
 ; AsmRepLodsd (
 ;   IN UINT32  *Address,
-;   IN UINT32   Length
+;   IN UINTN   Length
 ;   );
 ;------------------------------------------------------------------------------
 global ASM_PFX(AsmRepLodsd)