ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-sparc: Tidy save_npc interface 

Use the cpu_cond global register directly instead of passing it down.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Richard Henderson 2012-10-05 16:54:55 -07:00 committed by Blue Swirl
parent 13a6dd0043
commit 934da7ee08
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-sparc/translate.c
View File

@ -1126,10 +1126,10 @@ static inline void flush_cond(DisasContext *dc)
} }
} }
static inline void save_npc(DisasContext *dc, TCGv cond) static inline void save_npc(DisasContext *dc)
{ {
if (dc->npc == JUMP_PC) { if (dc->npc == JUMP_PC) {
gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1], cond); gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1], cpu_cond);
dc->npc = DYNAMIC_PC; dc->npc = DYNAMIC_PC;
} else if (dc->npc != DYNAMIC_PC) { } else if (dc->npc != DYNAMIC_PC) {
tcg_gen_movi_tl(cpu_npc, dc->npc); tcg_gen_movi_tl(cpu_npc, dc->npc);
@ -1144,7 +1144,7 @@ static inline void save_state(DisasContext *dc)
dc->cc_op = CC_OP_FLAGS; dc->cc_op = CC_OP_FLAGS;
gen_helper_compute_psr(cpu_env); gen_helper_compute_psr(cpu_env);
} }
save_npc(dc, cpu_cond); save_npc(dc);
} }
static inline void gen_mov_pc_npc(DisasContext *dc) static inline void gen_mov_pc_npc(DisasContext *dc)
@ -5372,7 +5372,7 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb,
} else { } else {
if (dc->pc != DYNAMIC_PC) if (dc->pc != DYNAMIC_PC)
tcg_gen_movi_tl(cpu_pc, dc->pc); tcg_gen_movi_tl(cpu_pc, dc->pc);
save_npc(dc, cpu_cond); save_npc(dc);
tcg_gen_exit_tb(0); tcg_gen_exit_tb(0);
} }
} }