[PATCH v4 3/3] MdeModulePkg/EbcDxe: reorganize EBC header definitions

[Pete Batard <pete@akeo.ie>]

VM related defs are now in EbcVmTest.h, and opocode related definitions in
Ebc.h.
Because it is used by both the EBC Debugger and driver,
EbcDebugSignalException() sees its definition factorized in
EbcDebuggerHook.h.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Pete Batard <pete@akeo.ie>
---
 MdeModulePkg/Include/Protocol/EbcVmTest.h          |  49 +++++
 MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h    |   4 -
 .../Universal/EbcDxe/EbcDebugger/EdbCommon.h       |   5 +
 MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c    |   4 +-
 MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h    |  23 +++
 MdeModulePkg/Universal/EbcDxe/EbcExecute.h         | 198 ---------------------
 MdeModulePkg/Universal/EbcDxe/EbcInt.h             |  29 ---
 MdePkg/Include/Protocol/Ebc.h                      | 161 +++++++++++++++++
 8 files changed, 239 insertions(+), 234 deletions(-)

diff --git a/MdeModulePkg/Include/Protocol/EbcVmTest.h b/MdeModulePkg/Include/Protocol/EbcVmTest.h
index a9bbb3a0a6e3..9eedca1906a2 100644
--- a/MdeModulePkg/Include/Protocol/EbcVmTest.h
+++ b/MdeModulePkg/Include/Protocol/EbcVmTest.h
@@ -30,6 +30,55 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 typedef struct _EFI_EBC_VM_TEST_PROTOCOL EFI_EBC_VM_TEST_PROTOCOL;
 
+//
+// VM major/minor version
+//
+#define VM_MAJOR_VERSION  1
+#define VM_MINOR_VERSION  0
+
+//
+// Bits in the VM->StopFlags field
+//
+#define STOPFLAG_APP_DONE         0x0001
+#define STOPFLAG_BREAKPOINT       0x0002
+#define STOPFLAG_INVALID_BREAK    0x0004
+#define STOPFLAG_BREAK_ON_CALLEX  0x0008
+
+//
+// Masks for working with the VM flags register
+//
+#define VMFLAGS_CC        0x0001  // condition flag
+#define VMFLAGS_STEP      0x0002  // step instruction mode
+#define VMFLAGS_ALL_VALID (VMFLAGS_CC | VMFLAGS_STEP)
+
+//
+// Macros for operating on the VM flags register
+//
+#define VMFLAG_SET(pVM, Flag)   (pVM->Flags |= (Flag))
+#define VMFLAG_ISSET(pVM, Flag) ((pVM->Flags & (Flag)) ? 1 : 0)
+#define VMFLAG_CLEAR(pVM, Flag) (pVM->Flags &= ~(Flag))
+
+//
+// Define a macro to get the operand. Then we can change it to be either a
+// direct read or have it call a function to read memory.
+//
+#define GETOPERANDS(pVM)  (UINT8) (*(UINT8 *) (pVM->Ip + 1))
+#define GETOPCODE(pVM)    (UINT8) (*(UINT8 *) pVM->Ip)
+
+//
+// Macros for operating on the VM GP registers
+//
+#define OPERAND1_REGDATA(pVM, Op) pVM->Gpr[OPERAND1_REGNUM (Op)]
+#define OPERAND2_REGDATA(pVM, Op) pVM->Gpr[OPERAND2_REGNUM (Op)]
+
+//
+// Bits of exception flags field of VM context
+//
+#define EXCEPTION_FLAG_FATAL    0x80000000  // can't continue
+#define EXCEPTION_FLAG_ERROR    0x40000000  // bad, but try to continue
+#define EXCEPTION_FLAG_WARNING  0x20000000  // harmless problem
+#define EXCEPTION_FLAG_NONE     0x00000000  // for normal return
+
 ///
 /// instruction pointer for the VM
 ///
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h
index d366ca536323..91b507e3a113 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h
@@ -21,12 +21,8 @@ Abstract:
 #ifndef _EFI_EDB_H_
 #define _EFI_EDB_H_
 
