Skip to content

Commit

Permalink
OvmfPkg LoadLinuxLib: Convert Ia32/JumpToKernel.asm to NASM
Browse files Browse the repository at this point in the history
The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
Ia32/JumpToKernel.asm to Ia32/JumpToKernel.nasm

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16287 6f19259b-4bc3-4df7-8a09-765794883524
  • Loading branch information
jljusten2 authored and jljusten committed Oct 31, 2014
1 parent b81cc7d commit 529fd9a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 60 deletions.
46 changes: 0 additions & 46 deletions OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
;
;------------------------------------------------------------------------------

.586p
.model flat,C
.code
SECTION .text

;------------------------------------------------------------------------------
; VOID
Expand All @@ -24,14 +22,13 @@
; VOID *KernelBootParams
; );
;------------------------------------------------------------------------------
JumpToKernel PROC
global ASM_PFX(JumpToKernel)
ASM_PFX(JumpToKernel):

mov esi, [esp + 8]
call DWORD PTR [esp + 4]
call DWORD [esp + 4]
ret

JumpToKernel ENDP

;------------------------------------------------------------------------------
; VOID
; EFIAPI
Expand All @@ -42,13 +39,11 @@ JumpToKernel ENDP
; VOID *KernelStart
; );
;------------------------------------------------------------------------------
JumpToUefiKernel PROC
global ASM_PFX(JumpToUefiKernel)
ASM_PFX(JumpToUefiKernel):

mov eax, [esp + 12]
mov eax, [eax + 264h]
mov eax, [eax + 0x264]
add eax, [esp + 16]
jmp eax

JumpToUefiKernel ENDP

END
3 changes: 1 addition & 2 deletions OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
LinuxGdt.c

[Sources.IA32]
Ia32/JumpToKernel.asm
Ia32/JumpToKernel.S
Ia32/JumpToKernel.nasm

[Sources.X64]
X64/JumpToKernel.asm
Expand Down

0 comments on commit 529fd9a

Please sign in to comment.