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

diff --git a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S
deleted file mode 100644 (file)
index f7440f7..0000000
--- a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S
+++ /dev/null
@@ -1,46 +0,0 @@
-#------------------------------------------------------------------------------\r
-#\r
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
-#\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php.\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-ASM_GLOBAL ASM_PFX(JumpToKernel)\r
-ASM_GLOBAL ASM_PFX(JumpToUefiKernel)\r
-\r
-#------------------------------------------------------------------------------\r
-# VOID\r
-# EFIAPI\r
-# JumpToKernel (\r
-#   VOID *KernelStart,\r
-#   VOID *KernelBootParams\r
-#   );\r
-#------------------------------------------------------------------------------\r
-ASM_PFX(JumpToKernel):\r
-    movl    0x8(%esp), %esi\r
-    calll   0x4(%esp)\r
-    ret\r
-\r
-#------------------------------------------------------------------------------\r
-# VOID\r
-# EFIAPI\r
-# JumpToUefiKernel (\r
-#   EFI_HANDLE ImageHandle,\r
-#   EFI_SYSTEM_TABLE *SystemTable,\r
-#   VOID *KernelBootParams,\r
-#   VOID *KernelStart\r
-#   );\r
-#------------------------------------------------------------------------------\r
-ASM_PFX(JumpToUefiKernel):\r
-    movl    0xc(%esp), %eax\r
-    movl    0x264(%eax), %eax\r
-    addl    0x10(%esp), %eax\r
-    jmp     %eax\r
-\r

diff --git a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.asm b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.asm
deleted file mode 100644 (file)
index 21d0c4e..0000000
--- a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-;------------------------------------------------------------------------------\r
-;\r
-; Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
-;\r
-; This program and the accompanying materials\r
-; are licensed and made available under the terms and conditions of the BSD License\r
-; which accompanies this distribution.  The full text of the license may be found at\r
-; http://opensource.org/licenses/bsd-license.php.\r
-;\r
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-;\r
-;------------------------------------------------------------------------------\r
-\r
-  .586p\r
-  .model flat,C\r
-  .code\r
-\r
-;------------------------------------------------------------------------------\r
-; VOID\r
-; EFIAPI\r
-; JumpToKernel (\r
-;   VOID *KernelStart,\r
-;   VOID *KernelBootParams\r
-;   );\r
-;------------------------------------------------------------------------------\r
-JumpToKernel PROC\r
-\r
-    mov     esi, [esp + 8]\r
-    call    DWORD PTR [esp + 4]\r
-    ret\r
-\r
-JumpToKernel ENDP\r
-\r
-;------------------------------------------------------------------------------\r
-; VOID\r
-; EFIAPI\r
-; JumpToUefiKernel (\r
-;   EFI_HANDLE ImageHandle,\r
-;   EFI_SYSTEM_TABLE *SystemTable,\r
-;   VOID *KernelBootParams,\r
-;   VOID *KernelStart\r
-;   );\r
-;------------------------------------------------------------------------------\r
-JumpToUefiKernel PROC\r
-\r
-    mov     eax, [esp + 12]\r
-    mov     eax, [eax + 264h]\r
-    add     eax, [esp + 16]\r
-    jmp     eax\r
-\r
-JumpToUefiKernel ENDP\r
-\r
-END\r

diff --git a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.nasm b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.nasm
new file mode 100644 (file)
index 0000000..fcb686c
--- /dev/null
+++ b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.nasm
@@ -0,0 +1,49 @@
+;------------------------------------------------------------------------------\r
+;\r
+; Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+;\r
+; This program and the accompanying materials\r
+; are licensed and made available under the terms and conditions of the BSD License\r
+; which accompanies this distribution.  The full text of the license may be found at\r
+; http://opensource.org/licenses/bsd-license.php.\r
+;\r
+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+;\r
+;------------------------------------------------------------------------------\r
+\r
+  SECTION .text\r
+\r
+;------------------------------------------------------------------------------\r
+; VOID\r
+; EFIAPI\r
+; JumpToKernel (\r
+;   VOID *KernelStart,\r
+;   VOID *KernelBootParams\r
+;   );\r
+;------------------------------------------------------------------------------\r
+global ASM_PFX(JumpToKernel)\r
+ASM_PFX(JumpToKernel):\r
+\r
+    mov     esi, [esp + 8]\r
+    call    DWORD [esp + 4]\r
+    ret\r
+\r
+;------------------------------------------------------------------------------\r
+; VOID\r
+; EFIAPI\r
+; JumpToUefiKernel (\r
+;   EFI_HANDLE ImageHandle,\r
+;   EFI_SYSTEM_TABLE *SystemTable,\r
+;   VOID *KernelBootParams,\r
+;   VOID *KernelStart\r
+;   );\r
+;------------------------------------------------------------------------------\r
+global ASM_PFX(JumpToUefiKernel)\r
+ASM_PFX(JumpToUefiKernel):\r
+\r
+    mov     eax, [esp + 12]\r
+    mov     eax, [eax + 0x264]\r
+    add     eax, [esp + 16]\r
+    jmp     eax\r
+\r

diff --git a/OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf b/OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf
index b8f987c4777729552372a24bf4d28c7d161f0bf4..0d98c26f0b59c75a23f00775ac411a87a5ce2659 100644 (file)
--- a/OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf
+++ b/OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf
@@ -31,8 +31,7 @@
   LinuxGdt.c\r
 \r
 [Sources.IA32]\r
-  Ia32/JumpToKernel.asm\r
-  Ia32/JumpToKernel.S\r
+  Ia32/JumpToKernel.nasm\r
 \r
 [Sources.X64]\r
   X64/JumpToKernel.asm\r