tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 08:34:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

1. Fixed bug in FlushCacheLine.asm, added return value

Browse Source 
2. Updated AsmEnablePaging64(), added far jump to long mode with updating CS

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@649 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff 2006-06-28 08:42:05 +00:00
parent ee80c4d024
commit 939d540699
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
View File

@ -26,9 +26,13 @@
.code .code
InternalX86EnablePaging64 PROC InternalX86EnablePaging64 PROC
cli cli
mov [esp], @F ; offset for far retf
mov eax, cr4 mov ebx, [esp + 4] ; save CS
mov eax, OFFSET cs_address
mov word ptr [eax], bx ; Update CS selector for far jump
mov eax, cr4
or al, (1 SHL 5) or al, (1 SHL 5)
mov cr4, eax ; enable PAE mov cr4, eax ; enable PAE
mov ecx, 0c0000080h mov ecx, 0c0000080h
@ -37,19 +41,30 @@ InternalX86EnablePaging64 PROC
wrmsr wrmsr
mov eax, cr0 mov eax, cr0
bts eax, 31 bts eax, 31
mov cr0, eax ; enable paging mov cr0, eax ; enable paging
retf retf
@@: ; long mode starts here jmp go_to_long_mode
go_to_long_mode:
;
; This is the next instruction after enabling paging. Jump to long mode
;
db 067h
db 0eah ; Far Jump Offset:Selector to reload CS
dd OFFSET in_long_mode ; Offset is ensuing instruction boundary
cs_address:
dw 0h ; CS selector will be updated at runtime
in_long_mode: ; now in long mode
DB 67h, 48h DB 67h, 48h
mov ebx, [esp] ; mov rbx, [esp] mov ebx, [esp + 8] ; mov rbx, [esp]
DB 67h, 48h
mov ecx, [esp + 10h] ; mov rcx, [esp + 8]
DB 67h, 48h DB 67h, 48h
mov ecx, [esp + 8] ; mov rcx, [esp + 8] mov edx, [esp + 18h] ; mov rdx, [esp + 10h]
DB 67h, 48h DB 67h, 48h
mov edx, [esp + 10h] ; mov rdx, [esp + 10h] mov esp, [esp + 20h] ; mov rsp, [esp + 18h]
DB 67h, 48h
mov esp, [esp + 18h] ; mov rsp, [esp + 18h]
DB 48h DB 48h
add esp, -20h ; add rsp, -20h
call ebx ; call rbx call ebx ; call rbx
jmp $ jmp $
InternalX86EnablePaging64 ENDP InternalX86EnablePaging64 ENDP

2
MdePkg/Library/BaseLib/X64/FlushCacheLine.asm
View File

@ -24,7 +24,7 @@
.code .code
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; VOID * ; VOID
; EFIAPI ; EFIAPI
; AsmFlushCacheLine ( ; AsmFlushCacheLine (
; IN VOID *LinearAddress ; IN VOID *LinearAddress