Changeset 9219 in vbox

Timestamp:

May 29, 2008 12:03:45 PM (16 years ago)

Author:

vboxsync

Message:

More fixes for 32 bits hosts & 64 bits guests.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (1 diff)
• src/VBox/VMM/REMInternal.h (modified) (1 diff)
• src/recompiler/Makefile.kmk (modified) (1 diff)
• src/recompiler/VBoxRecompiler.c (modified) (3 diffs)

trunk/include/VBox/vm.h

@@ -552 +552 @@
         char        padding[HC_ARCH_BITS == 32 ? 0x6f00 : 0xbf00];    /* multiple of 32 */
 #else
-        char        padding[HC_ARCH_BITS == 32 ? 0x8f00 : 0xdf00];    /* multiple of 32 */
+        char        padding[HC_ARCH_BITS == 32 ? 0x9f00 : 0xdf00];    /* multiple of 32 */
 #endif
     } rem;

trunk/src/VBox/VMM/REMInternal.h

@@ -245 +245 @@
 #define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x6440 : 0xb4a0)
 #else
-#define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x8440 : 0xd4a0)
+#define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x9440 : 0xd4a0)
 #endif
 

trunk/src/recompiler/Makefile.kmk

@@ -188 +188 @@
  endif
 
- $(REM_MOD)_DEFS           += IN_RING3 LOG_USE_C99
+ $(REM_MOD)_DEFS           += IN_RING3 LOG_USE_C99 $(ARCH_BITS_DEFS)
  #$(REM_MOD)_DEFS          += DEBUG_DISAS DEBUG_PCALL DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.
  # these defines are probably all irrelevant now:

trunk/src/recompiler/VBoxRecompiler.c

@@ -225 +225 @@
 AssertCompile(RT_SIZEOFMEMB(VM, rem.padding) >= RT_SIZEOFMEMB(VM, rem.s));
 #if !defined(IPRT_NO_CRT) && (defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS))
-AssertCompileMemberSize(REM, Env, REM_ENV_SIZE);
+//AssertCompileMemberSize(REM, Env, REM_ENV_SIZE);
+/* Why did this have to be identical?? */
+AssertCompile(RT_SIZEOFMEMB(REM, Env) <= REM_ENV_SIZE);
 #else
 AssertCompile(RT_SIZEOFMEMB(REM, Env) <= REM_ENV_SIZE);
@@ -3330 +3332 @@
      * Disassemble.
      */
-    RTINTPTR        off = env->eip - (RTINTPTR)pvPC;
+    RTINTPTR        off = env->eip - (RTGCUINTPTR)pvPC;
     DISCPUSTATE     Cpu;
     Cpu.mode = f32BitCode ? CPUMODE_32BIT : CPUMODE_16BIT;
@@ -3422 +3424 @@
      * Disassemble.
      */
-    RTINTPTR        off = env->eip - (RTINTPTR)pvPC;
+    RTINTPTR        off = env->eip - (RTGCUINTPTR)pvPC;
     DISCPUSTATE     Cpu;
     Cpu.mode = f32BitCode ? CPUMODE_32BIT : CPUMODE_16BIT;