dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame 0086-tcg-sparc-Support-GUEST_BASE.patch

5544c1
From fecc7bd255206876152baab622c61902133066bd Mon Sep 17 00:00:00 2001
5544c1
From: Richard Henderson <rth@twiddle.net>
5544c1
Date: Sat, 24 Mar 2012 22:11:25 +0100
5544c1
Subject: [PATCH] tcg-sparc: Support GUEST_BASE.
5544c1
5544c1
Signed-off-by: Richard Henderson <rth@twiddle.net>
5544c1
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
5544c1
---
5544c1
 configure              |  2 ++
5544c1
 tcg/sparc/tcg-target.c | 26 +++++++++++++++++++++++---
5544c1
 tcg/sparc/tcg-target.h |  2 ++
5544c1
 3 files changed, 27 insertions(+), 3 deletions(-)
5544c1
5544c1
diff --git a/configure b/configure
5544c1
index 0590f16..9139b5c 100755
5544c1
--- a/configure
5544c1
+++ b/configure
5544c1
@@ -872,6 +872,7 @@ case "$cpu" in
5544c1
            if test "$solaris" = "no" ; then
5544c1
              QEMU_CFLAGS="-ffixed-g1 -ffixed-g6 $QEMU_CFLAGS"
5544c1
            fi
5544c1
+           host_guest_base="yes"
5544c1
            ;;
5544c1
     sparc64)
5544c1
            LDFLAGS="-m64 $LDFLAGS"
5544c1
@@ -880,6 +881,7 @@ case "$cpu" in
5544c1
            if test "$solaris" != "no" ; then
5544c1
              QEMU_CFLAGS="-ffixed-g1 $QEMU_CFLAGS"
5544c1
            fi
5544c1
+           host_guest_base="yes"
5544c1
            ;;
5544c1
     s390)
5544c1
            QEMU_CFLAGS="-m31 -march=z990 $QEMU_CFLAGS"
5544c1
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
5544c1
index d89c19b..5acfeba 100644
5544c1
--- a/tcg/sparc/tcg-target.c
5544c1
+++ b/tcg/sparc/tcg-target.c
5544c1
@@ -59,6 +59,12 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
5544c1
 };
5544c1
 #endif
5544c1
 
5544c1
+#ifdef CONFIG_USE_GUEST_BASE
5544c1
+# define TCG_GUEST_BASE_REG TCG_REG_I3
5544c1
+#else
5544c1
+# define TCG_GUEST_BASE_REG TCG_REG_G0
5544c1
+#endif
5544c1
+
5544c1
 static const int tcg_target_reg_alloc_order[] = {
5544c1
     TCG_REG_L0,
5544c1
     TCG_REG_L1,
5544c1
@@ -680,6 +686,14 @@ static void tcg_target_qemu_prologue(TCGContext *s)
5544c1
     tcg_out32(s, SAVE | INSN_RD(TCG_REG_O6) | INSN_RS1(TCG_REG_O6) |
5544c1
               INSN_IMM13(-(TCG_TARGET_STACK_MINFRAME +
5544c1
                            CPU_TEMP_BUF_NLONGS * (int)sizeof(long))));
5544c1
+
5544c1
+#ifdef CONFIG_USE_GUEST_BASE
5544c1
+    if (GUEST_BASE != 0) {
5544c1
+        tcg_out_movi(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, GUEST_BASE);
5544c1
+        tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG);
5544c1
+    }
5544c1
+#endif
5544c1
+
5544c1
     tcg_out32(s, JMPL | INSN_RD(TCG_REG_G0) | INSN_RS1(TCG_REG_I1) |
5544c1
               INSN_RS2(TCG_REG_G0));
5544c1
     tcg_out_mov(s, TCG_TYPE_PTR, TCG_AREG0, TCG_REG_I0);
5544c1
@@ -925,14 +939,18 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int sizeop)
5544c1
     if (TCG_TARGET_REG_BITS == 32 && sizeop == 3) {
5544c1
         int reg64 = (datalo < 16 ? datalo : TCG_REG_O0);
5544c1
 
5544c1
-        tcg_out_ldst_rr(s, reg64, addr_reg, TCG_REG_G0, qemu_ld_opc[sizeop]);
5544c1
+        tcg_out_ldst_rr(s, reg64, addr_reg,
5544c1
+                        (GUEST_BASE ? TCG_GUEST_BASE_REG : TCG_REG_G0),
5544c1
+                        qemu_ld_opc[sizeop]);
5544c1
 
5544c1
         tcg_out_arithi(s, datahi, reg64, 32, SHIFT_SRLX);
5544c1
         if (reg64 != datalo) {
5544c1
             tcg_out_mov(s, TCG_TYPE_I32, datalo, reg64);
5544c1
         }
5544c1
     } else {
5544c1
-        tcg_out_ldst_rr(s, datalo, addr_reg, TCG_REG_G0, qemu_ld_opc[sizeop]);
5544c1
+        tcg_out_ldst_rr(s, datalo, addr_reg,
5544c1
+                        (GUEST_BASE ? TCG_GUEST_BASE_REG : TCG_REG_G0),
5544c1
+                        qemu_ld_opc[sizeop]);
5544c1
     }
5544c1
 #endif /* CONFIG_SOFTMMU */
5544c1
 }
5544c1
@@ -1026,7 +1044,9 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int sizeop)
5544c1
         tcg_out_arith(s, TCG_REG_G1, TCG_REG_G1, TCG_REG_O2, ARITH_OR);
5544c1
         datalo = TCG_REG_G1;
5544c1
     }
5544c1
-    tcg_out_ldst_rr(s, datalo, addr_reg, TCG_REG_G0, qemu_st_opc[sizeop]);
5544c1
+    tcg_out_ldst_rr(s, datalo, addr_reg,
5544c1
+                    (GUEST_BASE ? TCG_GUEST_BASE_REG : TCG_REG_G0),
5544c1
+                    qemu_st_opc[sizeop]);
5544c1
 #endif /* CONFIG_SOFTMMU */
5544c1
 }
5544c1
 
5544c1
diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h
5544c1
index adca1d2..99e9f57 100644
5544c1
--- a/tcg/sparc/tcg-target.h
5544c1
+++ b/tcg/sparc/tcg-target.h
5544c1
@@ -128,6 +128,8 @@ typedef enum {
5544c1
 #define TCG_TARGET_HAS_movcond_i64      0
5544c1
 #endif
5544c1
 
5544c1
+#define TCG_TARGET_HAS_GUEST_BASE
5544c1
+
5544c1
 #ifdef CONFIG_SOLARIS
5544c1
 #define TCG_AREG0 TCG_REG_G2
5544c1
 #elif HOST_LONG_BITS == 64
5544c1
-- 
5544c1
1.7.12.1
5544c1