-#include <Uefi.h>
 #include "EdbCommon.h"
 
-#include "EbcInt.h"
-#include "EbcExecute.h"
-
 #define EBC_DEBUGGER_MAJOR_VERSION   1
 #define EBC_DEBUGGER_MINOR_VERSION   0
 
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
index 8c9449c6203f..45634af9ce39 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
@@ -22,9 +22,14 @@ Abstract:
 #define _EFI_EDB_COMMON_H_
 
 #include <Uefi.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/DebugLib.h>
 #include <Library/UefiLib.h>
 #include <Library/PrintLib.h>
 #include <Library/UefiBootServicesTableLib.h>
+#include <Protocol/Ebc.h>
 #include <Protocol/DebugSupport.h>
 #include <Protocol/PciRootBridgeIo.h>
 #include <Protocol/SimpleFileSystem.h>
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c b/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c
index 88a43f236435..1594cecf1650 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c
@@ -16,9 +16,7 @@
 
 **/
 
-#include <Uefi.h>
-#include <Protocol/DebugSupport.h>
-#include <Protocol/EbcVmTest.h>
+#include "EbcDebuggerHook.h"
 
 VOID
 EbcDebuggerHookInit (
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h b/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h
index f4dd5cf813a1..ad93fd787d56 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h
@@ -15,6 +15,29 @@
 #ifndef _EFI_EBC_DEBUGGER_HOOK_H_
 #define _EFI_EBC_DEBUGGER_HOOK_H_
 
+#include <Uefi.h>
+
+#include <Protocol/DebugSupport.h>
+#include <Protocol/EbcVmTest.h>
+
+/**
+  The VM interpreter calls this function when an exception is detected.
+
+  @param  ExceptionType          Specifies the processor exception detected.
+  @param  ExceptionFlags         Specifies the exception context.
+  @param  VmPtr                  Pointer to a VM context for passing info to the
+                                 EFI debugger.
+
+  @retval EFI_SUCCESS            This function completed successfully.
+
+**/
+EFI_STATUS
+EbcDebugSignalException (
+  IN EFI_EXCEPTION_TYPE                   ExceptionType,
+  IN EXCEPTION_FLAGS                      ExceptionFlags,
+  IN VM_CONTEXT                           *VmPtr
+  );
+
 //
 // Hooks in EbcInt.c
 //
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
index bdc70b1d4368..b7489514b919 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
@@ -18,214 +18,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EBC_EXECUTE_H_
 
 //
-// VM major/minor version
-//
-#define VM_MAJOR_VERSION  1
-#define VM_MINOR_VERSION  0
-
-//
 // Macros to check and set alignment
 //
 #define ASSERT_ALIGNED(addr, size)  ASSERT (!((UINT32) (addr) & (size - 1)))
 #define IS_ALIGNED(addr, size)      !((UINT32) (addr) & (size - 1))
 
 //
-// Define a macro to get the operand. Then we can change it to be either a
-// direct read or have it call a function to read memory.
-//
-#define GETOPERANDS(pVM)  (UINT8) (*(UINT8 *) (pVM->Ip + 1))
-#define GETOPCODE(pVM)    (UINT8) (*(UINT8 *) pVM->Ip)
-
-//
-// Bit masks for opcode encodings
-//
-#define OPCODE_M_OPCODE       0x3F  // bits of interest for first level decode
-#define OPCODE_M_IMMDATA      0x80
-#define OPCODE_M_IMMDATA64    0x40
-#define OPCODE_M_64BIT        0x40  // for CMP
-#define OPCODE_M_RELADDR      0x10  // for CALL instruction
-#define OPCODE_M_CMPI32_DATA  0x80  // for CMPI
-#define OPCODE_M_CMPI64       0x40  // for CMPI 32 or 64 bit comparison
-#define OPERAND_M_MOVIN_N     0x80
-#define OPERAND_M_CMPI_INDEX  0x10
-
-//
-// Masks for instructions that encode presence of indexes for operand1 and/or
-// operand2.
-//
-#define OPCODE_M_IMMED_OP1  0x80
-#define OPCODE_M_IMMED_OP2  0x40
-
-//
-// Bit masks for operand encodings
-//
-#define OPERAND_M_INDIRECT1 0x08
-#define OPERAND_M_INDIRECT2 0x80
-#define OPERAND_M_OP1       0x07
-#define OPERAND_M_OP2       0x70
-
-//
-// Masks for data manipulation instructions
-//
-#define DATAMANIP_M_64      0x40  // 64-bit width operation
-#define DATAMANIP_M_IMMDATA 0x80
-
-//
-// For MOV instructions, need a mask for the opcode when immediate
-// data applies to R2.
-//
-#define OPCODE_M_IMMED_OP2  0x40
-
-//
-// The MOVI/MOVIn instructions use bit 6 of operands byte to indicate
-// if an index is present. Then bits 4 and 5 are used to indicate the width
-// of the move.
-//
-#define MOVI_M_IMMDATA    0x40
-#define MOVI_M_DATAWIDTH  0xC0
-#define MOVI_DATAWIDTH16  0x40
-#define MOVI_DATAWIDTH32  0x80
-#define MOVI_DATAWIDTH64  0xC0
-#define MOVI_M_MOVEWIDTH  0x30
-#define MOVI_MOVEWIDTH8   0x00
-#define MOVI_MOVEWIDTH16  0x10
-#define MOVI_MOVEWIDTH32  0x20
-#define MOVI_MOVEWIDTH64  0x30
-
-//
-// Masks for CALL instruction encodings
-//
-#define OPERAND_M_RELATIVE_ADDR 0x10
-#define OPERAND_M_NATIVE_CALL   0x20
-
-//
-// Masks for decoding push/pop instructions
-//
-#define PUSHPOP_M_IMMDATA 0x80  // opcode bit indicating immediate data
-#define PUSHPOP_M_64      0x40  // opcode bit indicating 64-bit operation
-//
-// Mask for operand of JMP instruction
-//
-#define JMP_M_RELATIVE    0x10
-#define JMP_M_CONDITIONAL 0x80
-#define JMP_M_CS          0x40
-
-//
-// Macros to determine if a given operand is indirect
-//
-#define OPERAND1_INDIRECT(op) ((op) & OPERAND_M_INDIRECT1)
-#define OPERAND2_INDIRECT(op) ((op) & OPERAND_M_INDIRECT2)
-
-//
-// Macros to extract the operands from second byte of instructions
-//
-#define OPERAND1_REGNUM(op)       ((op) & OPERAND_M_OP1)
-#define OPERAND2_REGNUM(op)       (((op) & OPERAND_M_OP2) >> 4)
-
-#define OPERAND1_CHAR(op)         ('0' + OPERAND1_REGNUM (op))
-#define OPERAND2_CHAR(op)         ('0' + OPERAND2_REGNUM (op))
-
-#define OPERAND1_REGDATA(pvm, op) pvm->Gpr[OPERAND1_REGNUM (op)]
-#define OPERAND2_REGDATA(pvm, op) pvm->Gpr[OPERAND2_REGNUM (op)]
-
-//
-// Condition masks usually for byte 1 encodings of code
-//
-#define CONDITION_M_CONDITIONAL 0x80
-#define CONDITION_M_CS          0x40
-
-//
-// Bits in the VM->StopFlags field
-//
-#define STOPFLAG_APP_DONE         0x0001
-#define STOPFLAG_BREAKPOINT       0x0002
-#define STOPFLAG_INVALID_BREAK    0x0004
-#define STOPFLAG_BREAK_ON_CALLEX  0x0008
-
-//
-// Masks for working with the VM flags register
-//
-#define VMFLAGS_CC        0x0001  // condition flag
-#define VMFLAGS_STEP      0x0002  // step instruction mode
-#define VMFLAGS_ALL_VALID (VMFLAGS_CC | VMFLAGS_STEP)
-
-//
-// Macros for operating on the VM flags register
-//
-#define VMFLAG_SET(pVM, Flag)   (pVM->Flags |= (Flag))
-#define VMFLAG_ISSET(pVM, Flag) ((pVM->Flags & (Flag)) ? 1 : 0)
-#define VMFLAG_CLEAR(pVM, Flag) (pVM->Flags &= ~(Flag))
-
-//
 // Debug macro
 //
 #define EBCMSG(s) gST->ConOut->OutputString (gST->ConOut, s)
 
-//
-// Define OPCODES
-//
-#define OPCODE_BREAK    0x00
-#define OPCODE_JMP      0x01
-#define OPCODE_JMP8     0x02
-#define OPCODE_CALL     0x03
-#define OPCODE_RET      0x04
-#define OPCODE_CMPEQ    0x05
-#define OPCODE_CMPLTE   0x06
-#define OPCODE_CMPGTE   0x07
-#define OPCODE_CMPULTE  0x08
-#define OPCODE_CMPUGTE  0x09
-#define OPCODE_NOT      0x0A
-#define OPCODE_NEG      0x0B
-#define OPCODE_ADD      0x0C
-#define OPCODE_SUB      0x0D
-#define OPCODE_MUL      0x0E
-#define OPCODE_MULU     0x0F
-#define OPCODE_DIV      0x10
-#define OPCODE_DIVU     0x11
-#define OPCODE_MOD      0x12
-#define OPCODE_MODU     0x13
-#define OPCODE_AND      0x14
-#define OPCODE_OR       0x15
-#define OPCODE_XOR      0x16
-#define OPCODE_SHL      0x17
-#define OPCODE_SHR      0x18
-#define OPCODE_ASHR     0x19
-#define OPCODE_EXTNDB   0x1A
-#define OPCODE_EXTNDW   0x1B
-#define OPCODE_EXTNDD   0x1C
-#define OPCODE_MOVBW    0x1D
-#define OPCODE_MOVWW    0x1E
-#define OPCODE_MOVDW    0x1F
-#define OPCODE_MOVQW    0x20
-#define OPCODE_MOVBD    0x21
-#define OPCODE_MOVWD    0x22
-#define OPCODE_MOVDD    0x23
-#define OPCODE_MOVQD    0x24
-#define OPCODE_MOVSNW   0x25  // Move signed natural with word index
-#define OPCODE_MOVSND   0x26  // Move signed natural with dword index
-//
-// #define OPCODE_27         0x27
-//
-#define OPCODE_MOVQQ    0x28  // Does this go away?
-#define OPCODE_LOADSP   0x29
-#define OPCODE_STORESP  0x2A
-#define OPCODE_PUSH     0x2B
-#define OPCODE_POP      0x2C
-#define OPCODE_CMPIEQ   0x2D
-#define OPCODE_CMPILTE  0x2E
-#define OPCODE_CMPIGTE  0x2F
-#define OPCODE_CMPIULTE 0x30
-#define OPCODE_CMPIUGTE 0x31
-#define OPCODE_MOVNW    0x32
-#define OPCODE_MOVND    0x33
-//
-// #define OPCODE_34         0x34
-//
-#define OPCODE_PUSHN  0x35
-#define OPCODE_POPN   0x36
-#define OPCODE_MOVI   0x37
-#define OPCODE_MOVIN  0x38
-#define OPCODE_MOVREL 0x39
 
 /**
   Execute an EBC image from an entry point or from a published protocol.
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index 01ac4412151c..75017a23e75e 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
@@ -34,13 +34,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 extern VM_CONTEXT                    *mVmPtr;
 
 //
-// Bits of exception flags field of VM context
-//
-#define EXCEPTION_FLAG_FATAL    0x80000000  // can't continue
-#define EXCEPTION_FLAG_ERROR    0x40000000  // bad, but try to continue
-#define EXCEPTION_FLAG_WARNING  0x20000000  // harmless problem
-#define EXCEPTION_FLAG_NONE     0x00000000  // for normal return
-//
 // Flags passed to the internal create-thunks function.
 //
 #define FLAG_THUNK_ENTRY_POINT  0x01  // thunk for an image entry point
@@ -97,28 +90,6 @@ EbcAddImageThunk (
   );
 
 //
-// The interpreter calls these when an exception is detected,
-// or as a periodic callback.
-//
-/**
-  The VM interpreter calls this function when an exception is detected.
-
-  @param  ExceptionType          Specifies the processor exception detected.
-  @param  ExceptionFlags         Specifies the exception context.
-  @param  VmPtr                  Pointer to a VM context for passing info to the
-                                 EFI debugger.
-
-  @retval EFI_SUCCESS            This function completed successfully.
-
-**/
-EFI_STATUS
-EbcDebugSignalException (
-  IN EFI_EXCEPTION_TYPE                   ExceptionType,
-  IN EXCEPTION_FLAGS                      ExceptionFlags,
-  IN VM_CONTEXT                           *VmPtr
-  );
-
-//
 // Define a constant of how often to call the debugger periodic callback
 // function.
 //
diff --git a/MdePkg/Include/Protocol/Ebc.h b/MdePkg/Include/Protocol/Ebc.h
index 969bb5496b05..0fcb82bce85b 100644
--- a/MdePkg/Include/Protocol/Ebc.h
+++ b/MdePkg/Include/Protocol/Ebc.h
@@ -20,6 +20,167 @@
     0x13AC6DD1, 0x73D0, 0x11D4, {0xB0, 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7 } \
   }
 
