UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[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 3143bafee734a990960999ab904c6a1efb27ef7c..8d7b63ac022747bf550f6dbe46066acd0a6af30e 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
@@ -1,20 +1,16 @@
 /** @file\r
   X64 specific functions to support Debug Support protocol.\r
 \r
-Copyright (c) 2008, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
-#include "DebugSupport.h"\r
+#include "PlDebugSupport.h"\r
 \r
-IA32_IDT_GATE_DESCRIPTOR  NullDesc = {{0,0}};\r
+IA32_IDT_GATE_DESCRIPTOR  NullDesc = {\r
+  { 0, 0 }\r
+};\r
 \r
 /**\r
   Get Interrupt Handle from IDT Gate Descriptor.\r
@@ -29,11 +25,16 @@ GetInterruptHandleFromIdt (
   IN IA32_IDT_GATE_DESCRIPTOR  *IdtGateDecriptor\r
   )\r
 {\r
-  UINTN      InterruptHandle;\r
- \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
+  UINTN  InterruptHandle;\r
+\r
+  //\r
+  // InterruptHandle  0-15 : OffsetLow\r
+  // InterruptHandle 16-31 : OffsetHigh\r
+  // InterruptHandle 32-63 : OffsetUpper\r
+  //\r
+  InterruptHandle = ((UINTN)IdtGateDecriptor->Bits.OffsetLow) |\r
+                    (((UINTN)IdtGateDecriptor->Bits.OffsetHigh)  << 16) |\r
+                    (((UINTN)IdtGateDecriptor->Bits.OffsetUpper) << 32);\r
 \r
   return InterruptHandle;\r
 }\r
@@ -51,11 +52,11 @@ GetInterruptHandleFromIdt (
 **/\r
 VOID\r
 CreateEntryStub (\r
-  IN EFI_EXCEPTION_TYPE     ExceptionType,\r
-  OUT VOID                  **Stub\r
+  IN EFI_EXCEPTION_TYPE  ExceptionType,\r
+  OUT VOID               **Stub\r
   )\r
 {\r
-  UINT8       *StubCopy;\r
+  UINT8  *StubCopy;\r
 \r
   StubCopy = *Stub;\r
 \r
@@ -73,12 +74,12 @@ CreateEntryStub (
   //\r
   // poke in the exception type so the second push pushes the exception type\r
   //\r
-  StubCopy[0x1] = (UINT8) ExceptionType;\r
+  StubCopy[0x1] = (UINT8)ExceptionType;\r
 \r
   //\r
   // fixup the jump target to point to the common entry\r
   //\r
-  *(UINT32 *) &StubCopy[0x3] = (UINT32)((UINTN) CommonIdtEntry - (UINTN) &StubCopy[StubSize]);\r
+  *(UINT32 *)&StubCopy[0x3] = (UINT32)((UINTN)CommonIdtEntry - (UINTN)&StubCopy[StubSize]);\r
 \r
   return;\r
 }\r
@@ -103,8 +104,8 @@ CreateEntryStub (
 **/\r
 EFI_STATUS\r
 ManageIdtEntryTable (\r
-  VOID               (*NewCallback)(),\r
-  EFI_EXCEPTION_TYPE ExceptionType\r
+  CALLBACK_FUNC       NewCallback,\r
+  EFI_EXCEPTION_TYPE  ExceptionType\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -136,6 +137,6 @@ ManageIdtEntryTable (
       HookEntry (ExceptionType, NewCallback);\r
     }\r
   }\r
- \r
+\r
   return Status;\r
 }\r