Changeset 13652 in vbox

Timestamp:

Oct 29, 2008 2:16:35 PM (16 years ago)

Author:

vboxsync

Message:

Solaris and general 32-bit compilation fixes

Location:

trunk

Files:

• include/VBox/vm.h (modified) (1 diff)
• src/recompiler_new/Makefile.kmk (modified) (1 diff)
• src/recompiler_new/VBoxRecompiler.c (modified) (1 diff)
• src/recompiler_new/exec.c (modified) (2 diffs)
• src/recompiler_new/target-i386/helper.c (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -700 +700 @@
  * Must be multiple of 32 and coherent with REM_ENV_SIZE from REMInternal.h. */
 #if GC_ARCH_BITS == 32
-# define VM_REM_SIZE        (HC_ARCH_BITS == 32 ? 0xff00 : 0xff00)
+# define VM_REM_SIZE        (HC_ARCH_BITS == 32 ? 0x10800 : 0x10800)
 #else
 # define VM_REM_SIZE        (HC_ARCH_BITS == 32 ? 0x10900 : 0x10900)

trunk/src/recompiler_new/Makefile.kmk

@@ -65 +65 @@
         translate-all.c         \
         host-utils.c            \
+        cutils.c                \
         tcg/tcg.c               \
         tcg/tcg-dyngen.c        \

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -5045 +5045 @@
 #endif
 
+void cpu_smm_update(CPUState* env)
+{
+}

trunk/src/recompiler_new/exec.c

@@ -3572 +3572 @@
 #endif
 
-#ifndef VBOX
 /* virtual memory access for debug */
 int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
@@ -3657 +3656 @@
 }
 
+#ifndef VBOX
 void dump_exec_info(FILE *f,
                     int (*cpu_fprintf)(FILE *f, const char *fmt, ...))

trunk/src/recompiler_new/target-i386/helper.c

@@ -518 +518 @@
 }
 
+void cpu_x86_close(CPUX86State *env)
+{
 #ifndef VBOX
-void cpu_x86_close(CPUX86State *env)
-{
     qemu_free(env);
-}
-#endif
+#endif
+}
 
 /***********************************************************/