Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com>
Cc: Sergey Isakov <isakov...@bk.ru>
---
MdePkg/Library/BaseLib/Ia32/Thunk16.nasm | 2 +-
MdePkg/Library/BaseLib/X64/Thunk16.nasm | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.nasm
b/MdePkg/Library/BaseLib/Ia32/Thunk16.nasm
index e3d0d4e..794d831 100644
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/Thunk16.nasm
@@ -58,7 +58,7 @@ SECTION .data
;
; These are global constant to convey information to C code.
;
-ASM_PFX(m16Size) DW InternalAsmThunk16 - ASM_PFX(m16Start)
+ASM_PFX(m16Size) DW ASM_PFX(InternalAsmThunk16) -
ASM_PFX(m16Start)
ASM_PFX(mThunk16Attr) DW _BackFromUserCode.ThunkAttrEnd - 4 -
ASM_PFX(m16Start)
ASM_PFX(m16Gdt) DW _NullSegDesc - ASM_PFX(m16Start)
ASM_PFX(m16GdtrBase) DW _16GdtrBase - ASM_PFX(m16Start)
diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.nasm
b/MdePkg/Library/BaseLib/X64/Thunk16.nasm
index 7c4a8d3..cfa55d4 100644
--- a/MdePkg/Library/BaseLib/X64/Thunk16.nasm
+++ b/MdePkg/Library/BaseLib/X64/Thunk16.nasm
@@ -56,7 +56,7 @@ SECTION .data
;
; These are global constant to convey information to C code.
;
-ASM_PFX(m16Size) DW InternalAsmThunk16 - ASM_PFX(m16Start)
+ASM_PFX(m16Size) DW ASM_PFX(InternalAsmThunk16) -
ASM_PFX(m16Start)
ASM_PFX(mThunk16Attr) DW _BackFromUserCode.ThunkAttrEnd - 4 -
ASM_PFX(m16Start)
ASM_PFX(m16Gdt) DW _NullSeg - ASM_PFX(m16Start)
ASM_PFX(m16GdtrBase) DW _16GdtrBase - ASM_PFX(m16Start)
@@ -269,7 +269,7 @@ BITS 64
sgdt [rsp + 60h] ; save GDT stack in argument space
movzx r10, word [rsp + 60h] ; r10 <- GDT limit
- lea r11, [rcx + (InternalAsmThunk16 - _BackFromUserCode.SavedCr4End) +
0xf]
+ lea r11, [rcx + (ASM_PFX(InternalAsmThunk16) -
_BackFromUserCode.SavedCr4End) + 0xf]
and r11, ~0xf ; r11 <- 16-byte aligned shadowed GDT table
in real mode buffer
mov [rcx + (SavedGdt - _BackFromUserCode.SavedCr4End)], r10w ;
save the limit of shadowed GDT table
--
2.1.0
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
