Fix bug in EBC thunk for X64 that appears when higher levels of compiler optimization...

This is a temporary fix that should for for most tool chains.  A more complete fix will be required to guarantee compatibility with all tool chains.

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

diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S b/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S
index acebb63a7730f1ac6b459cdcc1cca0127065b5c5..e7bda2f5e3d3929e80c619c41573ea31bd448958 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S
+++ b/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S
@@ -86,6 +86,7 @@ ASM_PFX(EbcLLCALLEXNative):
 #\r
 ASM_GLOBAL ASM_PFX(EbcLLGetEbcEntryPoint);\r
 ASM_PFX(EbcLLGetEbcEntryPoint):\r
+    mov    %r10, %rax\r
     ret\r
 \r
 #/*++\r

diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c b/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
index 6c0428d9cc94a0b00f6b79f606b93494c86d9e46..ef4b4c4c0ddbd0addf1c4de78a2e62b7a2e91918 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
+++ b/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
@@ -412,7 +412,7 @@ EbcCreateThunks (
 \r
   //\r
   // Add code bytes to load up a processor register with the EBC entry point.\r
-  // mov r10, 123456789abcdef0h  => 48 B8 F0 DE BC 9A 78 56 34 12\r
+  // mov r10, 123456789abcdef0h  => 49 BA F0 DE BC 9A 78 56 34 12\r
   // The first 8 bytes of the thunk entry is the address of the EBC\r
   // entry point.\r
   //\r