MdeModulePkg/EbcDxe AARCH64: clean up comment style in ASM file

Change to consistent // style comments. Also, remove bogus global
definitions for external functions, and move the real exports to
the top of the file.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/MdeModulePkg/Universal/EbcDxe/AArch64/EbcLowLevel.S b/MdeModulePkg/Universal/EbcDxe/AArch64/EbcLowLevel.S
index e858227586a8bbe590f2c3b645e6bf263f60e94f..17f379248a6280cf98d8f3183232248856f21248 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/AArch64/EbcLowLevel.S
+++ b/MdeModulePkg/Universal/EbcDxe/AArch64/EbcLowLevel.S
@@ -1,40 +1,35 @@
-#/** @file\r
-#\r
-#    This code provides low level routines that support the Virtual Machine\r
-#   for option ROMs.\r
-#\r
-#  Copyright (c) 2015, The Linux Foundation. All rights reserved.\r
-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\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
-#---------------------------------------------------------------------------\r
-# Equate files needed.\r
-#---------------------------------------------------------------------------\r
-\r
-ASM_GLOBAL ASM_PFX(CopyMem);\r
-ASM_GLOBAL ASM_PFX(EbcInterpret);\r
-ASM_GLOBAL ASM_PFX(ExecuteEbcImageEntryPoint);\r
-\r
-#****************************************************************************\r
-# EbcLLCALLEX\r
-#\r
-# This function is called to execute an EBC CALLEX instruction.\r
-# This instruction requires that we thunk out to external native\r
-# code. For AArch64, we copy the VM stack into the main stack and then pop\r
-# the first 8 arguments off according to the AArch64 Procedure Call Standard\r
-# On return, we restore the stack pointer to its original location.\r
-#\r
-#****************************************************************************\r
-# UINTN EbcLLCALLEXNative(UINTN FuncAddr, UINTN NewStackPointer, VOID *FramePtr)\r
-ASM_GLOBAL ASM_PFX(EbcLLCALLEXNative);\r
+///** @file\r
+//\r
+//  This code provides low level routines that support the Virtual Machine\r
+//  for option ROMs.\r
+//\r
+//  Copyright (c) 2015, The Linux Foundation. All rights reserved.\r
+//  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\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(EbcLLCALLEXNative)\r
+ASM_GLOBAL ASM_PFX(EbcLLEbcInterpret)\r
+ASM_GLOBAL ASM_PFX(EbcLLExecuteEbcImageEntryPoint)\r
+\r
+//****************************************************************************\r
+// EbcLLCALLEX\r
+//\r
+// This function is called to execute an EBC CALLEX instruction.\r
+// This instruction requires that we thunk out to external native\r
+// code. For AArch64, we copy the VM stack into the main stack and then pop\r
+// the first 8 arguments off according to the AArch64 Procedure Call Standard\r
+// On return, we restore the stack pointer to its original location.\r
+//\r
+//****************************************************************************\r
+// UINTN EbcLLCALLEXNative(UINTN FuncAddr, UINTN NewStackPointer, VOID *FramePtr)\r
 ASM_PFX(EbcLLCALLEXNative):\r
       stp  x19, x20, [sp, #-16]!\r
       stp  x29, x30, [sp, #-16]!\r
@@ -61,16 +56,15 @@ ASM_PFX(EbcLLCALLEXNative):
 \r
       ret\r
 \r
-#****************************************************************************\r
-# EbcLLEbcInterpret\r
-#\r
-# This function is called by the thunk code to handle an Native to EBC call\r
-# This can handle up to 16 arguments (1-8 on in x0-x7, 9-16 are on the stack)\r
-# x9 contains the Entry point that will be the first argument when\r
-# EBCInterpret is called.\r
-#\r
-#****************************************************************************\r
-ASM_GLOBAL ASM_PFX(EbcLLEbcInterpret);\r
+//****************************************************************************\r
+// EbcLLEbcInterpret\r
+//\r
+// This function is called by the thunk code to handle an Native to EBC call\r
+// This can handle up to 16 arguments (1-8 on in x0-x7, 9-16 are on the stack)\r
+// x9 contains the Entry point that will be the first argument when\r
+// EBCInterpret is called.\r
+//\r
+//****************************************************************************\r
 ASM_PFX(EbcLLEbcInterpret):\r
     stp  x29, x30, [sp, #-16]!\r
 \r
@@ -105,7 +99,7 @@ ASM_PFX(EbcLLEbcInterpret):
     mov x1, x0\r
     mov x0, x9\r
 \r
-    # call C-code\r
+    // call C-code\r
     bl ASM_PFX(EbcInterpret)\r
     add sp, sp, #80\r
 \r
@@ -113,23 +107,22 @@ ASM_PFX(EbcLLEbcInterpret):
 \r
     ret\r
 \r
-#****************************************************************************\r
-# EbcLLExecuteEbcImageEntryPoint\r
-#\r
-# This function is called by the thunk code to handle the image entry point\r
-# x9 contains the Entry point that will be the first argument when\r
-# ExecuteEbcImageEntryPoint is called.\r
-#\r
-#****************************************************************************\r
-ASM_GLOBAL ASM_PFX(EbcLLExecuteEbcImageEntryPoint);\r
+//****************************************************************************\r
+// EbcLLExecuteEbcImageEntryPoint\r
+//\r
+// This function is called by the thunk code to handle the image entry point\r
+// x9 contains the Entry point that will be the first argument when\r
+// ExecuteEbcImageEntryPoint is called.\r
+//\r
+//****************************************************************************\r
 ASM_PFX(EbcLLExecuteEbcImageEntryPoint):\r
     stp  x29, x30, [sp, #-16]!\r
-    # build new paramater calling convention\r
+    // build new parameter calling convention\r
     mov  x2, x1\r
     mov  x1, x0\r
     mov  x0, x9\r
 \r
-    # call C-code\r
+    // call C-code\r
     bl ASM_PFX(ExecuteEbcImageEntryPoint)\r
     ldp  x29, x30, [sp], #16\r
     ret\r