CpuException: Init global variables in-place

Additionally removed two useless global variables:
"SPIN_LOCK  mDisplayMessageSpinLock" from SMM instance.
"UINTN mEnabledInterruptNum" from DXE instance.

Signed-off-by: Ray Ni <ray.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
index 5083c4b8e8cee9c51b683d04f5754e72c01efb37..da5b96d6c63be1ed7d0337a95a3cc7788c1db154 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
@@ -16,9 +16,12 @@ CONST UINTN  mDoFarReturnFlag = 0;
 \r
 RESERVED_VECTORS_DATA      mReservedVectorsData[CPU_EXCEPTION_NUM];\r
 EFI_CPU_INTERRUPT_HANDLER  mExternalInterruptHandlerTable[CPU_EXCEPTION_NUM];\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
+EXCEPTION_HANDLER_DATA     mExceptionHandlerData = {\r
+  0,   // To be fixed\r
+  0,   // To be fixed\r
+  mReservedVectorsData,\r
+  mExternalInterruptHandlerTable\r
+};\r

 \r
 UINT8  mNewStack[CPU_STACK_SWITCH_EXCEPTION_NUMBER *\r
                  CPU_KNOWN_GOOD_STACK_SIZE];\r
 \r
 UINT8  mNewStack[CPU_STACK_SWITCH_EXCEPTION_NUMBER *\r
                  CPU_KNOWN_GOOD_STACK_SIZE];\r


@@ -62,8 +65,6 @@ InitializeCpuExceptionHandlers (
   IN EFI_VECTOR_HANDOFF_INFO  *VectorInfo OPTIONAL\r
   )\r
 {\r
   IN EFI_VECTOR_HANDOFF_INFO  *VectorInfo OPTIONAL\r
   )\r
 {\r

-  mExceptionHandlerData.ReservedVectors          = mReservedVectorsData;\r
-  mExceptionHandlerData.ExternalInterruptHandler = mExternalInterruptHandlerTable;\r

   InitializeSpinLock (&mExceptionHandlerData.DisplayMessageSpinLock);\r
   return InitializeCpuExceptionHandlersWorker (VectorInfo, &mExceptionHandlerData);\r
 }\r
   InitializeSpinLock (&mExceptionHandlerData.DisplayMessageSpinLock);\r
   return InitializeCpuExceptionHandlersWorker (VectorInfo, &mExceptionHandlerData);\r
 }\r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
index 77ee74579fb261e0a068f6ba4824c68811752546..9f0af4120a7bf034d7a08fcabcbdd27fc69a6481 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
@@ -11,14 +11,14 @@
 \r
 CONST UINTN  mDoFarReturnFlag = 1;\r
 \r
 \r
 CONST UINTN  mDoFarReturnFlag = 1;\r
 \r

-//\r
-// Spin lock for CPU information display\r
-//\r
-SPIN_LOCK  mDisplayMessageSpinLock;\r
-\r

 RESERVED_VECTORS_DATA      mReservedVectorsData[CPU_EXCEPTION_NUM];\r
 EFI_CPU_INTERRUPT_HANDLER  mExternalInterruptHandlerTable[CPU_EXCEPTION_NUM];\r
 RESERVED_VECTORS_DATA      mReservedVectorsData[CPU_EXCEPTION_NUM];\r
 EFI_CPU_INTERRUPT_HANDLER  mExternalInterruptHandlerTable[CPU_EXCEPTION_NUM];\r

-EXCEPTION_HANDLER_DATA     mExceptionHandlerData;\r
+EXCEPTION_HANDLER_DATA     mExceptionHandlerData = {\r
+  0,   // To be fixed\r
+  0,   // To be fixed\r
+  mReservedVectorsData,\r
+  mExternalInterruptHandlerTable\r
+};\r

 \r
 /**\r
   Common exception handler.\r
 \r
 /**\r
   Common exception handler.\r


@@ -58,8 +58,6 @@ InitializeCpuExceptionHandlers (
   IN EFI_VECTOR_HANDOFF_INFO  *VectorInfo OPTIONAL\r
   )\r
 {\r
   IN EFI_VECTOR_HANDOFF_INFO  *VectorInfo OPTIONAL\r
   )\r
 {\r

-  mExceptionHandlerData.ReservedVectors          = mReservedVectorsData;\r
-  mExceptionHandlerData.ExternalInterruptHandler = mExternalInterruptHandlerTable;\r

   InitializeSpinLock (&mExceptionHandlerData.DisplayMessageSpinLock);\r
   return InitializeCpuExceptionHandlersWorker (VectorInfo, &mExceptionHandlerData);\r
 }\r
   InitializeSpinLock (&mExceptionHandlerData.DisplayMessageSpinLock);\r
   return InitializeCpuExceptionHandlersWorker (VectorInfo, &mExceptionHandlerData);\r
 }\r