motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 05:51:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcg/tci: Split out tcg_out_op_rr

Browse source 
At the same time, validate the type argument in tcg_out_mov.

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 08:45:41 -10:00
parent 7aa295c5d2
commit ffe86eb043
1 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tcg/tci/tcg-target.c.inc
View file

@ -317,6 +317,17 @@ static void tcg_out_op_p(TCGContext *s, TCGOpcode op, void *p0)
old_code_ptr[1] = s->code_ptr - old_code_ptr; old_code_ptr[1] = s->code_ptr - old_code_ptr;
} }
static void tcg_out_op_rr(TCGContext *s, TCGOpcode op, TCGReg r0, TCGReg r1)
{
uint8_t *old_code_ptr = s->code_ptr;
tcg_out_op_t(s, op);
tcg_out_r(s, r0);
tcg_out_r(s, r1);
old_code_ptr[1] = s->code_ptr - old_code_ptr;
}
static void tcg_out_op_rrs(TCGContext *s, TCGOpcode op, static void tcg_out_op_rrs(TCGContext *s, TCGOpcode op,
TCGReg r0, TCGReg r1, intptr_t i2) TCGReg r0, TCGReg r1, intptr_t i2)
{ {
@ -351,16 +362,18 @@ static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg val, TCGReg base,
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; switch (type) {
tcg_debug_assert(ret != arg); case TCG_TYPE_I32:
#if TCG_TARGET_REG_BITS == 32 tcg_out_op_rr(s, INDEX_op_mov_i32, ret, arg);
tcg_out_op_t(s, INDEX_op_mov_i32); break;
#else #if TCG_TARGET_REG_BITS == 64
tcg_out_op_t(s, INDEX_op_mov_i64); case TCG_TYPE_I64:
tcg_out_op_rr(s, INDEX_op_mov_i64, ret, arg);
break;
#endif #endif
tcg_out_r(s, ret); default:
tcg_out_r(s, arg); g_assert_not_reached();
old_code_ptr[1] = s->code_ptr - old_code_ptr; }
return true; return true;
} }
@ -534,10 +547,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
CASE_32_64(bswap16) /* Optional (TCG_TARGET_HAS_bswap16_*). */ CASE_32_64(bswap16) /* Optional (TCG_TARGET_HAS_bswap16_*). */
CASE_32_64(bswap32) /* Optional (TCG_TARGET_HAS_bswap32_*). */ CASE_32_64(bswap32) /* Optional (TCG_TARGET_HAS_bswap32_*). */
CASE_64(bswap64) /* Optional (TCG_TARGET_HAS_bswap64_i64). */ CASE_64(bswap64) /* Optional (TCG_TARGET_HAS_bswap64_i64). */
tcg_out_op_t(s, opc); tcg_out_op_rr(s, opc, args[0], args[1]);
tcg_out_r(s, args[0]);
tcg_out_r(s, args[1]);
old_code_ptr[1] = s->code_ptr - old_code_ptr;
break; break;
#if TCG_TARGET_REG_BITS == 32 #if TCG_TARGET_REG_BITS == 32