Changeset 41270 in vbox

Timestamp:

May 14, 2012 8:44:16 AM (12 years ago)

Author:

vboxsync

Message:

cleanups

Location:

trunk/include

Files:

• VBox/vmm/cpumctx.h (modified) (4 diffs)
• iprt/x86.h (modified) (9 diffs)

trunk/include/VBox/vmm/cpumctx.h

@@ -96 +96 @@
  * CPU context core.
  */
-#ifndef VBOX_FOR_DTRACE_LIB
-# pragma pack(1)
-#endif
+#pragma pack(1)
 typedef struct CPUMCTXCORE
 {
@@ -197 +195 @@
 
 } CPUMCTXCORE;
-
-# ifndef VBOX_FOR_DTRACE_LIB
-#  pragma pack()
-# endif
+#pragma pack()
 
 
@@ -206 +201 @@
  * CPU context.
  */
-#ifndef VBOX_FOR_DTRACE_LIB
-# pragma pack(1)
-#endif
+#pragma pack(1)
 typedef struct CPUMCTX
 {
@@ -376 +369 @@
     /** @} */
 
-# if 0
+#if 0
     /** Padding to align the size on a 64 byte boundary. */
     uint32_t        padding[6];
-# endif
+#endif
 } CPUMCTX;
-# ifndef VBOX_FOR_DTRACE_LIB
-#  pragma pack()
-# endif
+#pragma pack()
 
 #ifndef VBOX_FOR_DTRACE_LIB

trunk/include/iprt/x86.h

@@ -2258 +2258 @@
 typedef const X86DESCATTR *PCX86DESCATTR;
 
+#ifndef VBOX_FOR_DTRACE_LIB
 
 /**
@@ -2329 +2330 @@
     unsigned    u16OffsetHigh : 16;
 } X86DESCGATE;
-#ifndef VBOX_FOR_DTRACE_LIB
-AssertCompileSize(X86DESCGATE, 8);
-#endif
 /** Pointer to a Call-, Interrupt-, Trap- or Task-gate descriptor entry. */
 typedef X86DESCGATE *PX86DESCGATE;
@@ -2337 +2335 @@
 typedef const X86DESCGATE *PCX86DESCGATE;
 
+#endif /* VBOX_FOR_DTRACE_LIB */
+
 /**
  * Descriptor table entry.
@@ -2343 +2343 @@
 typedef union X86DESC
 {
+#ifndef VBOX_FOR_DTRACE_LIB
     /** Generic descriptor view. */
     X86DESCGENERIC  Gen;
     /** Gate descriptor view. */
     X86DESCGATE     Gate;
+#endif
 
     /** 8 bit unsigned integer view. */
@@ -2389 +2391 @@
         ( (desc.u >> (16+16+8)) & UINT32_C(0xf0ff) ) /** @todo do we have a define for 0xf0ff? */
 
+#ifndef VBOX_FOR_DTRACE_LIB
 
 /**
@@ -2519 +2522 @@
     unsigned    u32Reserved : 32;
 } X86DESC64GATE;
-#ifndef VBOX_FOR_DTRACE_LIB
 AssertCompileSize(X86DESC64GATE, 16);
-#endif
 /** Pointer to a Call-, Interrupt-, Trap- or Task-gate descriptor entry. */
 typedef X86DESC64GATE *PX86DESC64GATE;
@@ -2527 +2528 @@
 typedef const X86DESC64GATE *PCX86DESC64GATE;
 
+#endif /* VBOX_FOR_DTRACE_LIB */
 
 /**
@@ -2534 +2536 @@
 typedef union X86DESC64
 {
+#ifndef VBOX_FOR_DTRACE_LIB
     /** Generic descriptor view. */
     X86DESC64GENERIC    Gen;
@@ -2540 +2543 @@
     /** Gate descriptor view. */
     X86DESC64GATE       Gate;
+#endif
 
     /** 8 bit unsigned integer view. */