mirror of https://github.com/acidanthera/audk.git
1. Fixed bug in FlushCacheLine.asm, added return value
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:
parent
ee80c4d024
commit
939d540699
|
@ -27,7 +27,11 @@
|
|||
|
||||
InternalX86EnablePaging64 PROC
|
||||
cli
|
||||
mov [esp], @F ; offset for far retf
|
||||
|
||||
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)
|
||||
mov cr4, eax ; enable PAE
|
||||
|
@ -39,17 +43,28 @@ InternalX86EnablePaging64 PROC
|
|||
bts eax, 31
|
||||
mov cr0, eax ; enable paging
|
||||
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
|
||||
mov ebx, [esp] ; mov rbx, [esp]
|
||||
mov ebx, [esp + 8] ; mov rbx, [esp]
|
||||
DB 67h, 48h
|
||||
mov ecx, [esp + 8] ; mov rcx, [esp + 8]
|
||||
mov ecx, [esp + 10h] ; mov rcx, [esp + 8]
|
||||
DB 67h, 48h
|
||||
mov edx, [esp + 10h] ; mov rdx, [esp + 10h]
|
||||
mov edx, [esp + 18h] ; mov rdx, [esp + 10h]
|
||||
DB 67h, 48h
|
||||
mov esp, [esp + 18h] ; mov rsp, [esp + 18h]
|
||||
mov esp, [esp + 20h] ; mov rsp, [esp + 18h]
|
||||
DB 48h
|
||||
add esp, -20h ; add rsp, -20h
|
||||
call ebx ; call rbx
|
||||
jmp $
|
||||
InternalX86EnablePaging64 ENDP
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
.code
|
||||
|
||||
;------------------------------------------------------------------------------
|
||||
; VOID *
|
||||
; VOID
|
||||
; EFIAPI
|
||||
; AsmFlushCacheLine (
|
||||
; IN VOID *LinearAddress
|
||||
|
|
Loading…
Reference in New Issue