Changeset 22429 in vbox for trunk/include

Timestamp:

Aug 25, 2009 11:54:39 AM (16 years ago)

Author:

vboxsync

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

51420

Message:

VMM,x86.h/mac: Be more careful with X86DESCHC.

Location:

trunk/include/VBox

Files:

• x86.h (modified) (3 diffs)
• x86.mac (modified) (2 diffs)

trunk/include/VBox/x86.h

@@ -2261 +2261 @@
 typedef const X86DESC64 *PCX86DESC64;
 
-#if HC_ARCH_BITS == 64
-typedef X86DESC64   X86DESCHC;
-typedef X86DESC64   *PX86DESCHC;
-#else
-typedef X86DESC     X86DESCHC;
-typedef X86DESC     *PX86DESCHC;
-#endif
-
 /** @def X86DESC64_BASE
  * Return the base of a 64-bit descriptor.
@@ -2277 +2269 @@
          | (           (desc).Gen.u8BaseHigh1   << 16) \
          | (           (desc).Gen.u16BaseLow         ) )
+
+
+
+/** @name Host system descriptor table entry - Use with care!
+ * @{ */
+/** Host system descriptor table entry. */
+#if HC_ARCH_BITS == 64
+typedef X86DESC64   X86DESCHC;
+#else
+typedef X86DESC     X86DESCHC;
+#endif
+/** Pointer to a host system descriptor table entry. */
+#if HC_ARCH_BITS == 64
+typedef PX86DESC64  PX86DESCHC;
+#else
+typedef PX86DESC    PX86DESCHC;
+#endif
+/** Pointer to a const host system descriptor table entry. */
+#if HC_ARCH_BITS == 64
+typedef PCX86DESC64 PCX86DESCHC;
+#else
+typedef PCX86DESC   PCX86DESCHC;
+#endif
+/** @} */
 
 
@@ -2546 +2562 @@
 
 /**
- * The shift used to convert a selector from and to index an index (C).
- */
-#define AMD64_SEL_SHIFT     4
-
-/** @def X86_SEL_SHIFT_HC
- * This is for use with X86DESCHC. */
-#if HC_ARCH_BITS == 64
-#define X86_SEL_SHIFT_HC    AMD64_SEL_SHIFT
-#else
-#define X86_SEL_SHIFT_HC    X86_SEL_SHIFT
-#endif
-
-/**
  * The mask used to mask off the table indicator and CPL of an selector.
  */

trunk/include/VBox/x86.mac

@@ -418 +418 @@
 %define X86_PML4_SHIFT              39
 %define X86_PML4_MASK               0x1ff
+%define X86DESC64_BASE(desc) \
 %if HC_ARCH_BITS == 64
 %else
 %endif
-%define X86DESC64_BASE(desc) \
+%if HC_ARCH_BITS == 64
+%else
+%endif
+%if HC_ARCH_BITS == 64
+%else
+%endif
 %define X86_SEL_TYPE_CODE                   8
 %define X86_SEL_TYPE_MEMORY                 RT_BIT(4)
@@ -475 +481 @@
 %define X86_DESC_G                          RT_BIT(23)
 %define X86_SEL_SHIFT       3
-%define AMD64_SEL_SHIFT     4
-%if HC_ARCH_BITS == 64
-%define X86_SEL_SHIFT_HC    AMD64_SEL_SHIFT
-%else
-%define X86_SEL_SHIFT_HC    X86_SEL_SHIFT
-%endif
 %define X86_SEL_MASK        0xfff8
 %define X86_SEL_LDT         0x0004