gwj / at91sam9263 · Commits

Commit 46525e1fbe3fc18b8f3d8e567b955b8c66f0c28c

Authored by blueswir1
1 parent 996ba2cc

Drop unused parameters 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3022 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 15 additions and 12 deletions
target-sparc/translate.c
  View file @46525e1
@@ -598,7 +598,8 @@ static inline void gen_goto_tb(DisasContext *s, int tb_num, @@ -598,7 +598,8 @@ static inline void gen_goto_tb(DisasContext *s, int tb_num,
598 } 598 }
599 } 599 }
600 600
601 -static inline void gen_branch2(DisasContext *dc, long tb, target_ulong pc1, target_ulong pc2) 601 +static inline void gen_branch2(DisasContext *dc, target_ulong pc1,
  602 + target_ulong pc2)
602 { 603 {
603 int l1; 604 int l1;
604 605
@@ -612,7 +613,8 @@ static inline void gen_branch2(DisasContext *dc, long tb, target_ulong pc1, targ @@ -612,7 +613,8 @@ static inline void gen_branch2(DisasContext *dc, long tb, target_ulong pc1, targ
612 gen_goto_tb(dc, 1, pc2, pc2 + 4); 613 gen_goto_tb(dc, 1, pc2, pc2 + 4);
613 } 614 }
614 615
615 -static inline void gen_branch_a(DisasContext *dc, long tb, target_ulong pc1, target_ulong pc2) 616 +static inline void gen_branch_a(DisasContext *dc, target_ulong pc1,
  617 + target_ulong pc2)
616 { 618 {
617 int l1; 619 int l1;
618 620
@@ -626,12 +628,13 @@ static inline void gen_branch_a(DisasContext *dc, long tb, target_ulong pc1, tar @@ -626,12 +628,13 @@ static inline void gen_branch_a(DisasContext *dc, long tb, target_ulong pc1, tar
626 gen_goto_tb(dc, 1, pc2 + 4, pc2 + 8); 628 gen_goto_tb(dc, 1, pc2 + 4, pc2 + 8);
627 } 629 }
628 630
629 -static inline void gen_branch(DisasContext *dc, long tb, target_ulong pc, target_ulong npc) 631 +static inline void gen_branch(DisasContext *dc, target_ulong pc,
  632 + target_ulong npc)
630 { 633 {
631 gen_goto_tb(dc, 0, pc, npc); 634 gen_goto_tb(dc, 0, pc, npc);
632 } 635 }
633 636
634 -static inline void gen_generic_branch(DisasContext *dc, target_ulong npc1, target_ulong npc2) 637 +static inline void gen_generic_branch(target_ulong npc1, target_ulong npc2)
635 { 638 {
636 int l1, l2; 639 int l1, l2;
637 640
@@ -651,7 +654,7 @@ static inline void gen_generic_branch(DisasContext *dc, target_ulong npc1, targe @@ -651,7 +654,7 @@ static inline void gen_generic_branch(DisasContext *dc, target_ulong npc1, targe
651 static inline void flush_T2(DisasContext * dc) 654 static inline void flush_T2(DisasContext * dc)
652 { 655 {
653 if (dc->npc == JUMP_PC) { 656 if (dc->npc == JUMP_PC) {
654 - gen_generic_branch(dc, dc->jump_pc[0], dc->jump_pc[1]); 657 + gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1]);
655 dc->npc = DYNAMIC_PC; 658 dc->npc = DYNAMIC_PC;
656 } 659 }
657 } 660 }
@@ -659,7 +662,7 @@ static inline void flush_T2(DisasContext * dc) @@ -659,7 +662,7 @@ static inline void flush_T2(DisasContext * dc)
659 static inline void save_npc(DisasContext * dc) 662 static inline void save_npc(DisasContext * dc)
660 { 663 {
661 if (dc->npc == JUMP_PC) { 664 if (dc->npc == JUMP_PC) {
662 - gen_generic_branch(dc, dc->jump_pc[0], dc->jump_pc[1]); 665 + gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1]);
663 dc->npc = DYNAMIC_PC; 666 dc->npc = DYNAMIC_PC;
664 } else if (dc->npc != DYNAMIC_PC) { 667 } else if (dc->npc != DYNAMIC_PC) {
665 gen_movl_npc_im(dc->npc); 668 gen_movl_npc_im(dc->npc);
@@ -675,7 +678,7 @@ static inline void save_state(DisasContext * dc) @@ -675,7 +678,7 @@ static inline void save_state(DisasContext * dc)
675 static inline void gen_mov_pc_npc(DisasContext * dc) 678 static inline void gen_mov_pc_npc(DisasContext * dc)
676 { 679 {
677 if (dc->npc == JUMP_PC) { 680 if (dc->npc == JUMP_PC) {
678 - gen_generic_branch(dc, dc->jump_pc[0], dc->jump_pc[1]); 681 + gen_generic_branch(dc->jump_pc[0], dc->jump_pc[1]);
679 gen_op_mov_pc_npc(); 682 gen_op_mov_pc_npc();
680 dc->pc = DYNAMIC_PC; 683 dc->pc = DYNAMIC_PC;
681 } else if (dc->npc == DYNAMIC_PC) { 684 } else if (dc->npc == DYNAMIC_PC) {
@@ -861,7 +864,7 @@ static void do_branch(DisasContext * dc, int32_t offset, uint32_t insn, int cc) @@ -861,7 +864,7 @@ static void do_branch(DisasContext * dc, int32_t offset, uint32_t insn, int cc)
861 flush_T2(dc); 864 flush_T2(dc);
862 gen_cond[cc][cond](); 865 gen_cond[cc][cond]();
863 if (a) { 866 if (a) {
864 - gen_branch_a(dc, (long)dc->tb, target, dc->npc); 867 + gen_branch_a(dc, target, dc->npc);
865 dc->is_br = 1; 868 dc->is_br = 1;
866 } else { 869 } else {
867 dc->pc = dc->npc; 870 dc->pc = dc->npc;
@@ -900,7 +903,7 @@ static void do_fbranch(DisasContext * dc, int32_t offset, uint32_t insn, int cc) @@ -900,7 +903,7 @@ static void do_fbranch(DisasContext * dc, int32_t offset, uint32_t insn, int cc)
900 flush_T2(dc); 903 flush_T2(dc);
901 gen_fcond[cc][cond](); 904 gen_fcond[cc][cond]();
902 if (a) { 905 if (a) {
903 - gen_branch_a(dc, (long)dc->tb, target, dc->npc); 906 + gen_branch_a(dc, target, dc->npc);
904 dc->is_br = 1; 907 dc->is_br = 1;
905 } else { 908 } else {
906 dc->pc = dc->npc; 909 dc->pc = dc->npc;
@@ -921,7 +924,7 @@ static void do_branch_reg(DisasContext * dc, int32_t offset, uint32_t insn) @@ -921,7 +924,7 @@ static void do_branch_reg(DisasContext * dc, int32_t offset, uint32_t insn)
921 flush_T2(dc); 924 flush_T2(dc);
922 gen_cond_reg(cond); 925 gen_cond_reg(cond);
923 if (a) { 926 if (a) {
924 - gen_branch_a(dc, (long)dc->tb, target, dc->npc); 927 + gen_branch_a(dc, target, dc->npc);
925 dc->is_br = 1; 928 dc->is_br = 1;
926 } else { 929 } else {
927 dc->pc = dc->npc; 930 dc->pc = dc->npc;
@@ -3123,7 +3126,7 @@ static void disas_sparc_insn(DisasContext * dc) @@ -3123,7 +3126,7 @@ static void disas_sparc_insn(DisasContext * dc)
3123 gen_op_next_insn(); 3126 gen_op_next_insn();
3124 } else if (dc->npc == JUMP_PC) { 3127 } else if (dc->npc == JUMP_PC) {
3125 /* we can do a static jump */ 3128 /* we can do a static jump */
3126 - gen_branch2(dc, (long)dc->tb, dc->jump_pc[0], dc->jump_pc[1]); 3129 + gen_branch2(dc, dc->jump_pc[0], dc->jump_pc[1]);
3127 dc->is_br = 1; 3130 dc->is_br = 1;
3128 } else { 3131 } else {
3129 dc->pc = dc->npc; 3132 dc->pc = dc->npc;
@@ -3249,7 +3252,7 @@ static inline int gen_intermediate_code_internal(TranslationBlock * tb, @@ -3249,7 +3252,7 @@ static inline int gen_intermediate_code_internal(TranslationBlock * tb,
3249 if (dc->pc != DYNAMIC_PC && 3252 if (dc->pc != DYNAMIC_PC &&
3250 (dc->npc != DYNAMIC_PC && dc->npc != JUMP_PC)) { 3253 (dc->npc != DYNAMIC_PC && dc->npc != JUMP_PC)) {
3251 /* static PC and NPC: we can use direct chaining */ 3254 /* static PC and NPC: we can use direct chaining */
3252 - gen_branch(dc, (long)tb, dc->pc, dc->npc); 3255 + gen_branch(dc, dc->pc, dc->npc);
3253 } else { 3256 } else {
3254 if (dc->pc != DYNAMIC_PC) 3257 if (dc->pc != DYNAMIC_PC)
3255 gen_jmp_im(dc->pc); 3258 gen_jmp_im(dc->pc);