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

Convert mulscc to TCG, add cc_src2

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4075 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-03-16 19:22:18 +00:00
parent c4071c9014
commit d9bdab86e8
3 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-sparc/cpu.h
View File

@ -186,7 +186,7 @@ typedef struct CPUSPARCState {
target_ulong y; /* multiply/divide register */
/* emulator internal flags handling */
target_ulong cc_src;
target_ulong cc_src, cc_src2;
target_ulong cc_dst;
uint32_t psr; /* processor state register */

28
target-sparc/op.c
View File

@ -195,34 +195,6 @@ void OPPROTO op_smul_T1_T0(void)
env->y = res >> 32;
}
void OPPROTO op_mulscc_T1_T0(void)
{
unsigned int b1, N, V, b2;
target_ulong src1;
N = FLAG_SET(PSR_NEG);
V = FLAG_SET(PSR_OVF);
b1 = N ^ V;
b2 = T0 & 1;
T0 = (b1 << 31) | (T0 >> 1);
if (!(env->y & 1))
T1 = 0;
/* do addition and update flags */
src1 = T0;
T0 += T1;
env->psr = 0;
if (!T0)
env->psr |= PSR_ZERO;
if ((int32_t) T0 < 0)
env->psr |= PSR_NEG;
if (T0 < src1)
env->psr |= PSR_CARRY;
if (((src1 ^ T1 ^ -1) & (src1 ^ T0)) & (1 << 31))
env->psr |= PSR_OVF;
env->y = (b2 << 31) | (env->y >> 1);
FORCE_RET();
}
void OPPROTO op_udiv_T1_T0(void)
{
uint64_t x0;

56
target-sparc/translate.c
View File

@ -46,7 +46,7 @@
according to jump_pc[T2] */
/* global register indexes */
static TCGv cpu_env, cpu_T[3], cpu_regwptr, cpu_cc_src, cpu_cc_dst;
static TCGv cpu_env, cpu_T[3], cpu_regwptr, cpu_cc_src, cpu_cc_src2, cpu_cc_dst;
static TCGv cpu_psr, cpu_fsr, cpu_gregs[8];
#ifdef TARGET_SPARC64
static TCGv cpu_xcc;
@ -710,6 +710,57 @@ static inline void gen_op_tsub_T1_T0_ccTV(void)
gen_cc_C_sub(cpu_cc_src, cpu_T[1]);
}
static inline void gen_op_mulscc_T1_T0(void)
{
TCGv r_temp;
int l1, l2;
l1 = gen_new_label();
l2 = gen_new_label();
r_temp = tcg_temp_new(TCG_TYPE_TL);
/* old op:
if (!(env->y & 1))
T1 = 0;
*/
tcg_gen_ld_i32(r_temp, cpu_env, offsetof(CPUSPARCState, y));
tcg_gen_andi_i32(r_temp, r_temp, 0x1);
tcg_gen_brcond_i32(TCG_COND_EQ, r_temp, tcg_const_tl(0), l1);
tcg_gen_mov_tl(cpu_cc_src2, cpu_T[1]);
gen_op_jmp_label(l2);
gen_set_label(l1);
tcg_gen_movi_tl(cpu_cc_src2, 0);
gen_set_label(l2);
// b2 = T0 & 1;
// env->y = (b2 << 31) | (env->y >> 1);
tcg_gen_shli_i32(r_temp, cpu_T[0], 31);
tcg_gen_ld_i32(cpu_tmp0, cpu_env, offsetof(CPUSPARCState, y));
tcg_gen_shri_i32(cpu_tmp0, cpu_tmp0, 1);
tcg_gen_or_i32(cpu_tmp0, cpu_tmp0, r_temp);
tcg_gen_st_i32(cpu_tmp0, cpu_env, offsetof(CPUSPARCState, y));
// b1 = N ^ V;
gen_mov_reg_N(cpu_tmp0, cpu_psr);
gen_mov_reg_V(r_temp, cpu_psr);
tcg_gen_xor_tl(cpu_tmp0, cpu_tmp0, r_temp);
// T0 = (b1 << 31) | (T0 >> 1);
// src1 = T0;
tcg_gen_shli_tl(cpu_tmp0, cpu_tmp0, 31);
tcg_gen_shri_tl(cpu_cc_src, cpu_T[0], 1);
tcg_gen_or_tl(cpu_cc_src, cpu_cc_src, cpu_tmp0);
/* do addition and update flags */
tcg_gen_add_tl(cpu_T[0], cpu_cc_src, cpu_cc_src2);
tcg_gen_discard_tl(r_temp);
gen_cc_clear();
gen_cc_NZ(cpu_T[0]);
gen_cc_V_add(cpu_T[0], cpu_cc_src, cpu_cc_src2);
gen_cc_C_add(cpu_T[0], cpu_cc_src);
}
#ifdef TARGET_SPARC64
static inline void gen_trap_ifdivzero_i64(TCGv divisor)
{
@ -4627,6 +4678,9 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model)
cpu_cc_src = tcg_global_mem_new(TCG_TYPE_TL,
TCG_AREG0, offsetof(CPUState, cc_src),
"cc_src");
cpu_cc_src2 = tcg_global_mem_new(TCG_TYPE_TL, TCG_AREG0,
offsetof(CPUState, cc_src2),
"cc_src2");
cpu_cc_dst = tcg_global_mem_new(TCG_TYPE_TL,
TCG_AREG0, offsetof(CPUState, cc_dst),
"cc_dst");