diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-10-05 16:54:56 -0700 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-10-07 16:39:31 +0000 |
| commit | 2e655fe768d9873d07be3be264c042c35720694b (patch) | |
| tree | 34cc01fe7bf47056ab729069c5b37277576746e0 /target-sparc | |
| parent | 934da7ee0840f582c7720d0ce4507456d9955feb (diff) | |
target-sparc: Tidy gen_generic_branch interface
The arguments passed are always the same.
Pass down just DisasContext instead.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-sparc')
| -rw-r--r-- | target-sparc/translate.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 4cc78872d4..d759da21c8 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -1098,21 +1098,20 @@ static inline void gen_branch_a(DisasContext *dc, target_ulong pc1, gen_goto_tb(dc, 1, pc2 + 4, pc2 + 8); } -static inline void gen_generic_branch(target_ulong npc1, target_ulong npc2, - TCGv r_cond) +static inline void gen_generic_branch(DisasContext *dc) { int l1, l2; l1 = gen_new_label(); l2 = gen_new_label(); - tcg_gen_brcondi_tl(TCG_COND_EQ, r_cond, 0, l1); + tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_cond, 0, l1); - tcg_gen_movi_tl(cpu_npc, npc1); + tcg_gen_movi_tl(cpu_npc, dc->jump_pc[0]); tcg_gen_br(l2); gen_set_label(l1); - tcg_gen_movi_tl(cpu_npc, npc2); + tcg_gen_movi_tl(cpu_npc, dc->jump_pc[1]); gen_set_label(l2); } @@ -1121,7 +1120,7 @@ static inline void gen_generic_branch(target_ulong npc1, target_ulong npc2, static inline void flush_cond(DisasContext *dc) { if (dc->npc == JUMP_PC) { - gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1], cpu_cond); + gen_generic_branch(dc); dc->npc = DYNAMIC_PC; } } @@ -1129,7 +1128,7 @@ static inline void flush_cond(DisasContext *dc) static inline void save_npc(DisasContext *dc) { if (dc->npc == JUMP_PC) { - gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1], cpu_cond); + gen_generic_branch(dc); dc->npc = DYNAMIC_PC; } else if (dc->npc != DYNAMIC_PC) { tcg_gen_movi_tl(cpu_npc, dc->npc); @@ -1150,7 +1149,7 @@ static inline void save_state(DisasContext *dc) static inline void gen_mov_pc_npc(DisasContext *dc) { if (dc->npc == JUMP_PC) { - gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1], cpu_cond); + gen_generic_branch(dc); tcg_gen_mov_tl(cpu_pc, cpu_npc); dc->pc = DYNAMIC_PC; } else if (dc->npc == DYNAMIC_PC) { |