Port AsmFuncs.s to pass CYGWINGCC build for x64.

[mirror_edk2.git] / MdeModulePkg / Universal / DebugSupportDxe / X64 / PlDebugSupportX64.c

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
index 943d2c6911b023865fb813216713274c7d0122ab..d6173bb12f3fa5588403d4bccbc983cac6ceb490 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
@@ -12,30 +12,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-//\r
-// private header files\r
-//\r
 #include "DebugSupport.h"\r
 \r
+IA32_IDT_GATE_DESCRIPTOR  NullDesc = {{0,0}};\r
+\r
 /**\r
-  Get Procedure Entry Point from IDT Gate Descriptor.\r
+  Get Interrupt Handle from IDT Gate Descriptor.\r
 \r
   @param  IdtGateDecriptor  IDT Gate Descriptor.\r
 \r
-  @return Procedure Entry Point located in IDT Gate Descriptor.\r
+  @return Interrupt Handle stored in IDT Gate Descriptor.\r
 \r
 **/\r
-UINTN GetProcedureEntryPoint (\r
+UINTN\r
+GetInterruptHandleFromIdt (\r
   IN IA32_IDT_GATE_DESCRIPTOR  *IdtGateDecriptor\r
   )\r
 {\r
-  UINTN      ProcedureEntryPoint;\r
+  UINTN      InterruptHandle;\r
  \r
-  ((UINT16 *) &ProcedureEntryPoint)[0] = (UINT16) IdtGateDecriptor->Bits.OffsetLow;\r
-  ((UINT16 *) &ProcedureEntryPoint)[1] = (UINT16) IdtGateDecriptor->Bits.OffsetHigh;\r
-  ((UINT32 *) &ProcedureEntryPoint)[1] = (UINT32) IdtGateDecriptor->Bits.OffsetUpper;\r
+  ((UINT16 *) &InterruptHandle)[0] = (UINT16) IdtGateDecriptor->Bits.OffsetLow;\r
+  ((UINT16 *) &InterruptHandle)[1] = (UINT16) IdtGateDecriptor->Bits.OffsetHigh;\r
+  ((UINT32 *) &InterruptHandle)[1] = (UINT32) IdtGateDecriptor->Bits.OffsetUpper;\r
 \r
-  return ProcedureEntryPoint;\r
+  return InterruptHandle;\r
 }\r
 \r
 /**\r
@@ -48,10 +48,8 @@ UINTN GetProcedureEntryPoint (
                           for.\r
   @param  Stub            On successful exit, *Stub contains the newly allocated entry stub.\r
 \r
-  @retval EFI_SUCCESS     Always.\r
-\r
 **/\r
-EFI_STATUS\r
+VOID\r
 CreateEntryStub (\r
   IN EFI_EXCEPTION_TYPE     ExceptionType,\r
   OUT VOID                  **Stub\r
@@ -82,7 +80,7 @@ CreateEntryStub (
   //\r
   *(UINT32 *) &StubCopy[0x3] = (UINT32)((UINTN) CommonIdtEntry - (UINTN) &StubCopy[StubSize]);\r
 \r
-  return EFI_SUCCESS;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -123,7 +121,7 @@ ManageIdtEntryTable (
       //\r
       Status = EFI_ALREADY_STARTED;\r
     } else {\r
-      Status = UnhookEntry (ExceptionType);\r
+      UnhookEntry (ExceptionType);\r
     }\r
   } else {\r
     //\r
@@ -135,7 +133,7 @@ ManageIdtEntryTable (
       //\r
       Status = EFI_INVALID_PARAMETER;\r
     } else {\r
-      Status = HookEntry (ExceptionType, NewCallback);\r
+      HookEntry (ExceptionType, NewCallback);\r
     }\r
   }\r
  \r