[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 02/13] tcg-s390: Properly allocate a stack frame.
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL v2 02/13] tcg-s390: Properly allocate a stack frame. |
Date: |
Fri, 5 Apr 2013 13:47:30 -0500 |
Set TCG_TARGET_CALL_STACK_OFFSET properly for the abi. Allocate the
standard TCG_STATIC_CALL_ARGS_SIZE. And while we're at it, allocate
space for CPU_TEMP_BUF_NLONGS.
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/s390/tcg-target.c | 20 ++++++++++++++------
tcg/s390/tcg-target.h | 2 +-
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
index 0132010..d91b894 100644
--- a/tcg/s390/tcg-target.c
+++ b/tcg/s390/tcg-target.c
@@ -2302,17 +2302,24 @@ static void tcg_target_init(TCGContext *s)
tcg_regset_set_reg(s->reserved_regs, TCG_REG_CALL_STACK);
tcg_add_target_add_op_defs(s390_op_defs);
- tcg_set_frame(s, TCG_AREG0, offsetof(CPUArchState, temp_buf),
- CPU_TEMP_BUF_NLONGS * sizeof(long));
}
static void tcg_target_qemu_prologue(TCGContext *s)
{
+ tcg_target_long frame_size;
+
/* stmg %r6,%r15,48(%r15) (save registers) */
tcg_out_insn(s, RXY, STMG, TCG_REG_R6, TCG_REG_R15, TCG_REG_R15, 48);
- /* aghi %r15,-160 (stack frame) */
- tcg_out_insn(s, RI, AGHI, TCG_REG_R15, -160);
+ /* aghi %r15,-frame_size */
+ frame_size = TCG_TARGET_CALL_STACK_OFFSET;
+ frame_size += TCG_STATIC_CALL_ARGS_SIZE;
+ frame_size += CPU_TEMP_BUF_NLONGS * sizeof(long);
+ tcg_out_insn(s, RI, AGHI, TCG_REG_R15, -frame_size);
+
+ tcg_set_frame(s, TCG_REG_CALL_STACK,
+ TCG_STATIC_CALL_ARGS_SIZE + TCG_TARGET_CALL_STACK_OFFSET,
+ CPU_TEMP_BUF_NLONGS * sizeof(long));
if (GUEST_BASE >= 0x80000) {
tcg_out_movi(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, GUEST_BASE);
@@ -2325,8 +2332,9 @@ static void tcg_target_qemu_prologue(TCGContext *s)
tb_ret_addr = s->code_ptr;
- /* lmg %r6,%r15,208(%r15) (restore registers) */
- tcg_out_insn(s, RXY, LMG, TCG_REG_R6, TCG_REG_R15, TCG_REG_R15, 208);
+ /* lmg %r6,%r15,fs+48(%r15) (restore registers) */
+ tcg_out_insn(s, RXY, LMG, TCG_REG_R6, TCG_REG_R15, TCG_REG_R15,
+ frame_size + 48);
/* br %r14 (return) */
tcg_out_insn(s, RR, BCR, S390_CC_ALWAYS, TCG_REG_R14);
diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h
index 40211e6..c6d9e84 100644
--- a/tcg/s390/tcg-target.h
+++ b/tcg/s390/tcg-target.h
@@ -100,7 +100,7 @@ typedef enum TCGReg {
/* used for function call generation */
#define TCG_REG_CALL_STACK TCG_REG_R15
#define TCG_TARGET_STACK_ALIGN 8
-#define TCG_TARGET_CALL_STACK_OFFSET 0
+#define TCG_TARGET_CALL_STACK_OFFSET 160
#define TCG_TARGET_EXTEND_ARGS 1
--
1.8.1.4
- [Qemu-devel] [PULL v2 00/13] tcg-s390 updates, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 02/13] tcg-s390: Properly allocate a stack frame.,
Richard Henderson <=
- [Qemu-devel] [PULL v2 01/13] tcg-s390: Fix movi, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 04/13] tcg-s390: Implement add2/sub2 opcodes, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 03/13] tcg-s390: Remove useless preprocessor conditions, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 07/13] tcg-s390: Implement deposit opcodes, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 05/13] tcg-s390: Implement mulu2_i64 opcode, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 06/13] tcg-s390: Implement movcond opcodes, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 09/13] tcg-s390: Use risbgz for andi, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 08/13] tcg-s390: Remove constraint letters for and, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 11/13] tcg-s390: Use load-address for addition, Richard Henderson, 2013/04/05
- [Qemu-devel] [PULL v2 12/13] tcg-s390: Use all 20 bits of the offset in tcg_out_mem, Richard Henderson, 2013/04/05