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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70322

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/x86_64

Files:

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

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

@@ -253 +253 @@
 }
 
-static inline void tcg_out_push(TCGContext *s, int reg)
-{
-    tcg_out_opc(s, (0x50 + (reg & 7)), 0, reg, 0);
-}
-
-static inline void tcg_out_pop(TCGContext *s, int reg)
-{
-    tcg_out_opc(s, (0x58 + (reg & 7)), 0, reg, 0);
-}
-
-
 /* rm < 0 means no register index plus (-rm - 1 immediate bytes) */
 static inline void tcg_out_modrm_offset(TCGContext *s, int opc, int r, int rm,
@@ -633 +622 @@
 }
 
-#endif
+#endif /* VBOX && REM_PHYS_ADDR_IN_TLB */
 
 static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,
@@ -812 +801 @@
         tcg_abort();
     }
-#else /* VBOX */
+#else  /* VBOX && REM_PHYS_ADDR_IN_TLB */
     tcg_out_vbox_phys_read(s, opc, r0, data_reg);
-#endif /* VBOX */
+#endif /* VBOX && REM_PHYS_ADDR_IN_TLB */
 
 #if defined(CONFIG_SOFTMMU)
@@ -964 +953 @@
         tcg_abort();
     }
-#else /* VBOX */
+#else  /* VBOX && REM_PHYS_ADDR_IN_TLB */
     tcg_out_vbox_phys_write(s, opc, r0, data_reg);
-#endif /* VBOX */
+#endif /* VBOX && REM_PHYS_ADDR_IN_TLB */
 
 #if defined(CONFIG_SOFTMMU)
@@ -1003 +992 @@
                                                    args[0]));
 #else
-            /* @todo: can we clobber RAX here? */
+            /** @todo: can we clobber RAX here? */
             tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_RAX,
                          (tcg_target_long)&(s->tb_next[args[0]]));
@@ -1319 +1308 @@
 };
 
+static inline void tcg_out_push(TCGContext *s, int reg)
+{
+    tcg_out_opc(s, (0x50 + (reg & 7)), 0, reg, 0);
+}
+
+static inline void tcg_out_pop(TCGContext *s, int reg)
+{
+    tcg_out_opc(s, (0x58 + (reg & 7)), 0, reg, 0);
+}
+
 /* Generate global QEMU prologue and epilogue code */
 void tcg_target_qemu_prologue(TCGContext *s)

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

@@ -68 +68 @@
 #define TCG_TARGET_HAS_ext32s_i64
 
-/* Must be in sync with dyngen register notion, see dyngen-exec.h */
+/* Note: must be synced with dyngen-exec.h */
 #define TCG_AREG0 TCG_REG_R14
 #define TCG_AREG1 TCG_REG_R15