Update to fix minor coding style issues.

[mirror_edk2.git] / MdeModulePkg / Universal / EbcDxe / EbcExecute.c

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index e4240c9b83a83b91abdb8da2ed2ccc10c208feb7..b819c5f024360fa967a580ccdbd525f39fb85c0a 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
@@ -1,7 +1,7 @@
 /** @file\r
   Contains code that implements the virtual machine.\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation\r
+Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
 All rights reserved. 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
@@ -64,7 +64,6 @@ UINT64
   @return The decoded offset.\r
 \r
 **/\r
-STATIC\r
 INT16\r
 VmReadIndex16 (\r
   IN VM_CONTEXT     *VmPtr,\r
@@ -81,7 +80,6 @@ VmReadIndex16 (
   @return Converted index per EBC VM specification.\r
 \r
 **/\r
-STATIC\r
 INT32\r
 VmReadIndex32 (\r
   IN VM_CONTEXT     *VmPtr,\r
@@ -98,7 +96,6 @@ VmReadIndex32 (
   @return Converted index per EBC VM specification\r
 \r
 **/\r
-STATIC\r
 INT64\r
 VmReadIndex64 (\r
   IN VM_CONTEXT     *VmPtr,\r
@@ -114,7 +111,6 @@ VmReadIndex64 (
   @return The 8-bit value from the memory adress.\r
 \r
 **/\r
-STATIC\r
 UINT8\r
 VmReadMem8 (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -130,7 +126,6 @@ VmReadMem8 (
   @return The 16-bit value from the memory adress.\r
 \r
 **/\r
-STATIC\r
 UINT16\r
 VmReadMem16 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -146,7 +141,6 @@ VmReadMem16 (
   @return The 32-bit value from the memory adress.\r
 \r
 **/\r
-STATIC\r
 UINT32\r
 VmReadMem32 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -162,7 +156,6 @@ VmReadMem32 (
   @return The 64-bit value from the memory adress.\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 VmReadMem64 (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -178,7 +171,6 @@ VmReadMem64 (
   @return The natural value at address Addr.\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 VmReadMemN (\r
   IN VM_CONTEXT    *VmPtr,\r
@@ -208,7 +200,6 @@ VmReadMemN (
   @retval Other             Some error occurs when writing data to the address.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 VmWriteMem8 (\r
   IN VM_CONTEXT    *VmPtr,\r
@@ -239,7 +230,6 @@ VmWriteMem8 (
   @retval Other             Some error occurs when writing data to the address.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 VmWriteMem16 (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -270,7 +260,6 @@ VmWriteMem16 (
   @retval Other             Some error occurs when writing data to the address.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 VmWriteMem32 (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -290,7 +279,6 @@ VmWriteMem32 (
   @return The raw unsigned 16-bit value from the code stream.\r
 \r
 **/\r
-STATIC\r
 UINT16\r
 VmReadCode16 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -309,7 +297,6 @@ VmReadCode16 (
   @return The raw unsigned 32-bit value from the code stream.\r
 \r
 **/\r
-STATIC\r
 UINT32\r
 VmReadCode32 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -328,7 +315,6 @@ VmReadCode32 (
   @return The raw unsigned 64-bit value from the code stream.\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 VmReadCode64 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -349,7 +335,6 @@ VmReadCode64 (
   @return Signed data of the requested size from the specified address.\r
 \r
 **/\r
-STATIC\r
 INT8\r
 VmReadImmed8 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -370,7 +355,6 @@ VmReadImmed8 (
   @return Signed data of the requested size from the specified address.\r
 \r
 **/\r
-STATIC\r
 INT16\r
 VmReadImmed16 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -391,7 +375,6 @@ VmReadImmed16 (
   @return Signed data of the requested size from the specified address.\r
 \r
 **/\r
-STATIC\r
 INT32\r
 VmReadImmed32 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -412,7 +395,6 @@ VmReadImmed32 (
   @return Signed data of the requested size from the specified address.\r
 \r
 **/\r
-STATIC\r
 INT64\r
 VmReadImmed64 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -438,7 +420,6 @@ VmReadImmed64 (
           adjust for the stack gap and return the modified address.\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 ConvertStackAddr (\r
   IN VM_CONTEXT    *VmPtr,\r
@@ -463,7 +444,6 @@ ConvertStackAddr (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteDataManip (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -481,7 +461,6 @@ ExecuteDataManip (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteBREAK (\r
   IN VM_CONTEXT *VmPtr\r
@@ -512,7 +491,6 @@ ExecuteBREAK (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteJMP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -529,7 +507,6 @@ ExecuteJMP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteJMP8 (\r
   IN VM_CONTEXT *VmPtr\r
@@ -551,7 +528,6 @@ ExecuteJMP8 (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteCALL (\r
   IN VM_CONTEXT *VmPtr\r
@@ -568,7 +544,6 @@ ExecuteCALL (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteRET (\r
   IN VM_CONTEXT *VmPtr\r
@@ -586,7 +561,6 @@ ExecuteRET (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteCMP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -604,7 +578,6 @@ ExecuteCMP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteCMPI (\r
   IN VM_CONTEXT *VmPtr\r
@@ -631,7 +604,6 @@ ExecuteCMPI (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVxx (\r
   IN VM_CONTEXT *VmPtr\r
@@ -658,7 +630,6 @@ ExecuteMOVxx (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVI (\r
   IN VM_CONTEXT *VmPtr\r
@@ -678,7 +649,6 @@ ExecuteMOVI (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVIn (\r
   IN VM_CONTEXT *VmPtr\r
@@ -698,7 +668,6 @@ ExecuteMOVIn (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVREL (\r
   IN VM_CONTEXT *VmPtr\r
@@ -715,7 +684,6 @@ ExecuteMOVREL (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecutePUSHn (\r
   IN VM_CONTEXT *VmPtr\r
@@ -732,7 +700,6 @@ ExecutePUSHn (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecutePUSH (\r
   IN VM_CONTEXT *VmPtr\r
@@ -749,7 +716,6 @@ ExecutePUSH (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecutePOPn (\r
   IN VM_CONTEXT *VmPtr\r
@@ -766,7 +732,6 @@ ExecutePOPn (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecutePOP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -789,7 +754,6 @@ ExecutePOP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteSignedDataManip (\r
   IN VM_CONTEXT   *VmPtr\r
@@ -812,7 +776,6 @@ ExecuteSignedDataManip (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteUnsignedDataManip (\r
   IN VM_CONTEXT   *VmPtr\r
@@ -830,7 +793,6 @@ ExecuteUnsignedDataManip (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteLOADSP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -848,7 +810,6 @@ ExecuteLOADSP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteSTORESP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -873,7 +834,6 @@ ExecuteSTORESP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVsnd (\r
   IN VM_CONTEXT *VmPtr\r
@@ -898,7 +858,6 @@ ExecuteMOVsnd (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVsnw (\r
   IN VM_CONTEXT *VmPtr\r
@@ -920,7 +879,6 @@ ExecuteMOVsnw (
   @return ~Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteNOT (\r
   IN VM_CONTEXT     *VmPtr,\r
@@ -941,7 +899,6 @@ ExecuteNOT (
   @return Op2 * -1\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteNEG (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -962,7 +919,6 @@ ExecuteNEG (
   @return Op1 + Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteADD (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -983,7 +939,6 @@ ExecuteADD (
   @return Op1 - Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteSUB (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1004,7 +959,6 @@ ExecuteSUB (
   @return Op1 * Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteMUL (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1025,7 +979,6 @@ ExecuteMUL (
   @return (unsigned)Op1 * (unsigned)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteMULU (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1046,7 +999,6 @@ ExecuteMULU (
   @return Op1 / Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteDIV (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1067,7 +1019,6 @@ ExecuteDIV (
   @return (unsigned)Op1 / (unsigned)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteDIVU (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1088,7 +1039,6 @@ ExecuteDIVU (
   @return Op1 MODULUS Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteMOD (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1109,7 +1059,6 @@ ExecuteMOD (
   @return Op1 UNSIGNED_MODULUS Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteMODU (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1130,7 +1079,6 @@ ExecuteMODU (
   @return Op1 AND Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteAND (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1151,7 +1099,6 @@ ExecuteAND (
   @return Op1 OR Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteOR (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1172,7 +1119,6 @@ ExecuteOR (
   @return Op1 XOR Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteXOR (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1193,7 +1139,6 @@ ExecuteXOR (
   @return Op1 << Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteSHL (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1214,7 +1159,6 @@ ExecuteSHL (
   @return Op1 >> Op2  (unsigned operands)\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteSHR (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1235,7 +1179,6 @@ ExecuteSHR (
   @return Op1 >> Op2 (signed)\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteASHR (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1256,7 +1199,6 @@ ExecuteASHR (
   @return (INT64)(INT8)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteEXTNDB (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1277,7 +1219,6 @@ ExecuteEXTNDB (
   @return (INT64)(INT16)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteEXTNDW (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1298,7 +1239,6 @@ ExecuteEXTNDW (
   @return (INT64)(INT32)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteEXTNDD (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -1613,7 +1553,6 @@ Done:
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVxx (\r
   IN VM_CONTEXT *VmPtr\r
@@ -1883,7 +1822,6 @@ ExecuteMOVxx (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteBREAK (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2009,7 +1947,6 @@ ExecuteBREAK (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteJMP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2172,7 +2109,6 @@ ExecuteJMP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteJMP8 (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2233,7 +2169,6 @@ ExecuteJMP8 (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVI (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2352,7 +2287,6 @@ ExecuteMOVI (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVIn (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2455,7 +2389,6 @@ ExecuteMOVIn (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVREL (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2562,7 +2495,6 @@ ExecuteMOVREL (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVsnw (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2656,7 +2588,6 @@ ExecuteMOVsnw (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteMOVsnd (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2742,7 +2673,6 @@ ExecuteMOVsnd (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecutePUSHn (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2802,7 +2732,6 @@ ExecutePUSHn (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecutePUSH (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2879,7 +2808,6 @@ ExecutePUSH (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecutePOPn (\r
   IN VM_CONTEXT *VmPtr\r
@@ -2939,7 +2867,6 @@ ExecutePOPn (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecutePOP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -3024,7 +2951,6 @@ ExecutePOP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteCALL (\r
   IN VM_CONTEXT *VmPtr\r
@@ -3158,7 +3084,6 @@ ExecuteCALL (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteRET (\r
   IN VM_CONTEXT *VmPtr\r
@@ -3207,7 +3132,6 @@ ExecuteRET (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteCMP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -3369,7 +3293,6 @@ ExecuteCMP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteCMPI (\r
   IN VM_CONTEXT *VmPtr\r
@@ -3550,7 +3473,6 @@ ExecuteCMPI (
   @return ~Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteNOT (\r
   IN VM_CONTEXT     *VmPtr,\r
@@ -3575,7 +3497,6 @@ ExecuteNOT (
   @return Op2 * -1\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteNEG (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3600,7 +3521,6 @@ ExecuteNEG (
   @return Op1 + Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteADD (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3625,7 +3545,6 @@ ExecuteADD (
   @return Op1 - Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteSUB (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3654,7 +3573,6 @@ ExecuteSUB (
   @return Op1 * Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteMUL (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3683,7 +3601,6 @@ ExecuteMUL (
   @return (unsigned)Op1 * (unsigned)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteMULU (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3712,7 +3629,6 @@ ExecuteMULU (
   @return Op1 / Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteDIV (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3756,7 +3672,6 @@ ExecuteDIV (
   @return (unsigned)Op1 / (unsigned)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteDIVU (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3802,7 +3717,6 @@ ExecuteDIVU (
   @return Op1 MODULUS Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteMOD (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3842,7 +3756,6 @@ ExecuteMOD (
   @return Op1 UNSIGNED_MODULUS Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteMODU (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3882,7 +3795,6 @@ ExecuteMODU (
   @return Op1 AND Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteAND (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3907,7 +3819,6 @@ ExecuteAND (
   @return Op1 OR Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteOR (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3932,7 +3843,6 @@ ExecuteOR (
   @return Op1 XOR Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteXOR (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3957,7 +3867,6 @@ ExecuteXOR (
   @return Op1 << Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteSHL (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -3986,7 +3895,6 @@ ExecuteSHL (
   @return Op1 >> Op2  (unsigned operands)\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteSHR (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -4015,7 +3923,6 @@ ExecuteSHR (
   @return Op1 >> Op2 (signed)\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteASHR (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -4044,7 +3951,6 @@ ExecuteASHR (
   @return (INT64)(INT8)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteEXTNDB (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -4078,7 +3984,6 @@ ExecuteEXTNDB (
   @return (INT64)(INT16)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteEXTNDW (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -4119,7 +4024,6 @@ ExecuteEXTNDW (
   @return (INT64)(INT32)Op2\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 ExecuteEXTNDD (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -4157,7 +4061,6 @@ ExecuteEXTNDD (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteSignedDataManip (\r
   IN VM_CONTEXT   *VmPtr\r
@@ -4188,7 +4091,6 @@ ExecuteSignedDataManip (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteUnsignedDataManip (\r
   IN VM_CONTEXT   *VmPtr\r
@@ -4220,7 +4122,6 @@ ExecuteUnsignedDataManip (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteDataManip (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -4370,7 +4271,6 @@ ExecuteDataManip (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteLOADSP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -4425,7 +4325,6 @@ ExecuteLOADSP (
   @retval EFI_SUCCESS       The instruction is executed successfully.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ExecuteSTORESP (\r
   IN VM_CONTEXT *VmPtr\r
@@ -4497,7 +4396,6 @@ ExecuteSTORESP (
   @return The decoded offset.\r
 \r
 **/\r
-STATIC\r
 INT16\r
 VmReadIndex16 (\r
   IN VM_CONTEXT     *VmPtr,\r
@@ -4569,7 +4467,6 @@ VmReadIndex16 (
   @return Converted index per EBC VM specification.\r
 \r
 **/\r
-STATIC\r
 INT32\r
 VmReadIndex32 (\r
   IN VM_CONTEXT     *VmPtr,\r
@@ -4633,7 +4530,6 @@ VmReadIndex32 (
   @return Converted index per EBC VM specification\r
 \r
 **/\r
-STATIC\r
 INT64\r
 VmReadIndex64 (\r
   IN VM_CONTEXT     *VmPtr,\r
@@ -4710,7 +4606,6 @@ VmReadIndex64 (
   @retval Other             Some error occurs when writing data to the address.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 VmWriteMem8 (\r
   IN VM_CONTEXT    *VmPtr,\r
@@ -4749,7 +4644,6 @@ VmWriteMem8 (
   @retval Other             Some error occurs when writing data to the address.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 VmWriteMem16 (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -4813,7 +4707,6 @@ VmWriteMem16 (
   @retval Other             Some error occurs when writing data to the address.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 VmWriteMem32 (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -4991,7 +4884,6 @@ VmWriteMemN (
   @return Signed data of the requested size from the specified address.\r
 \r
 **/\r
-STATIC\r
 INT8\r
 VmReadImmed8 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5018,7 +4910,6 @@ VmReadImmed8 (
   @return Signed data of the requested size from the specified address.\r
 \r
 **/\r
-STATIC\r
 INT16\r
 VmReadImmed16 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5061,7 +4952,6 @@ VmReadImmed16 (
   @return Signed data of the requested size from the specified address.\r
 \r
 **/\r
-STATIC\r
 INT32\r
 VmReadImmed32 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5099,7 +4989,6 @@ VmReadImmed32 (
   @return Signed data of the requested size from the specified address.\r
 \r
 **/\r
-STATIC\r
 INT64\r
 VmReadImmed64 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5141,7 +5030,6 @@ VmReadImmed64 (
   @return The raw unsigned 16-bit value from the code stream.\r
 \r
 **/\r
-STATIC\r
 UINT16\r
 VmReadCode16 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5182,7 +5070,6 @@ VmReadCode16 (
   @return The raw unsigned 32-bit value from the code stream.\r
 \r
 **/\r
-STATIC\r
 UINT32\r
 VmReadCode32 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5217,7 +5104,6 @@ VmReadCode32 (
   @return The raw unsigned 64-bit value from the code stream.\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 VmReadCode64 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5256,7 +5142,6 @@ VmReadCode64 (
   @return The 8-bit value from the memory adress.\r
 \r
 **/\r
-STATIC\r
 UINT8\r
 VmReadMem8 (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -5282,7 +5167,6 @@ VmReadMem8 (
   @return The 16-bit value from the memory adress.\r
 \r
 **/\r
-STATIC\r
 UINT16\r
 VmReadMem16 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5314,7 +5198,6 @@ VmReadMem16 (
   @return The 32-bit value from the memory adress.\r
 \r
 **/\r
-STATIC\r
 UINT32\r
 VmReadMem32 (\r
   IN VM_CONTEXT *VmPtr,\r
@@ -5350,7 +5233,6 @@ VmReadMem32 (
   @return The 64-bit value from the memory adress.\r
 \r
 **/\r
-STATIC\r
 UINT64\r
 VmReadMem64 (\r
   IN VM_CONTEXT   *VmPtr,\r
@@ -5400,7 +5282,6 @@ VmReadMem64 (
           adjust for the stack gap and return the modified address.\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 ConvertStackAddr (\r
   IN VM_CONTEXT    *VmPtr,\r
@@ -5421,7 +5302,6 @@ ConvertStackAddr (
   @return The natural value at address Addr.\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 VmReadMemN (\r
   IN VM_CONTEXT    *VmPtr,\r