UefiCpuPkg/ExceptionLib: Move global variable location

Move some global variables location from PeiDxeSmmCpuException.c to
DxeCpuException.c and SmmCpuException.c. And remove some un-used global
vairables.

Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
index 3320066564c35e48df5c10e8b0bc3d14133b2a6f..a61a52b19ab0ce526122190314a4aca304148b58 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
@@ -19,9 +19,15 @@
 \r
 CONST UINTN    mDoFarReturnFlag  = 0;\r
 \r
-extern EFI_CPU_INTERRUPT_HANDLER   *mExternalInterruptHandler;\r
-extern RESERVED_VECTORS_DATA       mReservedVectorsData[CPU_EXCEPTION_NUM];\r
-extern EFI_CPU_INTERRUPT_HANDLER   mExternalInterruptHandlerTable[CPU_EXCEPTION_NUM];\r
+//\r
+// Image align size for DXE/SMM\r
+//\r
+CONST UINTN      mImageAlignSize = SIZE_4KB;\r
+\r
+RESERVED_VECTORS_DATA       mReservedVectorsData[CPU_EXCEPTION_NUM];\r
+EFI_CPU_INTERRUPT_HANDLER   mExternalInterruptHandlerTable[CPU_EXCEPTION_NUM];\r
+UINTN                       mEnabledInterruptNum = 0;\r
+\r
 EXCEPTION_HANDLER_DATA      mExceptionHandlerData;\r
 \r
 /**\r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c
index d4bc293db073121eb18019d68864088cd9724202..02d56223c6b7462e112858fd40336f202e84fdac 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c
@@ -15,17 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "CpuExceptionCommon.h"\r
 #include <Library/DebugLib.h>\r
 \r
-\r
-//\r
-// Image align size for DXE/SMM\r
-//\r
-CONST UINTN      mImageAlignSize = SIZE_4KB;\r
-\r
-RESERVED_VECTORS_DATA       mReservedVectorsData[CPU_EXCEPTION_NUM];\r
-EFI_CPU_INTERRUPT_HANDLER   mExternalInterruptHandlerTable[CPU_EXCEPTION_NUM];\r
-EFI_CPU_INTERRUPT_HANDLER   *mExternalInterruptHandler = NULL;\r
-UINTN                       mEnabledInterruptNum = 0;\r
-\r
 /**\r
   Internal worker function for common exception handler.\r
 \r
@@ -196,11 +185,6 @@ UpdateIdtTable (
       break;\r
     }\r
   }\r
- \r
-  //\r
-  // Save Interrupt number to global variable used for RegisterCpuInterruptHandler ()\r
-  //\r
-  mEnabledInterruptNum = ExceptionHandlerData->IdtEntryCount;\r
 }\r
 \r
 /**\r
@@ -237,7 +221,6 @@ InitializeCpuExceptionHandlersWorker (
     }\r
   }\r
 \r
-  mExternalInterruptHandler = mExternalInterruptHandlerTable;\r
   //\r
   // Read IDT descriptor and calculate IDT size\r
   //\r
@@ -256,7 +239,7 @@ InitializeCpuExceptionHandlersWorker (
 \r
   ExceptionHandlerData->IdtEntryCount = IdtEntryCount;\r
   UpdateIdtTable (IdtTable, &TemplateMap, ExceptionHandlerData);\r
-  mEnabledInterruptNum = IdtEntryCount;\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
index 3528c8cc7518829b0bc3a829a529a0b2edba01cd..7ad228c806ad83bc29f8f37a672273aa835891a4 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
@@ -17,8 +17,18 @@
 \r
 CONST UINTN   mDoFarReturnFlag   = 1; \r
 \r
-extern RESERVED_VECTORS_DATA       mReservedVectorsData[CPU_EXCEPTION_NUM];\r
-extern EFI_CPU_INTERRUPT_HANDLER   mExternalInterruptHandlerTable[CPU_EXCEPTION_NUM];\r
+//\r
+// Spin lock for CPU information display\r
+//\r
+SPIN_LOCK        mDisplayMessageSpinLock;\r
+\r
+//\r
+// Image align size for DXE/SMM\r
+//\r
+CONST UINTN      mImageAlignSize = SIZE_4KB;\r
+\r
+RESERVED_VECTORS_DATA       mReservedVectorsData[CPU_EXCEPTION_NUM];\r
+EFI_CPU_INTERRUPT_HANDLER   mExternalInterruptHandlerTable[CPU_EXCEPTION_NUM];\r
 EXCEPTION_HANDLER_DATA      mExceptionHandlerData;\r
 /**\r
   Common exception handler.\r