From 934da7ee0840f582c7720d0ce4507456d9955feb Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 5 Oct 2012 16:54:55 -0700 Subject: target-sparc: Tidy save_npc interface Use the cpu_cond global register directly instead of passing it down. Signed-off-by: Richard Henderson Signed-off-by: Blue Swirl --- target-sparc/translate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index d9e1b0155..4cc78872d 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -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) { - 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; } else if (dc->npc != DYNAMIC_PC) { 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; gen_helper_compute_psr(cpu_env); } - save_npc(dc, cpu_cond); + save_npc(dc); } static inline void gen_mov_pc_npc(DisasContext *dc) @@ -5372,7 +5372,7 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb, } else { if (dc->pc != DYNAMIC_PC) tcg_gen_movi_tl(cpu_pc, dc->pc); - save_npc(dc, cpu_cond); + save_npc(dc); tcg_gen_exit_tb(0); } } -- cgit v1.2.3