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

Timestamp:

Nov 1, 2007 4:09:26 PM (18 years ago)

Author:

vboxsync

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

25895

Message:

BIT => RT_BIT, BIT64 => RT_BIT_64. BIT() is defined in Linux 2.6.24

File:

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

trunk/include/VBox/dis.h

@@ -62 +62 @@
  * Operand type.
  */
-#define OPTYPE_INVALID               BIT(0)
-#define OPTYPE_HARMLESS              BIT(1)
-#define OPTYPE_CONTROLFLOW           BIT(2)
-#define OPTYPE_POTENTIALLY_DANGEROUS BIT(3)
-#define OPTYPE_DANGEROUS             BIT(4)
-#define OPTYPE_PORTIO                BIT(5)
-#define OPTYPE_PRIVILEGED            BIT(6)
-#define OPTYPE_PRIVILEGED_NOTRAP     BIT(7)
-#define OPTYPE_UNCOND_CONTROLFLOW    BIT(8)
-#define OPTYPE_RELATIVE_CONTROLFLOW  BIT(9)
-#define OPTYPE_COND_CONTROLFLOW      BIT(10)
-#define OPTYPE_INTERRUPT             BIT(11)
-#define OPTYPE_ILLEGAL               BIT(12)
-#define OPTYPE_RRM_DANGEROUS         BIT(14) /**< Some additional dangerouse ones when recompiling raw r0. */
-#define OPTYPE_RRM_DANGEROUS_16      BIT(15) /**< Some additional dangerouse ones when recompiling 16-bit raw r0. */
+#define OPTYPE_INVALID               RT_BIT(0)
+#define OPTYPE_HARMLESS              RT_BIT(1)
+#define OPTYPE_CONTROLFLOW           RT_BIT(2)
+#define OPTYPE_POTENTIALLY_DANGEROUS RT_BIT(3)
+#define OPTYPE_DANGEROUS             RT_BIT(4)
+#define OPTYPE_PORTIO                RT_BIT(5)
+#define OPTYPE_PRIVILEGED            RT_BIT(6)
+#define OPTYPE_PRIVILEGED_NOTRAP     RT_BIT(7)
+#define OPTYPE_UNCOND_CONTROLFLOW    RT_BIT(8)
+#define OPTYPE_RELATIVE_CONTROLFLOW  RT_BIT(9)
+#define OPTYPE_COND_CONTROLFLOW      RT_BIT(10)
+#define OPTYPE_INTERRUPT             RT_BIT(11)
+#define OPTYPE_ILLEGAL               RT_BIT(12)
+#define OPTYPE_RRM_DANGEROUS         RT_BIT(14) /**< Some additional dangerouse ones when recompiling raw r0. */
+#define OPTYPE_RRM_DANGEROUS_16      RT_BIT(15) /**< Some additional dangerouse ones when recompiling 16-bit raw r0. */
 #define OPTYPE_RRM_MASK              (OPTYPE_RRM_DANGEROUS | OPTYPE_RRM_DANGEROUS_16)
-#define OPTYPE_INHIBIT_IRQS          BIT(16) /**< Will or can inhibit irqs (sti, pop ss, mov ss) */
-#define OPTYPE_PORTIO_READ           BIT(17)
-#define OPTYPE_PORTIO_WRITE          BIT(18)
+#define OPTYPE_INHIBIT_IRQS          RT_BIT(16) /**< Will or can inhibit irqs (sti, pop ss, mov ss) */
+#define OPTYPE_PORTIO_READ           RT_BIT(17)
+#define OPTYPE_PORTIO_WRITE          RT_BIT(18)
 #define OPTYPE_ALL                   (0xffffffff)
 
