Clean up to update the reference of the these macros:

[mirror_edk2.git] / MdeModulePkg / Universal / EbcDxe / EbcInt.h

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index a8767e8957f5fa0071bf62ecedfb16354f508239..66339d1a85e8df385b543eb3169640336857b5ff 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EBC_INT_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/Ebc.h>\r
@@ -34,11 +34,11 @@ typedef UINT8   *VMIP;      // instruction pointer for the VM
 typedef UINT32  EXCEPTION_FLAGS;\r
 \r
 typedef struct {\r
-  VM_REGISTER       R[8];   // General purpose registers.\r
-  UINT64            Flags;  // Flags register:\r
-                            //   0   Set to 1 if the result of the last compare was true\r
-                            //   1  Set to 1 if stepping\r
-                            //   2..63 Reserved.\r
+  VM_REGISTER       R[8];                   // General purpose registers.\r
+  UINT64            Flags;                  // Flags register:\r
+                                            //   0   Set to 1 if the result of the last compare was true\r
+                                            //   1  Set to 1 if stepping\r
+                                            //   2..63 Reserved.\r
   VMIP              Ip;                     // Instruction pointer.\r
   UINTN             LastException;          //\r
   EXCEPTION_FLAGS   ExceptionFlags;         // to keep track of exceptions\r
@@ -132,7 +132,7 @@ EbcAddImageThunk (
   The VM interpreter calls this function when an exception is detected.\r
 \r
   @param  ExceptionType          Specifies the processor exception detected.\r
-  @param  ExceptionFlags         Specifies the exception context. \r
+  @param  ExceptionFlags         Specifies the exception context.\r
   @param  VmPtr                  Pointer to a VM context for passing info to the\r
                                  EFI debugger.\r
 \r
@@ -157,13 +157,13 @@ EbcDebugSignalException (
 \r
 //\r
 // External low level functions that are native-processor dependent\r
-// \r
+//\r
 /**\r
-  The VM thunk code stuffs an EBC entry point into a processor \r
+  The VM thunk code stuffs an EBC entry point into a processor\r
   register. Since we can't use inline assembly to get it from\r
   the interpreter C code, stuff it into the return value\r
   register and return.\r
- \r
+\r
   @return  The contents of the register in which the entry point is passed.\r
 \r
 **/\r
@@ -191,7 +191,7 @@ EbcLLGetStackPointer (
 /**\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 x64, we switch stacks, copy the arguments to the stack \r
+  code. For x64, we switch stacks, copy the arguments to the stack\r
   and jump to the specified function.\r
   On return, we restore the stack pointer to its original location.\r
   Destroys no working registers.\r
@@ -251,10 +251,10 @@ EbcLLGetReturnValue (
 /**\r
   Returns the stack index and buffer assosicated with the Handle parameter.\r
 \r
-  @param  Handle                The EFI handle as the index to the EBC stack. \r
+  @param  Handle                The EFI handle as the index to the EBC stack.\r
   @param  StackBuffer           A pointer to hold the returned stack buffer.\r
   @param  BufferIndex           A pointer to hold the returned stack index.\r
-   \r
+\r
   @retval EFI_OUT_OF_RESOURCES  The Handle parameter does not correspond to any\r
                                 existing EBC stack.\r
   @retval EFI_SUCCESS           The stack index and buffer were found and\r
@@ -269,10 +269,10 @@ GetEBCStack(
   );\r
 \r
 /**\r
-  Returns from the EBC stack by stack Index. \r
-   \r
+  Returns from the EBC stack by stack Index.\r
+\r
   @param  Index        Specifies which EBC stack to return from.\r
-   \r
+\r
   @retval EFI_SUCCESS  The function completed successfully.\r
 \r
 **/\r
@@ -284,7 +284,7 @@ ReturnEBCStack(
 /**\r
   Allocates memory to hold all the EBC stacks.\r
 \r
-  @retval EFI_SUCCESS          The EBC stacks were allocated successfully. \r
+  @retval EFI_SUCCESS          The EBC stacks were allocated successfully.\r
   @retval EFI_OUT_OF_RESOURCES Not enough memory available for EBC stacks.\r
 \r
 **/\r
@@ -305,10 +305,10 @@ FreeEBCStack(
   );\r
 \r
 /**\r
-  Returns from the EBC stack associated with the Handle parameter. \r
-   \r
+  Returns from the EBC stack associated with the Handle parameter.\r
+\r
   @param  Handle      Specifies the EFI handle to find the EBC stack with.\r
-   \r
+\r
   @retval EFI_SUCCESS The function completed successfully.\r
 \r
 **/\r
@@ -316,6 +316,8 @@ EFI_STATUS
 ReturnEBCStackByHandle(\r
   IN EFI_HANDLE Handle\r
   );\r
+\r
+\r
 //\r
 // Defines for a simple EBC debugger interface\r
 //\r
@@ -329,23 +331,23 @@ typedef struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL EFI_EBC_SIMPLE_DEBUGGER_PROTOCO
 typedef\r
 EFI_STATUS\r
 (*EBC_DEBUGGER_SIGNAL_EXCEPTION) (\r
-  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           * This,\r
-  IN VM_CONTEXT                                 * VmPtr,\r
+  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,\r
+  IN VM_CONTEXT                                 *VmPtr,\r
   IN EFI_EXCEPTION_TYPE                         ExceptionType\r
   );\r
 \r
 typedef\r
 VOID\r
 (*EBC_DEBUGGER_DEBUG) (\r
-  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           * This,\r
-  IN VM_CONTEXT                                 * VmPtr\r
+  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,\r
+  IN VM_CONTEXT                                 *VmPtr\r
   );\r
 \r
 typedef\r
 UINT32\r
 (*EBC_DEBUGGER_DASM) (\r
-  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           * This,\r
-  IN VM_CONTEXT                                 * VmPtr,\r
+  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,\r
+  IN VM_CONTEXT                                 *VmPtr,\r
   IN UINT16                                     *DasmString OPTIONAL,\r
   IN UINT32                                     DasmStringSize\r
   );\r
@@ -359,7 +361,7 @@ UINT32
 typedef\r
 EFI_STATUS\r
 (*EBC_DEBUGGER_CONFIGURE) (\r
-  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           * This,\r
+  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,\r
   IN UINT32                                     ConfigId,\r
   IN UINTN                                      ConfigValue\r
   );\r
@@ -381,7 +383,7 @@ typedef struct {
   VM_CONTEXT        VmContext;\r
 } EFI_EBC_THUNK_DATA;\r
 \r
-#define EBC_PROTOCOL_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('e', 'b', 'c', 'p')\r
+#define EBC_PROTOCOL_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('e', 'b', 'c', 'p')\r
 \r
 \r
 #define EBC_PROTOCOL_PRIVATE_DATA_FROM_THIS(a) \\r