Changeset 15373 in vbox for trunk/src

Timestamp:

Dec 12, 2008 3:05:46 PM (16 years ago)

Author:

vboxsync

Message:

rem: fixed Mac builds and alignment problems

File:

• trunk/src/recompiler_new/tcg/i386/tcg-target.c (modified) (8 diffs)

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

@@ -389 +389 @@
 }
 
+#ifdef VBOX
+void tcg_out_subi(TCGContext *s, int reg, tcg_target_long val)
+{
+    if (val != 0)
+        tgen_arithi(s, ARITH_SUB, reg, val);
+}
+#endif
+
 static void tcg_out_jxx(TCGContext *s, int opc, int label_index)
 {
@@ -868 +876 @@
     int addr_reg2;
 #endif
+#ifdef VBOX
+# ifdef RT_OS_DARWIN
+    int bias1 = 12, bias2 = 8, bias3 = 4;
+# else
+    int bias1 = bias2 = bias3 = 0;
+# endif
+#endif
 
     data_reg = *args++;
@@ -944 +959 @@
         tcg_out_mov(s, TCG_REG_EDX, data_reg);
         tcg_out_mov(s, TCG_REG_ECX, data_reg2);
+#ifdef VBOX
+        tcg_out_subi(s, TCG_REG_ESP, bias1);
+#endif
         tcg_out8(s, 0x6a); /* push Ib */
         tcg_out8(s, mem_index);
@@ -952 +970 @@
         tcg_out32(s, (tcg_target_long)qemu_st_helpers[s_bits] -
                   (tcg_target_long)s->code_ptr - 4);
+#ifdef VBOX
+        tcg_out_addi(s, TCG_REG_ESP, 4+bias1);
+#else
         tcg_out_addi(s, TCG_REG_ESP, 4);
+#endif
     } else {
         switch(opc) {
@@ -978 +1000 @@
     if (opc == 3) {
         tcg_out_mov(s, TCG_REG_EDX, addr_reg2);
+# ifdef VBOX
+        tcg_out_subi(s, TCG_REG_ESP, bias3);
+# endif
         tcg_out8(s, 0x6a); /* push Ib */
         tcg_out8(s, mem_index);
@@ -988 +1013 @@
         tcg_out32(s, (tcg_target_long)qemu_st_helpers[s_bits] -
                   (tcg_target_long)s->code_ptr - 4);
+#ifdef VBOX
+        tcg_out_addi(s, TCG_REG_ESP, 12+bias3);
+#else
         tcg_out_addi(s, TCG_REG_ESP, 12);
+#endif
     } else {
         tcg_out_mov(s, TCG_REG_EDX, addr_reg2);
@@ -1004 +1033 @@
             break;
         }
-# if defined(VBOX) && defined(RT_OS_DARWIN)
-        tgen_arithi(s, ARITH_SUB, TCG_REG_ESP, 12); /** @todo FIXME: This is not 100% correct (assumes a bunch of things), but it works around the current issue it seems... */
+# ifdef VBOX
+        tcg_out_subi(s, TCG_REG_ESP, bias1);
 # endif
         tcg_out8(s, 0x6a); /* push Ib */
@@ -1016 +1045 @@
         tcg_out32(s, (tcg_target_long)qemu_st_helpers[s_bits] -
                   (tcg_target_long)s->code_ptr - 4);
-# if defined(VBOX) && defined(RT_OS_DARWIN)
-        tcg_out_addi(s, TCG_REG_ESP, 12+4);
+# if defined(VBOX)
+        tcg_out_addi(s, TCG_REG_ESP, 4 + bias1);
 # else
         tcg_out_addi(s, TCG_REG_ESP, 4);