tcg/tci: Split out tcg_out_op_rrs

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-02-01 07:58:02 -10:00
parent ae216c9747
commit fe8c47cbf6

View File

@ -297,32 +297,38 @@ static void stack_bounds_check(TCGReg base, target_long offset)
} }
} }
static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, static void tcg_out_op_rrs(TCGContext *s, TCGOpcode op,
intptr_t arg2) TCGReg r0, TCGReg r1, intptr_t i2)
{ {
uint8_t *old_code_ptr = s->code_ptr; uint8_t *old_code_ptr = s->code_ptr;
stack_bounds_check(arg1, arg2); tcg_out_op_t(s, op);
if (type == TCG_TYPE_I32) { tcg_out_r(s, r0);
tcg_out_op_t(s, INDEX_op_ld_i32); tcg_out_r(s, r1);
tcg_out_r(s, ret); tcg_debug_assert(i2 == (int32_t)i2);
tcg_out_r(s, arg1); tcg_out32(s, i2);
tcg_out32(s, arg2);
} else {
tcg_debug_assert(type == TCG_TYPE_I64);
#if TCG_TARGET_REG_BITS == 64
tcg_out_op_t(s, INDEX_op_ld_i64);
tcg_out_r(s, ret);
tcg_out_r(s, arg1);
tcg_debug_assert(arg2 == (int32_t)arg2);
tcg_out32(s, arg2);
#else
TODO();
#endif
}
old_code_ptr[1] = s->code_ptr - old_code_ptr; old_code_ptr[1] = s->code_ptr - old_code_ptr;
} }
static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg val, TCGReg base,
intptr_t offset)
{
stack_bounds_check(base, offset);
switch (type) {
case TCG_TYPE_I32:
tcg_out_op_rrs(s, INDEX_op_ld_i32, val, base, offset);
break;
#if TCG_TARGET_REG_BITS == 64
case TCG_TYPE_I64:
tcg_out_op_rrs(s, INDEX_op_ld_i64, val, base, offset);
break;
#endif
default:
g_assert_not_reached();
}
}
static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg) static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg)
{ {
uint8_t *old_code_ptr = s->code_ptr; uint8_t *old_code_ptr = s->code_ptr;
@ -444,12 +450,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
CASE_64(st32) CASE_64(st32)
CASE_64(st) CASE_64(st)
stack_bounds_check(args[1], args[2]); stack_bounds_check(args[1], args[2]);
tcg_out_op_t(s, opc); tcg_out_op_rrs(s, opc, args[0], args[1], args[2]);
tcg_out_r(s, args[0]);
tcg_out_r(s, args[1]);
tcg_debug_assert(args[2] == (int32_t)args[2]);
tcg_out32(s, args[2]);
old_code_ptr[1] = s->code_ptr - old_code_ptr;
break; break;
CASE_32_64(add) CASE_32_64(add)
@ -597,29 +598,22 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
} }
} }
static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, static void tcg_out_st(TCGContext *s, TCGType type, TCGReg val, TCGReg base,
intptr_t arg2) intptr_t offset)
{ {
uint8_t *old_code_ptr = s->code_ptr; stack_bounds_check(base, offset);
switch (type) {
stack_bounds_check(arg1, arg2); case TCG_TYPE_I32:
if (type == TCG_TYPE_I32) { tcg_out_op_rrs(s, INDEX_op_st_i32, val, base, offset);
tcg_out_op_t(s, INDEX_op_st_i32); break;
tcg_out_r(s, arg);
tcg_out_r(s, arg1);
tcg_out32(s, arg2);
} else {
tcg_debug_assert(type == TCG_TYPE_I64);
#if TCG_TARGET_REG_BITS == 64 #if TCG_TARGET_REG_BITS == 64
tcg_out_op_t(s, INDEX_op_st_i64); case TCG_TYPE_I64:
tcg_out_r(s, arg); tcg_out_op_rrs(s, INDEX_op_st_i64, val, base, offset);
tcg_out_r(s, arg1); break;
tcg_out32(s, arg2);
#else
TODO();
#endif #endif
default:
g_assert_not_reached();
} }
old_code_ptr[1] = s->code_ptr - old_code_ptr;
} }
static inline bool tcg_out_sti(TCGContext *s, TCGType type, TCGArg val, static inline bool tcg_out_sti(TCGContext *s, TCGType type, TCGArg val,