SysCall: Refactored out CORE_STACK and RING3_STACK.

acidanthera · Jan 13, 2025 · 08df5dd · 08df5dd
1 parent 0f9e888
commit 08df5dd
Show file tree

Hide file tree

Showing 6 changed files with 409 additions and 355 deletions.
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -234,17 +234,6 @@ typedef struct {
   UINTN                                   UserStackTop;
 } LOADED_IMAGE_PRIVATE_DATA;
 
-typedef struct {
-  UINTN  Argument1;
-  UINTN  Argument2;
-  UINTN  Argument3;
-} CORE_STACK;
-
-typedef struct {
-  UINTN  Rip;
-  UINTN  Arguments[];
-} RING3_STACK;
-
 #define LOADED_IMAGE_PRIVATE_DATA_FROM_THIS(a) \
           CR(a, LOADED_IMAGE_PRIVATE_DATA, Info, LOADED_IMAGE_PRIVATE_DATA_SIGNATURE)
 
@@ -2737,9 +2726,8 @@ CoreBootServices (
 EFI_STATUS
 EFIAPI
 CallBootService (
-  IN UINT8       Type,
-  IN CORE_STACK  *CoreRbp,
-  IN RING3_STACK *UserRsp
+  IN UINT8  Type,
+  IN UINTN  *UserArguments
   );
 
 VOID

diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c
@@ -74,8 +74,7 @@ SysCallBootService (
 
   Status = CallBootService (
              Type,
-             (CORE_STACK *)CoreRbp,
-             (RING3_STACK *)(UINTN)Physical
+             (UINTN *)((UINTN)Physical + sizeof (UINTN))
              );
 
   CoreFreePages (Physical, EFI_SIZE_TO_PAGES (9 * sizeof (UINTN)));

diff --git a/MdeModulePkg/Core/Dxe/SysCall/ARM/InitializeARM.c b/MdeModulePkg/Core/Dxe/SysCall/ARM/InitializeARM.c
@@ -80,8 +80,7 @@ SysCallBootService (
 
   Status = CallBootService (
              Type,
-             (CORE_STACK *)CoreRbp,
-             (RING3_STACK *)(UINTN)Physical
+             (UINTN *)((UINTN)Physical + sizeof (UINTN))
              );
   //
   // TODO: Fix memory leak for ReturnToCore().