Changeset 37852 in vbox

Timestamp:

Jul 8, 2011 7:18:05 PM (14 years ago)

Author:

vboxsync

Message:

alignment fix (darwin.x86/VBoxREM64).

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (2 diffs)
• target-i386/cpu.h (modified) (1 diff)

trunk/src/recompiler/VBoxRecompiler.c

@@ -221 +221 @@
 
 /** Prologue code, must be in lower 4G to simplify jumps to/from generated code.
- * @todo huh??? That cannot be the case on the mac... So, this 
+ * @todo huh??? That cannot be the case on the mac... So, this
  *       point is probably not valid any longer. */
 uint8_t *code_gen_prologue;
@@ -415 +415 @@
     STAM_REG(pVM, &pVM->rem.s.Env.StatTbFlush,      STAMTYPE_PROFILE,   "/REM/TbFlush",     STAMUNIT_TICKS_PER_CALL, "profiling tb_flush().");
 #endif /* VBOX_WITH_STATISTICS */
+    AssertCompileMemberAlignment(CPUX86State, StatTbFlush, 4);
+    AssertCompileMemberAlignment(CPUX86State, StatTbFlush, 8);
 
     STAM_REL_REG(pVM, &tb_flush_count,              STAMTYPE_U32_RESET, "/REM/TbFlushCount",                STAMUNIT_OCCURENCES, "tb_flush() calls");

trunk/src/recompiler/target-i386/cpu.h

@@ -782 +782 @@
 #else  /* VBOX */
 
-/* see 641 line to consult current alignments for darwin 32-bit host. */
-# if HC_ARCH_BITS == 64 || (defined(RT_OS_DARWIN) && HC_ARCH_BITS == 32)
-    uint32_t alignment2[3];
-# else
-    uint32_t alignmnt2[2];
+    /** Alignment padding. */
+# if HC_ARCH_BITS == 64 || (defined(RT_OS_DARWIN) && !defined(VBOX_ENABLE_VBOXREM64))
+    uint32_t alignment2[1];
 # endif
+
     /** Profiling tb_flush. */
     STAMPROFILE StatTbFlush;