mirror of https://gitlab.com/qemu-project/qemu
tcg/s390x: Pass TCGType to tcg_out_qemu_{ld,st}
We need to set this in TCGLabelQemuLdst, so plumb this all the way through from tcg_out_op. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
f7041977a6
commit
01a3b5dead
|
@ -1770,13 +1770,14 @@ static TCGReg tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, MemOp opc,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void add_qemu_ldst_label(TCGContext *s, bool is_ld, MemOpIdx oi,
|
static void add_qemu_ldst_label(TCGContext *s, bool is_ld, MemOpIdx oi,
|
||||||
TCGReg data, TCGReg addr,
|
TCGType type, TCGReg data, TCGReg addr,
|
||||||
tcg_insn_unit *raddr, tcg_insn_unit *label_ptr)
|
tcg_insn_unit *raddr, tcg_insn_unit *label_ptr)
|
||||||
{
|
{
|
||||||
TCGLabelQemuLdst *label = new_ldst_label(s);
|
TCGLabelQemuLdst *label = new_ldst_label(s);
|
||||||
|
|
||||||
label->is_ld = is_ld;
|
label->is_ld = is_ld;
|
||||||
label->oi = oi;
|
label->oi = oi;
|
||||||
|
label->type = type;
|
||||||
label->datalo_reg = data;
|
label->datalo_reg = data;
|
||||||
label->addrlo_reg = addr;
|
label->addrlo_reg = addr;
|
||||||
label->raddr = tcg_splitwx_to_rx(raddr);
|
label->raddr = tcg_splitwx_to_rx(raddr);
|
||||||
|
@ -1900,7 +1901,7 @@ static void tcg_prepare_user_ldst(TCGContext *s, TCGReg *addr_reg,
|
||||||
#endif /* CONFIG_SOFTMMU */
|
#endif /* CONFIG_SOFTMMU */
|
||||||
|
|
||||||
static void tcg_out_qemu_ld(TCGContext* s, TCGReg data_reg, TCGReg addr_reg,
|
static void tcg_out_qemu_ld(TCGContext* s, TCGReg data_reg, TCGReg addr_reg,
|
||||||
MemOpIdx oi)
|
MemOpIdx oi, TCGType data_type)
|
||||||
{
|
{
|
||||||
MemOp opc = get_memop(oi);
|
MemOp opc = get_memop(oi);
|
||||||
#ifdef CONFIG_SOFTMMU
|
#ifdef CONFIG_SOFTMMU
|
||||||
|
@ -1916,7 +1917,8 @@ static void tcg_out_qemu_ld(TCGContext* s, TCGReg data_reg, TCGReg addr_reg,
|
||||||
|
|
||||||
tcg_out_qemu_ld_direct(s, opc, data_reg, base_reg, TCG_REG_R2, 0);
|
tcg_out_qemu_ld_direct(s, opc, data_reg, base_reg, TCG_REG_R2, 0);
|
||||||
|
|
||||||
add_qemu_ldst_label(s, 1, oi, data_reg, addr_reg, s->code_ptr, label_ptr);
|
add_qemu_ldst_label(s, true, oi, data_type, data_reg, addr_reg,
|
||||||
|
s->code_ptr, label_ptr);
|
||||||
#else
|
#else
|
||||||
TCGReg index_reg;
|
TCGReg index_reg;
|
||||||
tcg_target_long disp;
|
tcg_target_long disp;
|
||||||
|
@ -1931,7 +1933,7 @@ static void tcg_out_qemu_ld(TCGContext* s, TCGReg data_reg, TCGReg addr_reg,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tcg_out_qemu_st(TCGContext* s, TCGReg data_reg, TCGReg addr_reg,
|
static void tcg_out_qemu_st(TCGContext* s, TCGReg data_reg, TCGReg addr_reg,
|
||||||
MemOpIdx oi)
|
MemOpIdx oi, TCGType data_type)
|
||||||
{
|
{
|
||||||
MemOp opc = get_memop(oi);
|
MemOp opc = get_memop(oi);
|
||||||
#ifdef CONFIG_SOFTMMU
|
#ifdef CONFIG_SOFTMMU
|
||||||
|
@ -1947,7 +1949,8 @@ static void tcg_out_qemu_st(TCGContext* s, TCGReg data_reg, TCGReg addr_reg,
|
||||||
|
|
||||||
tcg_out_qemu_st_direct(s, opc, data_reg, base_reg, TCG_REG_R2, 0);
|
tcg_out_qemu_st_direct(s, opc, data_reg, base_reg, TCG_REG_R2, 0);
|
||||||
|
|
||||||
add_qemu_ldst_label(s, 0, oi, data_reg, addr_reg, s->code_ptr, label_ptr);
|
add_qemu_ldst_label(s, false, oi, data_type, data_reg, addr_reg,
|
||||||
|
s->code_ptr, label_ptr);
|
||||||
#else
|
#else
|
||||||
TCGReg index_reg;
|
TCGReg index_reg;
|
||||||
tcg_target_long disp;
|
tcg_target_long disp;
|
||||||
|
@ -2307,13 +2310,16 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case INDEX_op_qemu_ld_i32:
|
case INDEX_op_qemu_ld_i32:
|
||||||
/* ??? Technically we can use a non-extending instruction. */
|
tcg_out_qemu_ld(s, args[0], args[1], args[2], TCG_TYPE_I32);
|
||||||
|
break;
|
||||||
case INDEX_op_qemu_ld_i64:
|
case INDEX_op_qemu_ld_i64:
|
||||||
tcg_out_qemu_ld(s, args[0], args[1], args[2]);
|
tcg_out_qemu_ld(s, args[0], args[1], args[2], TCG_TYPE_I64);
|
||||||
break;
|
break;
|
||||||
case INDEX_op_qemu_st_i32:
|
case INDEX_op_qemu_st_i32:
|
||||||
|
tcg_out_qemu_st(s, args[0], args[1], args[2], TCG_TYPE_I32);
|
||||||
|
break;
|
||||||
case INDEX_op_qemu_st_i64:
|
case INDEX_op_qemu_st_i64:
|
||||||
tcg_out_qemu_st(s, args[0], args[1], args[2]);
|
tcg_out_qemu_st(s, args[0], args[1], args[2], TCG_TYPE_I64);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case INDEX_op_ld16s_i64:
|
case INDEX_op_ld16s_i64:
|
||||||
|
|
Loading…
Reference in New Issue