Use the new concat_tl_i64 op for std and stda

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5283 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index be00054..96dd56f 100644 (file)
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -1715,14 +1715,10 @@ static inline void gen_ldda_asi(TCGv hi, TCGv addr, int insn, int rd)
 
 static inline void gen_stda_asi(TCGv hi, TCGv addr, int insn, int rd)
 {
-    TCGv r_low, r_asi, r_size;
+    TCGv r_asi, r_size;
 
     gen_movl_reg_TN(rd + 1, cpu_tmp0);
-    r_low = tcg_temp_new(TCG_TYPE_I32);
-    tcg_gen_trunc_tl_i32(r_low, cpu_tmp0);
-    tcg_gen_trunc_tl_i32(cpu_tmp32, hi);
-    tcg_gen_concat_i32_i64(cpu_tmp64, r_low, cpu_tmp32);
-    tcg_temp_free(r_low);
+    tcg_gen_concat_tl_i64(cpu_tmp64, cpu_tmp0, hi);
     r_asi = gen_get_asi(insn, addr);
     r_size = tcg_const_i32(8);
     tcg_gen_helper_0_4(helper_st_asi, addr, cpu_tmp64, r_asi, r_size);
@@ -1818,14 +1814,10 @@ static inline void gen_ldda_asi(TCGv hi, TCGv addr, int insn, int rd)
 
 static inline void gen_stda_asi(TCGv hi, TCGv addr, int insn, int rd)
 {
-    TCGv r_low, r_asi, r_size;
+    TCGv r_asi, r_size;
 
     gen_movl_reg_TN(rd + 1, cpu_tmp0);
-    r_low = tcg_temp_new(TCG_TYPE_I32);
-    tcg_gen_trunc_tl_i32(r_low, cpu_tmp0);
-    tcg_gen_trunc_tl_i32(cpu_tmp32, hi);
-    tcg_gen_concat_i32_i64(cpu_tmp64, r_low, cpu_tmp32);
-    tcg_temp_free(r_low);
+    tcg_gen_concat_tl_i64(cpu_tmp64, cpu_tmp0, hi);
     r_asi = tcg_const_i32(GET_FIELD(insn, 19, 26));
     r_size = tcg_const_i32(8);
     tcg_gen_helper_0_4(helper_st_asi, addr, cpu_tmp64, r_asi, r_size);
@@ -4477,7 +4469,7 @@ static void disas_sparc_insn(DisasContext * dc)
                     if (rd & 1)
                         goto illegal_insn;
                     else {
-                        TCGv r_low, r_const;
+                        TCGv r_const;
 
                         save_state(dc, cpu_cond);
                         gen_address_mask(dc, cpu_addr);
@@ -4486,11 +4478,7 @@ static void disas_sparc_insn(DisasContext * dc)
                                            r_const); // XXX remove
                         tcg_temp_free(r_const);
                         gen_movl_reg_TN(rd + 1, cpu_tmp0);
-                        r_low = tcg_temp_new(TCG_TYPE_I32);
-                        tcg_gen_trunc_tl_i32(r_low, cpu_tmp0);
-                        tcg_gen_trunc_tl_i32(cpu_tmp32, cpu_val);
-                        tcg_gen_concat_i32_i64(cpu_tmp64, r_low, cpu_tmp32);
-                        tcg_temp_free(r_low);
+                        tcg_gen_concat_tl_i64(cpu_tmp64, cpu_tmp0, cpu_val);
                         tcg_gen_qemu_st64(cpu_tmp64, cpu_addr, dc->mem_idx);
                     }
                     break;