sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the issue to clear the high 16-bit of EAX before use it Thunk code.

Browse Source 
This patch updates MdePkg BaseLib, EcpPkg EdkIIGlueLib BaseLib and ThunkLib.

Signed-off-by: lgao4
Reviewed-by: rsun3

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12877 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2011-12-15 08:27:53 +00:00
parent c577049aaf
commit 0249feb8b5
8 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
EdkCompatibilityPkg/Foundation/Library/Thunk16/Ia32/Thunk16.S
View File

@@ -1,6 +1,6 @@
#*****************************************************************************
#*
#* Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
#* Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
#* This program and the accompanying materials
#* are licensed and made available under the terms and conditions of the BSD License
#* which accompanies this distribution. The full text of the license may be found at
@@ -116,7 +116,8 @@ L_16Bit:
.byte 0xfc
L_Lable1:
movl %ss,%eax
xor %eax,%eax
movw %ss,%ax
shl $0x4,%eax
add %esp,%eax
lss 0x3c(%esp),%esp

5
EdkCompatibilityPkg/Foundation/Library/Thunk16/Ia32/Thunk16.asm
View File

@@ -1,6 +1,6 @@
;*****************************************************************************
;*
;* Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
;* Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
;* This program and the accompanying materials
;* are licensed and made available under the terms and conditions of the BSD License
;* which accompanies this distribution. The full text of the license may be found at
@@ -141,7 +141,8 @@ __Thunk16 PROC USES ebp ebx esi edi ds es fs gs
mov cr4, eax ; disable PAE & PSE
db 67h, 0FFh, 06Ch, 024h, 0FCh ; jmp dword ptr [esp-4]
@@:
mov eax, ss
xor eax, eax
mov ax, ss
shl eax, 4
add eax, esp ; eax <- address of 16-bit stack
lss esp, fword ptr (_STK16 ptr [esp + sizeof (IA32_REGS)]).SavedEsp

2
EdkCompatibilityPkg/Foundation/Library/Thunk16/X64/Thunk16.S
View File

@@ -148,7 +148,7 @@ Label_16Bit:
Label:
xor %rax,%rax
movl %ss,%eax
movw %ss,%ax
shl $0x4,%eax
add %esp,%eax
mov %r15,%rsp

2
EdkCompatibilityPkg/Foundation/Library/Thunk16/X64/Thunk16.asm
View File

@@ -144,7 +144,7 @@ _Thunk16 PROC USES rbp rbx rsi rdi r12 r13 r14 r15
retf
@@:
xor rax, rax
mov eax, ss
mov ax, ss
shl eax, 4
add eax, esp ; rax <- address of 16-bit stack
mov rsp, r15