target/arm: Use mte_checkN for sve unpredicated stores
Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20200626033144.790098-30-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
b2aa8879b8
commit
bba87d0a0f
@ -4432,10 +4432,12 @@ static void do_str(DisasContext *s, uint32_t vofs, int len, int rn, int imm)
|
|||||||
int len_remain = len % 8;
|
int len_remain = len % 8;
|
||||||
int nparts = len / 8 + ctpop8(len_remain);
|
int nparts = len / 8 + ctpop8(len_remain);
|
||||||
int midx = get_mem_index(s);
|
int midx = get_mem_index(s);
|
||||||
TCGv_i64 addr, t0;
|
TCGv_i64 dirty_addr, clean_addr, t0;
|
||||||
|
|
||||||
addr = tcg_temp_new_i64();
|
dirty_addr = tcg_temp_new_i64();
|
||||||
t0 = tcg_temp_new_i64();
|
tcg_gen_addi_i64(dirty_addr, cpu_reg_sp(s, rn), imm);
|
||||||
|
clean_addr = gen_mte_checkN(s, dirty_addr, false, rn != 31, len, MO_8);
|
||||||
|
tcg_temp_free_i64(dirty_addr);
|
||||||
|
|
||||||
/* Note that unpredicated load/store of vector/predicate registers
|
/* Note that unpredicated load/store of vector/predicate registers
|
||||||
* are defined as a stream of bytes, which equates to little-endian
|
* are defined as a stream of bytes, which equates to little-endian
|
||||||
@ -4448,33 +4450,35 @@ static void do_str(DisasContext *s, uint32_t vofs, int len, int rn, int imm)
|
|||||||
if (nparts <= 4) {
|
if (nparts <= 4) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
t0 = tcg_temp_new_i64();
|
||||||
for (i = 0; i < len_align; i += 8) {
|
for (i = 0; i < len_align; i += 8) {
|
||||||
tcg_gen_ld_i64(t0, cpu_env, vofs + i);
|
tcg_gen_ld_i64(t0, cpu_env, vofs + i);
|
||||||
tcg_gen_addi_i64(addr, cpu_reg_sp(s, rn), imm + i);
|
tcg_gen_qemu_st_i64(t0, clean_addr, midx, MO_LEQ);
|
||||||
tcg_gen_qemu_st_i64(t0, addr, midx, MO_LEQ);
|
tcg_gen_addi_i64(clean_addr, cpu_reg_sp(s, rn), 8);
|
||||||
}
|
}
|
||||||
|
tcg_temp_free_i64(t0);
|
||||||
} else {
|
} else {
|
||||||
TCGLabel *loop = gen_new_label();
|
TCGLabel *loop = gen_new_label();
|
||||||
TCGv_ptr t2, i = tcg_const_local_ptr(0);
|
TCGv_ptr tp, i = tcg_const_local_ptr(0);
|
||||||
|
|
||||||
|
/* Copy the clean address into a local temp, live across the loop. */
|
||||||
|
t0 = clean_addr;
|
||||||
|
clean_addr = tcg_temp_local_new_i64();
|
||||||
|
tcg_gen_mov_i64(clean_addr, t0);
|
||||||
|
tcg_temp_free_i64(t0);
|
||||||
|
|
||||||
gen_set_label(loop);
|
gen_set_label(loop);
|
||||||
|
|
||||||
t2 = tcg_temp_new_ptr();
|
t0 = tcg_temp_new_i64();
|
||||||
tcg_gen_add_ptr(t2, cpu_env, i);
|
tp = tcg_temp_new_ptr();
|
||||||
tcg_gen_ld_i64(t0, t2, vofs);
|
tcg_gen_add_ptr(tp, cpu_env, i);
|
||||||
|
tcg_gen_ld_i64(t0, tp, vofs);
|
||||||
/* Minimize the number of local temps that must be re-read from
|
|
||||||
* the stack each iteration. Instead, re-compute values other
|
|
||||||
* than the loop counter.
|
|
||||||
*/
|
|
||||||
tcg_gen_addi_ptr(t2, i, imm);
|
|
||||||
tcg_gen_extu_ptr_i64(addr, t2);
|
|
||||||
tcg_gen_add_i64(addr, addr, cpu_reg_sp(s, rn));
|
|
||||||
tcg_temp_free_ptr(t2);
|
|
||||||
|
|
||||||
tcg_gen_qemu_st_i64(t0, addr, midx, MO_LEQ);
|
|
||||||
|
|
||||||
tcg_gen_addi_ptr(i, i, 8);
|
tcg_gen_addi_ptr(i, i, 8);
|
||||||
|
tcg_temp_free_ptr(tp);
|
||||||
|
|
||||||
|
tcg_gen_qemu_st_i64(t0, clean_addr, midx, MO_LEQ);
|
||||||
|
tcg_gen_addi_i64(clean_addr, clean_addr, 8);
|
||||||
|
tcg_temp_free_i64(t0);
|
||||||
|
|
||||||
tcg_gen_brcondi_ptr(TCG_COND_LTU, i, len_align, loop);
|
tcg_gen_brcondi_ptr(TCG_COND_LTU, i, len_align, loop);
|
||||||
tcg_temp_free_ptr(i);
|
tcg_temp_free_ptr(i);
|
||||||
@ -4482,29 +4486,30 @@ static void do_str(DisasContext *s, uint32_t vofs, int len, int rn, int imm)
|
|||||||
|
|
||||||
/* Predicate register stores can be any multiple of 2. */
|
/* Predicate register stores can be any multiple of 2. */
|
||||||
if (len_remain) {
|
if (len_remain) {
|
||||||
|
t0 = tcg_temp_new_i64();
|
||||||
tcg_gen_ld_i64(t0, cpu_env, vofs + len_align);
|
tcg_gen_ld_i64(t0, cpu_env, vofs + len_align);
|
||||||
tcg_gen_addi_i64(addr, cpu_reg_sp(s, rn), imm + len_align);
|
|
||||||
|
|
||||||
switch (len_remain) {
|
switch (len_remain) {
|
||||||
case 2:
|
case 2:
|
||||||
case 4:
|
case 4:
|
||||||
case 8:
|
case 8:
|
||||||
tcg_gen_qemu_st_i64(t0, addr, midx, MO_LE | ctz32(len_remain));
|
tcg_gen_qemu_st_i64(t0, clean_addr, midx,
|
||||||
|
MO_LE | ctz32(len_remain));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 6:
|
case 6:
|
||||||
tcg_gen_qemu_st_i64(t0, addr, midx, MO_LEUL);
|
tcg_gen_qemu_st_i64(t0, clean_addr, midx, MO_LEUL);
|
||||||
tcg_gen_addi_i64(addr, addr, 4);
|
tcg_gen_addi_i64(clean_addr, clean_addr, 4);
|
||||||
tcg_gen_shri_i64(t0, t0, 32);
|
tcg_gen_shri_i64(t0, t0, 32);
|
||||||
tcg_gen_qemu_st_i64(t0, addr, midx, MO_LEUW);
|
tcg_gen_qemu_st_i64(t0, clean_addr, midx, MO_LEUW);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
tcg_temp_free_i64(addr);
|
|
||||||
tcg_temp_free_i64(t0);
|
tcg_temp_free_i64(t0);
|
||||||
|
}
|
||||||
|
tcg_temp_free_i64(clean_addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool trans_LDR_zri(DisasContext *s, arg_rri *a)
|
static bool trans_LDR_zri(DisasContext *s, arg_rri *a)
|
||||||
|
Loading…
Reference in New Issue
Block a user