aboutsummaryrefslogtreecommitdiff
path: root/target-sparc/translate.c
diff options
context:
space:
mode:
Diffstat (limited to 'target-sparc/translate.c')
-rw-r--r--target-sparc/translate.c36
1 files changed, 20 insertions, 16 deletions
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index fa34d27133..be00054ae2 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -1715,13 +1715,14 @@ 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_temp, r_asi, r_size;
-
- r_temp = tcg_temp_new(TCG_TYPE_TL);
- gen_movl_reg_TN(rd + 1, r_temp);
- tcg_gen_helper_1_2(helper_pack64, cpu_tmp64, hi,
- r_temp);
- tcg_temp_free(r_temp);
+ TCGv r_low, 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);
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);
@@ -1817,12 +1818,14 @@ 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_temp, r_asi, r_size;
+ TCGv r_low, r_asi, r_size;
- r_temp = tcg_temp_new(TCG_TYPE_TL);
- gen_movl_reg_TN(rd + 1, r_temp);
- tcg_gen_helper_1_2(helper_pack64, cpu_tmp64, hi, r_temp);
- tcg_temp_free(r_temp);
+ 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);
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);
@@ -4482,10 +4485,11 @@ static void disas_sparc_insn(DisasContext * dc)
tcg_gen_helper_0_2(helper_check_align, cpu_addr,
r_const); // XXX remove
tcg_temp_free(r_const);
- r_low = tcg_temp_new(TCG_TYPE_TL);
- gen_movl_reg_TN(rd + 1, r_low);
- tcg_gen_helper_1_2(helper_pack64, cpu_tmp64, cpu_val,
- r_low);
+ 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_qemu_st64(cpu_tmp64, cpu_addr, dc->mem_idx);
}