OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Switch the standard multiplication instructions to TCG.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4740 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2008-06-12 12:43:29 +00:00
parent 2b0233abfb
commit 214c465f86
5 changed files with 166 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-mips/exec.h
View File

@ -49,8 +49,6 @@ register target_ulong T1 asm(AREG2);
#endif /* !defined(CONFIG_USER_ONLY) */
#if TARGET_LONG_BITS > HOST_LONG_BITS
void do_mult (void);
void do_multu (void);
void do_madd (void);
void do_maddu (void);
void do_msub (void);

2
target-mips/helper.h
View File

@ -11,6 +11,8 @@ DEF_HELPER(void, do_clz, (void))
#ifdef TARGET_MIPS64
DEF_HELPER(void, do_dclo, (void))
DEF_HELPER(void, do_dclz, (void))
DEF_HELPER(void, do_dmult, (void))
DEF_HELPER(void, do_dmultu, (void))
#endif
/* CP0 helpers */

74
target-mips/op.c
View File

@ -68,18 +68,6 @@
/* 64 bits arithmetic */
#if TARGET_LONG_BITS > HOST_LONG_BITS
void op_mult (void)
{
CALL_FROM_TB0(do_mult);
FORCE_RET();
}
void op_multu (void)
{
CALL_FROM_TB0(do_multu);
FORCE_RET();
}
void op_madd (void)
{
CALL_FROM_TB0(do_madd);
@ -214,54 +202,6 @@ static always_inline void set_HI_LOT0 (uint64_t HILO)
env->HI[env->current_tc][0] = (int32_t)(HILO >> 32);
}
void op_mult (void)
{
set_HILO((int64_t)(int32_t)T0 * (int64_t)(int32_t)T1);
FORCE_RET();
}
void op_multu (void)
{
set_HILO((uint64_t)(uint32_t)T0 * (uint64_t)(uint32_t)T1);
FORCE_RET();
}
void op_madd (void)
{
int64_t tmp;
tmp = ((int64_t)(int32_t)T0 * (int64_t)(int32_t)T1);
set_HILO((int64_t)get_HILO() + tmp);
FORCE_RET();
}
void op_maddu (void)
{
uint64_t tmp;
tmp = ((uint64_t)(uint32_t)T0 * (uint64_t)(uint32_t)T1);
set_HILO(get_HILO() + tmp);
FORCE_RET();
}
void op_msub (void)
{
int64_t tmp;
tmp = ((int64_t)(int32_t)T0 * (int64_t)(int32_t)T1);
set_HILO((int64_t)get_HILO() - tmp);
FORCE_RET();
}
void op_msubu (void)
{
uint64_t tmp;
tmp = ((uint64_t)(uint32_t)T0 * (uint64_t)(uint32_t)T1);
set_HILO(get_HILO() - tmp);
FORCE_RET();
}
/* Multiplication variants of the vr54xx. */
void op_muls (void)
{
@ -349,20 +289,6 @@ void op_mulshiu (void)
#endif /* TARGET_LONG_BITS > HOST_LONG_BITS */
#if defined(TARGET_MIPS64)
void op_dmult (void)
{
CALL_FROM_TB4(muls64, &(env->LO[env->current_tc][0]), &(env->HI[env->current_tc][0]), T0, T1);
FORCE_RET();
}
void op_dmultu (void)
{
CALL_FROM_TB4(mulu64, &(env->LO[env->current_tc][0]), &(env->HI[env->current_tc][0]), T0, T1);
FORCE_RET();
}
#endif
/* CP1 functions */
#if 0
# define DEBUG_FPU_STATE() CALL_FROM_TB1(dump_fpu, env)

22
target-mips/op_helper.c
View File

@ -192,16 +192,6 @@ static always_inline void set_HI_LOT0 (uint64_t HILO)
env->HI[env->current_tc][0] = (int32_t)(HILO >> 32);
}
void do_mult (void)
{
set_HILO((int64_t)(int32_t)T0 * (int64_t)(int32_t)T1);
}
void do_multu (void)
{
set_HILO((uint64_t)(uint32_t)T0 * (uint64_t)(uint32_t)T1);
}
void do_madd (void)
{
int64_t tmp;
@ -306,6 +296,18 @@ void do_mulshiu (void)
}
#endif /* TARGET_LONG_BITS > HOST_LONG_BITS */
#ifdef TARGET_MIPS64
void do_dmult (void)
{
muls64(&(env->LO[env->current_tc][0]), &(env->HI[env->current_tc][0]), T0, T1);
}
void do_dmultu (void)
{
mulu64(&(env->LO[env->current_tc][0]), &(env->HI[env->current_tc][0]), T0, T1);
}
#endif
#ifdef CONFIG_USER_ONLY
void do_mfc0_random (void)
{

160
target-mips/translate.c
View File

@ -1941,11 +1941,47 @@ static void gen_muldiv (DisasContext *ctx, uint32_t opc,
opn = "divu";
break;
case OPC_MULT:
gen_op_mult();
{
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp2 = tcg_temp_new(TCG_TYPE_I64);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
tcg_gen_ext_tl_i64(r_tmp1, cpu_T[0]);
tcg_gen_ext_tl_i64(r_tmp2, cpu_T[1]);
tcg_gen_mul_i64(r_tmp1, r_tmp1, r_tmp2);
tcg_temp_free(r_tmp2);
tcg_gen_trunc_i64_tl(cpu_T[0], r_tmp1);
tcg_gen_shri_i64(r_tmp1, r_tmp1, 32);
tcg_gen_trunc_i64_tl(cpu_T[1], r_tmp1);
tcg_temp_free(r_tmp1);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
gen_store_LO(cpu_T[0], 0);
gen_store_HI(cpu_T[1], 0);
}
opn = "mult";
break;
case OPC_MULTU:
gen_op_multu();
{
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp2 = tcg_temp_new(TCG_TYPE_I64);
tcg_gen_ext32u_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32u_tl(cpu_T[1], cpu_T[1]);
tcg_gen_extu_tl_i64(r_tmp1, cpu_T[0]);
tcg_gen_extu_tl_i64(r_tmp2, cpu_T[1]);
tcg_gen_mul_i64(r_tmp1, r_tmp1, r_tmp2);
tcg_temp_free(r_tmp2);
tcg_gen_trunc_i64_tl(cpu_T[0], r_tmp1);
tcg_gen_shri_i64(r_tmp1, r_tmp1, 32);
tcg_gen_trunc_i64_tl(cpu_T[1], r_tmp1);
tcg_temp_free(r_tmp1);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
gen_store_LO(cpu_T[0], 0);
gen_store_HI(cpu_T[1], 0);
}
opn = "multu";
break;
#if defined(TARGET_MIPS64)
@ -2003,28 +2039,136 @@ static void gen_muldiv (DisasContext *ctx, uint32_t opc,
opn = "ddivu";
break;
case OPC_DMULT:
gen_op_dmult();
tcg_gen_helper_0_0(do_dmult);
opn = "dmult";
break;
case OPC_DMULTU:
gen_op_dmultu();
tcg_gen_helper_0_0(do_dmultu);
opn = "dmultu";
break;
#endif
case OPC_MADD:
gen_op_madd();
{
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp2 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp3 = tcg_temp_new(TCG_TYPE_I64);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
tcg_gen_ext_tl_i64(r_tmp1, cpu_T[0]);
tcg_gen_ext_tl_i64(r_tmp2, cpu_T[1]);
tcg_gen_mul_i64(r_tmp1, r_tmp1, r_tmp2);
gen_load_LO(cpu_T[0], 0);
gen_load_HI(cpu_T[1], 0);
tcg_gen_extu_tl_i64(r_tmp2, cpu_T[0]);
tcg_gen_extu_tl_i64(r_tmp3, cpu_T[1]);
tcg_gen_shli_i64(r_tmp3, r_tmp3, 32);
tcg_gen_or_i64(r_tmp2, r_tmp2, r_tmp3);
tcg_temp_free(r_tmp3);
tcg_gen_add_i64(r_tmp1, r_tmp1, r_tmp2);
tcg_temp_free(r_tmp2);
tcg_gen_trunc_i64_tl(cpu_T[0], r_tmp1);
tcg_gen_shri_i64(r_tmp1, r_tmp1, 32);
tcg_gen_trunc_i64_tl(cpu_T[1], r_tmp1);
tcg_temp_free(r_tmp1);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
gen_store_LO(cpu_T[0], 0);
gen_store_HI(cpu_T[1], 0);
}
opn = "madd";
break;
case OPC_MADDU:
gen_op_maddu();
{
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp2 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp3 = tcg_temp_new(TCG_TYPE_I64);
tcg_gen_ext32u_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32u_tl(cpu_T[1], cpu_T[1]);
tcg_gen_extu_tl_i64(r_tmp1, cpu_T[0]);
tcg_gen_extu_tl_i64(r_tmp2, cpu_T[1]);
tcg_gen_mul_i64(r_tmp1, r_tmp1, r_tmp2);
gen_load_LO(cpu_T[0], 0);
gen_load_HI(cpu_T[1], 0);
tcg_gen_extu_tl_i64(r_tmp2, cpu_T[0]);
tcg_gen_extu_tl_i64(r_tmp3, cpu_T[1]);
tcg_gen_shli_i64(r_tmp3, r_tmp3, 32);
tcg_gen_or_i64(r_tmp2, r_tmp2, r_tmp3);
tcg_temp_free(r_tmp3);
tcg_gen_add_i64(r_tmp1, r_tmp1, r_tmp2);
tcg_temp_free(r_tmp2);
tcg_gen_trunc_i64_tl(cpu_T[0], r_tmp1);
tcg_gen_shri_i64(r_tmp1, r_tmp1, 32);
tcg_gen_trunc_i64_tl(cpu_T[1], r_tmp1);
tcg_temp_free(r_tmp1);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
gen_store_LO(cpu_T[0], 0);
gen_store_HI(cpu_T[1], 0);
}
opn = "maddu";
break;
case OPC_MSUB:
gen_op_msub();
{
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp2 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp3 = tcg_temp_new(TCG_TYPE_I64);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
tcg_gen_ext_tl_i64(r_tmp1, cpu_T[0]);
tcg_gen_ext_tl_i64(r_tmp2, cpu_T[1]);
tcg_gen_mul_i64(r_tmp1, r_tmp1, r_tmp2);
gen_load_LO(cpu_T[0], 0);
gen_load_HI(cpu_T[1], 0);
tcg_gen_extu_tl_i64(r_tmp2, cpu_T[0]);
tcg_gen_extu_tl_i64(r_tmp3, cpu_T[1]);
tcg_gen_shli_i64(r_tmp3, r_tmp3, 32);
tcg_gen_or_i64(r_tmp2, r_tmp2, r_tmp3);
tcg_temp_free(r_tmp3);
tcg_gen_sub_i64(r_tmp1, r_tmp1, r_tmp2);
tcg_temp_free(r_tmp2);
tcg_gen_trunc_i64_tl(cpu_T[0], r_tmp1);
tcg_gen_shri_i64(r_tmp1, r_tmp1, 32);
tcg_gen_trunc_i64_tl(cpu_T[1], r_tmp1);
tcg_temp_free(r_tmp1);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
gen_store_LO(cpu_T[0], 0);
gen_store_HI(cpu_T[1], 0);
}
opn = "msub";
break;
case OPC_MSUBU:
gen_op_msubu();
{
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp2 = tcg_temp_new(TCG_TYPE_I64);
TCGv r_tmp3 = tcg_temp_new(TCG_TYPE_I64);
tcg_gen_ext32u_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32u_tl(cpu_T[1], cpu_T[1]);
tcg_gen_extu_tl_i64(r_tmp1, cpu_T[0]);
tcg_gen_extu_tl_i64(r_tmp2, cpu_T[1]);
tcg_gen_mul_i64(r_tmp1, r_tmp1, r_tmp2);
gen_load_LO(cpu_T[0], 0);
gen_load_HI(cpu_T[1], 0);
tcg_gen_extu_tl_i64(r_tmp2, cpu_T[0]);
tcg_gen_extu_tl_i64(r_tmp3, cpu_T[1]);
tcg_gen_shli_i64(r_tmp3, r_tmp3, 32);
tcg_gen_or_i64(r_tmp2, r_tmp2, r_tmp3);
tcg_temp_free(r_tmp3);
tcg_gen_sub_i64(r_tmp1, r_tmp1, r_tmp2);
tcg_temp_free(r_tmp2);
tcg_gen_trunc_i64_tl(cpu_T[0], r_tmp1);
tcg_gen_shri_i64(r_tmp1, r_tmp1, 32);
tcg_gen_trunc_i64_tl(cpu_T[1], r_tmp1);
tcg_temp_free(r_tmp1);
tcg_gen_ext32s_tl(cpu_T[0], cpu_T[0]);
tcg_gen_ext32s_tl(cpu_T[1], cpu_T[1]);
gen_store_LO(cpu_T[0], 0);
gen_store_HI(cpu_T[1], 0);
}
opn = "msubu";
break;
default: