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

Fix potential condition code problems

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4382 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-05-07 18:03:02 +00:00
parent bec19c0932
commit ba28189bac
1 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
target-sparc/translate.c
View File

@ -434,15 +434,16 @@ static inline void gen_op_add_cc(TCGv dst, TCGv src1, TCGv src2)
tcg_gen_mov_tl(cpu_cc_src, src1); tcg_gen_mov_tl(cpu_cc_src, src1);
tcg_gen_mov_tl(cpu_cc_src2, src2); tcg_gen_mov_tl(cpu_cc_src2, src2);
tcg_gen_add_tl(dst, src1, src2); tcg_gen_add_tl(dst, src1, src2);
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_C_add_icc(dst, cpu_cc_src); gen_cc_C_add_icc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_add_icc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_add_icc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_clear_xcc(); gen_cc_clear_xcc();
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
gen_cc_C_add_xcc(dst, cpu_cc_src); gen_cc_C_add_xcc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_add_xcc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_add_xcc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#endif #endif
} }
@ -459,13 +460,14 @@ static inline void gen_op_addx_cc(TCGv dst, TCGv src1, TCGv src2)
gen_cc_C_add_xcc(dst, cpu_cc_src); gen_cc_C_add_xcc(dst, cpu_cc_src);
#endif #endif
tcg_gen_add_tl(dst, dst, cpu_cc_src2); tcg_gen_add_tl(dst, dst, cpu_cc_src2);
gen_cc_NZ_icc(dst); tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_C_add_icc(dst, cpu_cc_src); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_V_add_icc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_C_add_icc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_add_icc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
gen_cc_C_add_xcc(dst, cpu_cc_src); gen_cc_C_add_xcc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_add_xcc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_add_xcc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#endif #endif
} }
@ -474,16 +476,17 @@ static inline void gen_op_tadd_cc(TCGv dst, TCGv src1, TCGv src2)
tcg_gen_mov_tl(cpu_cc_src, src1); tcg_gen_mov_tl(cpu_cc_src, src1);
tcg_gen_mov_tl(cpu_cc_src2, src2); tcg_gen_mov_tl(cpu_cc_src2, src2);
tcg_gen_add_tl(dst, src1, src2); tcg_gen_add_tl(dst, src1, src2);
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_C_add_icc(dst, cpu_cc_src); gen_cc_C_add_icc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_add_icc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_add_icc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
gen_cc_V_tag(cpu_cc_src, cpu_cc_src2); gen_cc_V_tag(cpu_cc_src, cpu_cc_src2);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_clear_xcc(); gen_cc_clear_xcc();
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
gen_cc_C_add_xcc(dst, cpu_cc_src); gen_cc_C_add_xcc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_add_xcc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_add_xcc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#endif #endif
} }
@ -493,15 +496,16 @@ static inline void gen_op_tadd_ccTV(TCGv dst, TCGv src1, TCGv src2)
tcg_gen_mov_tl(cpu_cc_src2, src2); tcg_gen_mov_tl(cpu_cc_src2, src2);
gen_tag_tv(cpu_cc_src, cpu_cc_src2); gen_tag_tv(cpu_cc_src, cpu_cc_src2);
tcg_gen_add_tl(dst, src1, src2); tcg_gen_add_tl(dst, src1, src2);
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_add_tv(dst, cpu_cc_src, cpu_cc_src2); gen_add_tv(dst, cpu_cc_src, cpu_cc_src2);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_C_add_icc(dst, cpu_cc_src); gen_cc_C_add_icc(cpu_cc_dst, cpu_cc_src);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_clear_xcc(); gen_cc_clear_xcc();
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
gen_cc_C_add_xcc(dst, cpu_cc_src); gen_cc_C_add_xcc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_add_xcc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_add_xcc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#endif #endif
} }
@ -592,15 +596,16 @@ static inline void gen_op_sub_cc(TCGv dst, TCGv src1, TCGv src2)
tcg_gen_mov_tl(cpu_cc_src, src1); tcg_gen_mov_tl(cpu_cc_src, src1);
tcg_gen_mov_tl(cpu_cc_src2, src2); tcg_gen_mov_tl(cpu_cc_src2, src2);
tcg_gen_sub_tl(dst, src1, src2); tcg_gen_sub_tl(dst, src1, src2);
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_C_sub_icc(cpu_cc_src, cpu_cc_src2); gen_cc_C_sub_icc(cpu_cc_src, cpu_cc_src2);
gen_cc_V_sub_icc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_sub_icc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_clear_xcc(); gen_cc_clear_xcc();
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
gen_cc_C_sub_xcc(cpu_cc_src, cpu_cc_src2); gen_cc_C_sub_xcc(cpu_cc_src, cpu_cc_src2);
gen_cc_V_sub_xcc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_sub_xcc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#endif #endif
} }
@ -617,13 +622,14 @@ static inline void gen_op_subx_cc(TCGv dst, TCGv src1, TCGv src2)
gen_cc_C_sub_xcc(dst, cpu_cc_src); gen_cc_C_sub_xcc(dst, cpu_cc_src);
#endif #endif
tcg_gen_sub_tl(dst, dst, cpu_cc_src2); tcg_gen_sub_tl(dst, dst, cpu_cc_src2);
gen_cc_NZ_icc(dst); tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_C_sub_icc(dst, cpu_cc_src); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_V_sub_icc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_C_sub_icc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_sub_icc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
gen_cc_C_sub_xcc(dst, cpu_cc_src); gen_cc_C_sub_xcc(cpu_cc_dst, cpu_cc_src);
gen_cc_V_sub_xcc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_sub_xcc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#endif #endif
} }
@ -632,16 +638,17 @@ static inline void gen_op_tsub_cc(TCGv dst, TCGv src1, TCGv src2)
tcg_gen_mov_tl(cpu_cc_src, src1); tcg_gen_mov_tl(cpu_cc_src, src1);
tcg_gen_mov_tl(cpu_cc_src2, src2); tcg_gen_mov_tl(cpu_cc_src2, src2);
tcg_gen_sub_tl(dst, src1, src2); tcg_gen_sub_tl(dst, src1, src2);
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_C_sub_icc(cpu_cc_src, cpu_cc_src2); gen_cc_C_sub_icc(cpu_cc_src, cpu_cc_src2);
gen_cc_V_sub_icc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_sub_icc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
gen_cc_V_tag(cpu_cc_src, cpu_cc_src2); gen_cc_V_tag(cpu_cc_src, cpu_cc_src2);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_clear_xcc(); gen_cc_clear_xcc();
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
gen_cc_C_sub_xcc(cpu_cc_src, cpu_cc_src2); gen_cc_C_sub_xcc(cpu_cc_src, cpu_cc_src2);
gen_cc_V_sub_xcc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_sub_xcc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#endif #endif
} }
@ -651,15 +658,16 @@ static inline void gen_op_tsub_ccTV(TCGv dst, TCGv src1, TCGv src2)
tcg_gen_mov_tl(cpu_cc_src2, src2); tcg_gen_mov_tl(cpu_cc_src2, src2);
gen_tag_tv(cpu_cc_src, cpu_cc_src2); gen_tag_tv(cpu_cc_src, cpu_cc_src2);
tcg_gen_sub_tl(dst, src1, src2); tcg_gen_sub_tl(dst, src1, src2);
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_sub_tv(dst, cpu_cc_src, cpu_cc_src2); gen_sub_tv(dst, cpu_cc_src, cpu_cc_src2);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_C_sub_icc(cpu_cc_src, cpu_cc_src2); gen_cc_C_sub_icc(cpu_cc_src, cpu_cc_src2);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_clear_xcc(); gen_cc_clear_xcc();
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
gen_cc_C_sub_xcc(cpu_cc_src, cpu_cc_src2); gen_cc_C_sub_xcc(cpu_cc_src, cpu_cc_src2);
gen_cc_V_sub_xcc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_sub_xcc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
#endif #endif
} }
@ -708,11 +716,12 @@ static inline void gen_op_mulscc(TCGv dst, TCGv src1, TCGv src2)
/* do addition and update flags */ /* do addition and update flags */
tcg_gen_add_tl(dst, cpu_cc_src, cpu_cc_src2); tcg_gen_add_tl(dst, cpu_cc_src, cpu_cc_src2);
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
gen_cc_V_add_icc(dst, cpu_cc_src, cpu_cc_src2); gen_cc_V_add_icc(cpu_cc_dst, cpu_cc_src, cpu_cc_src2);
gen_cc_C_add_icc(dst, cpu_cc_src); gen_cc_C_add_icc(cpu_cc_dst, cpu_cc_src);
} }
static inline void gen_op_umul(TCGv dst, TCGv src1, TCGv src2) static inline void gen_op_umul(TCGv dst, TCGv src1, TCGv src2)
@ -791,8 +800,9 @@ static inline void gen_op_div_cc(TCGv dst)
{ {
int l1; int l1;
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
l1 = gen_new_label(); l1 = gen_new_label();
tcg_gen_ld_tl(cpu_tmp0, cpu_env, offsetof(CPUSPARCState, cc_src2)); tcg_gen_ld_tl(cpu_tmp0, cpu_env, offsetof(CPUSPARCState, cc_src2));
tcg_gen_brcond_tl(TCG_COND_EQ, cpu_tmp0, tcg_const_tl(0), l1); tcg_gen_brcond_tl(TCG_COND_EQ, cpu_tmp0, tcg_const_tl(0), l1);
@ -802,11 +812,13 @@ static inline void gen_op_div_cc(TCGv dst)
static inline void gen_op_logic_cc(TCGv dst) static inline void gen_op_logic_cc(TCGv dst)
{ {
tcg_gen_mov_tl(cpu_cc_dst, dst);
gen_cc_clear_icc(); gen_cc_clear_icc();
gen_cc_NZ_icc(dst); gen_cc_NZ_icc(cpu_cc_dst);
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
gen_cc_clear_xcc(); gen_cc_clear_xcc();
gen_cc_NZ_xcc(dst); gen_cc_NZ_xcc(cpu_cc_dst);
#endif #endif
} }