Skip to content

Commit

Permalink
SH4: convert some more arithmetics ops to TCG
Browse files Browse the repository at this point in the history 
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5116 c046a42c-6fe2-441c-8c8c-71466251a162
  • Loading branch information
aurel32 committed Aug 30, 2008
1 parent 79383c9 commit 6f06939
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 193 deletions.
11 changes: 0 additions & 11 deletions target-sh4/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,12 @@ int find_itlb_entry(CPUState * env, target_ulong address,
int use_asid, int update);
int find_utlb_entry(CPUState * env, target_ulong address, int use_asid);

void helper_addc_T0_T1(void);
void helper_addv_T0_T1(void);
void helper_div1_T0_T1(void);
void helper_dmulsl_T0_T1(void);
void helper_dmulul_T0_T1(void);
void helper_macl_T0_T1(void);
void helper_macw_T0_T1(void);
void helper_negc_T0(void);
void helper_subc_T0_T1(void);
void helper_subv_T0_T1(void);
void helper_rotcl(uint32_t * addr);
void helper_rotcr(uint32_t * addr);
void helper_ldtlb(void);

void do_interrupt(CPUState * env);

void cpu_loop_exit(void);
void do_raise_exception(void);

#endif /* _EXEC_SH4_H */
8 changes: 8 additions & 0 deletions target-sh4/helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@ DEF_HELPER(void, helper_raise_slot_illegal_instruction, (void))
DEF_HELPER(void, helper_debug, (void))
DEF_HELPER(void, helper_sleep, (void))
DEF_HELPER(void, helper_trapa, (uint32_t))

DEF_HELPER(uint32_t, helper_addv, (uint32_t, uint32_t))
DEF_HELPER(uint32_t, helper_addc, (uint32_t, uint32_t))
DEF_HELPER(uint32_t, helper_subv, (uint32_t, uint32_t))
DEF_HELPER(uint32_t, helper_subc, (uint32_t, uint32_t))
DEF_HELPER(uint32_t, helper_negc, (uint32_t))
DEF_HELPER(void, helper_macl, (uint32_t, uint32_t))
DEF_HELPER(void, helper_macw, (uint32_t, uint32_t))
93 changes: 1 addition & 92 deletions target-sh4/op.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,6 @@ static inline void cond_t(int cond)
clr_t();
}

void OPPROTO op_frchg(void)
{
env->fpscr ^= FPSCR_FR;
RETURN();
}

void OPPROTO op_fschg(void)
{
env->fpscr ^= FPSCR_SZ;
RETURN();
}

void OPPROTO op_addc_T0_T1(void)
{
helper_addc_T0_T1();
RETURN();
}

void OPPROTO op_addv_T0_T1(void)
{
helper_addv_T0_T1();
RETURN();
}

void OPPROTO op_cmp_str_T0_T1(void)
{
cond_t((T0 & 0x000000ff) == (T1 & 0x000000ff) ||
Expand Down Expand Up @@ -90,54 +66,6 @@ void OPPROTO op_div1_T0_T1(void)
RETURN();
}

void OPPROTO op_dmulsl_T0_T1(void)
{
helper_dmulsl_T0_T1();
RETURN();
}

void OPPROTO op_dmulul_T0_T1(void)
{
helper_dmulul_T0_T1();
RETURN();
}

void OPPROTO op_macl_T0_T1(void)
{
helper_macl_T0_T1();
RETURN();
}

void OPPROTO op_macw_T0_T1(void)
{
helper_macw_T0_T1();
RETURN();
}

void OPPROTO op_mull_T0_T1(void)
{
env->macl = (T0 * T1) & 0xffffffff;
RETURN();
}

void OPPROTO op_mulsw_T0_T1(void)
{
env->macl = (int32_t)(int16_t) T0 *(int32_t)(int16_t) T1;
RETURN();
}

void OPPROTO op_muluw_T0_T1(void)
{
env->macl = (uint32_t)(uint16_t) T0 *(uint32_t)(uint16_t) T1;
RETURN();
}

void OPPROTO op_negc_T0(void)
{
helper_negc_T0();
RETURN();
}

void OPPROTO op_shad_T0_T1(void)
{
if ((T0 & 0x80000000) == 0)
Expand All @@ -160,25 +88,6 @@ void OPPROTO op_shld_T0_T1(void)
RETURN();
}

void OPPROTO op_subc_T0_T1(void)
{
helper_subc_T0_T1();
RETURN();
}

void OPPROTO op_subv_T0_T1(void)
{
helper_subv_T0_T1();
RETURN();
}

void OPPROTO op_ldcl_rMplus_rN_bank(void)
{
env->gregs[PARAM2] = env->gregs[PARAM1];
env->gregs[PARAM1] += 4;
RETURN();
}

void OPPROTO op_ldc_T0_sr(void)
{
env->sr = T0 & 0x700083f3;
Expand Down Expand Up @@ -237,7 +146,7 @@ void OPPROTO op_rotcr_Rn(void)
RETURN();
}

void OPPROTO op_rotl_Rn(void)
void OPPROTO op_rotl_Rn(void)
{
cond_t(env->gregs[PARAM1] & 0x80000000);
env->gregs[PARAM1] = (env->gregs[PARAM1] << 1) | (env->sr & SR_T);
Expand Down
79 changes: 33 additions & 46 deletions target-sh4/op_helper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,36 +108,37 @@ void helper_trapa(uint32_t tra)
cpu_loop_exit();
}

void helper_addc_T0_T1(void)
uint32_t helper_addc(uint32_t arg0, uint32_t arg1)
{
uint32_t tmp0, tmp1;

tmp1 = T0 + T1;
tmp0 = T1;
T1 = tmp1 + (env->sr & 1);
tmp1 = arg0 + arg1;
tmp0 = arg1;
arg1 = tmp1 + (env->sr & 1);
if (tmp0 > tmp1)
env->sr |= SR_T;
else
env->sr &= ~SR_T;
if (tmp1 > T1)
if (tmp1 > arg1)
env->sr |= SR_T;
return arg1;
}

void helper_addv_T0_T1(void)
uint32_t helper_addv(uint32_t arg0, uint32_t arg1)
{
uint32_t dest, src, ans;

if ((int32_t) T1 >= 0)
if ((int32_t) arg1 >= 0)
dest = 0;
else
dest = 1;
if ((int32_t) T0 >= 0)
if ((int32_t) arg0 >= 0)
src = 0;
else
src = 1;
src += dest;
T1 += T0;
if ((int32_t) T1 >= 0)
arg1 += arg0;
if ((int32_t) arg1 >= 0)
ans = 0;
else
ans = 1;
Expand All @@ -149,6 +150,7 @@ void helper_addv_T0_T1(void)
env->sr &= ~SR_T;
} else
env->sr &= ~SR_T;
return arg1;
}