+//
+// Define OPCODES
+//
+#define OPCODE_BREAK    0x00
+#define OPCODE_JMP      0x01
+#define OPCODE_JMP8     0x02
+#define OPCODE_CALL     0x03
+#define OPCODE_RET      0x04
+#define OPCODE_CMPEQ    0x05
+#define OPCODE_CMPLTE   0x06
+#define OPCODE_CMPGTE   0x07
+#define OPCODE_CMPULTE  0x08
+#define OPCODE_CMPUGTE  0x09
+#define OPCODE_NOT      0x0A
+#define OPCODE_NEG      0x0B
+#define OPCODE_ADD      0x0C
+#define OPCODE_SUB      0x0D
+#define OPCODE_MUL      0x0E
+#define OPCODE_MULU     0x0F
+#define OPCODE_DIV      0x10
+#define OPCODE_DIVU     0x11
+#define OPCODE_MOD      0x12
+#define OPCODE_MODU     0x13
+#define OPCODE_AND      0x14
+#define OPCODE_OR       0x15
+#define OPCODE_XOR      0x16
+#define OPCODE_SHL      0x17
+#define OPCODE_SHR      0x18
+#define OPCODE_ASHR     0x19
+#define OPCODE_EXTNDB   0x1A
+#define OPCODE_EXTNDW   0x1B
+#define OPCODE_EXTNDD   0x1C
+#define OPCODE_MOVBW    0x1D
+#define OPCODE_MOVWW    0x1E
+#define OPCODE_MOVDW    0x1F
+#define OPCODE_MOVQW    0x20
+#define OPCODE_MOVBD    0x21
+#define OPCODE_MOVWD    0x22
+#define OPCODE_MOVDD    0x23
+#define OPCODE_MOVQD    0x24
+#define OPCODE_MOVSNW   0x25  // Move signed natural with word index
+#define OPCODE_MOVSND   0x26  // Move signed natural with dword index
+//
+// #define OPCODE_27         0x27
+//
+#define OPCODE_MOVQQ    0x28  // Does this go away?
+#define OPCODE_LOADSP   0x29
+#define OPCODE_STORESP  0x2A
+#define OPCODE_PUSH     0x2B
+#define OPCODE_POP      0x2C
+#define OPCODE_CMPIEQ   0x2D
+#define OPCODE_CMPILTE  0x2E
+#define OPCODE_CMPIGTE  0x2F
+#define OPCODE_CMPIULTE 0x30
+#define OPCODE_CMPIUGTE 0x31
+#define OPCODE_MOVNW    0x32
+#define OPCODE_MOVND    0x33
+//
+// #define OPCODE_34         0x34
+//
+#define OPCODE_PUSHN  0x35
+#define OPCODE_POPN   0x36
+#define OPCODE_MOVI   0x37
+#define OPCODE_MOVIN  0x38
+#define OPCODE_MOVREL 0x39
+
+//
+// Bit masks for opcode encodings
+//
+#define OPCODE_M_OPCODE       0x3F  // bits of interest for first level decode
+#define OPCODE_M_IMMDATA      0x80
+#define OPCODE_M_IMMDATA64    0x40
+#define OPCODE_M_64BIT        0x40  // for CMP
+#define OPCODE_M_RELADDR      0x10  // for CALL instruction
+#define OPCODE_M_CMPI32_DATA  0x80  // for CMPI
+#define OPCODE_M_CMPI64       0x40  // for CMPI 32 or 64 bit comparison
+#define OPERAND_M_MOVIN_N     0x80
+#define OPERAND_M_CMPI_INDEX  0x10
+
+//
+// Masks for instructions that encode presence of indexes for operand1 and/or
+// operand2.
+//
+#define OPCODE_M_IMMED_OP1  0x80
+#define OPCODE_M_IMMED_OP2  0x40
+
+//
+// Bit masks for operand encodings
+//
+#define OPERAND_M_INDIRECT1 0x08
+#define OPERAND_M_INDIRECT2 0x80
+#define OPERAND_M_OP1       0x07
+#define OPERAND_M_OP2       0x70
+
+//
+// Masks for data manipulation instructions
+//
+#define DATAMANIP_M_64      0x40  // 64-bit width operation
+#define DATAMANIP_M_IMMDATA 0x80
+
+//
+// For MOV instructions, need a mask for the opcode when immediate
+// data applies to R2.
+//
+#define OPCODE_M_IMMED_OP2  0x40
+
+//
+// The MOVI/MOVIn instructions use bit 6 of operands byte to indicate
+// if an index is present. Then bits 4 and 5 are used to indicate the width
+// of the move.
+//
+#define MOVI_M_IMMDATA    0x40
+#define MOVI_M_DATAWIDTH  0xC0
+#define MOVI_DATAWIDTH16  0x40
+#define MOVI_DATAWIDTH32  0x80
+#define MOVI_DATAWIDTH64  0xC0
+#define MOVI_M_MOVEWIDTH  0x30
+#define MOVI_MOVEWIDTH8   0x00
+#define MOVI_MOVEWIDTH16  0x10
+#define MOVI_MOVEWIDTH32  0x20
+#define MOVI_MOVEWIDTH64  0x30
+
+//
+// Masks for CALL instruction encodings
+//
+#define OPERAND_M_RELATIVE_ADDR 0x10
+#define OPERAND_M_NATIVE_CALL   0x20
+
+//
+// Masks for decoding push/pop instructions
+//
+#define PUSHPOP_M_IMMDATA 0x80  // opcode bit indicating immediate data
+#define PUSHPOP_M_64      0x40  // opcode bit indicating 64-bit operation
+//
+// Mask for operand of JMP instruction
+//
+#define JMP_M_RELATIVE    0x10
+#define JMP_M_CONDITIONAL 0x80
+#define JMP_M_CS          0x40
+
+//
+// Macros to determine if a given operand is indirect
+//
+#define OPERAND1_INDIRECT(op) ((op) & OPERAND_M_INDIRECT1)
+#define OPERAND2_INDIRECT(op) ((op) & OPERAND_M_INDIRECT2)
+
+//
+// Macros to extract the operands from second byte of instructions
+//
+#define OPERAND1_REGNUM(op)       ((op) & OPERAND_M_OP1)
+#define OPERAND2_REGNUM(op)       (((op) & OPERAND_M_OP2) >> 4)
+
+#define OPERAND1_CHAR(op)         ('0' + OPERAND1_REGNUM (op))
+#define OPERAND2_CHAR(op)         ('0' + OPERAND2_REGNUM (op))
+
+//
+// Condition masks usually for byte 1 encodings of code
+//
+#define CONDITION_M_CONDITIONAL 0x80
+#define CONDITION_M_CS          0x40
+
 ///
 /// Protocol Guid Name defined in spec.
 ///
-- 
2.9.3.windows.2