[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/21] tcg-ppc64: Tidy register allocation order
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 16/21] tcg-ppc64: Tidy register allocation order |
Date: |
Wed, 25 Sep 2013 09:27:33 -0700 |
Remove conditionalization from tcg_target_reg_alloc_order, relying on
reserved_regs to prevent register allocation that shouldn't happen.
So R11 is now present in reg_alloc_order for __APPLE__, but also now
reserved.
Sort reg_alloc_order into call-saved, call-clobbered, and parameters.
This reduces the effect of values getting spilled and reloaded before
function calls.
Whether or not it is reserved, R2 (TOC) is always call-clobbered.
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/ppc64/tcg-target.c | 49 ++++++++++++++++++++++---------------------------
1 file changed, 22 insertions(+), 27 deletions(-)
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index 0659dd6..c01a8bb 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -99,7 +99,7 @@ static const char * const
tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
#endif
static const int tcg_target_reg_alloc_order[] = {
- TCG_REG_R14,
+ TCG_REG_R14, /* call saved registers */
TCG_REG_R15,
TCG_REG_R16,
TCG_REG_R17,
@@ -109,29 +109,25 @@ static const int tcg_target_reg_alloc_order[] = {
TCG_REG_R21,
TCG_REG_R22,
TCG_REG_R23,
+ TCG_REG_R24,
+ TCG_REG_R25,
+ TCG_REG_R26,
+ TCG_REG_R27,
TCG_REG_R28,
TCG_REG_R29,
TCG_REG_R30,
TCG_REG_R31,
-#ifdef __APPLE__
+ TCG_REG_R12, /* call clobbered, non-arguments */
+ TCG_REG_R11,
TCG_REG_R2,
-#endif
- TCG_REG_R3,
- TCG_REG_R4,
- TCG_REG_R5,
- TCG_REG_R6,
- TCG_REG_R7,
- TCG_REG_R8,
+ TCG_REG_R10, /* call clobbered, arguments */
TCG_REG_R9,
- TCG_REG_R10,
-#ifndef __APPLE__
- TCG_REG_R11,
-#endif
- TCG_REG_R12,
- TCG_REG_R24,
- TCG_REG_R25,
- TCG_REG_R26,
- TCG_REG_R27
+ TCG_REG_R8,
+ TCG_REG_R7,
+ TCG_REG_R6,
+ TCG_REG_R5,
+ TCG_REG_R4,
+ TCG_REG_R3,
};
static const int tcg_target_call_iarg_regs[] = {
@@ -2133,9 +2129,7 @@ static void tcg_target_init(TCGContext *s)
tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I64], 0, 0xffffffff);
tcg_regset_set32(tcg_target_call_clobber_regs, 0,
(1 << TCG_REG_R0) |
-#ifdef __APPLE__
(1 << TCG_REG_R2) |
-#endif
(1 << TCG_REG_R3) |
(1 << TCG_REG_R4) |
(1 << TCG_REG_R5) |
@@ -2145,16 +2139,17 @@ static void tcg_target_init(TCGContext *s)
(1 << TCG_REG_R9) |
(1 << TCG_REG_R10) |
(1 << TCG_REG_R11) |
- (1 << TCG_REG_R12)
- );
+ (1 << TCG_REG_R12));
tcg_regset_clear(s->reserved_regs);
- tcg_regset_set_reg(s->reserved_regs, TCG_REG_R0);
- tcg_regset_set_reg(s->reserved_regs, TCG_REG_R1);
-#ifndef __APPLE__
- tcg_regset_set_reg(s->reserved_regs, TCG_REG_R2);
+ tcg_regset_set_reg(s->reserved_regs, TCG_REG_R0); /* tcg temp */
+ tcg_regset_set_reg(s->reserved_regs, TCG_REG_R1); /* stack pointer */
+#ifdef __APPLE__
+ tcg_regset_set_reg(s->reserved_regs, TCG_REG_R11); /* ??? */
+#else
+ tcg_regset_set_reg(s->reserved_regs, TCG_REG_R2); /* toc */
#endif
- tcg_regset_set_reg(s->reserved_regs, TCG_REG_R13);
+ tcg_regset_set_reg(s->reserved_regs, TCG_REG_R13); /* thread pointer */
tcg_add_target_add_op_defs(ppc_op_defs);
}
--
1.8.1.4
- [Qemu-devel] [PULL 02/21] tcg-ppc: fix qemu_ld/qemu_st for AIX ABI, (continued)
- [Qemu-devel] [PULL 02/21] tcg-ppc: fix qemu_ld/qemu_st for AIX ABI, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 07/21] tcg-ppc: Fix and cleanup tcg_out_tlb_check, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 08/21] tcg-ppc64: Reformat tcg-target.c, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 09/21] tcg-ppc64: More use of TAI and SAI helper macros, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 11/21] tcg-ppc64: Use tcg_out64, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 10/21] tcg-ppc64: Use TCG_REG_Rn constants, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 12/21] tcg-ppc64: Avoid code for nop move, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 13/21] tcg-ppc64: Don't load the static chain from TCG, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 14/21] tcg-ppc64: Fold constant call address into descriptor load, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 15/21] tcg-ppc64: Look through a constant function descriptor, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 16/21] tcg-ppc64: Tidy register allocation order,
Richard Henderson <=
- [Qemu-devel] [PULL 17/21] tcg-ppc64: Handle long offsets better, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 18/21] tcg-ppc64: Implement tcg_register_jit, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 19/21] tcg-ppc64: Streamline tcg_out_tlb_read, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 20/21] tcg-ppc64: Add _noaddr functions for emitting forward branches, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 21/21] tcg-ppc64: Implement CONFIG_QEMU_LDST_OPTIMIZATION, Richard Henderson, 2013/09/25