Clean up the private GUID definition in module Level.

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

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index e9aecf11c5435a0ef1774c39b1f1f6413bc73280..98ba7e66f34629cb02f2d3691161edb2dff4e583 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
@@ -2,7 +2,7 @@
   Main routines for the EBC interpreter.  Includes the initialization and\r
   main interpreter routines.\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -21,6 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/Ebc.h>\r
+#include <Protocol/EbcVmTest.h>\r
+#include <Protocol/EbcSimpleDebugger.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
@@ -29,36 +31,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 \r
-typedef INT64   VM_REGISTER;\r
-typedef UINT8   *VMIP;      // instruction pointer for the VM\r
-typedef UINT32  EXCEPTION_FLAGS;\r
-\r
-typedef struct {\r
-  VM_REGISTER       Gpr[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
-  UINT32            StopFlags;\r
-  UINT32            CompilerVersion;        // via break(6)\r
-  UINTN             HighStackBottom;        // bottom of the upper stack\r
-  UINTN             LowStackTop;            // top of the lower stack\r
-  UINT64            StackRetAddr;           // location of final return address on stack\r
-  UINTN             *StackMagicPtr;         // pointer to magic value on stack to detect corruption\r
-  EFI_HANDLE        ImageHandle;            // for this EBC driver\r
-  EFI_SYSTEM_TABLE  *SystemTable;           // for debugging only\r
-  UINTN             LastAddrConverted;      // for debug\r
-  UINTN             LastAddrConvertedValue; // for debug\r
-  VOID              *FramePtr;\r
-  VOID              *EntryPoint;            // entry point of EBC image\r
-  UINTN             ImageBase;\r
-  VOID              *StackPool;\r
-  VOID              *StackTop;\r
-} VM_CONTEXT;\r
-\r
 extern VM_CONTEXT                    *mVmPtr;\r
 \r
 //\r
@@ -317,65 +289,6 @@ ReturnEBCStackByHandle(
   IN EFI_HANDLE Handle\r
   );\r
 \r
-\r
-//\r
-// Defines for a simple EBC debugger interface\r
-//\r
-typedef struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL;\r
-\r
-#define EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL_GUID \\r
-  { \\r
-    0x2a72d11e, 0x7376, 0x40f6, { 0x9c, 0x68, 0x23, 0xfa, 0x2f, 0xe3, 0x63, 0xf1 } \\r
-  }\r
-\r
-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_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
-  );\r
-\r
-typedef\r
-UINT32\r
-(*EBC_DEBUGGER_DASM) (\r
-  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,\r
-  IN VM_CONTEXT                                 *VmPtr,\r
-  IN UINT16                                     *DasmString OPTIONAL,\r
-  IN UINT32                                     DasmStringSize\r
-  );\r
-\r
-//\r
-// This interface allows you to configure the EBC debug support\r
-// driver. For example, turn on or off saving and printing of\r
-// delta VM even if called. Or to even disable the entire interface,\r
-// in which case all functions become no-ops.\r
-//\r
-typedef\r
-EFI_STATUS\r
-(*EBC_DEBUGGER_CONFIGURE) (\r
-  IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,\r
-  IN UINT32                                     ConfigId,\r
-  IN UINTN                                      ConfigValue\r
-  );\r
-\r
-//\r
-// Prototype for the actual EBC debug support protocol interface\r
-//\r
-struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL {\r
-  EBC_DEBUGGER_DEBUG            Debugger;\r
-  EBC_DEBUGGER_SIGNAL_EXCEPTION SignalException;\r
-  EBC_DEBUGGER_DASM             Dasm;\r
-  EBC_DEBUGGER_CONFIGURE        Configure;\r
-};\r
-\r
 typedef struct {\r
   EFI_EBC_PROTOCOL  *This;\r
   VOID              *EntryPoint;\r