Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdePkg BaseLib NASM Thunk16: Remove remaining 'DB' code 

Convert remaining 'DB' code to assembly code by:
* Move instruction immediate data labels to end of instruction
* Use strict keyword to make sure immediate data size is not optimized

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16024 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jordan Justen 2014-09-01 17:23:57 +00:00 committed by jljusten
parent f6888eea46
commit 7458df400c
2 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
MdePkg/Library/BaseLib/Ia32/Thunk16.nasm
View File

@ -59,7 +59,7 @@ SECTION .data
; These are global constant to convey information to C code. ; These are global constant to convey information to C code.
; ;
ASM_PFX(m16Size) DW InternalAsmThunk16 - ASM_PFX(m16Start) ASM_PFX(m16Size) DW InternalAsmThunk16 - ASM_PFX(m16Start)
ASM_PFX(mThunk16Attr) DW _BackFromUserCode.ThunkAttr - ASM_PFX(m16Start) ASM_PFX(mThunk16Attr) DW _BackFromUserCode.ThunkAttrEnd - 4 - ASM_PFX(m16Start)
ASM_PFX(m16Gdt) DW _NullSegDesc - ASM_PFX(m16Start) ASM_PFX(m16Gdt) DW _NullSegDesc - ASM_PFX(m16Start)
ASM_PFX(m16GdtrBase) DW _16GdtrBase - ASM_PFX(m16Start) ASM_PFX(m16GdtrBase) DW _16GdtrBase - ASM_PFX(m16Start)
ASM_PFX(mTransition) DW _EntryPoint - ASM_PFX(m16Start) ASM_PFX(mTransition) DW _EntryPoint - ASM_PFX(m16Start)
@ -94,8 +94,8 @@ o32 call dword .Base ; push eip
push es push es
push ds push ds
pushad pushad
DB 66h, 0bah ; mov edx, imm32 mov edx, strict dword 0
.ThunkAttr: dd 0 .ThunkAttrEnd:
test dl, THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 test dl, THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15
jz .1 jz .1
mov ax, 2401h mov ax, 2401h
@ -116,18 +116,18 @@ o32 call dword .Base ; push eip
mov bx, [bp - IA32_REGS.size + IA32_REGS._EIP] mov bx, [bp - IA32_REGS.size + IA32_REGS._EIP]
shl eax, 4 ; shl eax, 4 shl eax, 4 ; shl eax, 4
add ebp, eax ; add ebp, eax add ebp, eax ; add ebp, eax
DB 66h, 0b8h ; mov eax, imm32 mov eax, strict dword 0
.SavedCr4: DD 0 .SavedCr4End:
mov cr4, eax mov cr4, eax
o32 lgdt [cs:bx + (SavedGdt - .Base)] o32 lgdt [cs:bx + (SavedGdt - .Base)]
DB 66h, 0b8h ; mov eax, imm32 mov eax, strict dword 0
.SavedCr0: DD 0 .SavedCr0End:
mov cr0, eax mov cr0, eax
DB 0b8h ; mov ax, imm16 mov ax, strict word 0
.SavedSs DW 0 .SavedSsEnd:
mov ss, eax mov ss, eax
DB 66h, 0bch ; mov esp, imm32 mov esp, strict dword 0
.SavedEsp DD 0 .SavedEspEnd:
o32 retf ; return to protected mode o32 retf ; return to protected mode
_EntryPoint: _EntryPoint:
@ -155,15 +155,14 @@ BITS 16
mov gs, cx mov gs, cx
mov cr0, eax ; real mode starts at next instruction mov cr0, eax ; real mode starts at next instruction
; which (per SDM) *must* be a far JMP. ; which (per SDM) *must* be a far JMP.
DB 0eah jmp 0:strict word 0
.RealAddr: DW 0, 0 .RealAddrEnd:
mov cr4, ebp mov cr4, ebp
mov ss, si ; set up 16-bit stack segment mov ss, si ; set up 16-bit stack segment
xchg esp, ebx ; set up 16-bit stack pointer xchg esp, ebx ; set up 16-bit stack pointer
mov bp, [esp + IA32_REGS.size] mov bp, [esp + IA32_REGS.size]
mov [cs:bp + (_BackFromUserCode.SavedSs - _BackFromUserCode)], dx mov [cs:bp + (_BackFromUserCode.SavedSsEnd - 2 - _BackFromUserCode)], dx
mov [cs:bp + (_BackFromUserCode.SavedEsp - _BackFromUserCode)], ebx mov [cs:bp + (_BackFromUserCode.SavedEspEnd - 4 - _BackFromUserCode)], ebx
lidt [cs:bp + (_16Idtr - _BackFromUserCode)] lidt [cs:bp + (_16Idtr - _BackFromUserCode)]
popad popad
@ -224,28 +223,28 @@ BITS 32
rep movsd ; copy RegSet rep movsd ; copy RegSet
mov eax, [esp + 40] ; eax <- address of transition code mov eax, [esp + 40] ; eax <- address of transition code
mov esi, edx ; esi <- 16-bit stack segment mov esi, edx ; esi <- 16-bit stack segment
lea edx, [eax + (_BackFromUserCode.SavedCr0 - ASM_PFX(m16Start))] lea edx, [eax + (_BackFromUserCode.SavedCr0End - ASM_PFX(m16Start))]
mov ecx, eax mov ecx, eax
and ecx, 0fh and ecx, 0fh
shl eax, 12 shl eax, 12
lea ecx, [ecx + (_BackFromUserCode - ASM_PFX(m16Start))] lea ecx, [ecx + (_BackFromUserCode - ASM_PFX(m16Start))]
mov ax, cx mov ax, cx
stosd ; [edi] <- return address of user code stosd ; [edi] <- return address of user code
add eax, _ToUserCode.RealAddr + 4 - _BackFromUserCode add eax, _ToUserCode.RealAddrEnd - _BackFromUserCode
mov [edx + (_ToUserCode.RealAddr - _BackFromUserCode.SavedCr0)], eax mov [edx + (_ToUserCode.RealAddrEnd - 4 - _BackFromUserCode.SavedCr0End)], eax
sgdt [edx + (SavedGdt - _BackFromUserCode.SavedCr0)] sgdt [edx + (SavedGdt - _BackFromUserCode.SavedCr0End)]
sidt [esp + 36] ; save IDT stack in argument space sidt [esp + 36] ; save IDT stack in argument space
mov eax, cr0 mov eax, cr0
mov [edx], eax ; save CR0 in _BackFromUserCode.SavedCr0 mov [edx - 4], eax ; save CR0 in _BackFromUserCode.SavedCr0End - 4
and eax, 7ffffffeh ; clear PE, PG bits and eax, 7ffffffeh ; clear PE, PG bits
mov ebp, cr4 mov ebp, cr4
mov [edx + (_BackFromUserCode.SavedCr4 - _BackFromUserCode.SavedCr0)], ebp mov [edx + (_BackFromUserCode.SavedCr4End - 4 - _BackFromUserCode.SavedCr0End)], ebp
and ebp, ~30h ; clear PAE, PSE bits and ebp, ~30h ; clear PAE, PSE bits
push 10h push 10h
pop ecx ; ecx <- selector for data segments pop ecx ; ecx <- selector for data segments
lgdt [edx + (_16Gdtr - _BackFromUserCode.SavedCr0)] lgdt [edx + (_16Gdtr - _BackFromUserCode.SavedCr0End)]
pushfd ; Save df/if indeed pushfd ; Save df/if indeed
call dword far [edx + (_EntryPoint - _BackFromUserCode.SavedCr0)] call dword far [edx + (_EntryPoint - _BackFromUserCode.SavedCr0End)]
popfd popfd
lidt [esp + 36] ; restore protected mode IDTR lidt [esp + 36] ; restore protected mode IDTR
lea eax, [ebp - IA32_REGS.size] ; eax <- the address of IA32_REGS lea eax, [ebp - IA32_REGS.size] ; eax <- the address of IA32_REGS

