Changeset 36140 in vbox for trunk/src/recompiler/tcg/i386

Timestamp:

Mar 3, 2011 1:48:16 PM (14 years ago)

Author:

vboxsync

Message:

rem: Re-synced to ​svn://svn.savannah.nongnu.org/qemu/trunk@5495 (repo UUID c046a42c-6fe2-441c-8c8c-71466251a162).

Location:

trunk/src/recompiler/tcg/i386

Files:

• tcg-target.c (modified) (5 diffs)
• tcg-target.h (modified) (1 diff)

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

@@ -199 +199 @@
 #define P_EXT   0x100 /* 0x0f opcode prefix */
 
-#if !defined(VBOX) || !defined(_MSC_VER)
 static const uint8_t tcg_cond_to_jcc[10] = {
     [TCG_COND_EQ] = JCC_JE,
@@ -212 +211 @@
     [TCG_COND_GTU] = JCC_JA,
 };
-#else
-/* Fortunately, ordering is right */
-static const uint8_t tcg_cond_to_jcc[10] = {
-    JCC_JE,
-    JCC_JNE,
-    JCC_JL,
-    JCC_JGE,
-    JCC_JLE,
-    JCC_JG,
-    JCC_JB,
-    JCC_JAE,
-    JCC_JBE,
-    JCC_JA,
-};
-#endif
 
 static inline void tcg_out_opc(TCGContext *s, int opc)
@@ -291 +275 @@
         tcg_out32(s, arg);
     }
-}
-
-static inline void tcg_out_push(TCGContext *s, int reg)
-{
-    tcg_out_opc(s, 0x50 + reg);
-}
-
-static inline void tcg_out_pop(TCGContext *s, int reg)
-{
-    tcg_out_opc(s, 0x58 + reg);
 }
 
@@ -1065 +1039 @@
         tcg_abort();
     }
-#else
+#else  /* VBOX && REM_PHYS_ADDR_IN_TLB */
     tcg_out_vbox_phys_write(s, opc, r0, data_reg, data_reg2);
-#endif
+#endif /* VBOX && REM_PHYS_ADDR_IN_TLB */
 
 #if defined(CONFIG_SOFTMMU)
@@ -1376 +1350 @@
 };
 
+static inline void tcg_out_push(TCGContext *s, int reg)
+{
+    tcg_out_opc(s, 0x50 + reg);
+}
+
+static inline void tcg_out_pop(TCGContext *s, int reg)
+{
+    tcg_out_opc(s, 0x58 + reg);
+}
+
 /* Generate global QEMU prologue and epilogue code */
 void tcg_target_qemu_prologue(TCGContext *s)

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

@@ -53 +53 @@
 #define TCG_AREG3 TCG_REG_EDI
 #else
-#define TCG_AREG0 TCG_REG_ESI
-#define TCG_AREG1 TCG_REG_EDI
+# define TCG_AREG0 TCG_REG_ESI
+# define TCG_AREG1 TCG_REG_EDI
 #endif