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

Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2010-11-26 01:54:49 +00:00
parent 68bb5ce77e
commit 3e99020dbf
183 changed files with 15250 additions and 2636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
EdkCompatibilityPkg/Foundation/Library/Thunk16/X64/Fx.S
View File

@@ -41,8 +41,30 @@ ASM_PFX(AsmFxSave):
# IN CONST IA32_FX_BUFFER *Buffer
# );
#------------------------------------------------------------------------------
ASM_PFX(AsmFxRestore):
fxrstor (%rcx)
retq
#------------------------------------------------------------------------------
# UINTN
# AsmGetEflags (
# VOID
# );
#------------------------------------------------------------------------------
ASM_PFX(AsmGetEflags):
pushfq
popq %rax
ret
#AsmGetEflags ENDP
#------------------------------------------------------------------------------
# VOID
# AsmSetEflags (
# IN UINTN Eflags
# );
#------------------------------------------------------------------------------
ASM_PFX(AsmSetEflags):
pushq %rcx
popfq
ret
#AsmSetEflags ENDP

26
EdkCompatibilityPkg/Foundation/Library/Thunk16/X64/Fx.asm
View File

@@ -1,6 +1,6 @@
;*****************************************************************************
;*
;* Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
;* Copyright (c) 2006 - 2010, 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
@@ -43,4 +43,28 @@ AsmFxRestore PROC
ret
AsmFxRestore ENDP
;------------------------------------------------------------------------------
; UINTN
; AsmGetEflags (
; VOID
; );
;------------------------------------------------------------------------------
AsmGetEflags PROC
pushfq
pop rax
ret
AsmGetEflags ENDP
;------------------------------------------------------------------------------
; VOID
; AsmSetEflags (
; IN UINTN Eflags
; );
;------------------------------------------------------------------------------
AsmSetEflags PROC
push rcx
popfq
ret
AsmSetEflags ENDP
END

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

@@ -1,6 +1,6 @@
#*****************************************************************************
#*
#* Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
#* Copyright (c) 2008 - 2010, 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
@@ -106,6 +106,9 @@ ASM_PFX(Thunk16):
pushq $0xe #push sizeof (IA32_REGS) / 4
pop %rcx
rep movsl %ds:(%rsi),%es:(%rdi)
#; copy eflags to stack frame
mov -16(%rsi), %rax
mov %rax, -80(%rsi)
pop %rbx #rbx <- 16-bit stack offset
lea Label,%eax #42 <_Thunk16+0x42>
stos %eax,%es:(%rdi)
@@ -183,27 +186,30 @@ ASM_PFX(RealMode):
.byte 0x07 #pop es
popq %fs
popq %gs
add $0x8,%esp #skip RFLAGS
.byte 0x67 #test [esp + 0eh], 1
sub 64, %esp
.byte 0x66, 0x9d #popfd
add $0x4,%esp #skip high part of RFLAGS
.byte 0x67 #; test (_STK16 ptr [esp + STACK_PARAM_SIZE + sizeof(IA32_REGS)]).ThunkFlags, 1
.byte 0xf7
.byte 0x44
.byte 0x24
.byte 0x0e
.byte 0x4e
.byte 0x01
.byte 0x00
jz 1f
pushfq #pushf, actually
pushfq #pushf, actually, when it's INT#
1:
.byte 0x0e #push cs
.byte 0x68 #push /iw
.word FarCallRet - _Code16Addr
jz 2f
.byte 0x66
ljmp *6(%esp)
ljmp *70(%esp)
2:
.byte 0x66
ljmp *4(%esp)
ljmp *68(%esp)
FarCallRet:
add 64, %esp
.byte 0x66
push $0x00 #push a dword of zero
.byte 0x66

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

@@ -1,6 +1,6 @@
;*****************************************************************************
;*
;* Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
;* Copyright (c) 2006 - 2010, 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
@@ -49,6 +49,8 @@ _16Gdtr LABEL FWORD
.code
STACK_PARAM_SIZE EQU 16
IA32_REGS STRUC 4t
_EDI DD ?
_ESI DD ?
@@ -98,6 +100,11 @@ _Thunk16 PROC USES rbp rbx rsi rdi r12 r13 r14 r15
push sizeof (IA32_REGS) / 4
pop rcx
rep movsd
; copy eflags to stack frame
mov rax, (IA32_REGS ptr [rsi - sizeof(IA32_REGS)])._RFLAGS
mov [rdi - sizeof(IA32_REGS) - STACK_PARAM_SIZE - 8], rax
pop rbx ; rbx <- 16-bit stack offset
lea eax, @F ; return offset
stosd
@@ -165,22 +172,27 @@ RealMode PROC
DB 7 ; pop es
pop fs
pop gs
sub esp, (sizeof(IA32_REGS) - 16) + STACK_PARAM_SIZE + 8
add esp, 8 ; skip RFLAGS
DB 67h, 0f7h, 44h, 24h, 0eh, 1, 0 ; test [esp + 0eh], 1
DB 66h, 9Dh ; popfd
add esp, 4 ; skip high part of RFLAGS
DB 67h, 0f7h, 44h, 24h ; test (_STK16 ptr [esp + STACK_PARAM_SIZE + sizeof(IA32_REGS)]).ThunkFlags, 1
DB (STACK_PARAM_SIZE + sizeof(IA32_REGS) + 6)
DB 1, 0
jz @F
pushfq ; pushf, actually
pushfq ; pushf, actually, when it's INT#
@@:
DB 0eh ; push cs
DB 68h ; push /iw
DW @FarCallRet - _Code16Addr
jz @F
DB 66h
jmp fword ptr [esp + 6]
jmp fword ptr [esp + 6 + STACK_PARAM_SIZE + sizeof(IA32_REGS) - 8]
@@:
DB 66h
jmp fword ptr [esp + 4]
jmp fword ptr [esp + 4 + STACK_PARAM_SIZE + sizeof(IA32_REGS) - 8]
@FarCallRet:
add esp, (sizeof(IA32_REGS) - 16) + STACK_PARAM_SIZE + 8
DB 66h
push 0 ; push a dword of zero
pushf ; pushfd, actually