Changeset 41706 in vbox

Timestamp:

Jun 14, 2012 12:33:12 PM (13 years ago)

Author:

vboxsync

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

78514

Message:

dis.h: Drop the pragma pack(4) around DISOPCODE, it has no effect and only makes you think the structure is special. Use explicit packing instead.

Location:

trunk

Files:

• include/VBox/dis.h (modified) (3 diffs)
• src/VBox/Disassembler/DisasmInternal.h (modified) (1 diff)

trunk/include/VBox/dis.h

@@ -566 +566 @@
 } DISCPUSTATE;
 
-/** The storage padding sufficient to hold the largest DISCPUSTATE in all
- * contexts (R3, R0 and RC). Used various places in the VMM internals.   */
-#define DISCPUSTATE_PADDING_SIZE    (HC_ARCH_BITS == 64 ? 0x1a0 : 0x180)
-
-/** Opcode. */
-#pragma pack(4)
+
+/** 
+ * Opcode descriptor. 
+ */ 
 typedef struct DISOPCODE
 {
@@ -580 +578 @@
     uint8_t     idxParse2;
     uint8_t     idxParse3;
+    uint8_t     uUnused;
     uint16_t    opcode;
     uint16_t    param1;
@@ -586 +585 @@
     uint32_t    optype;
 } DISOPCODE;
-#pragma pack()
 
 

trunk/src/VBox/Disassembler/DisasmInternal.h

@@ -164 +164 @@
 #ifndef DIS_CORE_ONLY
 # define OP(pszOpcode, idxParse1, idxParse2, idxParse3, opcode, param1, param2, param3, optype) \
-    { pszOpcode, idxParse1, idxParse2, idxParse3, opcode, param1, param2, param3, optype }
+    { pszOpcode, idxParse1, idxParse2, idxParse3, 0, opcode, param1, param2, param3, optype }
 #else
 # define OP(pszOpcode, idxParse1, idxParse2, idxParse3, opcode, param1, param2, param3, optype) \
-    { idxParse1, idxParse2, idxParse3, opcode, param1, param2, param3, optype }
+    { idxParse1, idxParse2, idxParse3, 0, opcode, param1, param2, param3, optype }
 #endif