aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-04-09 17:28:40 +0200
committerAurelien Jarno <aurelien@aurel32.net>2010-04-14 00:59:42 +0200
commit60bf84cf4ce277e1212929f35674796888a681ce (patch)
tree6aa17fddc5924a5124f3f9dbc57e10910d306abf
parentf038e8f79bcda25bc30daacf3906d998c12b34f4 (diff)
tcp/mips: Change TCG_AREG0 (fp -> s0)
Register fp (frame pointer) is a bad choice for compilations without optimisation, because the compiler makes heavy use of this register (so the resulting code crashes). Register s0 had been used for TCG_AREG1 in earlier releases, but was no longer used and is now free for TCG_AREG0. The resulting code works for compilations without optimisation (tested with qemu mips in qemu mips on x86 host). Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--dyngen-exec.h2
-rw-r--r--tcg/mips/tcg-target.c5
-rw-r--r--tcg/mips/tcg-target.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/dyngen-exec.h b/dyngen-exec.h
index d04eda8a91..0700a2d9bb 100644
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -59,7 +59,7 @@ extern int printf(const char *, ...);
#elif defined(__hppa__)
#define AREG0 "r17"
#elif defined(__mips__)
-#define AREG0 "fp"
+#define AREG0 "s0"
#elif defined(__sparc__)
#ifdef CONFIG_SOLARIS
#define AREG0 "g2"
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
index f4fb615bf0..f38eb2888d 100644
--- a/tcg/mips/tcg-target.c
+++ b/tcg/mips/tcg-target.c
@@ -1450,7 +1450,9 @@ static const TCGTargetOpDef mips_op_defs[] = {
};
static int tcg_target_callee_save_regs[] = {
+#if 0 /* used for the global env (TCG_AREG0), so no need to save */
TCG_REG_S0,
+#endif
TCG_REG_S1,
TCG_REG_S2,
TCG_REG_S3,
@@ -1459,8 +1461,7 @@ static int tcg_target_callee_save_regs[] = {
TCG_REG_S6,
TCG_REG_S7,
TCG_REG_GP,
- /* TCG_REG_FP, */ /* currently used for the global env, so np
- need to save */
+ TCG_REG_FP,
TCG_REG_RA, /* should be last for ABI compliance */
};
diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
index 0292d3360d..0028bfa562 100644
--- a/tcg/mips/tcg-target.h
+++ b/tcg/mips/tcg-target.h
@@ -97,7 +97,7 @@ enum {
#undef TCG_TARGET_HAS_ext16u_i32 /* andi rt, rs, 0xffff */
/* Note: must be synced with dyngen-exec.h */
-#define TCG_AREG0 TCG_REG_FP
+#define TCG_AREG0 TCG_REG_S0
/* guest base is supported */
#define TCG_TARGET_HAS_GUEST_BASE