Changeset 41674 in vbox for trunk/include/VBox/dis.h

Timestamp:

Jun 12, 2012 8:16:31 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78481

Message:

DISCoreOne* -> DISCore*.

File:

• trunk/include/VBox/dis.h (modified) (5 diffs)

trunk/include/VBox/dis.h

@@ -35 +35 @@
 
 
-/** CPU mode flags (DISCPUSTATE::mode).
- * @{
- */
-typedef enum
+/**
+ * CPU mode flags (DISCPUSTATE::mode).
+ */
+typedef enum DISCPUMODE
 {
-    CPUMODE_16BIT = 1,
-    CPUMODE_32BIT = 2,
-    CPUMODE_64BIT = 3,
+    CPUMODE_INVALID = 0,
+    CPUMODE_16BIT,
+    CPUMODE_32BIT,
+    CPUMODE_64BIT,
     /** hack forcing the size of the enum to 32-bits. */
     CPUMODE_MAKE_32BIT_HACK = 0x7fffffff
 } DISCPUMODE;
-/** @} */
-
-/** Prefix byte flags
+
+/** @name Prefix byte flags
  * @{
  */
 #define PREFIX_NONE                     0
 /** non-default address size. */
-#define PREFIX_ADDRSIZE                 RT_BIT(0)
+#define PREFIX_ADDRSIZE                 UINT8_C(0x00)
 /** non-default operand size. */
-#define PREFIX_OPSIZE                   RT_BIT(1)
+#define PREFIX_OPSIZE                   UINT8_C(0x01)
 /** lock prefix. */
-#define PREFIX_LOCK                     RT_BIT(2)
+#define PREFIX_LOCK                     UINT8_C(0x02)
 /** segment prefix. */
-#define PREFIX_SEG                      RT_BIT(3)
+#define PREFIX_SEG                      UINT8_C(0x04)
 /** rep(e) prefix (not a prefix, but we'll treat is as one). */
-#define PREFIX_REP                      RT_BIT(4)
+#define PREFIX_REP                      UINT8_C(0x08)
 /** rep(e) prefix (not a prefix, but we'll treat is as one). */
-#define PREFIX_REPNE                    RT_BIT(5)
+#define PREFIX_REPNE                    UINT8_C(0x10)
 /** REX prefix (64 bits) */
-#define PREFIX_REX                      RT_BIT(6)
-/** @} */
-
-/** 64 bits prefix byte flags
+#define PREFIX_REX                      UINT8_C(0x20)
+/** @} */
+
+/** @name 64 bits prefix byte flags
  * @{
  */
@@ -90 +90 @@
 /** @} */
 
-/**
- * Operand type.
+/** @name Operand type.
+ * @{
  */
 #define OPTYPE_INVALID                  RT_BIT(0)
@@ -119 +119 @@
 #define OPTYPE_MOD_FIXED_11             RT_BIT(24)  /**< modrm.mod is always 11b */
 #define OPTYPE_FORCED_32_OP_SIZE_X86    RT_BIT(25)  /**< Forced 32 bits operand size; regardless of prefix bytes (only in 16 & 32 bits mode!) */
-#define OPTYPE_ALL                      (0xffffffff)
-
-/** Parameter usage flags.
+#define OPTYPE_ALL                      UINT32_C(0xffffffff)
+/** @}  */
+
+/** @name Parameter usage flags.
  * @{
  */
@@ -507 +508 @@
     PFNDISPARSE    *pfnDisasmFnTable;
     /** Internal: instruction filter */
-    uint32_t        uFilter;
+    uint32_t        fFilter;
     /** Return code set by a worker function like the opcode bytes readers. */
     int32_t         rc;
@@ -558 +559 @@
                              PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput);
 
-DISDECL(int) DISCoreOne(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PDISCPUSTATE pCpu, uint32_t *pcbInstr);
-DISDECL(int) DISCoreOneWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser,
-                                  PDISCPUSTATE pCpu, uint32_t *pcbInstr);
-DISDECL(int) DISCoreOneExEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t uFilter,
-                            PFNDISREADBYTES pfnReadBytes, void *pvUser,
-                            PDISCPUSTATE pCpu, uint32_t *pcbInstr);
+DISDECL(int) DISInstr(void const *pvInstr, DISCPUMODE enmCpuMode, PDISCPUSTATE pCpu, uint32_t *pcbInstr);
+DISDECL(int) DISInstrWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser,
+                                PDISCPUSTATE pCpu, uint32_t *pcbInstr);
+DISDECL(int) DISInstEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t uFilter,
+                       PFNDISREADBYTES pfnReadBytes, void *pvUser,
+                       PDISCPUSTATE pCpu, uint32_t *pcbInstr);
 
 DISDECL(int)        DISGetParamSize(PDISCPUSTATE pCpu, POP_PARAMETER pParam);