UefiCpuPkg/PiSmmCpuDxeSmm: patch "gSmiCr3" with PatchInstructionX86()

Rename the variable to "gPatchSmiCr3" so that its association with
PatchInstructionX86() is clear from the declaration, change its type to
X86_ASSEMBLY_PATCH_LABEL, and patch it with PatchInstructionX86(). This
lets us remove the binary (DB) encoding of some instructions in
"SmiEntry.nasm".

Cc: Eric Dong <eric.dong@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=866
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
index f0c2892543..5c2eb9ab6a 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
@@ -107,7 +107,7 @@ typedef struct {
 ///

 X86_ASSEMBLY_PATCH_LABEL gPatchSmbase;

 X86_ASSEMBLY_PATCH_LABEL gPatchSmiStack;

-extern UINT32            gSmiCr3;

+X86_ASSEMBLY_PATCH_LABEL gPatchSmiCr3;

 extern volatile UINT8    gcSmiHandlerTemplate[];

 extern CONST UINT16      gcSmiHandlerSize;

 

@@ -719,7 +719,7 @@ InstallSmiHandler (
   //

   CpuSmiStack = (UINT32)((UINTN)SmiStack + StackSize - sizeof (UINTN));

   PatchInstructionX86 (gPatchSmiStack, CpuSmiStack, 4);

-  gSmiCr3               = Cr3;

+  PatchInstructionX86 (gPatchSmiCr3, Cr3, 4);

   PatchInstructionX86 (gPatchSmbase, SmBase, 4);

   gSmiHandlerIdtr.Base  = IdtBase;

   gSmiHandlerIdtr.Limit = (UINT16)(IdtSize - 1);