Changeset 58765 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2015 12:33:39 PM (9 years ago)

Author:

vboxsync

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

104209

Message:

bs3kit.h: BS3_XPTR_* fixes.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -722 +722 @@
             "mov ax, ss" \
             "and ax, 3" \
-            value [ax dx] modify exact [ax] nomemory;
+            value [ax] modify exact [ax] nomemory;
 
 /**
@@ -755 +755 @@
 # define BS3_XPTR_GET(a_Type, a_Name)       ((a_Name).pTyped)
 #elif ARCH_BITS == 64
-# define BS3_XPTR_GET(a_Type, a_Name)       ((a_Type *)(uintptr_t)(a_Name).XPtr.uFlat))
+# define BS3_XPTR_GET(a_Type, a_Name)       ((a_Type *)(uintptr_t)(a_Name).XPtr.uFlat)
 #else
 # error "ARCH_BITS"
@@ -774 +774 @@
         if (BS3_IS_PROTECTED_MODE()) \
         { \
-            (a_Name).XPtr.u.Low  = BS3_FP_OFF(pTypeCheck); \
-            (a_Name).XPtr.u.High = (BS3_FP_SEG(pTypeCheck) & UINT16_C(0xfff8)) - BS3_SEL_TILED; \
+            (a_Name).XPtr.u.uLow  = BS3_FP_OFF(pTypeCheck); \
+            (a_Name).XPtr.u.uHigh = (BS3_FP_SEG(pTypeCheck) & UINT16_C(0xfff8)) - BS3_SEL_TILED; \
         } \
         else \