#define T (env->sr & SR_T)
Expand Down Expand Up @@ -268,30 +270,12 @@ void helper_div1_T0_T1(void)
//printf("Output: T1=0x%08x M=%d Q=%d T=%d\n", T1, M, Q, T);
}

void helper_dmulsl_T0_T1()
{
int64_t res;

res = (int64_t) (int32_t) T0 *(int64_t) (int32_t) T1;
env->mach = (res >> 32) & 0xffffffff;
env->macl = res & 0xffffffff;
}

void helper_dmulul_T0_T1()
{
uint64_t res;

res = (uint64_t) (uint32_t) T0 *(uint64_t) (uint32_t) T1;
env->mach = (res >> 32) & 0xffffffff;
env->macl = res & 0xffffffff;
}

void helper_macl_T0_T1()
void helper_macl(uint32_t arg0, uint32_t arg1)
{
int64_t res;

res = ((uint64_t) env->mach << 32) | env->macl;
res += (int64_t) (int32_t) T0 *(int64_t) (int32_t) T1;
res += (int64_t) (int32_t) arg0 *(int64_t) (int32_t) arg1;
env->mach = (res >> 32) & 0xffffffff;
env->macl = res & 0xffffffff;
if (env->sr & SR_S) {
Expand All @@ -302,12 +286,12 @@ void helper_macl_T0_T1()
}
}

void helper_macw_T0_T1()
void helper_macw(uint32_t arg0, uint32_t arg1)
{
int64_t res;

res = ((uint64_t) env->mach << 32) | env->macl;
res += (int64_t) (int16_t) T0 *(int64_t) (int16_t) T1;
res += (int64_t) (int16_t) arg0 *(int64_t) (int16_t) arg1;
env->mach = (res >> 32) & 0xffffffff;
env->macl = res & 0xffffffff;
if (env->sr & SR_S) {
Expand All @@ -321,50 +305,52 @@ void helper_macw_T0_T1()
}
}

void helper_negc_T0()
uint32_t helper_negc(uint32_t arg)
{
uint32_t temp;

temp = -T0;
T0 = temp - (env->sr & SR_T);
temp = -arg;
arg = temp - (env->sr & SR_T);
if (0 < temp)
env->sr |= SR_T;
else
env->sr &= ~SR_T;
if (temp < T0)
if (temp < arg)
env->sr |= SR_T;
return arg;
}

void helper_subc_T0_T1()
uint32_t helper_subc(uint32_t arg0, uint32_t arg1)
{
uint32_t tmp0, tmp1;

tmp1 = T1 - T0;
tmp0 = T1;
T1 = tmp1 - (env->sr & SR_T);
tmp1 = arg1 - arg0;
tmp0 = arg1;
arg1 = tmp1 - (env->sr & SR_T);
if (tmp0 < tmp1)
env->sr |= SR_T;
else
env->sr &= ~SR_T;
if (tmp1 < T1)
if (tmp1 < arg1)
env->sr |= SR_T;
return arg1;
}

void helper_subv_T0_T1()
uint32_t helper_subv(uint32_t arg0, uint32_t arg1)
{
int32_t dest, src, ans;

if ((int32_t) T1 >= 0)
if ((int32_t) arg1 >= 0)
dest = 0;
else
dest = 1;
if ((int32_t) T0 >= 0)
if ((int32_t) arg0 >= 0)
src = 0;
else
src = 1;
src += dest;
T1 -= T0;
if ((int32_t) T1 >= 0)
arg1 -= arg0;
if ((int32_t) arg1 >= 0)
ans = 0;
else
ans = 1;
Expand All @@ -376,6 +362,7 @@ void helper_subv_T0_T1()
env->sr &= ~SR_T;
} else
env->sr &= ~SR_T;
return arg1;
}

void helper_rotcl(uint32_t * addr)
Expand Down
Loading

0 comments on commit 6f06939

Please sign in to comment.