Changeset 87286 in vbox

Timestamp:

Jan 15, 2021 8:51:46 PM (4 years ago)

Author:

vboxsync

Message:

EFI: armasm version of DevEFI-binaries.asm. bugref:9898

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI-binaries.S (copied) (copied from trunk/src/VBox/Devices/EFI/DevEFI-binaries.asm ) (1 diff)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/EFI/DevEFI-binaries.S

@@ -1 @@
-; $Id$
-;; @file
-; DevEFI - firmware binaries.
-;
+/* $Id$ */
+/** @file
+ * DevEFI - firmware binaries.
+ */
 
-;
-; Copyright (C) 2011-2020 Oracle Corporation
-;
-; This file is part of VirtualBox Open Source Edition (OSE), as
-; available from http://www.virtualbox.org. This file is free software;
-; you can redistribute it and/or modify it under the terms of the GNU
-; General Public License (GPL) as published by the Free Software
-; Foundation, in version 2 as it comes in the "COPYING" file of the
-; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-;
+/*
+ * Copyright (C) 2011-2020 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
 
 
-;*********************************************************************************************************************************
-;*  Header Files                                                                                                                 *
-;*********************************************************************************************************************************
-%include "VBox/asmdefs.mac"
-%include "VBox/err.mac"
-%include "iprt/x86.mac"
+#ifdef RT_OS_DARWIN
+#define NAME(a_Name) _##a_Name
+#else
+#define NAME(a_Name) a_Name
+#endif
+
+.section __TEXT,__const
+
+; 32-bit firmware:
+.p2align 6
+.globl NAME(g_abEfiFirmware32)
+NAME(g_abEfiFirmware32):
+        .incbin "VBoxEFI32.fd"
+end_32_firmware:
+
+.p2align 2
+.globl NAME(g_cbEfiFirmware32)
+NAME(g_cbEfiFirmware32):
+        .long end_32_firmware - NAME(g_abEfiFirmware32)
 
 
-BEGINCONST
-EXPORTEDNAME g_abEfiFirmware32
-        incbin "VBoxEFI32.fd"
-end_32_firmware:
-EXPORTEDNAME g_cbEfiFirmware32
-        dd  end_32_firmware - NAME(g_abEfiFirmware32)
+; 64-bit firmware:
+.p2align 6
+.globl NAME(g_abEfiFirmware64)
+NAME(g_abEfiFirmware64):
+        .incbin "VBoxEFI64.fd"
+end_64_firmware:
 
-ALIGNDATA(64)
-EXPORTEDNAME g_abEfiFirmware64
-        incbin "VBoxEFI64.fd"
-end_64_firmware:
-EXPORTEDNAME g_cbEfiFirmware64
-        dd  end_64_firmware - NAME(g_abEfiFirmware64)
+.p2align 2
+.globl NAME(g_cbEfiFirmware64)
+NAME(g_cbEfiFirmware64):
+        .long  end_64_firmware - NAME(g_abEfiFirmware64)
 
-%ifdef ASM_FORMAT_ELF
-size g_abEfiFirmware32 end_32_firmware - NAME(g_abEfiFirmware32)
-type g_abEfiFirmware32 object
-size g_cbEfiFirmware32 4
-type g_cbEfiFirmware32 object
+#ifdef ASM_FORMAT_ELF
+.size g_abEfiFirmware32 end_32_firmware - NAME(g_abEfiFirmware32)
+.type g_abEfiFirmware32 object
+.size g_cbEfiFirmware32 4
+.type g_cbEfiFirmware32 object
 
-size g_abEfiFirmware64 end_64_firmware - NAME(g_abEfiFirmware64)
-type g_abEfiFirmware64 object
-size g_cbEfiFirmware64 4
-type g_cbEfiFirmware64 object
-%endif
+.size g_abEfiFirmware64 end_64_firmware - NAME(g_abEfiFirmware64)
+.type g_abEfiFirmware64 object
+.size g_cbEfiFirmware64 4
+.type g_cbEfiFirmware64 object
+#endif

trunk/src/VBox/Devices/Makefile.kmk

@@ -1117 +1117 @@
   VBoxDD_DEFS           += VBOX_WITH_EFI_IN_DD2
   VBoxDD2_DEFS          += VBOX_WITH_EFI
-  VBoxDD2_SOURCES       += \
-        EFI/DevEFI-binaries.asm
+  VBoxDD2_SOURCES.x86   += EFI/DevEFI-binaries.asm
+  VBoxDD2_SOURCES.amd64 += EFI/DevEFI-binaries.asm
   EFI/DevEFI-binaries.asm_ASINCS = $(PATH_STAGE)/$(INST_BIN)
   EFI/DevEFI-binaries.asm_DEPS   = \
+        $(PATH_STAGE)/$(INST_BIN)VBoxEFI32.fd \
+        $(PATH_STAGE)/$(INST_BIN)VBoxEFI64.fd
+
+  VBoxDD2_SOURCES.arm64 += EFI/DevEFI-binaries.S
+  EFI/DevEFI-binaries.S_ASINCS = $(PATH_STAGE)/$(INST_BIN)
+  EFI/DevEFI-binaries.S_DEPS   = \
         $(PATH_STAGE)/$(INST_BIN)VBoxEFI32.fd \
         $(PATH_STAGE)/$(INST_BIN)VBoxEFI64.fd