@@ -86 +86 @@
  * @{
  */
-#define USE_BASE                        BIT(0)
-#define USE_INDEX                       BIT(1)
-#define USE_SCALE                       BIT(2)
-#define USE_REG_GEN8                    BIT(3)
-#define USE_REG_GEN16                   BIT(4)
-#define USE_REG_GEN32                   BIT(5)
-#define USE_REG_FP                      BIT(6)
-#define USE_REG_MMX                     BIT(7)
-#define USE_REG_XMM                     BIT(8)
-#define USE_REG_CR                      BIT(9)
-#define USE_REG_DBG                     BIT(10)
-#define USE_REG_SEG                     BIT(11)
-#define USE_REG_TEST                    BIT(12)
-#define USE_DISPLACEMENT8               BIT(13)
-#define USE_DISPLACEMENT16              BIT(14)
-#define USE_DISPLACEMENT32              BIT(15)
-#define USE_IMMEDIATE8                  BIT(16)
-#define USE_IMMEDIATE8_REL              BIT(17)
-#define USE_IMMEDIATE16                 BIT(18)
-#define USE_IMMEDIATE16_REL             BIT(19)
-#define USE_IMMEDIATE32                 BIT(20)
-#define USE_IMMEDIATE32_REL             BIT(21)
-#define USE_IMMEDIATE64                 BIT(22)
-#define USE_IMMEDIATE_ADDR_0_32         BIT(23)
-#define USE_IMMEDIATE_ADDR_16_32        BIT(24)
-#define USE_IMMEDIATE_ADDR_0_16         BIT(25)
-#define USE_IMMEDIATE_ADDR_16_16        BIT(26)
+#define USE_BASE                        RT_BIT(0)
+#define USE_INDEX                       RT_BIT(1)
+#define USE_SCALE                       RT_BIT(2)
+#define USE_REG_GEN8                    RT_BIT(3)
+#define USE_REG_GEN16                   RT_BIT(4)
+#define USE_REG_GEN32                   RT_BIT(5)
+#define USE_REG_FP                      RT_BIT(6)
+#define USE_REG_MMX                     RT_BIT(7)
+#define USE_REG_XMM                     RT_BIT(8)
+#define USE_REG_CR                      RT_BIT(9)
+#define USE_REG_DBG                     RT_BIT(10)
+#define USE_REG_SEG                     RT_BIT(11)
+#define USE_REG_TEST                    RT_BIT(12)
+#define USE_DISPLACEMENT8               RT_BIT(13)
+#define USE_DISPLACEMENT16              RT_BIT(14)
+#define USE_DISPLACEMENT32              RT_BIT(15)
+#define USE_IMMEDIATE8                  RT_BIT(16)
+#define USE_IMMEDIATE8_REL              RT_BIT(17)
+#define USE_IMMEDIATE16                 RT_BIT(18)
+#define USE_IMMEDIATE16_REL             RT_BIT(19)
+#define USE_IMMEDIATE32                 RT_BIT(20)
+#define USE_IMMEDIATE32_REL             RT_BIT(21)
+#define USE_IMMEDIATE64                 RT_BIT(22)
+#define USE_IMMEDIATE_ADDR_0_32         RT_BIT(23)
+#define USE_IMMEDIATE_ADDR_16_32        RT_BIT(24)
+#define USE_IMMEDIATE_ADDR_0_16         RT_BIT(25)
+#define USE_IMMEDIATE_ADDR_16_16        RT_BIT(26)
 /** DS:ESI */
-#define USE_POINTER_DS_BASED            BIT(27)
+#define USE_POINTER_DS_BASED            RT_BIT(27)
 /** ES:EDI */
-#define USE_POINTER_ES_BASED            BIT(28)
-#define USE_IMMEDIATE16_SX8             BIT(29)
-#define USE_IMMEDIATE32_SX8             BIT(30)
+#define USE_POINTER_ES_BASED            RT_BIT(28)
+#define USE_IMMEDIATE16_SX8             RT_BIT(29)
+#define USE_IMMEDIATE32_SX8             RT_BIT(30)
 
 #define USE_IMMEDIATE                   (USE_IMMEDIATE8|USE_IMMEDIATE16|USE_IMMEDIATE32|USE_IMMEDIATE64|USE_IMMEDIATE8_REL|USE_IMMEDIATE16_REL|USE_IMMEDIATE32_REL|USE_IMMEDIATE_ADDR_0_32|USE_IMMEDIATE_ADDR_16_32|USE_IMMEDIATE_ADDR_0_16|USE_IMMEDIATE_ADDR_16_16|USE_IMMEDIATE16_SX8|USE_IMMEDIATE32_SX8)
@@ -218 +218 @@
  * @{
  */
-#define PARAM_VAL8             BIT(0)
-#define PARAM_VAL16            BIT(1)
-#define PARAM_VAL32            BIT(2)
-#define PARAM_VAL64            BIT(3)
-#define PARAM_VALFARPTR16      BIT(4)
-#define PARAM_VALFARPTR32      BIT(5)
+#define PARAM_VAL8             RT_BIT(0)
+#define PARAM_VAL16            RT_BIT(1)
+#define PARAM_VAL32            RT_BIT(2)
+#define PARAM_VAL64            RT_BIT(3)
+#define PARAM_VALFARPTR16      RT_BIT(4)
+#define PARAM_VALFARPTR32      RT_BIT(5)
 
 #define PARMTYPE_REGISTER      1