Changeset 1284 in vbox

Timestamp:

Mar 7, 2007 2:21:14 AM (18 years ago)

Author:

vboxsync

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

19237

Message:

hmm. weird.

Location:

trunk/src/VBox/VMM

Files:

• CPUMInternal.h (modified) (3 diffs)
• CPUMInternal.mac (modified) (3 diffs)
• testcase/Makefile (modified) (1 diff)

trunk/src/VBox/VMM/CPUMInternal.h

@@ -76 +76 @@
 /** @} */
 
+/* Sanity check. */
+#if defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) && (HC_ARCH_BITS != 32 || R0_ARCH_BITS != 32)
+# error "VBOX_WITH_HYBIRD_32BIT_KERNEL is only for 32 bit builds."
+#endif
+
 
 /**
  * The save host CPU state.
- * 
- * @remark  The special VBOX_WITH_HYBIRD_32BIT_KERNEL checks here are for the 10.4.x series 
+ *
+ * @remark  The special VBOX_WITH_HYBIRD_32BIT_KERNEL checks here are for the 10.4.x series
  *          of Mac OS X where the OS is essentially 32-bit but the cpu mode can be 64-bit.
  */
@@ -112 +117 @@
     //uint64_t        rip; - scratch
     uint64_t        rflags;
-#endif 
+#endif
 
 #if HC_ARCH_BITS == 32
@@ -231 +236 @@
     uint8_t         auPadding[16];
 # else
-    uint8_t         auPadding[24];
+    uint8_t         auPadding[8];
 # endif
 
 #else
 # error HC_ARCH_BITS not defined
-#endif 
+#endif
 } CPUMHOSTCTX, *PCPUMHOSTCTX;
 

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -41 +41 @@
 %define FPUSTATE_SIZE           512
 
-;; if anyone figures how to do %if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) in 
+;; if anyone figures how to do %if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) in
 ; nasm please tell / fix this hack.
 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
@@ -166 +166 @@
 %endif ; 64-bit
 
-    ; padding
-    ;.Host.padding            resd    0
-
 
     ;
@@ -174 +171 @@
     ; (Identical to .Host.*)
     ;
-    alignb 32
+    alignb 32                           ; the padding
     .Hyper.fpu            resb    512
 

trunk/src/VBox/VMM/testcase/Makefile

@@ -244 +244 @@
 # alias for the two struct tests.
 run-struct-tests: $(PATH_TARGET)/tstAsmStructs.run $(PATH_TARGET)/tstVMStructSize.run
-run-asm-tests: $(PATH_TARGET)/tstAsmStructs.run
-        $(ECHO) $<
-
+