diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2014-10-31 20:54:16 +0000 |
|---|---|---|
| committer | jljusten <jljusten@Edk2> | 2014-10-31 20:54:16 +0000 |
| commit | 529fd9aeb426eac63cb04dbbc98e5cf792dcfdde (patch) | |
| tree | 0b9c09dc21a9874326bb5d15794256bf544a192e /OvmfPkg/Library/LoadLinuxLib | |
| parent | b81cc7d6249671a2c1e36f6c8ac01da0e0b7c612 (diff) | |
| download | edk2-529fd9aeb426eac63cb04dbbc98e5cf792dcfdde.tar.gz edk2-529fd9aeb426eac63cb04dbbc98e5cf792dcfdde.tar.bz2 edk2-529fd9aeb426eac63cb04dbbc98e5cf792dcfdde.zip | |
OvmfPkg LoadLinuxLib: Convert Ia32/JumpToKernel.asm to NASM
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
Diffstat (limited to 'OvmfPkg/Library/LoadLinuxLib')
| -rw-r--r-- | OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S | 46 | ||||
| -rw-r--r-- | OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.nasm (renamed from OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.asm) | 19 | ||||
| -rw-r--r-- | OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf | 3 |
3 files changed, 8 insertions, 60 deletions
diff --git a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S deleted file mode 100644 index f7440f74c4..0000000000 --- a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S +++ /dev/null @@ -1,46 +0,0 @@ -#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006 - 2013, 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
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#------------------------------------------------------------------------------
-
-ASM_GLOBAL ASM_PFX(JumpToKernel)
-ASM_GLOBAL ASM_PFX(JumpToUefiKernel)
-
-#------------------------------------------------------------------------------
-# VOID
-# EFIAPI
-# JumpToKernel (
-# VOID *KernelStart,
-# VOID *KernelBootParams
-# );
-#------------------------------------------------------------------------------
-ASM_PFX(JumpToKernel):
- movl 0x8(%esp), %esi
- calll 0x4(%esp)
- ret
-
-#------------------------------------------------------------------------------
-# VOID
-# EFIAPI
-# JumpToUefiKernel (
-# EFI_HANDLE ImageHandle,
-# EFI_SYSTEM_TABLE *SystemTable,
-# VOID *KernelBootParams,
-# VOID *KernelStart
-# );
-#------------------------------------------------------------------------------
-ASM_PFX(JumpToUefiKernel):
- movl 0xc(%esp), %eax
- movl 0x264(%eax), %eax
- addl 0x10(%esp), %eax
- jmp %eax
-
diff --git a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.asm b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.nasm index 21d0c4e724..fcb686c644 100644 --- a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.asm +++ b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.nasm @@ -12,9 +12,7 @@ ;
;------------------------------------------------------------------------------
- .586p
- .model flat,C
- .code
+ SECTION .text
;------------------------------------------------------------------------------
; VOID
@@ -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
@@ -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
diff --git a/OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf b/OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf index b8f987c477..0d98c26f0b 100644 --- a/OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf +++ b/OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf @@ -31,8 +31,7 @@ LinuxGdt.c
[Sources.IA32]
- Ia32/JumpToKernel.asm
- Ia32/JumpToKernel.S
+ Ia32/JumpToKernel.nasm
[Sources.X64]
X64/JumpToKernel.asm
|