Drop unused parameters

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3022 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 15 insertions, 12 deletions

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 1993a4c892..110b804c7c 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -598,7 +598,8 @@ static inline void gen_goto_tb(DisasContext *s, int tb_num,
     }
 }
 
-static inline void gen_branch2(DisasContext *dc, long tb, target_ulong pc1, target_ulong pc2)
+static inline void gen_branch2(DisasContext *dc, target_ulong pc1,
+                               target_ulong pc2)
 {
     int l1;
 
@@ -612,7 +613,8 @@ static inline void gen_branch2(DisasContext *dc, long tb, target_ulong pc1, targ
     gen_goto_tb(dc, 1, pc2, pc2 + 4);
 }
 
-static inline void gen_branch_a(DisasContext *dc, long tb, target_ulong pc1, target_ulong pc2)
+static inline void gen_branch_a(DisasContext *dc, target_ulong pc1,
+                                target_ulong pc2)
 {
     int l1;
 
@@ -626,12 +628,13 @@ static inline void gen_branch_a(DisasContext *dc, long tb, target_ulong pc1, tar
     gen_goto_tb(dc, 1, pc2 + 4, pc2 + 8);
 }
 
-static inline void gen_branch(DisasContext *dc, long tb, target_ulong pc, target_ulong npc)
+static inline void gen_branch(DisasContext *dc, target_ulong pc,
+                              target_ulong npc)
 {
     gen_goto_tb(dc, 0, pc, npc);
 }
 
-static inline void gen_generic_branch(DisasContext *dc, target_ulong npc1, target_ulong npc2)
+static inline void gen_generic_branch(target_ulong npc1, target_ulong npc2)
 {
     int l1, l2;
 
@@ -651,7 +654,7 @@ static inline void gen_generic_branch(DisasContext *dc, target_ulong npc1, targe
 static inline void flush_T2(DisasContext * dc)
 {
     if (dc->npc == JUMP_PC) {
-        gen_generic_branch(dc, dc->jump_pc[0], dc->jump_pc[1]);
+        gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1]);
         dc->npc = DYNAMIC_PC;
     }
 }
@@ -659,7 +662,7 @@ static inline void flush_T2(DisasContext * dc)
 static inline void save_npc(DisasContext * dc)
 {
     if (dc->npc == JUMP_PC) {
-        gen_generic_branch(dc, dc->jump_pc[0], dc->jump_pc[1]);
+        gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1]);
         dc->npc = DYNAMIC_PC;
     } else if (dc->npc != DYNAMIC_PC) {
         gen_movl_npc_im(dc->npc);
@@ -675,7 +678,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, dc->jump_pc[0], dc->jump_pc[1]);
+        gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1]);
         gen_op_mov_pc_npc();
         dc->pc = DYNAMIC_PC;
     } else if (dc->npc == DYNAMIC_PC) {
@@ -861,7 +864,7 @@ static void do_branch(DisasContext * dc, int32_t offset, uint32_t insn, int cc)
         flush_T2(dc);
         gen_cond[cc][cond]();
 	if (a) {
-	    gen_branch_a(dc, (long)dc->tb, target, dc->npc);
+	    gen_branch_a(dc, target, dc->npc);
             dc->is_br = 1;
 	} else {
             dc->pc = dc->npc;
@@ -900,7 +903,7 @@ static void do_fbranch(DisasContext * dc, int32_t offset, uint32_t insn, int cc)
         flush_T2(dc);
         gen_fcond[cc][cond]();
 	if (a) {
-	    gen_branch_a(dc, (long)dc->tb, target, dc->npc);
+	    gen_branch_a(dc, target, dc->npc);
             dc->is_br = 1;
 	} else {
             dc->pc = dc->npc;
@@ -921,7 +924,7 @@ static void do_branch_reg(DisasContext * dc, int32_t offset, uint32_t insn)
     flush_T2(dc);
     gen_cond_reg(cond);
     if (a) {
-	gen_branch_a(dc, (long)dc->tb, target, dc->npc);
+	gen_branch_a(dc, target, dc->npc);
 	dc->is_br = 1;
     } else {
 	dc->pc = dc->npc;
@@ -3123,7 +3126,7 @@ static void disas_sparc_insn(DisasContext * dc)
 	gen_op_next_insn();
     } else if (dc->npc == JUMP_PC) {
         /* we can do a static jump */
-        gen_branch2(dc, (long)dc->tb, dc->jump_pc[0], dc->jump_pc[1]);
+        gen_branch2(dc, dc->jump_pc[0], dc->jump_pc[1]);
         dc->is_br = 1;
     } else {
 	dc->pc = dc->npc;
@@ -3249,7 +3252,7 @@ static inline int gen_intermediate_code_internal(TranslationBlock * tb,
         if (dc->pc != DYNAMIC_PC && 
             (dc->npc != DYNAMIC_PC && dc->npc != JUMP_PC)) {
             /* static PC and NPC: we can use direct chaining */
-            gen_branch(dc, (long)tb, dc->pc, dc->npc);
+            gen_branch(dc, dc->pc, dc->npc);
         } else {
             if (dc->pc != DYNAMIC_PC)
                 gen_jmp_im(dc->pc);