Fix a bug in SmmBaseHelper driver that the JMP instruction which jumps to the origina...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10681 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.S b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.S
index bcf2bd61183dd56839dae845825b84748530e0cb..5a50507353b55ba29940672e5878f494142d7b69 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.S
+++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.S
@@ -40,7 +40,7 @@ ASM_PFX(PageFaultHandlerHook):
     popq     %rcx\r
     popq     %rax                         # restore all volatile registers\r
     jnz      L1\r
-    jmp      ASM_PFX(mOriginalHandler)\r
+    jmpq     *ASM_PFX(mOriginalHandler)\r
 L1:\r
     addq     $0x08, %rsp                  # skip error code for PF\r
     iretq\r

diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
index 2c695e3b88584e73cef0263457adc54c161b2161..2bc6abdd2e8d1654a82eeb1ec44b2b22924de152 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
+++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
@@ -19,8 +19,8 @@
 ;
 ;------------------------------------------------------------------------------
 
-mOriginalHandler PROTO
-PageFaultHandler PROTO
+EXTERN mOriginalHandler:QWORD
+EXTERN PageFaultHandler:PROC
 
   .code
 
@@ -49,4 +49,4 @@ PageFaultHandlerHook PROC
     add     rsp, 08h                    ; skip error code for PF
     iretq
 PageFaultHandlerHook ENDP
-  END
\ No newline at end of file
+  END