yann@1162: Original patch from: ../4.3.2/160-flatten-switch-stmt-00.patch yann@1162: yann@1162: -= BEGIN original header =- yann@1162: Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/18_all_904-flatten-switch-stmt-00.patch yann@1162: http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html yann@1162: yann@1162: Hi, yann@1162: yann@1162: The attached patch makes sure that we create smaller object code for yann@1162: simple switch statements. We just make sure to flatten the switch yann@1162: statement into an if-else chain, basically. yann@1162: yann@1162: This fixes a size-regression as compared to gcc-3.4, as can be seen yann@1162: below. yann@1162: yann@1162: 2007-04-15 Bernhard Fischer <..> yann@1162: yann@1162: * stmt.c (expand_case): Do not create a complex binary tree when yann@1162: optimizing for size but rather use the simple ordered list. yann@1162: (emit_case_nodes): do not emit jumps to the default_label when yann@1162: optimizing for size. yann@1162: yann@1162: Not regtested so far. yann@1162: Comments? yann@1162: yann@1162: Attached is the test switch.c mentioned below. yann@1162: yann@1162: $ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do yann@1162: gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done yann@1162: $ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do yann@1162: gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done yann@1162: yann@1162: $ size switch-*.o yann@1162: text data bss dec hex filename yann@1162: 169 0 0 169 a9 switch-2.95.o yann@1162: 115 0 0 115 73 switch-3.3.o yann@1162: 103 0 0 103 67 switch-3.4.o yann@1162: 124 0 0 124 7c switch-4.0.o yann@1162: 124 0 0 124 7c switch-4.1.o yann@1162: 124 0 0 124 7c switch-4.2.orig-HEAD.o yann@1162: 95 0 0 95 5f switch-4.3-HEAD.o yann@1162: 124 0 0 124 7c switch-4.3.orig-HEAD.o yann@1162: 166 0 0 166 a6 switch-CHAIN-2.95.o yann@1162: 111 0 0 111 6f switch-CHAIN-3.3.o yann@1162: 95 0 0 95 5f switch-CHAIN-3.4.o yann@1162: 95 0 0 95 5f switch-CHAIN-4.0.o yann@1162: 95 0 0 95 5f switch-CHAIN-4.1.o yann@1162: 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o yann@1162: 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o yann@1162: 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o yann@1162: yann@1162: yann@1162: Content-Type: text/x-diff; charset=us-ascii yann@1162: Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff" yann@1162: yann@1162: -= END original header =- yann@1162: yann@1162: diff -durN gcc-4.3.3.orig/gcc/stmt.c gcc-4.3.3/gcc/stmt.c yann@1162: --- gcc-4.3.3.orig/gcc/stmt.c 2008-05-09 20:12:13.000000000 +0200 yann@1162: +++ gcc-4.3.3/gcc/stmt.c 2009-01-27 22:19:28.000000000 +0100 yann@1162: @@ -2509,7 +2509,11 @@ yann@1162: use_cost_table yann@1162: = (TREE_CODE (orig_type) != ENUMERAL_TYPE yann@1162: && estimate_case_costs (case_list)); yann@1162: - balance_case_nodes (&case_list, NULL); yann@1162: + /* When optimizing for size, we want a straight list to avoid yann@1162: + jumps as much as possible. This basically creates an if-else yann@1162: + chain. */ yann@1162: + if (!optimize_size) yann@1162: + balance_case_nodes (&case_list, NULL); yann@1162: emit_case_nodes (index, case_list, default_label, index_type); yann@1162: emit_jump (default_label); yann@1162: } yann@1162: @@ -3067,6 +3071,7 @@ yann@1162: { yann@1162: if (!node_has_low_bound (node, index_type)) yann@1162: { yann@1162: + if (!optimize_size) /* don't jl to the .default_label. */ yann@1162: emit_cmp_and_jump_insns (index, yann@1162: convert_modes yann@1162: (mode, imode,