Fix libvirt + seccomp combo (bz #855162) Fix scsi hotplug crash (bz #879657) Fix QOM refcount crash (bz #881486)
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From c914ae50df4dc2f2ab589c87c0cd2ce2f14d9639 Mon Sep 17 00:00:00 2001
|
|
From: Aurelien Jarno <aurelien@aurel32.net>
|
|
Date: Fri, 21 Sep 2012 18:20:26 +0200
|
|
Subject: [PATCH] tcg/mips: use stack for TCG temps
|
|
|
|
Use stack instead of temp_buf array in CPUState for TCG
|
|
temps.
|
|
|
|
Reviewed-by: Richard Henderson <rth@twiddle.net>
|
|
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
tcg/mips/tcg-target.c | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
|
|
index 0ea6a76..c05169f 100644
|
|
--- a/tcg/mips/tcg-target.c
|
|
+++ b/tcg/mips/tcg-target.c
|
|
@@ -1538,11 +1538,15 @@ static void tcg_target_qemu_prologue(TCGContext *s)
|
|
{
|
|
int i, frame_size;
|
|
|
|
- /* reserve some stack space */
|
|
+ /* reserve some stack space, also for TCG temps. */
|
|
frame_size = ARRAY_SIZE(tcg_target_callee_save_regs) * 4
|
|
- + TCG_STATIC_CALL_ARGS_SIZE;
|
|
+ + TCG_STATIC_CALL_ARGS_SIZE
|
|
+ + CPU_TEMP_BUF_NLONGS * sizeof(long);
|
|
frame_size = (frame_size + TCG_TARGET_STACK_ALIGN - 1) &
|
|
~(TCG_TARGET_STACK_ALIGN - 1);
|
|
+ tcg_set_frame(s, TCG_REG_SP, ARRAY_SIZE(tcg_target_callee_save_regs) * 4
|
|
+ + TCG_STATIC_CALL_ARGS_SIZE,
|
|
+ CPU_TEMP_BUF_NLONGS * sizeof(long));
|
|
|
|
/* TB prologue */
|
|
tcg_out_addi(s, TCG_REG_SP, -frame_size);
|
|
@@ -1597,6 +1601,4 @@ static void tcg_target_init(TCGContext *s)
|
|
tcg_regset_set_reg(s->reserved_regs, TCG_REG_GP); /* global pointer */
|
|
|
|
tcg_add_target_add_op_defs(mips_op_defs);
|
|
- tcg_set_frame(s, TCG_AREG0, offsetof(CPUArchState, temp_buf),
|
|
- CPU_TEMP_BUF_NLONGS * sizeof(long));
|
|
}
|
|
--
|
|
1.8.0.2
|
|
|