EdkCompatibilityPkg: SmmBaseHelper: remove set but unused variables

This patch also eliminates an AsmReadCr3() call in PageFaultHandler(), but
that should not be a problem.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
index 16566d2b2948ffa9404762b2fd815de4bb213e0e..5f220dd476955c7b59425a4cbf79fe3c08cda3d7 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
+++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
@@ -228,7 +228,6 @@ WriteCpuSaveState (
   IN EFI_SMM_CPU_SAVE_STATE  *ToWrite\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
   UINTN                  Index;\r
   EFI_SMM_CPU_STATE      *State;\r
   EFI_SMI_CPU_SAVE_STATE *SaveState;\r
@@ -250,14 +249,14 @@ WriteCpuSaveState (
   State->x86.AutoHALTRestart = SaveState->AutoHALTRestart;\r
   \r
   for (Index = 0; Index < sizeof (mCpuSaveStateConvTable) / sizeof (CPU_SAVE_STATE_CONVERSION); Index++) {\r
-    Status = mSmmCpu->WriteSaveState (\r
-                        mSmmCpu,\r
-                        (UINTN)sizeof (UINT32),\r
-                        mCpuSaveStateConvTable[Index].Register,\r
-                        CpuIndex,\r
-                        ((UINT8 *)SaveState) + \r
-                        mCpuSaveStateConvTable[Index].Offset\r
-                        );\r
+    mSmmCpu->WriteSaveState (\r
+               mSmmCpu,\r
+               (UINTN)sizeof (UINT32),\r
+               mCpuSaveStateConvTable[Index].Register,\r
+               CpuIndex,\r
+               ((UINT8 *)SaveState) +\r
+               mCpuSaveStateConvTable[Index].Offset\r
+               );\r
   }\r
 }\r
 \r
@@ -345,14 +344,12 @@ PageFaultHandler (
   )\r
 {\r
   BOOLEAN        IsHandled;\r
-  UINT64         *PageTable;\r
   UINT64         PFAddress;\r
   UINTN          NumCpuStatePages;\r
   \r
   ASSERT (mPageTableHookEnabled);\r
   AcquireSpinLock (&mPFLock);\r
 \r
-  PageTable = (UINT64*)(UINTN)(AsmReadCr3 () & mPhyMask);\r
   PFAddress = AsmReadCr2 ();\r
   NumCpuStatePages = EFI_SIZE_TO_PAGES (mNumberOfProcessors * sizeof (EFI_SMM_CPU_SAVE_STATE));\r
   IsHandled = FALSE;\r