Patchwork [12/18] TCG/MIPS: use TCG_REG_CALL_STACK instead of TCG_REG_SP

login
register
mail settings
Submitter Blue Swirl
Date May 28, 2011, 10:08 a.m.
Message ID <BANLkTinzO0DiMSQL0mnWxz7vaVp2=99Z1g@mail.gmail.com>
Download mbox | patch
Permalink /patch/97787/
State New
Headers show

Comments

Blue Swirl - May 28, 2011, 10:08 a.m.
Use TCG_REG_CALL_STACK instead of TCG_REG_SP for consistency.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 tcg/mips/tcg-target.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

     }
@@ -1477,10 +1477,10 @@ static void tcg_target_qemu_prologue(TCGContext *s)
                  ~(TCG_TARGET_STACK_ALIGN - 1);

     /* TB prologue */
-    tcg_out_addi(s, TCG_REG_SP, -frame_size);
+    tcg_out_addi(s, TCG_REG_CALL_STACK, -frame_size);
     for(i = 0 ; i < ARRAY_SIZE(tcg_target_callee_save_regs) ; i++) {
         tcg_out_st(s, TCG_TYPE_I32, tcg_target_callee_save_regs[i],
-                   TCG_REG_SP, TCG_STATIC_CALL_ARGS_SIZE + i * 4);
+                   TCG_REG_CALL_STACK, TCG_STATIC_CALL_ARGS_SIZE + i * 4);
     }

     /* Call generated code */
@@ -1491,11 +1491,11 @@ static void tcg_target_qemu_prologue(TCGContext *s)
     /* TB epilogue */
     for(i = 0 ; i < ARRAY_SIZE(tcg_target_callee_save_regs) ; i++) {
         tcg_out_ld(s, TCG_TYPE_I32, tcg_target_callee_save_regs[i],
-                   TCG_REG_SP, TCG_STATIC_CALL_ARGS_SIZE + i * 4);
+                   TCG_REG_CALL_STACK, TCG_STATIC_CALL_ARGS_SIZE + i * 4);
     }

     tcg_out_opc_reg(s, OPC_JR, 0, TCG_REG_RA, 0);
-    tcg_out_addi(s, TCG_REG_SP, frame_size);
+    tcg_out_addi(s, TCG_REG_CALL_STACK, frame_size);
 }

 static void tcg_target_init(TCGContext *s)
@@ -1525,7 +1525,8 @@ static void tcg_target_init(TCGContext *s)
     tcg_regset_set_reg(s->reserved_regs, TCG_REG_AT);   /* internal use */
     tcg_regset_set_reg(s->reserved_regs, TCG_REG_T0);   /* internal use */
     tcg_regset_set_reg(s->reserved_regs, TCG_REG_RA);   /* return address */
-    tcg_regset_set_reg(s->reserved_regs, TCG_REG_SP);   /* stack pointer */
+    /* stack pointer */
+    tcg_regset_set_reg(s->reserved_regs, TCG_REG_CALL_STACK);

     tcg_add_target_add_op_defs(mips_op_defs);
     tcg_set_frame(s, TCG_AREG0, offsetof(CPUState, temp_buf),

Patch

diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
index 12ff9d5..79e20fa 100644
--- a/tcg/mips/tcg-target.c
+++ b/tcg/mips/tcg-target.c
@@ -1062,7 +1062,7 @@  static void tcg_out_qemu_st(TCGContext *s, const
TCGArg *args,
     if (sp_args > TCG_REG_A3) {
         /* Push mem_index on the stack */
         tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_AT, mem_index);
-        tcg_out_st(s, TCG_TYPE_I32, TCG_REG_AT, TCG_REG_SP, 16);
+        tcg_out_st(s, TCG_TYPE_I32, TCG_REG_AT, TCG_REG_CALL_STACK, 16);
     } else {
         tcg_out_movi(s, TCG_TYPE_I32, sp_args, mem_index);