48
MdePkg/Library/BaseLib/X64/Thunk16.nasm
View File

@ -57,7 +57,7 @@ SECTION .data
; These are global constant to convey information to C code. ; These are global constant to convey information to C code.
; ;
ASM_PFX(m16Size) DW InternalAsmThunk16 - ASM_PFX(m16Start) ASM_PFX(m16Size) DW InternalAsmThunk16 - ASM_PFX(m16Start)
ASM_PFX(mThunk16Attr) DW _BackFromUserCode.ThunkAttr - ASM_PFX(m16Start) ASM_PFX(mThunk16Attr) DW _BackFromUserCode.ThunkAttrEnd - 4 - ASM_PFX(m16Start)
ASM_PFX(m16Gdt) DW _NullSeg - ASM_PFX(m16Start) ASM_PFX(m16Gdt) DW _NullSeg - ASM_PFX(m16Start)
ASM_PFX(m16GdtrBase) DW _16GdtrBase - ASM_PFX(m16Start) ASM_PFX(m16GdtrBase) DW _16GdtrBase - ASM_PFX(m16Start)
ASM_PFX(mTransition) DW _EntryPoint - ASM_PFX(m16Start) ASM_PFX(mTransition) DW _EntryPoint - ASM_PFX(m16Start)
@ -93,8 +93,8 @@ o32 call dword .Base ; push eip
push es push es
push ds push ds
pushad pushad
DB 66h, 0bah ; mov edx, imm32 mov edx, strict dword 0
.ThunkAttr: dd 0 .ThunkAttrEnd:
test dl, THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15 test dl, THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15
jz .1 jz .1
mov ax, 2401h mov ax, 2401h
@ -117,27 +117,25 @@ o32 call dword .Base ; push eip
add ebp, eax ; add ebp, eax add ebp, eax ; add ebp, eax
mov eax, cs mov eax, cs
shl eax, 4 shl eax, 4
lea eax, [eax + ebx + (.64BitCode - .Base)] lea eax, [eax + ebx + (.X64JmpEnd - .Base)]
mov [cs:bx + (.64Eip - .Base)], eax mov [cs:bx + (.X64JmpEnd - 6 - .Base)], eax
DB 66h, 0b8h ; mov eax, imm32 mov eax, strict dword 0
.SavedCr4: DD 0 .SavedCr4End:
mov cr4, eax mov cr4, eax
o32 lgdt [cs:bx + (SavedGdt - .Base)] o32 lgdt [cs:bx + (SavedGdt - .Base)]
mov ecx, 0c0000080h mov ecx, 0c0000080h
rdmsr rdmsr
or ah, 1 or ah, 1
wrmsr wrmsr
DB 66h, 0b8h ; mov eax, imm32 mov eax, strict dword 0
.SavedCr0: DD 0 .SavedCr0End:
mov cr0, eax mov cr0, eax
DB 66h, 0eah ; jmp far cs:.64Bit jmp 0:strict dword 0
.64Eip: DD 0 .X64JmpEnd:
.SavedCs: DW 0
.64BitCode:
BITS 64 BITS 64
nop nop
db 048h, 0bch ; mov rsp, imm64 mov rsp, strict qword 0
.SavedSp: DQ 0 ; restore stack .SavedSpEnd:
nop nop
ret ret
@ -258,7 +256,7 @@ BITS 64
add edi, eax ; edi <- linear address of 16-bit stack add edi, eax ; edi <- linear address of 16-bit stack
pop rcx pop rcx
rep movsd ; copy RegSet rep movsd ; copy RegSet
lea ecx, [rdx + (_BackFromUserCode.SavedCr4 - ASM_PFX(m16Start))] lea ecx, [rdx + (_BackFromUserCode.SavedCr4End - ASM_PFX(m16Start))]
mov eax, edx ; eax <- transition code address mov eax, edx ; eax <- transition code address
and edx, 0fh and edx, 0fh
shl eax, 12 ; segment address in high order 16 bits shl eax, 12 ; segment address in high order 16 bits
@ -267,11 +265,11 @@ BITS 64
sgdt [rsp + 60h] ; save GDT stack in argument space sgdt [rsp + 60h] ; save GDT stack in argument space
movzx r10, word [rsp + 60h] ; r10 <- GDT limit movzx r10, word [rsp + 60h] ; r10 <- GDT limit
lea r11, [rcx + (InternalAsmThunk16 - _BackFromUserCode.SavedCr4) + 0xf] lea r11, [rcx + (InternalAsmThunk16 - _BackFromUserCode.SavedCr4End) + 0xf]
and r11, ~0xf ; r11 <- 16-byte aligned shadowed GDT table in real mode buffer and r11, ~0xf ; r11 <- 16-byte aligned shadowed GDT table in real mode buffer
mov [rcx + (SavedGdt - _BackFromUserCode.SavedCr4)], r10w ; save the limit of shadowed GDT table mov [rcx + (SavedGdt - _BackFromUserCode.SavedCr4End)], r10w ; save the limit of shadowed GDT table
mov [rcx + (SavedGdt - _BackFromUserCode.SavedCr4) + 2], r11 ; save the base address of shadowed GDT table mov [rcx + (SavedGdt - _BackFromUserCode.SavedCr4End) + 2], r11 ; save the base address of shadowed GDT table
mov rsi, [rsp + 62h] ; rsi <- the original GDT base address mov rsi, [rsp + 62h] ; rsi <- the original GDT base address
xchg rcx, r10 ; save rcx to r10 and initialize rcx to be the limit of GDT table xchg rcx, r10 ; save rcx to r10 and initialize rcx to be the limit of GDT table
@ -283,24 +281,24 @@ BITS 64
sidt [rsp + 50h] ; save IDT stack in argument space sidt [rsp + 50h] ; save IDT stack in argument space
mov rax, cr0 mov rax, cr0
mov [rcx + (_BackFromUserCode.SavedCr0 - _BackFromUserCode.SavedCr4)], eax mov [rcx + (_BackFromUserCode.SavedCr0End - 4 - _BackFromUserCode.SavedCr4End)], eax
and eax, 7ffffffeh ; clear PE, PG bits and eax, 7ffffffeh ; clear PE, PG bits
mov rbp, cr4 mov rbp, cr4
mov [rcx], ebp ; save CR4 in _BackFromUserCode.SavedCr4 mov [rcx - 4], ebp ; save CR4 in _BackFromUserCode.SavedCr4End - 4
and ebp, ~30h ; clear PAE, PSE bits and ebp, ~30h ; clear PAE, PSE bits
mov esi, r8d ; esi <- 16-bit stack segment mov esi, r8d ; esi <- 16-bit stack segment
push DATA32 push DATA32
pop rdx ; rdx <- 32-bit data segment selector pop rdx ; rdx <- 32-bit data segment selector
lgdt [rcx + (_16Gdtr - _BackFromUserCode.SavedCr4)] lgdt [rcx + (_16Gdtr - _BackFromUserCode.SavedCr4End)]
mov ss, edx mov ss, edx
pushfq pushfq
lea edx, [rdx + DATA16 - DATA32] lea edx, [rdx + DATA16 - DATA32]
lea r8, [REL .RetFromRealMode] lea r8, [REL .RetFromRealMode]
push r8 push r8
mov r8d, cs mov r8d, cs
mov [rcx + (_BackFromUserCode.SavedCs - _BackFromUserCode.SavedCr4)], r8w mov [rcx + (_BackFromUserCode.X64JmpEnd - 2 - _BackFromUserCode.SavedCr4End)], r8w
mov [rcx + (_BackFromUserCode.SavedSp - _BackFromUserCode.SavedCr4)], rsp mov [rcx + (_BackFromUserCode.SavedSpEnd - 8 - _BackFromUserCode.SavedCr4End)], rsp
jmp dword far [rcx + (_EntryPoint - _BackFromUserCode.SavedCr4)] jmp dword far [rcx + (_EntryPoint - _BackFromUserCode.SavedCr4End)]
.RetFromRealMode: .RetFromRealMode:
popfq popfq
lgdt [rsp + 60h] ; restore protected mode GDTR lgdt [rsp + 60h] ; restore protected mode GDTR