Changeset 55049 in vbox

Timestamp:

Mar 31, 2015 7:01:36 PM (10 years ago)

Author:

vboxsync

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

99338

Message:

build fix

Location:

trunk/src/VBox/VMM

Files:

• include/CPUMInternal.h (modified) (2 diffs)
• include/CPUMInternal.mac (modified) (1 diff)
• testcase/tstHelp.h (modified) (2 diffs)

trunk/src/VBox/VMM/include/CPUMInternal.h

@@ -385 +385 @@
 
     /* padding to get 64byte aligned size */
-    uint8_t         auPadding[16+12];
+    uint8_t         auPadding[16+20];
 
 #elif HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
@@ -447 +447 @@
     R3PTRTYPE(PX86XSAVEAREA)    pXStateR3;
 } CPUMHOSTCTX;
+AssertCompileSizeAlignment(CPUMHOSTCTX, 64);
 /** Pointer to the saved host CPU state. */
 typedef CPUMHOSTCTX *PCPUMHOSTCTX;

trunk/src/VBox/VMM/include/CPUMInternal.mac

@@ -332 +332 @@
     .Host.SysEnter.esp   resq    1
     .Host.efer           resq    1
-    .Host.auPadding      resb    (16+12)
+    .Host.auPadding      resb    (16+20)
 
 %else ; 64-bit

trunk/src/VBox/VMM/testcase/tstHelp.h

@@ -37 +37 @@
         if (off != RT_OFFSETOF(type, m)) \
         { \
-            printf("error! %#010x %s  Off by %d!! (off=%#x)\n", RT_OFFSETOF(type, m), #type "." #m, off - RT_OFFSETOF(type, m), off); \
+            printf("error! %#010x %s  Off by %d!! (expected off=%#x)\n", \
+                   RT_OFFSETOF(type, m), #type "." #m, off - RT_OFFSETOF(type, m), off); \
             rc++; \
         } \
@@ -53 +54 @@
         if (size != sizeof(type)) \
         { \
-            printf("error! sizeof(%s): %#x (%d)  Off by %d!!\n", #type, (int)sizeof(type), (int)sizeof(type), (int)(sizeof(type) - size)); \
+            printf("error! sizeof(%s): %#x (%d)  Off by %d!! (expected %#x)\n", \
+                   #type, (int)sizeof(type), (int)sizeof(type), (int)(sizeof(type) - size, size)); \
             rc++; \
         } \