Changeset 42601 in vbox for trunk/src/recompiler/tcg/i386/tcg-target.c

Timestamp:

Aug 5, 2012 4:26:25 PM (12 years ago)

Author:

vboxsync

Message:

REM: Initial changes to make it work (seemingly) with MinGW-w64.

File:

• trunk/src/recompiler/tcg/i386/tcg-target.c (modified) (10 diffs)

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

@@ -44 +44 @@
     TCG_REG_R10,
     TCG_REG_R11,
+# if !defined(VBOX) || !defined(__MINGW64__)
     TCG_REG_R9,
     TCG_REG_R8,
     TCG_REG_RCX,
     TCG_REG_RDX,
+# endif
     TCG_REG_RSI,
     TCG_REG_RDI,
+# if defined(VBOX) && defined(__MINGW64__)
+    TCG_REG_R9,
+    TCG_REG_R8,
+    TCG_REG_RDX,
+    TCG_REG_RCX,
+# endif
     TCG_REG_RAX,
 #else
@@ -64 +72 @@
 static const int tcg_target_call_iarg_regs[] = {
 #if TCG_TARGET_REG_BITS == 64
+# if defined(VBOX) && defined(__MINGW64__)
+    TCG_REG_RCX,
+    TCG_REG_RDX,
+# else
     TCG_REG_RDI,
     TCG_REG_RSI,
     TCG_REG_RDX,
     TCG_REG_RCX,
+# endif
     TCG_REG_R8,
     TCG_REG_R9,
@@ -197 +210 @@
         if (TCG_TARGET_REG_BITS == 64) {
             tcg_regset_set32(ct->u.regs, 0, 0xffff);
+#if defined(VBOX) && defined(__MINGW64__)
+            tcg_regset_reset_reg(ct->u.regs, tcg_target_call_iarg_regs[2]);
+            tcg_regset_reset_reg(ct->u.regs, tcg_target_call_iarg_regs[1]);
+            tcg_regset_reset_reg(ct->u.regs, tcg_target_call_iarg_regs[0]);
+#else
+            /** @todo figure why RDX isn't mentioned here. */
             tcg_regset_reset_reg(ct->u.regs, TCG_REG_RSI);
             tcg_regset_reset_reg(ct->u.regs, TCG_REG_RDI);
+#endif
         } else {
             tcg_regset_set32(ct->u.regs, 0, 0xff);
@@ -759 +779 @@
 }
 
-#ifdef VBOX
+#ifdef VBOX_16_BYTE_STACK_ALIGN
 static void tcg_out_subi(TCGContext *s, int reg, tcg_target_long val)
 {
@@ -1390 +1410 @@
     *label_ptr[2] = s->code_ptr - label_ptr[2] - 1;
 #else
+# if defined(VBOX) && defined(__MINGW64__)
+#  error port me
+# endif
     {
         int32_t offset = GUEST_BASE;
@@ -1526 +1549 @@
     /* XXX: move that code at the end of the TB */
     if (TCG_TARGET_REG_BITS == 64) {
+#  if defined(VBOX) && defined(__MINGW64__)
+        tcg_out_mov(s, (opc == 3 ? TCG_TYPE_I64 : TCG_TYPE_I32),
+                    tcg_target_call_iarg_regs[1], data_reg);
+        tcg_out_movi(s, TCG_TYPE_I32, tcg_target_call_iarg_regs[2], mem_index);
+#  else
         tcg_out_mov(s, (opc == 3 ? TCG_TYPE_I64 : TCG_TYPE_I32),
                     TCG_REG_RSI, data_reg);
         tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_RDX, mem_index);
+#  endif
         stack_adjust = 0;
     } else if (TARGET_LONG_BITS == 32) {
@@ -1597 +1626 @@
     *label_ptr[2] = s->code_ptr - label_ptr[2] - 1;
 #else
+# if defined(VBOX) && defined(__MINGW64__)
+#  error port me
+# endif
     {
         int32_t offset = GUEST_BASE;
@@ -2092 +2124 @@
     TCG_REG_RBP,
     TCG_REG_RBX,
+# if defined(VBOX) && defined(__MINGW64__)
+    TCG_REG_RSI,
+    TCG_REG_RDI,
+# endif
     TCG_REG_R12,
     TCG_REG_R13,
@@ -2132 +2168 @@
 
     frame_size = push_size + TCG_STATIC_CALL_ARGS_SIZE;
+#if defined(VBOX) && defined(__MINGW64__)
+    frame_size += TCG_TARGET_CALL_STACK_OFFSET;
+#endif
     frame_size = (frame_size + TCG_TARGET_STACK_ALIGN - 1) &
         ~(TCG_TARGET_STACK_ALIGN - 1);
@@ -2176 +2215 @@
     tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_ECX);
     if (TCG_TARGET_REG_BITS == 64) {
+# if !defined(VBOX) || !defined(__MINGW64__)
         tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_RDI);
         tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_RSI);
+# endif
         tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_R8);
         tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_R9);