target-mips: gen_compute_branch1()

Optimize code generation in gen_compute_branch1():
- Directly use I32 variables instead of converting values from _tl to
  _i32 and back to _tl.
- Write the result directly to bcond instead of passing by a local
  variable.
- Temp variables are valid up to and *including* the brcond instruction.
  Use them instead of temp local variables.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5684 c046a42c-6fe2-441c-8c8c-71466251a162
master
aurel32 2008-11-11 11:50:51 +00:00
parent 9bf3eb2ca5
commit a6e92a658b
1 changed files with 41 additions and 81 deletions

View File

@ -5634,8 +5634,7 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
{ {
target_ulong btarget; target_ulong btarget;
const char *opn = "cp1 cond branch"; const char *opn = "cp1 cond branch";
TCGv t0 = tcg_temp_local_new(TCG_TYPE_TL); TCGv t0 = tcg_temp_new(TCG_TYPE_TL);
TCGv t1 = tcg_temp_local_new(TCG_TYPE_TL);
if (cc != 0) if (cc != 0)
check_insn(env, ctx, ISA_MIPS4 | ISA_MIPS32); check_insn(env, ctx, ISA_MIPS4 | ISA_MIPS32);
@ -5647,19 +5646,14 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
{ {
int l1 = gen_new_label(); int l1 = gen_new_label();
int l2 = gen_new_label(); int l2 = gen_new_label();
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I32);
get_fp_cond(r_tmp1); get_fp_cond(t0);
tcg_gen_ext_i32_tl(t0, r_tmp1); tcg_gen_andi_i32(t0, t0, 0x1 << cc);
tcg_temp_free(r_tmp1); tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0, l1);
tcg_gen_not_tl(t0, t0); tcg_gen_movi_i32(bcond, 0);
tcg_gen_movi_tl(t1, 0x1 << cc);
tcg_gen_and_tl(t0, t0, t1);
tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t0, 0);
tcg_gen_br(l2); tcg_gen_br(l2);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_movi_tl(t0, 1); tcg_gen_movi_i32(bcond, 1);
gen_set_label(l2); gen_set_label(l2);
} }
opn = "bc1f"; opn = "bc1f";
@ -5668,19 +5662,14 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
{ {
int l1 = gen_new_label(); int l1 = gen_new_label();
int l2 = gen_new_label(); int l2 = gen_new_label();
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I32);
get_fp_cond(r_tmp1); get_fp_cond(t0);
tcg_gen_ext_i32_tl(t0, r_tmp1); tcg_gen_andi_i32(t0, t0, 0x1 << cc);
tcg_temp_free(r_tmp1); tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0, l1);
tcg_gen_not_tl(t0, t0); tcg_gen_movi_i32(bcond, 0);
tcg_gen_movi_tl(t1, 0x1 << cc);
tcg_gen_and_tl(t0, t0, t1);
tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t0, 0);
tcg_gen_br(l2); tcg_gen_br(l2);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_movi_tl(t0, 1); tcg_gen_movi_i32(bcond, 1);
gen_set_label(l2); gen_set_label(l2);
} }
opn = "bc1fl"; opn = "bc1fl";
@ -5689,18 +5678,14 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
{ {
int l1 = gen_new_label(); int l1 = gen_new_label();
int l2 = gen_new_label(); int l2 = gen_new_label();
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I32);
get_fp_cond(r_tmp1); get_fp_cond(t0);
tcg_gen_ext_i32_tl(t0, r_tmp1); tcg_gen_andi_i32(t0, t0, 0x1 << cc);
tcg_temp_free(r_tmp1); tcg_gen_brcondi_i32(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t1, 0x1 << cc); tcg_gen_movi_i32(bcond, 0);
tcg_gen_and_tl(t0, t0, t1);
tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t0, 0);
tcg_gen_br(l2); tcg_gen_br(l2);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_movi_tl(t0, 1); tcg_gen_movi_i32(bcond, 1);
gen_set_label(l2); gen_set_label(l2);
} }
opn = "bc1t"; opn = "bc1t";
@ -5709,42 +5694,32 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
{ {
int l1 = gen_new_label(); int l1 = gen_new_label();
int l2 = gen_new_label(); int l2 = gen_new_label();
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I32);
get_fp_cond(r_tmp1); get_fp_cond(t0);
tcg_gen_ext_i32_tl(t0, r_tmp1); tcg_gen_andi_i32(t0, t0, 0x1 << cc);
tcg_temp_free(r_tmp1); tcg_gen_brcondi_i32(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t1, 0x1 << cc); tcg_gen_movi_i32(bcond, 0);
tcg_gen_and_tl(t0, t0, t1);
tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t0, 0);
tcg_gen_br(l2); tcg_gen_br(l2);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_movi_tl(t0, 1); tcg_gen_movi_i32(bcond, 1);
gen_set_label(l2); gen_set_label(l2);
} }
opn = "bc1tl"; opn = "bc1tl";
likely: likely:
ctx->hflags |= MIPS_HFLAG_BL; ctx->hflags |= MIPS_HFLAG_BL;
tcg_gen_trunc_tl_i32(bcond, t0);
break; break;
case OPC_BC1FANY2: case OPC_BC1FANY2:
{ {
int l1 = gen_new_label(); int l1 = gen_new_label();
int l2 = gen_new_label(); int l2 = gen_new_label();
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I32);
get_fp_cond(r_tmp1); get_fp_cond(t0);
tcg_gen_ext_i32_tl(t0, r_tmp1); tcg_gen_andi_i32(t0, t0, 0x3 << cc);
tcg_temp_free(r_tmp1); tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0, l1);
tcg_gen_not_tl(t0, t0); tcg_gen_movi_i32(bcond, 0);
tcg_gen_movi_tl(t1, 0x3 << cc);
tcg_gen_and_tl(t0, t0, t1);
tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t0, 0);
tcg_gen_br(l2); tcg_gen_br(l2);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_movi_tl(t0, 1); tcg_gen_movi_i32(bcond, 1);
gen_set_label(l2); gen_set_label(l2);
} }
opn = "bc1any2f"; opn = "bc1any2f";
@ -5753,18 +5728,14 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
{ {
int l1 = gen_new_label(); int l1 = gen_new_label();
int l2 = gen_new_label(); int l2 = gen_new_label();
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I32);
get_fp_cond(r_tmp1); get_fp_cond(t0);
tcg_gen_ext_i32_tl(t0, r_tmp1); tcg_gen_andi_i32(t0, t0, 0x3 << cc);
tcg_temp_free(r_tmp1); tcg_gen_brcondi_i32(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t1, 0x3 << cc); tcg_gen_movi_i32(bcond, 0);
tcg_gen_and_tl(t0, t0, t1);
tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t0, 0);
tcg_gen_br(l2); tcg_gen_br(l2);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_movi_tl(t0, 1); tcg_gen_movi_i32(bcond, 1);
gen_set_label(l2); gen_set_label(l2);
} }
opn = "bc1any2t"; opn = "bc1any2t";
@ -5773,19 +5744,14 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
{ {
int l1 = gen_new_label(); int l1 = gen_new_label();
int l2 = gen_new_label(); int l2 = gen_new_label();
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I32);
get_fp_cond(r_tmp1); get_fp_cond(t0);
tcg_gen_ext_i32_tl(t0, r_tmp1); tcg_gen_andi_i32(t0, t0, 0xf << cc);
tcg_temp_free(r_tmp1); tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0, l1);
tcg_gen_not_tl(t0, t0); tcg_gen_movi_i32(bcond, 0);
tcg_gen_movi_tl(t1, 0xf << cc);
tcg_gen_and_tl(t0, t0, t1);
tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t0, 0);
tcg_gen_br(l2); tcg_gen_br(l2);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_movi_tl(t0, 1); tcg_gen_movi_i32(bcond, 1);
gen_set_label(l2); gen_set_label(l2);
} }
opn = "bc1any4f"; opn = "bc1any4f";
@ -5794,24 +5760,19 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
{ {
int l1 = gen_new_label(); int l1 = gen_new_label();
int l2 = gen_new_label(); int l2 = gen_new_label();
TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I32);
get_fp_cond(r_tmp1); get_fp_cond(t0);
tcg_gen_ext_i32_tl(t0, r_tmp1); tcg_gen_andi_i32(t0, t0, 0xf << cc);
tcg_temp_free(r_tmp1); tcg_gen_brcondi_i32(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t1, 0xf << cc); tcg_gen_movi_i32(bcond, 0);
tcg_gen_and_tl(t0, t0, t1);
tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1);
tcg_gen_movi_tl(t0, 0);
tcg_gen_br(l2); tcg_gen_br(l2);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_movi_tl(t0, 1); tcg_gen_movi_i32(bcond, 1);
gen_set_label(l2); gen_set_label(l2);
} }
opn = "bc1any4t"; opn = "bc1any4t";
not_likely: not_likely:
ctx->hflags |= MIPS_HFLAG_BC; ctx->hflags |= MIPS_HFLAG_BC;
tcg_gen_trunc_tl_i32(bcond, t0);
break; break;
default: default:
MIPS_INVAL(opn); MIPS_INVAL(opn);
@ -5824,7 +5785,6 @@ static void gen_compute_branch1 (CPUState *env, DisasContext *ctx, uint32_t op,
out: out:
tcg_temp_free(t0); tcg_temp_free(t0);
tcg_temp_free(t1);
} }
/* Coprocessor 1 (FPU) */ /* Coprocessor 1 (FPU) */