diff options
Diffstat (limited to 'tcg/tcg-op.h')
| -rw-r--r-- | tcg/tcg-op.h | 670 |
1 files changed, 374 insertions, 296 deletions
diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index 705e0df971..6fb3138366 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -28,75 +28,141 @@ int gen_new_label(void); -static inline void tcg_gen_op1(int opc, TCGArg arg1) +static inline void tcg_gen_op1(int opc, TCGv arg1) { *gen_opc_ptr++ = opc; - *gen_opparam_ptr++ = arg1; + *gen_opparam_ptr++ = GET_TCGV(arg1); } -static inline void tcg_gen_op2(int opc, TCGArg arg1, TCGArg arg2) +static inline void tcg_gen_op1i(int opc, TCGArg arg1) { *gen_opc_ptr++ = opc; *gen_opparam_ptr++ = arg1; - *gen_opparam_ptr++ = arg2; } -static inline void tcg_gen_op3(int opc, TCGArg arg1, TCGArg arg2, TCGArg arg3) +static inline void tcg_gen_op2(int opc, TCGv arg1, TCGv arg2) { *gen_opc_ptr++ = opc; - *gen_opparam_ptr++ = arg1; - *gen_opparam_ptr++ = arg2; - *gen_opparam_ptr++ = arg3; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); } -static inline void tcg_gen_op4(int opc, TCGArg arg1, TCGArg arg2, TCGArg arg3, - TCGArg arg4) +static inline void tcg_gen_op2i(int opc, TCGv arg1, TCGArg arg2) { *gen_opc_ptr++ = opc; - *gen_opparam_ptr++ = arg1; + *gen_opparam_ptr++ = GET_TCGV(arg1); *gen_opparam_ptr++ = arg2; +} + +static inline void tcg_gen_op3(int opc, TCGv arg1, TCGv arg2, TCGv arg3) +{ + *gen_opc_ptr++ = opc; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); + *gen_opparam_ptr++ = GET_TCGV(arg3); +} + +static inline void tcg_gen_op3i(int opc, TCGv arg1, TCGv arg2, TCGArg arg3) +{ + *gen_opc_ptr++ = opc; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); *gen_opparam_ptr++ = arg3; +} + +static inline void tcg_gen_op4(int opc, TCGv arg1, TCGv arg2, TCGv arg3, + TCGv arg4) +{ + *gen_opc_ptr++ = opc; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); + *gen_opparam_ptr++ = GET_TCGV(arg3); + *gen_opparam_ptr++ = GET_TCGV(arg4); +} + +static inline void tcg_gen_op4i(int opc, TCGv arg1, TCGv arg2, TCGv arg3, + TCGArg arg4) +{ + *gen_opc_ptr++ = opc; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); + *gen_opparam_ptr++ = GET_TCGV(arg3); *gen_opparam_ptr++ = arg4; } -static inline void tcg_gen_op5(int opc, TCGArg arg1, TCGArg arg2, - TCGArg arg3, TCGArg arg4, - TCGArg arg5) +static inline void tcg_gen_op4ii(int opc, TCGv arg1, TCGv arg2, TCGArg arg3, + TCGArg arg4) { *gen_opc_ptr++ = opc; - *gen_opparam_ptr++ = arg1; - *gen_opparam_ptr++ = arg2; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); *gen_opparam_ptr++ = arg3; *gen_opparam_ptr++ = arg4; +} + +static inline void tcg_gen_op5(int opc, TCGv arg1, TCGv arg2, + TCGv arg3, TCGv arg4, + TCGv arg5) +{ + *gen_opc_ptr++ = opc; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); + *gen_opparam_ptr++ = GET_TCGV(arg3); + *gen_opparam_ptr++ = GET_TCGV(arg4); + *gen_opparam_ptr++ = GET_TCGV(arg5); +} + +static inline void tcg_gen_op5i(int opc, TCGv arg1, TCGv arg2, + TCGv arg3, TCGv arg4, + TCGArg arg5) +{ + *gen_opc_ptr++ = opc; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); + *gen_opparam_ptr++ = GET_TCGV(arg3); + *gen_opparam_ptr++ = GET_TCGV(arg4); *gen_opparam_ptr++ = arg5; } -static inline void tcg_gen_op6(int opc, TCGArg arg1, TCGArg arg2, - TCGArg arg3, TCGArg arg4, - TCGArg arg5, TCGArg arg6) +static inline void tcg_gen_op6(int opc, TCGv arg1, TCGv arg2, + TCGv arg3, TCGv arg4, + TCGv arg5, TCGv arg6) { *gen_opc_ptr++ = opc; - *gen_opparam_ptr++ = arg1; - *gen_opparam_ptr++ = arg2; - *gen_opparam_ptr++ = arg3; - *gen_opparam_ptr++ = arg4; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); + *gen_opparam_ptr++ = GET_TCGV(arg3); + *gen_opparam_ptr++ = GET_TCGV(arg4); + *gen_opparam_ptr++ = GET_TCGV(arg5); + *gen_opparam_ptr++ = GET_TCGV(arg6); +} + +static inline void tcg_gen_op6ii(int opc, TCGv arg1, TCGv arg2, + TCGv arg3, TCGv arg4, + TCGArg arg5, TCGArg arg6) +{ + *gen_opc_ptr++ = opc; + *gen_opparam_ptr++ = GET_TCGV(arg1); + *gen_opparam_ptr++ = GET_TCGV(arg2); + *gen_opparam_ptr++ = GET_TCGV(arg3); + *gen_opparam_ptr++ = GET_TCGV(arg4); *gen_opparam_ptr++ = arg5; *gen_opparam_ptr++ = arg6; } static inline void gen_set_label(int n) { - tcg_gen_op1(INDEX_op_set_label, n); + tcg_gen_op1i(INDEX_op_set_label, n); } -static inline void tcg_gen_mov_i32(int ret, int arg) +static inline void tcg_gen_mov_i32(TCGv ret, TCGv arg) { tcg_gen_op2(INDEX_op_mov_i32, ret, arg); } -static inline void tcg_gen_movi_i32(int ret, int32_t arg) +static inline void tcg_gen_movi_i32(TCGv ret, int32_t arg) { - tcg_gen_op2(INDEX_op_movi_i32, ret, arg); + tcg_gen_op2i(INDEX_op_movi_i32, ret, arg); } /* helper calls */ @@ -109,16 +175,16 @@ static inline void tcg_gen_helper_0_0(void *func) 0, NULL, 0, NULL); } -static inline void tcg_gen_helper_0_1(void *func, TCGArg arg) +static inline void tcg_gen_helper_0_1(void *func, TCGv arg) { tcg_gen_call(&tcg_ctx, tcg_const_ptr((tcg_target_long)func), TCG_HELPER_CALL_FLAGS, 0, NULL, 1, &arg); } -static inline void tcg_gen_helper_0_2(void *func, TCGArg arg1, TCGArg arg2) +static inline void tcg_gen_helper_0_2(void *func, TCGv arg1, TCGv arg2) { - TCGArg args[2]; + TCGv args[2]; args[0] = arg1; args[1] = arg2; tcg_gen_call(&tcg_ctx, @@ -126,10 +192,10 @@ static inline void tcg_gen_helper_0_2(void *func, TCGArg arg1, TCGArg arg2) 0, NULL, 2, args); } -static inline void tcg_gen_helper_1_2(void *func, TCGArg ret, - TCGArg arg1, TCGArg arg2) +static inline void tcg_gen_helper_1_2(void *func, TCGv ret, + TCGv arg1, TCGv arg2) { - TCGArg args[2]; + TCGv args[2]; args[0] = arg1; args[1] = arg2; tcg_gen_call(&tcg_ctx, @@ -139,72 +205,72 @@ static inline void tcg_gen_helper_1_2(void *func, TCGArg ret, /* 32 bit ops */ -static inline void tcg_gen_ld8u_i32(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld8u_i32(TCGv ret, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld8u_i32, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld8u_i32, ret, arg2, offset); } -static inline void tcg_gen_ld8s_i32(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld8s_i32(TCGv ret, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld8s_i32, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld8s_i32, ret, arg2, offset); } -static inline void tcg_gen_ld16u_i32(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld16u_i32(TCGv ret, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld16u_i32, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld16u_i32, ret, arg2, offset); } -static inline void tcg_gen_ld16s_i32(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld16s_i32(TCGv ret, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld16s_i32, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld16s_i32, ret, arg2, offset); } -static inline void tcg_gen_ld_i32(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld_i32(TCGv ret, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld_i32, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld_i32, ret, arg2, offset); } -static inline void tcg_gen_st8_i32(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st8_i32(TCGv arg1, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_st8_i32, arg1, arg2, offset); + tcg_gen_op3i(INDEX_op_st8_i32, arg1, arg2, offset); } -static inline void tcg_gen_st16_i32(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st16_i32(TCGv arg1, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_st16_i32, arg1, arg2, offset); + tcg_gen_op3i(INDEX_op_st16_i32, arg1, arg2, offset); } -static inline void tcg_gen_st_i32(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st_i32(TCGv arg1, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_st_i32, arg1, arg2, offset); + tcg_gen_op3i(INDEX_op_st_i32, arg1, arg2, offset); } -static inline void tcg_gen_add_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_add_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_add_i32, ret, arg1, arg2); } -static inline void tcg_gen_addi_i32(int ret, int arg1, int32_t arg2) +static inline void tcg_gen_addi_i32(TCGv ret, TCGv arg1, int32_t arg2) { tcg_gen_add_i32(ret, arg1, tcg_const_i32(arg2)); } -static inline void tcg_gen_sub_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_sub_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_sub_i32, ret, arg1, arg2); } -static inline void tcg_gen_subi_i32(int ret, int arg1, int32_t arg2) +static inline void tcg_gen_subi_i32(TCGv ret, TCGv arg1, int32_t arg2) { tcg_gen_sub_i32(ret, arg1, tcg_const_i32(arg2)); } -static inline void tcg_gen_and_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_and_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_and_i32, ret, arg1, arg2); } -static inline void tcg_gen_andi_i32(int ret, int arg1, int32_t arg2) +static inline void tcg_gen_andi_i32(TCGv ret, TCGv arg1, int32_t arg2) { /* some cases can be optimized here */ if (arg2 == 0) { @@ -216,12 +282,12 @@ static inline void tcg_gen_andi_i32(int ret, int arg1, int32_t arg2) } } -static inline void tcg_gen_or_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_or_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_or_i32, ret, arg1, arg2); } -static inline void tcg_gen_ori_i32(int ret, int arg1, int32_t arg2) +static inline void tcg_gen_ori_i32(TCGv ret, TCGv arg1, int32_t arg2) { /* some cases can be optimized here */ if (arg2 == 0xffffffff) { @@ -233,12 +299,12 @@ static inline void tcg_gen_ori_i32(int ret, int arg1, int32_t arg2) } } -static inline void tcg_gen_xor_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_xor_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_xor_i32, ret, arg1, arg2); } -static inline void tcg_gen_xori_i32(int ret, int arg1, int32_t arg2) +static inline void tcg_gen_xori_i32(TCGv ret, TCGv arg1, int32_t arg2) { /* some cases can be optimized here */ if (arg2 == 0) { @@ -248,95 +314,95 @@ static inline void tcg_gen_xori_i32(int ret, int arg1, int32_t arg2) } } -static inline void tcg_gen_shl_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_shl_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_shl_i32, ret, arg1, arg2); } -static inline void tcg_gen_shli_i32(int ret, int arg1, int32_t arg2) +static inline void tcg_gen_shli_i32(TCGv ret, TCGv arg1, int32_t arg2) { tcg_gen_shl_i32(ret, arg1, tcg_const_i32(arg2)); } -static inline void tcg_gen_shr_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_shr_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_shr_i32, ret, arg1, arg2); } -static inline void tcg_gen_shri_i32(int ret, int arg1, int32_t arg2) +static inline void tcg_gen_shri_i32(TCGv ret, TCGv arg1, int32_t arg2) { tcg_gen_shr_i32(ret, arg1, tcg_const_i32(arg2)); } -static inline void tcg_gen_sar_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_sar_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_sar_i32, ret, arg1, arg2); } -static inline void tcg_gen_sari_i32(int ret, int arg1, int32_t arg2) +static inline void tcg_gen_sari_i32(TCGv ret, TCGv arg1, int32_t arg2) { tcg_gen_sar_i32(ret, arg1, tcg_const_i32(arg2)); } -static inline void tcg_gen_brcond_i32(int cond, TCGArg arg1, TCGArg arg2, +static inline void tcg_gen_brcond_i32(int cond, TCGv arg1, TCGv arg2, int label_index) { - tcg_gen_op4(INDEX_op_brcond_i32, arg1, arg2, cond, label_index); + tcg_gen_op4ii(INDEX_op_brcond_i32, arg1, arg2, cond, label_index); } -static inline void tcg_gen_mul_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_mul_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_mul_i32, ret, arg1, arg2); } #ifdef TCG_TARGET_HAS_div_i32 -static inline void tcg_gen_div_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_div_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_div_i32, ret, arg1, arg2); } -static inline void tcg_gen_rem_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_rem_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_rem_i32, ret, arg1, arg2); } -static inline void tcg_gen_divu_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_divu_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_divu_i32, ret, arg1, arg2); } -static inline void tcg_gen_remu_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_remu_i32(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_remu_i32, ret, arg1, arg2); } #else -static inline void tcg_gen_div_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_div_i32(TCGv ret, TCGv arg1, TCGv arg2) { - int t0; + TCGv t0; t0 = tcg_temp_new(TCG_TYPE_I32); tcg_gen_sari_i32(t0, arg1, 31); tcg_gen_op5(INDEX_op_div2_i32, ret, t0, arg1, t0, arg2); } -static inline void tcg_gen_rem_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_rem_i32(TCGv ret, TCGv arg1, TCGv arg2) { - int t0; + TCGv t0; t0 = tcg_temp_new(TCG_TYPE_I32); tcg_gen_sari_i32(t0, arg1, 31); tcg_gen_op5(INDEX_op_div2_i32, t0, ret, arg1, t0, arg2); } -static inline void tcg_gen_divu_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_divu_i32(TCGv ret, TCGv arg1, TCGv arg2) { - int t0; + TCGv t0; t0 = tcg_temp_new(TCG_TYPE_I32); tcg_gen_movi_i32(t0, 0); tcg_gen_op5(INDEX_op_divu2_i32, ret, t0, arg1, t0, arg2); } -static inline void tcg_gen_remu_i32(int ret, int arg1, int arg2) +static inline void tcg_gen_remu_i32(TCGv ret, TCGv arg1, TCGv arg2) { - int t0; + TCGv t0; t0 = tcg_temp_new(TCG_TYPE_I32); tcg_gen_movi_i32(t0, 0); tcg_gen_op5(INDEX_op_divu2_i32, t0, ret, arg1, t0, arg2); @@ -345,433 +411,443 @@ static inline void tcg_gen_remu_i32(int ret, int arg1, int arg2) #if TCG_TARGET_REG_BITS == 32 -static inline void tcg_gen_mov_i64(int ret, int arg) +static inline void tcg_gen_mov_i64(TCGv ret, TCGv arg) { tcg_gen_mov_i32(ret, arg); - tcg_gen_mov_i32(ret + 1, arg + 1); + tcg_gen_mov_i32(TCGV_HIGH(ret), TCGV_HIGH(arg)); } -static inline void tcg_gen_movi_i64(int ret, int64_t arg) +static inline void tcg_gen_movi_i64(TCGv ret, int64_t arg) { tcg_gen_movi_i32(ret, arg); - tcg_gen_movi_i32(ret + 1, arg >> 32); + tcg_gen_movi_i32(TCGV_HIGH(ret), arg >> 32); } -static inline void tcg_gen_ld8u_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld8u_i64(TCGv ret, TCGv arg2, tcg_target_long offset) { tcg_gen_ld8u_i32(ret, arg2, offset); - tcg_gen_movi_i32(ret + 1, 0); + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); } -static inline void tcg_gen_ld8s_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld8s_i64(TCGv ret, TCGv arg2, tcg_target_long offset) { tcg_gen_ld8s_i32(ret, arg2, offset); - tcg_gen_sari_i32(ret + 1, ret, 31); + tcg_gen_sari_i32(TCGV_HIGH(ret), ret, 31); } -static inline void tcg_gen_ld16u_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld16u_i64(TCGv ret, TCGv arg2, tcg_target_long offset) { tcg_gen_ld16u_i32(ret, arg2, offset); - tcg_gen_movi_i32(ret + 1, 0); + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); } -static inline void tcg_gen_ld16s_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld16s_i64(TCGv ret, TCGv arg2, tcg_target_long offset) { tcg_gen_ld16s_i32(ret, arg2, offset); - tcg_gen_sari_i32(ret + 1, ret, 31); + tcg_gen_sari_i32(TCGV_HIGH(ret), ret, 31); } -static inline void tcg_gen_ld32u_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld32u_i64(TCGv ret, TCGv arg2, tcg_target_long offset) { tcg_gen_ld_i32(ret, arg2, offset); - tcg_gen_movi_i32(ret + 1, 0); + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); } -static inline void tcg_gen_ld32s_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld32s_i64(TCGv ret, TCGv arg2, tcg_target_long offset) { tcg_gen_ld_i32(ret, arg2, offset); - tcg_gen_sari_i32(ret + 1, ret, 31); + tcg_gen_sari_i32(TCGV_HIGH(ret), ret, 31); } -static inline void tcg_gen_ld_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld_i64(TCGv ret, TCGv arg2, tcg_target_long offset) { /* since arg2 and ret have different types, they cannot be the same temporary */ #ifdef TCG_TARGET_WORDS_BIGENDIAN - tcg_gen_ld_i32(ret + 1, arg2, offset); + tcg_gen_ld_i32(TCGV_HIGH(ret), arg2, offset); tcg_gen_ld_i32(ret, arg2, offset + 4); #else tcg_gen_ld_i32(ret, arg2, offset); - tcg_gen_ld_i32(ret + 1, arg2, offset + 4); + tcg_gen_ld_i32(TCGV_HIGH(ret), arg2, offset + 4); #endif } -static inline void tcg_gen_st8_i64(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st8_i64(TCGv arg1, TCGv arg2, tcg_target_long offset) { tcg_gen_st8_i32(arg1, arg2, offset); } -static inline void tcg_gen_st16_i64(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st16_i64(TCGv arg1, TCGv arg2, tcg_target_long offset) { tcg_gen_st16_i32(arg1, arg2, offset); } -static inline void tcg_gen_st32_i64(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st32_i64(TCGv arg1, TCGv arg2, tcg_target_long offset) { tcg_gen_st_i32(arg1, arg2, offset); } -static inline void tcg_gen_st_i64(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st_i64(TCGv arg1, TCGv arg2, tcg_target_long offset) { #ifdef TCG_TARGET_WORDS_BIGENDIAN - tcg_gen_st_i32(arg1 + 1, arg2, offset); + tcg_gen_st_i32(TCGV_HIGH(arg1), arg2, offset); tcg_gen_st_i32(arg1, arg2, offset + 4); #else tcg_gen_st_i32(arg1, arg2, offset); - tcg_gen_st_i32(arg1 + 1, arg2, offset + 4); + tcg_gen_st_i32(TCGV_HIGH(arg1), arg2, offset + 4); #endif } -static inline void tcg_gen_add_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_add_i64(TCGv ret, TCGv arg1, TCGv arg2) { - tcg_gen_op6(INDEX_op_add2_i32, ret, ret + 1, - arg1, arg1 + 1, arg2, arg2 + 1); + tcg_gen_op6(INDEX_op_add2_i32, ret, TCGV_HIGH(ret), + arg1, TCGV_HIGH(arg1), arg2, TCGV_HIGH(arg2)); } -static inline void tcg_gen_addi_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_addi_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_add_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_sub_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_sub_i64(TCGv ret, TCGv arg1, TCGv arg2) { - tcg_gen_op6(INDEX_op_sub2_i32, ret, ret + 1, - arg1, arg1 + 1, arg2, arg2 + 1); + tcg_gen_op6(INDEX_op_sub2_i32, ret, TCGV_HIGH(ret), + arg1, TCGV_HIGH(arg1), arg2, TCGV_HIGH(arg2)); } -static inline void tcg_gen_subi_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_subi_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_sub_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_and_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_and_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_and_i32(ret, arg1, arg2); - tcg_gen_and_i32(ret + 1, arg1 + 1, arg2 + 1); + tcg_gen_and_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), TCGV_HIGH(arg2)); } -static inline void tcg_gen_andi_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_andi_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_andi_i32(ret, arg1, arg2); - tcg_gen_andi_i32(ret + 1, arg1 + 1, arg2 >> 32); + tcg_gen_andi_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), arg2 >> 32); } -static inline void tcg_gen_or_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_or_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_or_i32(ret, arg1, arg2); - tcg_gen_or_i32(ret + 1, arg1 + 1, arg2 + 1); + tcg_gen_or_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), TCGV_HIGH(arg2)); } -static inline void tcg_gen_ori_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_ori_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_ori_i32(ret, arg1, arg2); - tcg_gen_ori_i32(ret + 1, arg1 + 1, arg2 >> 32); + tcg_gen_ori_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), arg2 >> 32); } -static inline void tcg_gen_xor_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_xor_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_xor_i32(ret, arg1, arg2); - tcg_gen_xor_i32(ret + 1, arg1 + 1, arg2 + 1); + tcg_gen_xor_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), TCGV_HIGH(arg2)); } -static inline void tcg_gen_xori_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_xori_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_xori_i32(ret, arg1, arg2); - tcg_gen_xori_i32(ret + 1, arg1 + 1, arg2 >> 32); + tcg_gen_xori_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), arg2 >> 32); } /* XXX: use generic code when basic block handling is OK or CPU specific code (x86) */ -static inline void tcg_gen_shl_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_shl_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_helper_1_2(tcg_helper_shl_i64, ret, arg1, arg2); } -static inline void tcg_gen_shli_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_shli_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_shifti_i64(ret, arg1, arg2, 0, 0); } -static inline void tcg_gen_shr_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_shr_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_helper_1_2(tcg_helper_shr_i64, ret, arg1, arg2); } -static inline void tcg_gen_shri_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_shri_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_shifti_i64(ret, arg1, arg2, 1, 0); } -static inline void tcg_gen_sar_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_sar_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_helper_1_2(tcg_helper_sar_i64, ret, arg1, arg2); } -static inline void tcg_gen_sari_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_sari_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_shifti_i64(ret, arg1, arg2, 1, 1); } -static inline void tcg_gen_brcond_i64(int cond, TCGArg arg1, TCGArg arg2, +static inline void tcg_gen_brcond_i64(int cond, TCGv arg1, TCGv arg2, int label_index) { - tcg_gen_op6(INDEX_op_brcond2_i32, - arg1, arg1 + 1, arg2, arg2 + 1, cond, label_index); + tcg_gen_op6ii(INDEX_op_brcond2_i32, + arg1, TCGV_HIGH(arg1), arg2, TCGV_HIGH(arg2), + cond, label_index); } -static inline void tcg_gen_mul_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_mul_i64(TCGv ret, TCGv arg1, TCGv arg2) { - int t0, t1; + TCGv t0, t1; t0 = tcg_temp_new(TCG_TYPE_I64); t1 = tcg_temp_new(TCG_TYPE_I32); - tcg_gen_op4(INDEX_op_mulu2_i32, t0, t0 + 1, arg1, arg2); + tcg_gen_op4(INDEX_op_mulu2_i32, t0, TCGV_HIGH(t0), arg1, arg2); - tcg_gen_mul_i32(t1, arg1, arg2 + 1); - tcg_gen_add_i32(t0 + 1, t0 + 1, t1); - tcg_gen_mul_i32(t1, arg1 + 1, arg2); - tcg_gen_add_i32(t0 + 1, t0 + 1, t1); + tcg_gen_mul_i32(t1, arg1, TCGV_HIGH(arg2)); + tcg_gen_add_i32(TCGV_HIGH(t0), TCGV_HIGH(t0), t1); + tcg_gen_mul_i32(t1, TCGV_HIGH(arg1), arg2); + tcg_gen_add_i32(TCGV_HIGH(t0), TCGV_HIGH(t0), t1); tcg_gen_mov_i64(ret, t0); } -static inline void tcg_gen_div_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_div_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_helper_1_2(tcg_helper_div_i64, ret, arg1, arg2); } -static inline void tcg_gen_rem_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_rem_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_helper_1_2(tcg_helper_rem_i64, ret, arg1, arg2); } -static inline void tcg_gen_divu_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_divu_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_helper_1_2(tcg_helper_divu_i64, ret, arg1, arg2); } -static inline void tcg_gen_remu_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_remu_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_helper_1_2(tcg_helper_remu_i64, ret, arg1, arg2); } #else -static inline void tcg_gen_mov_i64(int ret, int arg) +static inline void tcg_gen_mov_i64(TCGv ret, TCGv arg) { tcg_gen_op2(INDEX_op_mov_i64, ret, arg); } -static inline void tcg_gen_movi_i64(int ret, int64_t arg) +static inline void tcg_gen_movi_i64(TCGv ret, int64_t arg) { - tcg_gen_op2(INDEX_op_movi_i64, ret, arg); + tcg_gen_op2i(INDEX_op_movi_i64, ret, arg); } -static inline void tcg_gen_ld8u_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld8u_i64(TCGv ret, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld8u_i64, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld8u_i64, ret, arg2, offset); } -static inline void tcg_gen_ld8s_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld8s_i64(TCGv ret, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld8s_i64, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld8s_i64, ret, arg2, offset); } -static inline void tcg_gen_ld16u_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld16u_i64(TCGv ret, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld16u_i64, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld16u_i64, ret, arg2, offset); } -static inline void tcg_gen_ld16s_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld16s_i64(TCGv ret, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld16s_i64, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld16s_i64, ret, arg2, offset); } -static inline void tcg_gen_ld32u_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld32u_i64(TCGv ret, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld32u_i64, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld32u_i64, ret, arg2, offset); } -static inline void tcg_gen_ld32s_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld32s_i64(TCGv ret, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld32s_i64, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld32s_i64, ret, arg2, offset); } -static inline void tcg_gen_ld_i64(int ret, int arg2, tcg_target_long offset) +static inline void tcg_gen_ld_i64(TCGv ret, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_ld_i64, ret, arg2, offset); + tcg_gen_op3i(INDEX_op_ld_i64, ret, arg2, offset); } -static inline void tcg_gen_st8_i64(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st8_i64(TCGv arg1, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_st8_i64, arg1, arg2, offset); + tcg_gen_op3i(INDEX_op_st8_i64, arg1, arg2, offset); } -static inline void tcg_gen_st16_i64(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st16_i64(TCGv arg1, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_st16_i64, arg1, arg2, offset); + tcg_gen_op3i(INDEX_op_st16_i64, arg1, arg2, offset); } -static inline void tcg_gen_st32_i64(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st32_i64(TCGv arg1, TCGv arg2, + tcg_target_long offset) { - tcg_gen_op3(INDEX_op_st32_i64, arg1, arg2, offset); + tcg_gen_op3i(INDEX_op_st32_i64, arg1, arg2, offset); } -static inline void tcg_gen_st_i64(int arg1, int arg2, tcg_target_long offset) +static inline void tcg_gen_st_i64(TCGv arg1, TCGv arg2, tcg_target_long offset) { - tcg_gen_op3(INDEX_op_st_i64, arg1, arg2, offset); + tcg_gen_op3i(INDEX_op_st_i64, arg1, arg2, offset); } -static inline void tcg_gen_add_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_add_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_add_i64, ret, arg1, arg2); } -static inline void tcg_gen_addi_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_addi_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_add_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_sub_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_sub_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_sub_i64, ret, arg1, arg2); } -static inline void tcg_gen_subi_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_subi_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_sub_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_and_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_and_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_and_i64, ret, arg1, arg2); } -static inline void tcg_gen_andi_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_andi_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_and_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_or_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_or_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_or_i64, ret, arg1, arg2); } -static inline void tcg_gen_ori_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_ori_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_or_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_xor_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_xor_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_xor_i64, ret, arg1, arg2); } -static inline void tcg_gen_xori_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_xori_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_xor_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_shl_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_shl_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_shl_i64, ret, arg1, arg2); } -static inline void tcg_gen_shli_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_shli_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_shl_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_shr_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_shr_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_shr_i64, ret, arg1, arg2); } -static inline void tcg_gen_shri_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_shri_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_shr_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_sar_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_sar_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_sar_i64, ret, arg1, arg2); } -static inline void tcg_gen_sari_i64(int ret, int arg1, int64_t arg2) +static inline void tcg_gen_sari_i64(TCGv ret, TCGv arg1, int64_t arg2) { tcg_gen_sar_i64(ret, arg1, tcg_const_i64(arg2)); } -static inline void tcg_gen_brcond_i64(int cond, TCGArg arg1, TCGArg arg2, +static inline void tcg_gen_brcond_i64(int cond, TCGv arg1, TCGv arg2, int label_index) { - tcg_gen_op4(INDEX_op_brcond_i64, arg1, arg2, cond, label_index); + tcg_gen_op4ii(INDEX_op_brcond_i64, arg1, arg2, cond, label_index); } -static inline void tcg_gen_mul_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_mul_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_mul_i64, ret, arg1, arg2); } #ifdef TCG_TARGET_HAS_div_i64 -static inline void tcg_gen_div_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_div_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_div_i64, ret, arg1, arg2); } -static inline void tcg_gen_rem_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_rem_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_rem_i64, ret, arg1, arg2); } -static inline void tcg_gen_divu_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_divu_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_divu_i64, ret, arg1, arg2); } -static inline void tcg_gen_remu_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_remu_i64(TCGv ret, TCGv arg1, TCGv arg2) { tcg_gen_op3(INDEX_op_remu_i64, ret, arg1, arg2); } #else -static inline void tcg_gen_div_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_div_i64(TCGv ret, TCGv arg1, TCGv arg2) { - int t0; + TCGv t0; t0 = tcg_temp_new(TCG_TYPE_I64); tcg_gen_sari_i64(t0, arg1, 63); tcg_gen_op5(INDEX_op_div2_i64, ret, t0, arg1, t0, arg2); } -static inline void tcg_gen_rem_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_rem_i64(TCGv ret, TCGv arg1, TCGv arg2) { - int t0; + TCGv t0; t0 = tcg_temp_new(TCG_TYPE_I64); tcg_gen_sari_i64(t0, arg1, 63); tcg_gen_op5(INDEX_op_div2_i64, t0, ret, arg1, t0, arg2); } -static inline void tcg_gen_divu_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_divu_i64(TCGv ret, TCGv arg1, TCGv arg2) { - int t0; + TCGv t0; t0 = tcg_temp_new(TCG_TYPE_I64); tcg_gen_movi_i64(t0, 0); tcg_gen_op5(INDEX_op_divu2_i64, ret, t0, arg1, t0, arg2); } -static inline void tcg_gen_remu_i64(int ret, int arg1, int arg2) +static inline void tcg_gen_remu_i64(TCGv ret, TCGv arg1, TCGv arg2) { - int t0; + TCGv t0; t0 = tcg_temp_new(TCG_TYPE_I64); tcg_gen_movi_i64(t0, 0); tcg_gen_op5(INDEX_op_divu2_i64, t0, ret, arg1, t0, arg2); @@ -783,7 +859,7 @@ static inline void tcg_gen_remu_i64(int ret, int arg1, int arg2) /***************************************/ /* optional operations */ -static inline void tcg_gen_ext8s_i32(int ret, int arg) +static inline void tcg_gen_ext8s_i32(TCGv ret, TCGv arg) { #ifdef TCG_TARGET_HAS_ext8s_i32 tcg_gen_op2(INDEX_op_ext8s_i32, ret, arg); @@ -793,7 +869,7 @@ static inline void tcg_gen_ext8s_i32(int ret, int arg) #endif } -static inline void tcg_gen_ext16s_i32(int ret, int arg) +static inline void tcg_gen_ext16s_i32(TCGv ret, TCGv arg) { #ifdef TCG_TARGET_HAS_ext16s_i32 tcg_gen_op2(INDEX_op_ext16s_i32, ret, arg); @@ -804,12 +880,12 @@ static inline void tcg_gen_ext16s_i32(int ret, int arg) } /* Note: we assume the two high bytes are set to zero */ -static inline void tcg_gen_bswap16_i32(TCGArg ret, TCGArg arg) +static inline void tcg_gen_bswap16_i32(TCGv ret, TCGv arg) { #ifdef TCG_TARGET_HAS_bswap16_i32 tcg_gen_op2(INDEX_op_bswap16_i32, ret, arg); #else - TCGArg t0, t1; + TCGv t0, t1; t0 = tcg_temp_new(TCG_TYPE_I32); t1 = tcg_temp_new(TCG_TYPE_I32); @@ -820,12 +896,12 @@ static inline void tcg_gen_bswap16_i32(TCGArg ret, TCGArg arg) #endif } -static inline void tcg_gen_bswap_i32(TCGArg ret, TCGArg arg) +static inline void tcg_gen_bswap_i32(TCGv ret, TCGv arg) { #ifdef TCG_TARGET_HAS_bswap_i32 tcg_gen_op2(INDEX_op_bswap_i32, ret, arg); #else - TCGArg t0, t1; + TCGv t0, t1; t0 = tcg_temp_new(TCG_TYPE_I32); t1 = tcg_temp_new(TCG_TYPE_I32); @@ -845,55 +921,55 @@ static inline void tcg_gen_bswap_i32(TCGArg ret, TCGArg arg) } #if TCG_TARGET_REG_BITS == 32 -static inline void tcg_gen_ext8s_i64(int ret, int arg) +static inline void tcg_gen_ext8s_i64(TCGv ret, TCGv arg) { tcg_gen_ext8s_i32(ret, arg); - tcg_gen_sari_i32(ret + 1, ret, 31); + tcg_gen_sari_i32(TCGV_HIGH(ret), ret, 31); } -static inline void tcg_gen_ext16s_i64(int ret, int arg) +static inline void tcg_gen_ext16s_i64(TCGv ret, TCGv arg) { tcg_gen_ext16s_i32(ret, arg); - tcg_gen_sari_i32(ret + 1, ret, 31); + tcg_gen_sari_i32(TCGV_HIGH(ret), ret, 31); } -static inline void tcg_gen_ext32s_i64(int ret, int arg) +static inline void tcg_gen_ext32s_i64(TCGv ret, TCGv arg) { tcg_gen_mov_i32(ret, arg); - tcg_gen_sari_i32(ret + 1, ret, 31); + tcg_gen_sari_i32(TCGV_HIGH(ret), ret, 31); } -static inline void tcg_gen_trunc_i64_i32(int ret, int arg) +static inline void tcg_gen_trunc_i64_i32(TCGv ret, TCGv arg) { tcg_gen_mov_i32(ret, arg); } -static inline void tcg_gen_extu_i32_i64(int ret, int arg) +static inline void tcg_gen_extu_i32_i64(TCGv ret, TCGv arg) { tcg_gen_mov_i32(ret, arg); - tcg_gen_movi_i32(ret + 1, 0); + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); } -static inline void tcg_gen_ext_i32_i64(int ret, int arg) +static inline void tcg_gen_ext_i32_i64(TCGv ret, TCGv arg) { tcg_gen_mov_i32(ret, arg); - tcg_gen_sari_i32(ret + 1, ret, 31); + tcg_gen_sari_i32(TCGV_HIGH(ret), ret, 31); } -static inline void tcg_gen_bswap_i64(int ret, int arg) +static inline void tcg_gen_bswap_i64(TCGv ret, TCGv arg) { - int t0, t1; + TCGv t0, t1; t0 = tcg_temp_new(TCG_TYPE_I32); t1 = tcg_temp_new(TCG_TYPE_I32); tcg_gen_bswap_i32(t0, arg); - tcg_gen_bswap_i32(t1, arg + 1); + tcg_gen_bswap_i32(t1, TCGV_HIGH(arg)); tcg_gen_mov_i32(ret, t1); - tcg_gen_mov_i32(ret + 1, t0); + tcg_gen_mov_i32(TCGV_HIGH(ret), t0); } #else -static inline void tcg_gen_ext8s_i64(int ret, int arg) +static inline void tcg_gen_ext8s_i64(TCGv ret, TCGv arg) { #ifdef TCG_TARGET_HAS_ext8s_i64 tcg_gen_op2(INDEX_op_ext8s_i64, ret, arg); @@ -903,7 +979,7 @@ static inline void tcg_gen_ext8s_i64(int ret, int arg) #endif } -static inline void tcg_gen_ext16s_i64(int ret, int arg) +static inline void tcg_gen_ext16s_i64(TCGv ret, TCGv arg) { #ifdef TCG_TARGET_HAS_ext16s_i64 tcg_gen_op2(INDEX_op_ext16s_i64, ret, arg); @@ -913,7 +989,7 @@ static inline void tcg_gen_ext16s_i64(int ret, int arg) #endif } -static inline void tcg_gen_ext32s_i64(int ret, int arg) +static inline void tcg_gen_ext32s_i64(TCGv ret, TCGv arg) { #ifdef TCG_TARGET_HAS_ext32s_i64 tcg_gen_op2(INDEX_op_ext32s_i64, ret, arg); @@ -924,32 +1000,32 @@ static inline void tcg_gen_ext32s_i64(int ret, int arg) } /* Note: we assume the target supports move between 32 and 64 bit - registers */ -static inline void tcg_gen_trunc_i64_i32(int ret, int arg) + registers. This will probably break MIPS64 targets. */ +static inline void tcg_gen_trunc_i64_i32(TCGv ret, TCGv arg) { tcg_gen_mov_i32(ret, arg); } /* Note: we assume the target supports move between 32 and 64 bit registers */ -static inline void tcg_gen_extu_i32_i64(int ret, int arg) +static inline void tcg_gen_extu_i32_i64(TCGv ret, TCGv arg) { tcg_gen_andi_i64(ret, arg, 0xffffffff); } /* Note: we assume the target supports move between 32 and 64 bit registers */ -static inline void tcg_gen_ext_i32_i64(int ret, int arg) +static inline void tcg_gen_ext_i32_i64(TCGv ret, TCGv arg) { tcg_gen_ext32s_i64(ret, arg); } -static inline void tcg_gen_bswap_i64(TCGArg ret, TCGArg arg) +static inline void tcg_gen_bswap_i64(TCGv ret, TCGv arg) { #ifdef TCG_TARGET_HAS_bswap_i64 tcg_gen_op2(INDEX_op_bswap_i64, ret, arg); #else - TCGArg t0, t1; + TCGv t0, t1; t0 = tcg_temp_new(TCG_TYPE_I32); t1 = tcg_temp_new(TCG_TYPE_I32); @@ -987,9 +1063,9 @@ static inline void tcg_gen_bswap_i64(TCGArg ret, TCGArg arg) #endif /***************************************/ -static inline void tcg_gen_macro_2(int ret0, int ret1, int macro_id) +static inline void tcg_gen_macro_2(TCGv ret0, TCGv ret1, int macro_id) { - tcg_gen_op3(INDEX_op_macro_2, ret0, ret1, macro_id); + tcg_gen_op3i(INDEX_op_macro_2, ret0, ret1, macro_id); } /***************************************/ @@ -1001,175 +1077,177 @@ static inline void tcg_gen_macro_2(int ret0, int ret1, int macro_id) static inline void tcg_gen_exit_tb(tcg_target_long val) { - tcg_gen_op1(INDEX_op_exit_tb, val); + tcg_gen_op1i(INDEX_op_exit_tb, val); } static inline void tcg_gen_goto_tb(int idx) { - tcg_gen_op1(INDEX_op_goto_tb, idx); + tcg_gen_op1i(INDEX_op_goto_tb, idx); } #if TCG_TARGET_REG_BITS == 32 -static inline void tcg_gen_qemu_ld8u(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld8u(TCGv ret, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_ld8u, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld8u, ret, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_ld8u, ret, addr, addr + 1, mem_index); - tcg_gen_movi_i32(ret + 1, 0); + tcg_gen_op4i(INDEX_op_qemu_ld8u, ret, addr, TCGV_HIGH(addr), mem_index); + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); #endif } -static inline void tcg_gen_qemu_ld8s(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld8s(TCGv ret, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_ld8s, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld8s, ret, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_ld8s, ret, addr, addr + 1, mem_index); - tcg_gen_ext8s_i32(ret + 1, ret); + tcg_gen_op4i(INDEX_op_qemu_ld8s, ret, addr, TCGV_HIGH(addr), mem_index); + tcg_gen_ext8s_i32(TCGV_HIGH(ret), ret); #endif } -static inline void tcg_gen_qemu_ld16u(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld16u(TCGv ret, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_ld16u, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld16u, ret, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_ld16u, ret, addr, addr + 1, mem_index); - tcg_gen_movi_i32(ret + 1, 0); + tcg_gen_op4i(INDEX_op_qemu_ld16u, ret, addr, TCGV_HIGH(addr), mem_index); + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); #endif } -static inline void tcg_gen_qemu_ld16s(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld16s(TCGv ret, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_ld16s, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld16s, ret, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_ld16s, ret, addr, addr + 1, mem_index); - tcg_gen_ext16s_i32(ret + 1, ret); + tcg_gen_op4i(INDEX_op_qemu_ld16s, ret, addr, TCGV_HIGH(addr), mem_index); + tcg_gen_ext16s_i32(TCGV_HIGH(ret), ret); #endif } -static inline void tcg_gen_qemu_ld32u(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld32u(TCGv ret, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_ld32u, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld32u, ret, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_ld32u, ret, addr, addr + 1, mem_index); - tcg_gen_movi_i32(ret + 1, 0); + tcg_gen_op4i(INDEX_op_qemu_ld32u, ret, addr, TCGV_HIGH(addr), mem_index); + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); #endif } -static inline void tcg_gen_qemu_ld32s(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld32s(TCGv ret, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_ld32u, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld32u, ret, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_ld32u, ret, addr, addr + 1, mem_index); - tcg_gen_sari_i32(ret + 1, ret, 31); + tcg_gen_op4i(INDEX_op_qemu_ld32u, ret, addr, TCGV_HIGH(addr), mem_index); + tcg_gen_sari_i32(TCGV_HIGH(ret), ret, 31); #endif } -static inline void tcg_gen_qemu_ld64(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld64(TCGv ret, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op4(INDEX_op_qemu_ld64, ret, ret + 1, addr, mem_index); + tcg_gen_op4i(INDEX_op_qemu_ld64, ret, TCGV_HIGH(ret), addr, mem_index); #else - tcg_gen_op5(INDEX_op_qemu_ld64, ret, ret + 1, addr, addr + 1, mem_index); + tcg_gen_op5i(INDEX_op_qemu_ld64, ret, TCGV_HIGH(ret), + addr, TCGV_HIGH(addr), mem_index); #endif } -static inline void tcg_gen_qemu_st8(int arg, int addr, int mem_index) +static inline void tcg_gen_qemu_st8(TCGv arg, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_st8, arg, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_st8, arg, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_st8, arg, addr, addr + 1, mem_index); + tcg_gen_op4i(INDEX_op_qemu_st8, arg, addr, TCGV_HIGH(addr), mem_index); #endif } -static inline void tcg_gen_qemu_st16(int arg, int addr, int mem_index) +static inline void tcg_gen_qemu_st16(TCGv arg, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_st16, arg, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_st16, arg, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_st16, arg, addr, addr + 1, mem_index); + tcg_gen_op4i(INDEX_op_qemu_st16, arg, addr, TCGV_HIGH(addr), mem_index); #endif } -static inline void tcg_gen_qemu_st32(int arg, int addr, int mem_index) +static inline void tcg_gen_qemu_st32(TCGv arg, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op3(INDEX_op_qemu_st32, arg, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_st32, arg, addr, mem_index); #else - tcg_gen_op4(INDEX_op_qemu_st32, arg, addr, addr + 1, mem_index); + tcg_gen_op4i(INDEX_op_qemu_st32, arg, addr, TCGV_HIGH(addr), mem_index); #endif } -static inline void tcg_gen_qemu_st64(int arg, int addr, int mem_index) +static inline void tcg_gen_qemu_st64(TCGv arg, TCGv addr, int mem_index) { #if TARGET_LONG_BITS == 32 - tcg_gen_op4(INDEX_op_qemu_st64, arg, arg + 1, addr, mem_index); + tcg_gen_op4i(INDEX_op_qemu_st64, arg, TCGV_HIGH(arg), addr, mem_index); #else - tcg_gen_op5(INDEX_op_qemu_st64, arg, arg + 1, addr, addr + 1, mem_index); + tcg_gen_op5i(INDEX_op_qemu_st64, arg, TCGV_HIGH(arg), + addr, TCGV_HIGH(addr), mem_index); #endif } #else /* TCG_TARGET_REG_BITS == 32 */ -static inline void tcg_gen_qemu_ld8u(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld8u(TCGv ret, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_ld8u, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld8u, ret, addr, mem_index); } -static inline void tcg_gen_qemu_ld8s(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld8s(TCGv ret, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_ld8s, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld8s, ret, addr, mem_index); } -static inline void tcg_gen_qemu_ld16u(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld16u(TCGv ret, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_ld16u, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld16u, ret, addr, mem_index); } -static inline void tcg_gen_qemu_ld16s(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld16s(TCGv ret, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_ld16s, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld16s, ret, addr, mem_index); } -static inline void tcg_gen_qemu_ld32u(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld32u(TCGv ret, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_ld32u, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld32u, ret, addr, mem_index); } -static inline void tcg_gen_qemu_ld32s(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld32s(TCGv ret, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_ld32s, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld32s, ret, addr, mem_index); } -static inline void tcg_gen_qemu_ld64(int ret, int addr, int mem_index) +static inline void tcg_gen_qemu_ld64(TCGv ret, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_ld64, ret, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_ld64, ret, addr, mem_index); } -static inline void tcg_gen_qemu_st8(int arg, int addr, int mem_index) +static inline void tcg_gen_qemu_st8(TCGv arg, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_st8, arg, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_st8, arg, addr, mem_index); } -static inline void tcg_gen_qemu_st16(int arg, int addr, int mem_index) +static inline void tcg_gen_qemu_st16(TCGv arg, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_st16, arg, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_st16, arg, addr, mem_index); } -static inline void tcg_gen_qemu_st32(int arg, int addr, int mem_index) +static inline void tcg_gen_qemu_st32(TCGv arg, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_st32, arg, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_st32, arg, addr, mem_index); } -static inline void tcg_gen_qemu_st64(int arg, int addr, int mem_index) +static inline void tcg_gen_qemu_st64(TCGv arg, TCGv addr, int mem_index) { - tcg_gen_op3(INDEX_op_qemu_st64, arg, addr, mem_index); + tcg_gen_op3i(INDEX_op_qemu_st64, arg, addr, mem_index); } #endif /* TCG_TARGET_REG_BITS != 32 */ |