From: Beyhan Date: Thu, 7 Oct 2004 11:54:06 +0000 (+0000) Subject: different order of node output X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=f36aa39cf1d9f71f853cb9dd6c45ac60d0dd3aae;p=libfirm different order of node output [r4088] --- diff --git a/testprograms/ref-results/All_graphs.vcg b/testprograms/ref-results/All_graphs.vcg index 19374495e..8bbe252a2 100644 --- a/testprograms/ref-results/All_graphs.vcg +++ b/testprograms/ref-results/All_graphs.vcg @@ -327,7 +327,7 @@ irg: PRIMA_c arity: 2 "} edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n167" label: "1" class:16 priority:10} +edge: {sourcename: "n100" targetname: "n169" label: "1" class:16 priority:10} node: {title: "n99" label: "ProjIs 2 99" info1: "mode: Is visited: 51 irg: PRIMA_c @@ -340,7 +340,7 @@ irg: PRIMA_c arity: 2 volatility: volatility_non_volatile "} -edge: {sourcename: "n96" targetname: "n168" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n96" targetname: "n167" label: "0" class:17 priority:10 color:blue} edge: {sourcename: "n96" targetname: "n95" label: "1" class:1 priority:50} node: {title: "n95" label: "Sel a 95" info1: "mode: P visited: 51 @@ -349,8 +349,8 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n95" targetname: "n168" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n95" targetname: "n169" label: "1" class:16 priority:10} +edge: {sourcename: "n95" targetname: "n167" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n95" targetname: "n168" label: "1" class:16 priority:10} node: {title: "n170" label: "Jmp 170" info1: "mode: X visited: 51 irg: PRIMA_c @@ -360,36 +360,36 @@ arity: 0 graph: { title: "n82" label: "Block 82" status:clustered color:yellow edge: {sourcename: "n82" targetname: "n192" label: "0" class:13 priority:60 color:red} -node: {title: "n168" label: "FilterM 1 168" info1: "mode: M +node: {title: "n167" label: "FilterM 1 167" info1: "mode: M visited: 51 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 83 "color: yellow} -edge: {sourcename: "n168" targetname: "n187" label: "0" class:17 priority:10 color:blue} -node: {title: "n169" label: "FilterP 0 169" info1: "mode: P +edge: {sourcename: "n167" targetname: "n187" label: "0" class:17 priority:10 color:blue} +node: {title: "n168" label: "FilterP 0 168" info1: "mode: P visited: 51 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -edge: {sourcename: "n169" targetname: "n44" label: "0" class:16 priority:10} -node: {title: "n167" label: "FilterIs 1 167" info1: "mode: Is +edge: {sourcename: "n168" targetname: "n44" label: "0" class:16 priority:10} +node: {title: "n169" label: "FilterIs 1 169" info1: "mode: Is visited: 51 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -node: {title: "n167n38" label: "0x5Is 38" info1: "mode: Is +node: {title: "n169n38" label: "0x5Is 38" info1: "mode: Is visited: 51 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n167" targetname: "n167n38" label: "0" class:16 priority:10} +edge: {sourcename: "n169" targetname: "n169n38" label: "0" class:16 priority:10} node: {title: "n85" label: "ProjX 0 85" info1: "mode: X visited: 51 irg: PRIMA_c diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg index 88b728c83..0d6c280d0 100644 --- a/testprograms/ref-results/COND_EXAMPLE_main.vcg +++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg @@ -129,46 +129,46 @@ visited: 12 irg: COND_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n38" targetname: "n33" label: "0" class:1 priority:50} -edge: {sourcename: "n38" targetname: "n37" label: "1" class:1 priority:50} -node: {title: "n33" label: "ConvIs 33" info1: "mode: Is +edge: {sourcename: "n38" targetname: "n37" label: "0" class:1 priority:50} +edge: {sourcename: "n38" targetname: "n33" label: "1" class:1 priority:50} +node: {title: "n37" label: "ConvIs 37" info1: "mode: Is visited: 12 irg: COND_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n33" targetname: "n32" label: "0" class:1 priority:50} -node: {title: "n32" label: "Projb Gt 32" info1: "mode: b +edge: {sourcename: "n37" targetname: "n36" label: "0" class:1 priority:50} +node: {title: "n36" label: "Projb Lt 36" info1: "mode: b visited: 12 irg: COND_EXAMPLE_main arity: 1 "color: yellow} -edge: {sourcename: "n32" targetname: "n31" label: "0" class:1 priority:50} -node: {title: "n31" label: "CmpT 31" info1: "mode: T +edge: {sourcename: "n36" targetname: "n35" label: "0" class:1 priority:50} +node: {title: "n35" label: "CmpT 35" info1: "mode: T visited: 12 irg: COND_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n31" targetname: "n29" label: "0" class:1 priority:50} -edge: {sourcename: "n31" targetname: "n30" label: "1" class:16 priority:10} -node: {title: "n37" label: "ConvIs 37" info1: "mode: Is +edge: {sourcename: "n35" targetname: "n29" label: "0" class:1 priority:50} +edge: {sourcename: "n35" targetname: "n34" label: "1" class:16 priority:10} +node: {title: "n33" label: "ConvIs 33" info1: "mode: Is visited: 12 irg: COND_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n37" targetname: "n36" label: "0" class:1 priority:50} -node: {title: "n36" label: "Projb Lt 36" info1: "mode: b +edge: {sourcename: "n33" targetname: "n32" label: "0" class:1 priority:50} +node: {title: "n32" label: "Projb Gt 32" info1: "mode: b visited: 12 irg: COND_EXAMPLE_main arity: 1 "color: yellow} -edge: {sourcename: "n36" targetname: "n35" label: "0" class:1 priority:50} -node: {title: "n35" label: "CmpT 35" info1: "mode: T +edge: {sourcename: "n32" targetname: "n31" label: "0" class:1 priority:50} +node: {title: "n31" label: "CmpT 31" info1: "mode: T visited: 12 irg: COND_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n35" targetname: "n29" label: "0" class:1 priority:50} -edge: {sourcename: "n35" targetname: "n34" label: "1" class:16 priority:10} +edge: {sourcename: "n31" targetname: "n29" label: "0" class:1 priority:50} +edge: {sourcename: "n31" targetname: "n30" label: "1" class:16 priority:10} node: {title: "n29" label: "ProjIs 0 29" info1: "mode: Is visited: 12 irg: COND_EXAMPLE_main @@ -191,7 +191,7 @@ irg: COND_EXAMPLE_main arity: 0 Const of type type_unknown "color: yellow} -node: {title: "n30" label: "0x2Is 30" info1: "mode: Is +node: {title: "n34" label: "0xAIs 34" info1: "mode: Is visited: 12 irg: COND_EXAMPLE_main arity: 0 @@ -203,7 +203,7 @@ irg: COND_EXAMPLE_main arity: 1 "color: yellow} edge: {sourcename: "n26" targetname: "n20" label: "0" class:1 priority:50} -node: {title: "n34" label: "0xAIs 34" info1: "mode: Is +node: {title: "n30" label: "0x2Is 30" info1: "mode: Is visited: 12 irg: COND_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg index 2766ee2d8..8747978e9 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg @@ -327,7 +327,7 @@ irg: PRIMA_c arity: 2 "} edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n167" label: "1" class:16 priority:10} +edge: {sourcename: "n100" targetname: "n169" label: "1" class:16 priority:10} node: {title: "n99" label: "ProjIs 2 99" info1: "mode: Is visited: 34 irg: PRIMA_c @@ -340,7 +340,7 @@ irg: PRIMA_c arity: 2 volatility: volatility_non_volatile "} -edge: {sourcename: "n96" targetname: "n168" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n96" targetname: "n167" label: "0" class:17 priority:10 color:blue} edge: {sourcename: "n96" targetname: "n95" label: "1" class:1 priority:50} node: {title: "n95" label: "Sel a 95" info1: "mode: P visited: 34 @@ -349,8 +349,8 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n95" targetname: "n168" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n95" targetname: "n169" label: "1" class:16 priority:10} +edge: {sourcename: "n95" targetname: "n167" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n95" targetname: "n168" label: "1" class:16 priority:10} node: {title: "n170" label: "Jmp 170" info1: "mode: X visited: 34 irg: PRIMA_c @@ -360,36 +360,36 @@ arity: 0 graph: { title: "n82" label: "Block 82" status:clustered color:yellow edge: {sourcename: "n82" targetname: "n192" label: "0" class:13 priority:60 color:red} -node: {title: "n168" label: "FilterM 1 168" info1: "mode: M +node: {title: "n167" label: "FilterM 1 167" info1: "mode: M visited: 34 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 83 "color: yellow} -edge: {sourcename: "n168" targetname: "n187" label: "0" class:17 priority:10 color:blue} -node: {title: "n169" label: "FilterP 0 169" info1: "mode: P +edge: {sourcename: "n167" targetname: "n187" label: "0" class:17 priority:10 color:blue} +node: {title: "n168" label: "FilterP 0 168" info1: "mode: P visited: 34 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -edge: {sourcename: "n169" targetname: "n44" label: "0" class:16 priority:10} -node: {title: "n167" label: "FilterIs 1 167" info1: "mode: Is +edge: {sourcename: "n168" targetname: "n44" label: "0" class:16 priority:10} +node: {title: "n169" label: "FilterIs 1 169" info1: "mode: Is visited: 34 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -node: {title: "n167n38" label: "0x5Is 38" info1: "mode: Is +node: {title: "n169n38" label: "0x5Is 38" info1: "mode: Is visited: 34 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n167" targetname: "n167n38" label: "0" class:16 priority:10} +edge: {sourcename: "n169" targetname: "n169n38" label: "0" class:16 priority:10} node: {title: "n85" label: "ProjX 0 85" info1: "mode: X visited: 34 irg: PRIMA_c diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg index a209b05fc..5e74b7ed4 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg @@ -243,21 +243,21 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "color: lightyellow} edge: {sourcename: "n36" targetname: "n191" label: "0" class:13 priority:60 color:red} -node: {title: "n167" label: "FilterIs 1 167" info1: "mode: Is +node: {title: "n169" label: "FilterIs 1 169" info1: "mode: Is visited: 32 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -node: {title: "n167n38" label: "0x5Is 38" info1: "mode: Is +node: {title: "n169n38" label: "0x5Is 38" info1: "mode: Is visited: 32 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n167" targetname: "n167n38" label: "0" class:16 priority:10} -edge: { sourcename: "n167" targetname: "n82" class:2 priority:50 linestyle:dotted} +edge: {sourcename: "n169" targetname: "n169n38" label: "0" class:16 priority:10} +edge: { sourcename: "n169" targetname: "n82" class:2 priority:50 linestyle:dotted} node: {title: "n33" label: "ProjM 1 33" info1: "mode: M visited: 32 irg: OO_PROGRAM_EXAMPLE_main @@ -287,15 +287,15 @@ arity: 1 "color: yellow} edge: {sourcename: "n44" targetname: "n41" label: "0" class:1 priority:50} edge: { sourcename: "n44" targetname: "n182" class:2 priority:50 linestyle:dotted} -node: {title: "n169" label: "FilterP 0 169" info1: "mode: P +node: {title: "n168" label: "FilterP 0 168" info1: "mode: P visited: 32 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -edge: {sourcename: "n169" targetname: "n44" label: "0" class:16 priority:10} -edge: { sourcename: "n169" targetname: "n82" class:2 priority:50 linestyle:dotted} +edge: {sourcename: "n168" targetname: "n44" label: "0" class:16 priority:10} +edge: { sourcename: "n168" targetname: "n82" class:2 priority:50 linestyle:dotted} node: {title: "n177" label: "FilterIs 1 177" info1: "mode: Is visited: 32 irg: PRIMA_set_a @@ -372,15 +372,15 @@ intra predecessor nodes: "color: yellow} edge: {sourcename: "n187" targetname: "n76" label: "0" class:17 priority:10 color:blue} edge: { sourcename: "n187" targetname: "n188" class:2 priority:50 linestyle:dotted} -node: {title: "n168" label: "FilterM 1 168" info1: "mode: M +node: {title: "n167" label: "FilterM 1 167" info1: "mode: M visited: 32 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 83 "color: yellow} -edge: {sourcename: "n168" targetname: "n187" label: "0" class:17 priority:10 color:blue} -edge: { sourcename: "n168" targetname: "n82" class:2 priority:50 linestyle:dotted} +edge: {sourcename: "n167" targetname: "n187" label: "0" class:17 priority:10 color:blue} +edge: { sourcename: "n167" targetname: "n82" class:2 priority:50 linestyle:dotted} node: {title: "n95" label: "Sel a 95" info1: "mode: P visited: 32 irg: PRIMA_c @@ -388,8 +388,8 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n95" targetname: "n168" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n95" targetname: "n169" label: "1" class:16 priority:10} +edge: {sourcename: "n95" targetname: "n167" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n95" targetname: "n168" label: "1" class:16 priority:10} edge: { sourcename: "n95" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n96" label: "Load[Is] 96" info1: "mode: T visited: 32 @@ -397,7 +397,7 @@ irg: PRIMA_c arity: 2 volatility: volatility_non_volatile "} -edge: {sourcename: "n96" targetname: "n168" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n96" targetname: "n167" label: "0" class:17 priority:10 color:blue} edge: {sourcename: "n96" targetname: "n95" label: "1" class:1 priority:50} edge: { sourcename: "n96" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n99" label: "ProjIs 2 99" info1: "mode: Is @@ -413,7 +413,7 @@ irg: PRIMA_c arity: 2 "} edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n167" label: "1" class:16 priority:10} +edge: {sourcename: "n100" targetname: "n169" label: "1" class:16 priority:10} edge: { sourcename: "n100" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n194" label: "FilterIs 0 194" info1: "mode: Is visited: 32 diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg index 012ff8f01..889337f80 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg @@ -243,21 +243,21 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "color: lightyellow} edge: {sourcename: "n36" targetname: "n191" label: "0" class:13 priority:60 color:red} -node: {title: "n167" label: "FilterIs 1 167" info1: "mode: Is +node: {title: "n169" label: "FilterIs 1 169" info1: "mode: Is visited: 36 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -node: {title: "n167n38" label: "0x5Is 38" info1: "mode: Is +node: {title: "n169n38" label: "0x5Is 38" info1: "mode: Is visited: 36 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n167" targetname: "n167n38" label: "0" class:16 priority:10} -edge: { sourcename: "n167" targetname: "n82" class:2 priority:50 linestyle:dotted} +edge: {sourcename: "n169" targetname: "n169n38" label: "0" class:16 priority:10} +edge: { sourcename: "n169" targetname: "n82" class:2 priority:50 linestyle:dotted} node: {title: "n33" label: "ProjM 1 33" info1: "mode: M visited: 36 irg: OO_PROGRAM_EXAMPLE_main @@ -287,15 +287,15 @@ arity: 1 "color: yellow} edge: {sourcename: "n44" targetname: "n41" label: "0" class:1 priority:50} edge: { sourcename: "n44" targetname: "n182" class:2 priority:50 linestyle:dotted} -node: {title: "n169" label: "FilterP 0 169" info1: "mode: P +node: {title: "n168" label: "FilterP 0 168" info1: "mode: P visited: 36 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -edge: {sourcename: "n169" targetname: "n44" label: "0" class:16 priority:10} -edge: { sourcename: "n169" targetname: "n82" class:2 priority:50 linestyle:dotted} +edge: {sourcename: "n168" targetname: "n44" label: "0" class:16 priority:10} +edge: { sourcename: "n168" targetname: "n82" class:2 priority:50 linestyle:dotted} node: {title: "n177" label: "FilterIs 1 177" info1: "mode: Is visited: 36 irg: PRIMA_set_a @@ -372,15 +372,15 @@ intra predecessor nodes: "color: yellow} edge: {sourcename: "n187" targetname: "n76" label: "0" class:17 priority:10 color:blue} edge: { sourcename: "n187" targetname: "n188" class:2 priority:50 linestyle:dotted} -node: {title: "n168" label: "FilterM 1 168" info1: "mode: M +node: {title: "n167" label: "FilterM 1 167" info1: "mode: M visited: 36 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 83 "color: yellow} -edge: {sourcename: "n168" targetname: "n187" label: "0" class:17 priority:10 color:blue} -edge: { sourcename: "n168" targetname: "n82" class:2 priority:50 linestyle:dotted} +edge: {sourcename: "n167" targetname: "n187" label: "0" class:17 priority:10 color:blue} +edge: { sourcename: "n167" targetname: "n82" class:2 priority:50 linestyle:dotted} node: {title: "n95" label: "Sel a 95" info1: "mode: P visited: 36 irg: PRIMA_c @@ -388,8 +388,8 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n95" targetname: "n168" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n95" targetname: "n169" label: "1" class:16 priority:10} +edge: {sourcename: "n95" targetname: "n167" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n95" targetname: "n168" label: "1" class:16 priority:10} edge: { sourcename: "n95" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n96" label: "Load[Is] 96" info1: "mode: T visited: 36 @@ -397,7 +397,7 @@ irg: PRIMA_c arity: 2 volatility: volatility_non_volatile "} -edge: {sourcename: "n96" targetname: "n168" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n96" targetname: "n167" label: "0" class:17 priority:10 color:blue} edge: {sourcename: "n96" targetname: "n95" label: "1" class:1 priority:50} edge: { sourcename: "n96" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n99" label: "ProjIs 2 99" info1: "mode: Is @@ -413,7 +413,7 @@ irg: PRIMA_c arity: 2 "} edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n167" label: "1" class:16 priority:10} +edge: {sourcename: "n100" targetname: "n169" label: "1" class:16 priority:10} edge: { sourcename: "n100" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n194" label: "FilterIs 0 194" info1: "mode: Is visited: 36 diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg index b903aa381..0f83a4780 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg @@ -327,7 +327,7 @@ irg: PRIMA_c arity: 2 "} edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n167" label: "1" class:16 priority:10} +edge: {sourcename: "n100" targetname: "n169" label: "1" class:16 priority:10} node: {title: "n99" label: "ProjIs 2 99" info1: "mode: Is visited: 44 irg: PRIMA_c @@ -340,7 +340,7 @@ irg: PRIMA_c arity: 2 volatility: volatility_non_volatile "} -edge: {sourcename: "n96" targetname: "n168" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n96" targetname: "n167" label: "0" class:17 priority:10 color:blue} edge: {sourcename: "n96" targetname: "n95" label: "1" class:1 priority:50} node: {title: "n95" label: "Sel a 95" info1: "mode: P visited: 44 @@ -349,8 +349,8 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n95" targetname: "n168" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n95" targetname: "n169" label: "1" class:16 priority:10} +edge: {sourcename: "n95" targetname: "n167" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n95" targetname: "n168" label: "1" class:16 priority:10} node: {title: "n170" label: "Jmp 170" info1: "mode: X visited: 44 irg: PRIMA_c @@ -360,36 +360,36 @@ arity: 0 graph: { title: "n82" label: "Block 82" status:clustered color:yellow edge: {sourcename: "n82" targetname: "n192" label: "0" class:13 priority:60 color:red} -node: {title: "n168" label: "FilterM 1 168" info1: "mode: M +node: {title: "n167" label: "FilterM 1 167" info1: "mode: M visited: 44 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 83 "color: yellow} -edge: {sourcename: "n168" targetname: "n187" label: "0" class:17 priority:10 color:blue} -node: {title: "n169" label: "FilterP 0 169" info1: "mode: P +edge: {sourcename: "n167" targetname: "n187" label: "0" class:17 priority:10 color:blue} +node: {title: "n168" label: "FilterP 0 168" info1: "mode: P visited: 44 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -edge: {sourcename: "n169" targetname: "n44" label: "0" class:16 priority:10} -node: {title: "n167" label: "FilterIs 1 167" info1: "mode: Is +edge: {sourcename: "n168" targetname: "n44" label: "0" class:16 priority:10} +node: {title: "n169" label: "FilterIs 1 169" info1: "mode: Is visited: 44 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 89 "color: yellow} -node: {title: "n167n38" label: "0x5Is 38" info1: "mode: Is +node: {title: "n169n38" label: "0x5Is 38" info1: "mode: Is visited: 44 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n167" targetname: "n167n38" label: "0" class:16 priority:10} +edge: {sourcename: "n169" targetname: "n169n38" label: "0" class:16 priority:10} node: {title: "n85" label: "ProjX 0 85" info1: "mode: X visited: 44 irg: PRIMA_c diff --git a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg index 096685099..cce870772 100644 --- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg @@ -86,6 +86,13 @@ arity: 1 "color: yellow} edge: {sourcename: "n89" targetname: "n83" label: "0" class:1 priority:50} edge: { sourcename: "n89" targetname: "n82" class:2 priority:50 linestyle:dotted} +node: {title: "n93" label: "ProjIs 1 93" info1: "mode: Is +visited: 13 +irg: PRIMA_c +arity: 1 +"color: yellow} +edge: {sourcename: "n93" targetname: "n89" label: "0" class:16 priority:10} +edge: { sourcename: "n93" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n92" label: "ProjP 0 92" info1: "mode: P visited: 13 irg: PRIMA_c @@ -126,20 +133,13 @@ arity: 1 "color: yellow} edge: {sourcename: "n99" targetname: "n96" label: "0" class:1 priority:50} edge: { sourcename: "n99" targetname: "n91" class:2 priority:50 linestyle:dotted} -node: {title: "n93" label: "ProjIs 1 93" info1: "mode: Is -visited: 13 -irg: PRIMA_c -arity: 1 -"color: yellow} -edge: {sourcename: "n93" targetname: "n89" label: "0" class:16 priority:10} -edge: { sourcename: "n93" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n100" label: "AddIs 100" info1: "mode: Is visited: 13 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n100" targetname: "n93" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n99" label: "1" class:1 priority:50} +edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} +edge: {sourcename: "n100" targetname: "n93" label: "1" class:1 priority:50} edge: { sourcename: "n100" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n98" label: "ProjM 0 98" info1: "mode: M visited: 13 diff --git a/testprograms/ref-results/PRIMA_c-pure.vcg b/testprograms/ref-results/PRIMA_c-pure.vcg index a617f6b5a..9405c1a18 100644 --- a/testprograms/ref-results/PRIMA_c-pure.vcg +++ b/testprograms/ref-results/PRIMA_c-pure.vcg @@ -86,6 +86,13 @@ arity: 1 "color: yellow} edge: {sourcename: "n89" targetname: "n83" label: "0" class:1 priority:50} edge: { sourcename: "n89" targetname: "n82" class:2 priority:50 linestyle:dotted} +node: {title: "n93" label: "ProjIs 1 93" info1: "mode: Is +visited: 11 +irg: PRIMA_c +arity: 1 +"color: yellow} +edge: {sourcename: "n93" targetname: "n89" label: "0" class:16 priority:10} +edge: { sourcename: "n93" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n92" label: "ProjP 0 92" info1: "mode: P visited: 11 irg: PRIMA_c @@ -126,20 +133,13 @@ arity: 1 "color: yellow} edge: {sourcename: "n99" targetname: "n96" label: "0" class:1 priority:50} edge: { sourcename: "n99" targetname: "n91" class:2 priority:50 linestyle:dotted} -node: {title: "n93" label: "ProjIs 1 93" info1: "mode: Is -visited: 11 -irg: PRIMA_c -arity: 1 -"color: yellow} -edge: {sourcename: "n93" targetname: "n89" label: "0" class:16 priority:10} -edge: { sourcename: "n93" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n100" label: "AddIs 100" info1: "mode: Is visited: 11 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n100" targetname: "n93" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n99" label: "1" class:1 priority:50} +edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} +edge: {sourcename: "n100" targetname: "n93" label: "1" class:1 priority:50} edge: { sourcename: "n100" targetname: "n91" class:2 priority:50 linestyle:dotted} node: {title: "n98" label: "ProjM 0 98" info1: "mode: M visited: 11 diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg index 75ec51f4b..4b3c381a8 100644 --- a/testprograms/ref-results/PRIMA_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg @@ -83,14 +83,8 @@ visited: 16 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n100" targetname: "n93" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n99" label: "1" class:1 priority:50} -node: {title: "n93" label: "ProjIs 1 93" info1: "mode: Is -visited: 16 -irg: PRIMA_c -arity: 1 -"color: yellow} -edge: {sourcename: "n93" targetname: "n89" label: "0" class:16 priority:10} +edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} +edge: {sourcename: "n100" targetname: "n93" label: "1" class:1 priority:50} node: {title: "n99" label: "ProjIs 2 99" info1: "mode: Is visited: 16 irg: PRIMA_c @@ -120,6 +114,12 @@ irg: PRIMA_c arity: 1 "color: yellow} edge: {sourcename: "n92" targetname: "n89" label: "0" class:16 priority:10} +node: {title: "n93" label: "ProjIs 1 93" info1: "mode: Is +visited: 16 +irg: PRIMA_c +arity: 1 +"color: yellow} +edge: {sourcename: "n93" targetname: "n89" label: "0" class:16 priority:10} } graph: { title: "n82" label: "Block 82" status:clustered color:yellow diff --git a/testprograms/ref-results/PRIMA_c.vcg b/testprograms/ref-results/PRIMA_c.vcg index ee8181421..c4f3d75b4 100644 --- a/testprograms/ref-results/PRIMA_c.vcg +++ b/testprograms/ref-results/PRIMA_c.vcg @@ -83,14 +83,8 @@ visited: 12 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n100" targetname: "n93" label: "0" class:1 priority:50} -edge: {sourcename: "n100" targetname: "n99" label: "1" class:1 priority:50} -node: {title: "n93" label: "ProjIs 1 93" info1: "mode: Is -visited: 12 -irg: PRIMA_c -arity: 1 -"color: yellow} -edge: {sourcename: "n93" targetname: "n89" label: "0" class:16 priority:10} +edge: {sourcename: "n100" targetname: "n99" label: "0" class:1 priority:50} +edge: {sourcename: "n100" targetname: "n93" label: "1" class:1 priority:50} node: {title: "n99" label: "ProjIs 2 99" info1: "mode: Is visited: 12 irg: PRIMA_c @@ -120,6 +114,12 @@ irg: PRIMA_c arity: 1 "color: yellow} edge: {sourcename: "n92" targetname: "n89" label: "0" class:16 priority:10} +node: {title: "n93" label: "ProjIs 1 93" info1: "mode: Is +visited: 12 +irg: PRIMA_c +arity: 1 +"color: yellow} +edge: {sourcename: "n93" targetname: "n89" label: "0" class:16 priority:10} } graph: { title: "n82" label: "Block 82" status:clustered color:yellow diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg index 603d12194..019bbac5d 100644 --- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg +++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg @@ -53,7 +53,7 @@ colorentry 125: 255 250 250 graph: { title: "g33" label: "STRENGTH_RED_EXAMPLE_m1" status:clustered color:white graph: { title: "n23" label: "Block 23" status:clustered color:yellow -edge: {sourcename: "n23" targetname: "n95" label: "0" class:13 priority:60 color:red} +edge: {sourcename: "n23" targetname: "n99" label: "0" class:13 priority:60 color:red} node: {title: "n24" label: "End 24" info1: "mode: X visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 @@ -61,111 +61,104 @@ arity: 2 "color: blue} } -graph: { title: "n90" label: "Block 90" status:clustered color:yellow -edge: {sourcename: "n90" targetname: "n72" label: "0" class:13 priority:60 color:red} -node: {title: "n95" label: "Return 95" info1: "mode: X +graph: { title: "n94" label: "Block 94" status:clustered color:yellow +edge: {sourcename: "n94" targetname: "n74" label: "0" class:13 priority:60 color:red} +node: {title: "n99" label: "Return 99" info1: "mode: X visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 return in method of type STRENGTH_RED_EXAMPLE_meth_tp res 0 type: int "} -edge: {sourcename: "n95" targetname: "n88" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n95" targetname: "n89" label: "1" class:16 priority:10} +edge: {sourcename: "n99" targetname: "n92" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n99" targetname: "n93" label: "1" class:16 priority:10} } -graph: { title: "n66" label: "Block 66" status:clustered color:yellow -edge: {sourcename: "n66" targetname: "n43" label: "0" class:13 priority:60 color:red} -backedge: {sourcename: "n66" targetname: "n84" label: "1" linestyle:dashed class:13 priority:60 color:red} -node: {title: "n88" label: "PhiM 88" info1: "mode: M +graph: { title: "n68" label: "Block 68" status:clustered color:yellow +edge: {sourcename: "n68" targetname: "n43" label: "0" class:13 priority:60 color:red} +backedge: {sourcename: "n68" targetname: "n88" label: "1" linestyle:dashed class:13 priority:60 color:red} +node: {title: "n92" label: "PhiM 92" info1: "mode: M visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 backedges: "color: green} -edge: {sourcename: "n88" targetname: "n64" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n88" targetname: "n82" label: "1" class:17 priority:10 color:blue} -node: {title: "n359" label: "PhiIs 359" info1: "mode: Is -visited: 30 -irg: STRENGTH_RED_EXAMPLE_m1 -arity: 2 backedges: -"color: green} -edge: {sourcename: "n359" targetname: "n357" label: "0" class:16 priority:10} -edge: {sourcename: "n359" targetname: "n360" label: "1" class:16 priority:10} -node: {title: "n72" label: "ProjX 0 72" info1: "mode: X +edge: {sourcename: "n92" targetname: "n66" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n92" targetname: "n86" label: "1" class:17 priority:10 color:blue} +node: {title: "n74" label: "ProjX 0 74" info1: "mode: X visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 1 "color: yellow} -edge: {sourcename: "n72" targetname: "n71" label: "0" class:13 priority:60 color:red} -node: {title: "n73" label: "ProjX 1 73" info1: "mode: X +edge: {sourcename: "n74" targetname: "n73" label: "0" class:13 priority:60 color:red} +node: {title: "n75" label: "ProjX 1 75" info1: "mode: X visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 1 "color: yellow} -edge: {sourcename: "n73" targetname: "n71" label: "0" class:13 priority:60 color:red} -node: {title: "n71" label: "Cond 71" info1: "mode: T +edge: {sourcename: "n75" targetname: "n73" label: "0" class:13 priority:60 color:red} +node: {title: "n73" label: "Cond 73" info1: "mode: T visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 1 "} -edge: {sourcename: "n71" targetname: "n70" label: "0" class:1 priority:50} -node: {title: "n70" label: "Projb Lt 70" info1: "mode: b +edge: {sourcename: "n73" targetname: "n72" label: "0" class:1 priority:50} +node: {title: "n72" label: "Projb Lt 72" info1: "mode: b visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 1 "color: yellow} -edge: {sourcename: "n70" targetname: "n69" label: "0" class:1 priority:50} -node: {title: "n69" label: "CmpT 69" info1: "mode: T +edge: {sourcename: "n72" targetname: "n71" label: "0" class:1 priority:50} +node: {title: "n71" label: "CmpT 71" info1: "mode: T visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 "} -node: {title: "n69n35" label: "0x0Is 35" info1: "mode: Is +node: {title: "n71n35" label: "0x0Is 35" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n69" targetname: "n69n35" label: "0" class:16 priority:10} -edge: {sourcename: "n69" targetname: "n89" label: "1" class:1 priority:50} -node: {title: "n89" label: "PhiIs 89" info1: "mode: Is +edge: {sourcename: "n71" targetname: "n71n35" label: "0" class:16 priority:10} +edge: {sourcename: "n71" targetname: "n93" label: "1" class:1 priority:50} +node: {title: "n93" label: "PhiIs 93" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 backedges: "color: green} -edge: {sourcename: "n89" targetname: "n65" label: "0" class:16 priority:10} -edge: {sourcename: "n89" targetname: "n83" label: "1" class:16 priority:10} +edge: {sourcename: "n93" targetname: "n67" label: "0" class:16 priority:10} +edge: {sourcename: "n93" targetname: "n87" label: "1" class:16 priority:10} } -graph: { title: "n74" label: "Block 74" status:clustered color:yellow -edge: {sourcename: "n74" targetname: "n73" label: "0" class:13 priority:60 color:red} -node: {title: "n82" label: "ProjM 0 82" info1: "mode: M +graph: { title: "n76" label: "Block 76" status:clustered color:yellow +edge: {sourcename: "n76" targetname: "n75" label: "0" class:13 priority:60 color:red} +node: {title: "n86" label: "ProjM 0 86" info1: "mode: M visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 1 "color: yellow} -edge: {sourcename: "n82" targetname: "n80" label: "0" class:17 priority:10 color:blue} -node: {title: "n80" label: "Store 80" info1: "mode: T +edge: {sourcename: "n86" targetname: "n84" label: "0" class:17 priority:10 color:blue} +node: {title: "n84" label: "Store 84" info1: "mode: T visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 3 volatility: volatility_non_volatile "} -node: {title: "n80n52" label: "0x13Is 52" info1: "mode: Is +node: {title: "n84n54" label: "0x13Is 54" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n80" targetname: "n88" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n80" targetname: "n77" label: "1" class:1 priority:50} -edge: {sourcename: "n80" targetname: "n80n52" label: "2" class:16 priority:10} -node: {title: "n77" label: "AddP 77" info1: "mode: P +edge: {sourcename: "n84" targetname: "n92" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n84" targetname: "n81" label: "1" class:1 priority:50} +edge: {sourcename: "n84" targetname: "n84n54" label: "2" class:16 priority:10} +node: {title: "n81" label: "AddP 81" info1: "mode: P visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 "} -node: {title: "n77n48" label: "SymC &a 48" info1: "mode: P +node: {title: "n81n48" label: "SymC &a 48" info1: "mode: P visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 @@ -173,96 +166,70 @@ kind addr_ent entity GlobalType.a (21) "} -edge: {sourcename: "n77" targetname: "n77n48" label: "0" class:16 priority:10} -edge: {sourcename: "n77" targetname: "n359" label: "1" class:16 priority:10} -node: {title: "n360" label: "SubIs 360" info1: "mode: Is +edge: {sourcename: "n81" targetname: "n81n48" label: "0" class:16 priority:10} +edge: {sourcename: "n81" targetname: "n80" label: "1" class:1 priority:50} +node: {title: "n80" label: "ShlIs 80" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 "} -node: {title: "n360n47" label: "0x4Is 47" info1: "mode: Is +node: {title: "n80n51" label: "0x2Iu 51" info1: "mode: Iu visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n360" targetname: "n359" label: "0" class:16 priority:10} -edge: {sourcename: "n360" targetname: "n360n47" label: "1" class:16 priority:10} -node: {title: "n84" label: "Jmp 84" info1: "mode: X +edge: {sourcename: "n80" targetname: "n93" label: "0" class:16 priority:10} +edge: {sourcename: "n80" targetname: "n80n51" label: "1" class:16 priority:10} +node: {title: "n88" label: "Jmp 88" info1: "mode: X visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 "} -node: {title: "n83" label: "SubIs 83" info1: "mode: Is +node: {title: "n87" label: "SubIs 87" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 "} -node: {title: "n83n46" label: "0x1Is 46" info1: "mode: Is +node: {title: "n87n46" label: "0x1Is 46" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n83" targetname: "n89" label: "0" class:16 priority:10} -edge: {sourcename: "n83" targetname: "n83n46" label: "1" class:16 priority:10} +edge: {sourcename: "n87" targetname: "n93" label: "0" class:16 priority:10} +edge: {sourcename: "n87" targetname: "n87n46" label: "1" class:16 priority:10} } graph: { title: "n37" label: "Block 37" status:clustered color:yellow edge: {sourcename: "n37" targetname: "n36" label: "0" class:13 priority:60 color:red} -backedge: {sourcename: "n37" targetname: "n58" label: "1" linestyle:dashed class:13 priority:60 color:red} -node: {title: "n64" label: "PhiM 64" info1: "mode: M +backedge: {sourcename: "n37" targetname: "n60" label: "1" linestyle:dashed class:13 priority:60 color:red} +node: {title: "n66" label: "PhiM 66" info1: "mode: M visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 backedges: "color: green} -edge: {sourcename: "n64" targetname: "n31" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n64" targetname: "n56" label: "1" class:17 priority:10 color:blue} -node: {title: "n353" label: "PhiIs 353" info1: "mode: Is -visited: 30 -irg: STRENGTH_RED_EXAMPLE_m1 -arity: 2 backedges: -"color: green} -node: {title: "n353n35" label: "0x0Is 35" info1: "mode: Is -visited: 30 -irg: STRENGTH_RED_EXAMPLE_m1 -arity: 0 -Const of type type_unknown -"color: yellow} -edge: {sourcename: "n353" targetname: "n353n35" label: "0" class:16 priority:10} -edge: {sourcename: "n353" targetname: "n354" label: "1" class:16 priority:10} -node: {title: "n357" label: "MulIs 357" info1: "mode: Is -visited: 30 -irg: STRENGTH_RED_EXAMPLE_m1 -arity: 2 -"} -node: {title: "n357n47" label: "0x4Is 47" info1: "mode: Is -visited: 30 -irg: STRENGTH_RED_EXAMPLE_m1 -arity: 0 -Const of type type_unknown -"color: yellow} -edge: {sourcename: "n357" targetname: "n357n47" label: "0" class:16 priority:10} -edge: {sourcename: "n357" targetname: "n65" label: "1" class:1 priority:50} +edge: {sourcename: "n66" targetname: "n31" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n66" targetname: "n58" label: "1" class:17 priority:10 color:blue} node: {title: "n43" label: "ProjX 0 43" info1: "mode: X visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 1 "color: yellow} edge: {sourcename: "n43" targetname: "n42" label: "0" class:13 priority:60 color:red} -node: {title: "n65" label: "PhiIs 65" info1: "mode: Is +node: {title: "n67" label: "PhiIs 67" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 backedges: "color: green} -node: {title: "n65n35" label: "0x0Is 35" info1: "mode: Is +node: {title: "n67n35" label: "0x0Is 35" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n65" targetname: "n65n35" label: "0" class:16 priority:10} -edge: {sourcename: "n65" targetname: "n57" label: "1" class:16 priority:10} +edge: {sourcename: "n67" targetname: "n67n35" label: "0" class:16 priority:10} +edge: {sourcename: "n67" targetname: "n59" label: "1" class:16 priority:10} node: {title: "n44" label: "ProjX 1 44" info1: "mode: X visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 @@ -293,7 +260,7 @@ arity: 0 Const of type type_unknown "color: yellow} edge: {sourcename: "n40" targetname: "n40n39" label: "0" class:16 priority:10} -edge: {sourcename: "n40" targetname: "n65" label: "1" class:1 priority:50} +edge: {sourcename: "n40" targetname: "n67" label: "1" class:1 priority:50} } graph: { title: "n34" label: "Block 34" status:clustered color:yellow @@ -307,33 +274,33 @@ arity: 0 graph: { title: "n45" label: "Block 45" status:clustered color:yellow edge: {sourcename: "n45" targetname: "n44" label: "0" class:13 priority:60 color:red} -node: {title: "n56" label: "ProjM 0 56" info1: "mode: M +node: {title: "n58" label: "ProjM 0 58" info1: "mode: M visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 1 "color: yellow} -edge: {sourcename: "n56" targetname: "n54" label: "0" class:17 priority:10 color:blue} -node: {title: "n54" label: "Store 54" info1: "mode: T +edge: {sourcename: "n58" targetname: "n56" label: "0" class:17 priority:10 color:blue} +node: {title: "n56" label: "Store 56" info1: "mode: T visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 3 volatility: volatility_non_volatile "} -node: {title: "n54n52" label: "0x13Is 52" info1: "mode: Is +node: {title: "n56n54" label: "0x13Is 54" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n54" targetname: "n64" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n54" targetname: "n51" label: "1" class:1 priority:50} -edge: {sourcename: "n54" targetname: "n54n52" label: "2" class:16 priority:10} -node: {title: "n51" label: "AddP 51" info1: "mode: P +edge: {sourcename: "n56" targetname: "n66" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n56" targetname: "n53" label: "1" class:1 priority:50} +edge: {sourcename: "n56" targetname: "n56n54" label: "2" class:16 priority:10} +node: {title: "n53" label: "AddP 53" info1: "mode: P visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 "} -node: {title: "n51n48" label: "SymC &a 48" info1: "mode: P +node: {title: "n53n48" label: "SymC &a 48" info1: "mode: P visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 @@ -341,35 +308,35 @@ kind addr_ent entity GlobalType.a (21) "} -edge: {sourcename: "n51" targetname: "n51n48" label: "0" class:16 priority:10} -edge: {sourcename: "n51" targetname: "n353" label: "1" class:16 priority:10} -node: {title: "n354" label: "AddIs 354" info1: "mode: Is +edge: {sourcename: "n53" targetname: "n53n48" label: "0" class:16 priority:10} +edge: {sourcename: "n53" targetname: "n52" label: "1" class:1 priority:50} +node: {title: "n52" label: "ShlIs 52" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 "} -node: {title: "n354n47" label: "0x4Is 47" info1: "mode: Is +node: {title: "n52n51" label: "0x2Iu 51" info1: "mode: Iu visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n354" targetname: "n354n47" label: "0" class:16 priority:10} -edge: {sourcename: "n354" targetname: "n353" label: "1" class:16 priority:10} -node: {title: "n57" label: "AddIs 57" info1: "mode: Is +edge: {sourcename: "n52" targetname: "n67" label: "0" class:16 priority:10} +edge: {sourcename: "n52" targetname: "n52n51" label: "1" class:16 priority:10} +node: {title: "n59" label: "AddIs 59" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 2 "} -node: {title: "n57n46" label: "0x1Is 46" info1: "mode: Is +node: {title: "n59n46" label: "0x1Is 46" info1: "mode: Is visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n57" targetname: "n57n46" label: "0" class:16 priority:10} -edge: {sourcename: "n57" targetname: "n65" label: "1" class:16 priority:10} -node: {title: "n58" label: "Jmp 58" info1: "mode: X +edge: {sourcename: "n59" targetname: "n59n46" label: "0" class:16 priority:10} +edge: {sourcename: "n59" targetname: "n67" label: "1" class:16 priority:10} +node: {title: "n60" label: "Jmp 60" info1: "mode: X visited: 30 irg: STRENGTH_RED_EXAMPLE_m1 arity: 0 diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2-strength_reduced.vcg index dec085679..ff4291b6e 100644 --- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2-strength_reduced.vcg +++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2-strength_reduced.vcg @@ -51,179 +51,192 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -graph: { title: "g116" label: "STRENGTH_RED_EXAMPLE_m2" status:clustered color:white -graph: { title: "n106" label: "Block 106" status:clustered color:yellow -edge: {sourcename: "n106" targetname: "n151" label: "0" class:13 priority:60 color:red} -node: {title: "n107" label: "End 107" info1: "mode: X +graph: { title: "g120" label: "STRENGTH_RED_EXAMPLE_m2" status:clustered color:white +graph: { title: "n110" label: "Block 110" status:clustered color:yellow +edge: {sourcename: "n110" targetname: "n157" label: "0" class:13 priority:60 color:red} +node: {title: "n111" label: "End 111" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 1 "color: blue} } -graph: { title: "n148" label: "Block 148" status:clustered color:yellow -edge: {sourcename: "n148" targetname: "n127" label: "0" class:13 priority:60 color:red} -node: {title: "n151" label: "Return 151" info1: "mode: X +graph: { title: "n154" label: "Block 154" status:clustered color:yellow +edge: {sourcename: "n154" targetname: "n131" label: "0" class:13 priority:60 color:red} +node: {title: "n157" label: "Return 157" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 2 return in method of type STRENGTH_RED_EXAMPLE_meth_tp res 0 type: int "} -node: {title: "n151n131" label: "0x4Is 131" info1: "mode: Is +node: {title: "n157n135" label: "0x4Is 135" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n151" targetname: "n155" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n151" targetname: "n151n131" label: "1" class:16 priority:10} +edge: {sourcename: "n157" targetname: "n161" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n157" targetname: "n157n135" label: "1" class:16 priority:10} } -graph: { title: "n121" label: "Block 121" status:clustered color:yellow -edge: {sourcename: "n121" targetname: "n120" label: "0" class:13 priority:60 color:red} -backedge: {sourcename: "n121" targetname: "n142" label: "1" linestyle:dashed class:13 priority:60 color:red} -node: {title: "n155" label: "PhiM 155" info1: "mode: M +graph: { title: "n125" label: "Block 125" status:clustered color:yellow +edge: {sourcename: "n125" targetname: "n124" label: "0" class:13 priority:60 color:red} +backedge: {sourcename: "n125" targetname: "n148" label: "1" linestyle:dashed class:13 priority:60 color:red} +node: {title: "n161" label: "PhiM 161" info1: "mode: M visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 2 backedges: "color: green} -edge: {sourcename: "n155" targetname: "n114" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n155" targetname: "n140" label: "1" class:17 priority:10 color:blue} -node: {title: "n127" label: "ProjX 0 127" info1: "mode: X +edge: {sourcename: "n161" targetname: "n118" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n161" targetname: "n146" label: "1" class:17 priority:10 color:blue} +node: {title: "n131" label: "ProjX 0 131" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 1 "color: yellow} -edge: {sourcename: "n127" targetname: "n126" label: "0" class:13 priority:60 color:red} -node: {title: "n128" label: "ProjX 1 128" info1: "mode: X +edge: {sourcename: "n131" targetname: "n130" label: "0" class:13 priority:60 color:red} +node: {title: "n132" label: "ProjX 1 132" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 1 "color: yellow} -edge: {sourcename: "n128" targetname: "n126" label: "0" class:13 priority:60 color:red} -node: {title: "n126" label: "Cond 126" info1: "mode: T +edge: {sourcename: "n132" targetname: "n130" label: "0" class:13 priority:60 color:red} +node: {title: "n130" label: "Cond 130" info1: "mode: T visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 1 "} -edge: {sourcename: "n126" targetname: "n125" label: "0" class:1 priority:50} -node: {title: "n125" label: "Projb Gt 125" info1: "mode: b +edge: {sourcename: "n130" targetname: "n129" label: "0" class:1 priority:50} +node: {title: "n129" label: "Projb Gt 129" info1: "mode: b visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 1 "color: yellow} -edge: {sourcename: "n125" targetname: "n376" label: "0" class:1 priority:50} -node: {title: "n376" label: "CmpT 376" info1: "mode: T +edge: {sourcename: "n129" targetname: "n128" label: "0" class:1 priority:50} +node: {title: "n128" label: "CmpT 128" info1: "mode: T visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 2 "} -node: {title: "n376n375" label: "0x28Is 375" info1: "mode: Is +node: {title: "n128n127" label: "0xAIs 127" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n376" targetname: "n372" label: "0" class:1 priority:50} -edge: {sourcename: "n376" targetname: "n376n375" label: "1" class:16 priority:10} -node: {title: "n372" label: "PhiIs 372" info1: "mode: Is +edge: {sourcename: "n128" targetname: "n128n127" label: "0" class:16 priority:10} +edge: {sourcename: "n128" targetname: "n162" label: "1" class:1 priority:50} +node: {title: "n162" label: "PhiIs 162" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 2 backedges: "color: green} -node: {title: "n372n118" label: "0x0Is 118" info1: "mode: Is +node: {title: "n162n122" label: "0x0Is 122" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n372" targetname: "n372n118" label: "0" class:16 priority:10} -edge: {sourcename: "n372" targetname: "n373" label: "1" class:16 priority:10} +edge: {sourcename: "n162" targetname: "n162n122" label: "0" class:16 priority:10} +edge: {sourcename: "n162" targetname: "n147" label: "1" class:16 priority:10} } -graph: { title: "n117" label: "Block 117" status:clustered color:yellow -edge: {sourcename: "n117" targetname: "n111" label: "0" class:13 priority:60 color:red} -node: {title: "n120" label: "Jmp 120" info1: "mode: X +graph: { title: "n121" label: "Block 121" status:clustered color:yellow +edge: {sourcename: "n121" targetname: "n115" label: "0" class:13 priority:60 color:red} +node: {title: "n124" label: "Jmp 124" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 "} } -graph: { title: "n129" label: "Block 129" status:clustered color:yellow -edge: {sourcename: "n129" targetname: "n128" label: "0" class:13 priority:60 color:red} -node: {title: "n140" label: "ProjM 0 140" info1: "mode: M +graph: { title: "n133" label: "Block 133" status:clustered color:yellow +edge: {sourcename: "n133" targetname: "n132" label: "0" class:13 priority:60 color:red} +node: {title: "n146" label: "ProjM 0 146" info1: "mode: M visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 1 "color: yellow} -edge: {sourcename: "n140" targetname: "n138" label: "0" class:17 priority:10 color:blue} -node: {title: "n138" label: "Store 138" info1: "mode: T +edge: {sourcename: "n146" targetname: "n144" label: "0" class:17 priority:10 color:blue} +node: {title: "n144" label: "Store 144" info1: "mode: T visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 3 volatility: volatility_non_volatile "} -node: {title: "n138n136" label: "0x13Is 136" info1: "mode: Is +node: {title: "n144n142" label: "0x13Is 142" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n138" targetname: "n155" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n138" targetname: "n135" label: "1" class:1 priority:50} -edge: {sourcename: "n138" targetname: "n138n136" label: "2" class:16 priority:10} -node: {title: "n135" label: "AddP 135" info1: "mode: P +edge: {sourcename: "n144" targetname: "n161" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n144" targetname: "n141" label: "1" class:1 priority:50} +edge: {sourcename: "n144" targetname: "n144n142" label: "2" class:16 priority:10} +node: {title: "n141" label: "AddP 141" info1: "mode: P visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 2 "} -node: {title: "n135n119" label: "SymC &a 119" info1: "mode: P +node: {title: "n141n123" label: "SymC &a 123" info1: "mode: P visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 kind addr_ent -entity GlobalType.a (104) +entity GlobalType.a (108) "} -edge: {sourcename: "n135" targetname: "n372" label: "0" class:16 priority:10} -edge: {sourcename: "n135" targetname: "n135n119" label: "1" class:16 priority:10} -node: {title: "n142" label: "Jmp 142" info1: "mode: X +edge: {sourcename: "n141" targetname: "n139" label: "0" class:1 priority:50} +edge: {sourcename: "n141" targetname: "n141n123" label: "1" class:16 priority:10} +node: {title: "n139" label: "ShlIs 139" info1: "mode: Is +visited: 24 +irg: STRENGTH_RED_EXAMPLE_m2 +arity: 2 +"} +node: {title: "n139n138" label: "0x2Iu 138" info1: "mode: Iu +visited: 24 +irg: STRENGTH_RED_EXAMPLE_m2 +arity: 0 +Const of type type_unknown +"color: yellow} +edge: {sourcename: "n139" targetname: "n162" label: "0" class:16 priority:10} +edge: {sourcename: "n139" targetname: "n139n138" label: "1" class:16 priority:10} +node: {title: "n148" label: "Jmp 148" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 "} -node: {title: "n373" label: "AddIs 373" info1: "mode: Is +node: {title: "n147" label: "AddIs 147" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 2 "} -node: {title: "n373n131" label: "0x4Is 131" info1: "mode: Is +node: {title: "n147n134" label: "0x1Is 134" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n373" targetname: "n373n131" label: "0" class:16 priority:10} -edge: {sourcename: "n373" targetname: "n372" label: "1" class:16 priority:10} +edge: {sourcename: "n147" targetname: "n147n134" label: "0" class:16 priority:10} +edge: {sourcename: "n147" targetname: "n162" label: "1" class:16 priority:10} } -graph: { title: "n108" label: "Block 108" status:clustered color:yellow -edge: {sourcename: "n108" targetname: "n111" label: "0" class:13 priority:60 color:red} -node: {title: "n114" label: "ProjM 1 114" info1: "mode: M +graph: { title: "n112" label: "Block 112" status:clustered color:yellow +edge: {sourcename: "n112" targetname: "n115" label: "0" class:13 priority:60 color:red} +node: {title: "n118" label: "ProjM 1 118" info1: "mode: M visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 1 "color: yellow} -edge: {sourcename: "n114" targetname: "n109" label: "0" class:17 priority:10 color:blue} -node: {title: "n111" label: "ProjX 0 111" info1: "mode: X +edge: {sourcename: "n118" targetname: "n113" label: "0" class:17 priority:10 color:blue} +node: {title: "n115" label: "ProjX 0 115" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 1 "color: yellow} -edge: {sourcename: "n111" targetname: "n109" label: "0" class:13 priority:60 color:red} -node: {title: "n109" label: "Start 109" info1: "mode: T +edge: {sourcename: "n115" targetname: "n113" label: "0" class:13 priority:60 color:red} +node: {title: "n113" label: "Start 113" info1: "mode: T visited: 24 irg: STRENGTH_RED_EXAMPLE_m2 arity: 0 diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3-strength_reduced.vcg index 1714d7006..841ae3743 100644 --- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3-strength_reduced.vcg +++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3-strength_reduced.vcg @@ -51,199 +51,186 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -graph: { title: "g177" label: "STRENGTH_RED_EXAMPLE_m3" status:clustered color:white -graph: { title: "n167" label: "Block 167" status:clustered color:yellow -edge: {sourcename: "n167" targetname: "n211" label: "0" class:13 priority:60 color:red} -node: {title: "n168" label: "End 168" info1: "mode: X +graph: { title: "g183" label: "STRENGTH_RED_EXAMPLE_m3" status:clustered color:white +graph: { title: "n173" label: "Block 173" status:clustered color:yellow +edge: {sourcename: "n173" targetname: "n219" label: "0" class:13 priority:60 color:red} +node: {title: "n174" label: "End 174" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 1 "color: blue} } -graph: { title: "n208" label: "Block 208" status:clustered color:yellow -edge: {sourcename: "n208" targetname: "n188" label: "0" class:13 priority:60 color:red} -node: {title: "n211" label: "Return 211" info1: "mode: X +graph: { title: "n216" label: "Block 216" status:clustered color:yellow +edge: {sourcename: "n216" targetname: "n194" label: "0" class:13 priority:60 color:red} +node: {title: "n219" label: "Return 219" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 2 return in method of type STRENGTH_RED_EXAMPLE_meth_tp res 0 type: int "} -node: {title: "n211n192" label: "0x4Is 192" info1: "mode: Is +node: {title: "n219n198" label: "0x4Is 198" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n211" targetname: "n215" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n211" targetname: "n211n192" label: "1" class:16 priority:10} +edge: {sourcename: "n219" targetname: "n223" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n219" targetname: "n219n198" label: "1" class:16 priority:10} } -graph: { title: "n182" label: "Block 182" status:clustered color:yellow -edge: {sourcename: "n182" targetname: "n181" label: "0" class:13 priority:60 color:red} -backedge: {sourcename: "n182" targetname: "n202" label: "1" linestyle:dashed class:13 priority:60 color:red} -node: {title: "n215" label: "PhiM 215" info1: "mode: M -visited: 25 -irg: STRENGTH_RED_EXAMPLE_m3 -arity: 2 backedges: -"color: green} -edge: {sourcename: "n215" targetname: "n175" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n215" targetname: "n200" label: "1" class:17 priority:10 color:blue} -node: {title: "n388" label: "PhiIs 388" info1: "mode: Is +graph: { title: "n188" label: "Block 188" status:clustered color:yellow +edge: {sourcename: "n188" targetname: "n187" label: "0" class:13 priority:60 color:red} +backedge: {sourcename: "n188" targetname: "n210" label: "1" linestyle:dashed class:13 priority:60 color:red} +node: {title: "n223" label: "PhiM 223" info1: "mode: M visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 2 backedges: "color: green} -node: {title: "n388n386" label: "0x28Is 386" info1: "mode: Is -visited: 25 -irg: STRENGTH_RED_EXAMPLE_m3 -arity: 0 -Const of type type_unknown -"color: yellow} -edge: {sourcename: "n388" targetname: "n388n386" label: "0" class:16 priority:10} -edge: {sourcename: "n388" targetname: "n389" label: "1" class:16 priority:10} -node: {title: "n188" label: "ProjX 0 188" info1: "mode: X +edge: {sourcename: "n223" targetname: "n181" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n223" targetname: "n208" label: "1" class:17 priority:10 color:blue} +node: {title: "n194" label: "ProjX 0 194" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 1 "color: yellow} -edge: {sourcename: "n188" targetname: "n187" label: "0" class:13 priority:60 color:red} -node: {title: "n189" label: "ProjX 1 189" info1: "mode: X +edge: {sourcename: "n194" targetname: "n193" label: "0" class:13 priority:60 color:red} +node: {title: "n195" label: "ProjX 1 195" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 1 "color: yellow} -edge: {sourcename: "n189" targetname: "n187" label: "0" class:13 priority:60 color:red} -node: {title: "n187" label: "Cond 187" info1: "mode: T +edge: {sourcename: "n195" targetname: "n193" label: "0" class:13 priority:60 color:red} +node: {title: "n193" label: "Cond 193" info1: "mode: T visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 1 "} -edge: {sourcename: "n187" targetname: "n186" label: "0" class:1 priority:50} -node: {title: "n186" label: "Projb Lt 186" info1: "mode: b +edge: {sourcename: "n193" targetname: "n192" label: "0" class:1 priority:50} +node: {title: "n192" label: "Projb Lt 192" info1: "mode: b visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 1 "color: yellow} -edge: {sourcename: "n186" targetname: "n185" label: "0" class:1 priority:50} -node: {title: "n185" label: "CmpT 185" info1: "mode: T +edge: {sourcename: "n192" targetname: "n191" label: "0" class:1 priority:50} +node: {title: "n191" label: "CmpT 191" info1: "mode: T visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 2 "} -node: {title: "n185n184" label: "0x0Is 184" info1: "mode: Is +node: {title: "n191n190" label: "0x0Is 190" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n185" targetname: "n185n184" label: "0" class:16 priority:10} -edge: {sourcename: "n185" targetname: "n216" label: "1" class:1 priority:50} -node: {title: "n216" label: "PhiIs 216" info1: "mode: Is +edge: {sourcename: "n191" targetname: "n191n190" label: "0" class:16 priority:10} +edge: {sourcename: "n191" targetname: "n224" label: "1" class:1 priority:50} +node: {title: "n224" label: "PhiIs 224" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 2 backedges: "color: green} -node: {title: "n216n179" label: "0xAIs 179" info1: "mode: Is +node: {title: "n224n185" label: "0xAIs 185" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n216" targetname: "n216n179" label: "0" class:16 priority:10} -edge: {sourcename: "n216" targetname: "n201" label: "1" class:16 priority:10} +edge: {sourcename: "n224" targetname: "n224n185" label: "0" class:16 priority:10} +edge: {sourcename: "n224" targetname: "n209" label: "1" class:16 priority:10} } -graph: { title: "n178" label: "Block 178" status:clustered color:yellow -edge: {sourcename: "n178" targetname: "n172" label: "0" class:13 priority:60 color:red} -node: {title: "n181" label: "Jmp 181" info1: "mode: X +graph: { title: "n184" label: "Block 184" status:clustered color:yellow +edge: {sourcename: "n184" targetname: "n178" label: "0" class:13 priority:60 color:red} +node: {title: "n187" label: "Jmp 187" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 "} } -graph: { title: "n190" label: "Block 190" status:clustered color:yellow -edge: {sourcename: "n190" targetname: "n189" label: "0" class:13 priority:60 color:red} -node: {title: "n200" label: "ProjM 0 200" info1: "mode: M +graph: { title: "n196" label: "Block 196" status:clustered color:yellow +edge: {sourcename: "n196" targetname: "n195" label: "0" class:13 priority:60 color:red} +node: {title: "n208" label: "ProjM 0 208" info1: "mode: M visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 1 "color: yellow} -edge: {sourcename: "n200" targetname: "n198" label: "0" class:17 priority:10 color:blue} -node: {title: "n198" label: "Store 198" info1: "mode: T +edge: {sourcename: "n208" targetname: "n206" label: "0" class:17 priority:10 color:blue} +node: {title: "n206" label: "Store 206" info1: "mode: T visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 3 volatility: volatility_non_volatile "} -edge: {sourcename: "n198" targetname: "n215" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n198" targetname: "n196" label: "1" class:1 priority:50} -edge: {sourcename: "n198" targetname: "n216" label: "2" class:16 priority:10} -node: {title: "n196" label: "AddP 196" info1: "mode: P +edge: {sourcename: "n206" targetname: "n223" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n206" targetname: "n204" label: "1" class:1 priority:50} +edge: {sourcename: "n206" targetname: "n224" label: "2" class:16 priority:10} +node: {title: "n204" label: "AddP 204" info1: "mode: P visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 2 "} -node: {title: "n196n180" label: "SymC &a 180" info1: "mode: P +node: {title: "n204n186" label: "SymC &a 186" info1: "mode: P visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 kind addr_ent -entity GlobalType.a (165) +entity GlobalType.a (171) "} -edge: {sourcename: "n196" targetname: "n388" label: "0" class:16 priority:10} -edge: {sourcename: "n196" targetname: "n196n180" label: "1" class:16 priority:10} -node: {title: "n389" label: "SubIs 389" info1: "mode: Is +edge: {sourcename: "n204" targetname: "n202" label: "0" class:1 priority:50} +edge: {sourcename: "n204" targetname: "n204n186" label: "1" class:16 priority:10} +node: {title: "n202" label: "ShlIs 202" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 2 "} -node: {title: "n389n192" label: "0x4Is 192" info1: "mode: Is +node: {title: "n202n201" label: "0x2Iu 201" info1: "mode: Iu visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n389" targetname: "n388" label: "0" class:16 priority:10} -edge: {sourcename: "n389" targetname: "n389n192" label: "1" class:16 priority:10} -node: {title: "n202" label: "Jmp 202" info1: "mode: X +edge: {sourcename: "n202" targetname: "n224" label: "0" class:16 priority:10} +edge: {sourcename: "n202" targetname: "n202n201" label: "1" class:16 priority:10} +node: {title: "n210" label: "Jmp 210" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 "} -node: {title: "n201" label: "SubIs 201" info1: "mode: Is +node: {title: "n209" label: "SubIs 209" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 2 "} -node: {title: "n201n191" label: "0x1Is 191" info1: "mode: Is +node: {title: "n209n197" label: "0x1Is 197" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n201" targetname: "n216" label: "0" class:16 priority:10} -edge: {sourcename: "n201" targetname: "n201n191" label: "1" class:16 priority:10} +edge: {sourcename: "n209" targetname: "n224" label: "0" class:16 priority:10} +edge: {sourcename: "n209" targetname: "n209n197" label: "1" class:16 priority:10} } -graph: { title: "n169" label: "Block 169" status:clustered color:yellow -edge: {sourcename: "n169" targetname: "n172" label: "0" class:13 priority:60 color:red} -node: {title: "n175" label: "ProjM 1 175" info1: "mode: M +graph: { title: "n175" label: "Block 175" status:clustered color:yellow +edge: {sourcename: "n175" targetname: "n178" label: "0" class:13 priority:60 color:red} +node: {title: "n181" label: "ProjM 1 181" info1: "mode: M visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 1 "color: yellow} -edge: {sourcename: "n175" targetname: "n170" label: "0" class:17 priority:10 color:blue} -node: {title: "n172" label: "ProjX 0 172" info1: "mode: X +edge: {sourcename: "n181" targetname: "n176" label: "0" class:17 priority:10 color:blue} +node: {title: "n178" label: "ProjX 0 178" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 1 "color: yellow} -edge: {sourcename: "n172" targetname: "n170" label: "0" class:13 priority:60 color:red} -node: {title: "n170" label: "Start 170" info1: "mode: T +edge: {sourcename: "n178" targetname: "n176" label: "0" class:13 priority:60 color:red} +node: {title: "n176" label: "Start 176" info1: "mode: T visited: 25 irg: STRENGTH_RED_EXAMPLE_m3 arity: 0 diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4-strength_reduced.vcg index c1ecf677b..439c8a1e5 100644 --- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4-strength_reduced.vcg +++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4-strength_reduced.vcg @@ -51,199 +51,186 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -graph: { title: "g237" label: "STRENGTH_RED_EXAMPLE_m4" status:clustered color:white -graph: { title: "n227" label: "Block 227" status:clustered color:yellow -edge: {sourcename: "n227" targetname: "n271" label: "0" class:13 priority:60 color:red} -node: {title: "n228" label: "End 228" info1: "mode: X +graph: { title: "g245" label: "STRENGTH_RED_EXAMPLE_m4" status:clustered color:white +graph: { title: "n235" label: "Block 235" status:clustered color:yellow +edge: {sourcename: "n235" targetname: "n281" label: "0" class:13 priority:60 color:red} +node: {title: "n236" label: "End 236" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 1 "color: blue} } -graph: { title: "n268" label: "Block 268" status:clustered color:yellow -edge: {sourcename: "n268" targetname: "n248" label: "0" class:13 priority:60 color:red} -node: {title: "n271" label: "Return 271" info1: "mode: X +graph: { title: "n278" label: "Block 278" status:clustered color:yellow +edge: {sourcename: "n278" targetname: "n256" label: "0" class:13 priority:60 color:red} +node: {title: "n281" label: "Return 281" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 2 return in method of type STRENGTH_RED_EXAMPLE_meth_tp res 0 type: int "} -node: {title: "n271n252" label: "0x4Is 252" info1: "mode: Is +node: {title: "n281n260" label: "0x4Is 260" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n271" targetname: "n275" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n271" targetname: "n271n252" label: "1" class:16 priority:10} +edge: {sourcename: "n281" targetname: "n285" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n281" targetname: "n281n260" label: "1" class:16 priority:10} } -graph: { title: "n242" label: "Block 242" status:clustered color:yellow -edge: {sourcename: "n242" targetname: "n241" label: "0" class:13 priority:60 color:red} -backedge: {sourcename: "n242" targetname: "n262" label: "1" linestyle:dashed class:13 priority:60 color:red} -node: {title: "n275" label: "PhiM 275" info1: "mode: M -visited: 25 -irg: STRENGTH_RED_EXAMPLE_m4 -arity: 2 backedges: -"color: green} -edge: {sourcename: "n275" targetname: "n235" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n275" targetname: "n261" label: "1" class:17 priority:10 color:blue} -node: {title: "n401" label: "PhiIs 401" info1: "mode: Is +graph: { title: "n250" label: "Block 250" status:clustered color:yellow +edge: {sourcename: "n250" targetname: "n249" label: "0" class:13 priority:60 color:red} +backedge: {sourcename: "n250" targetname: "n272" label: "1" linestyle:dashed class:13 priority:60 color:red} +node: {title: "n285" label: "PhiM 285" info1: "mode: M visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 2 backedges: "color: green} -node: {title: "n401n239" label: "0x0Is 239" info1: "mode: Is -visited: 25 -irg: STRENGTH_RED_EXAMPLE_m4 -arity: 0 -Const of type type_unknown -"color: yellow} -edge: {sourcename: "n401" targetname: "n401n239" label: "0" class:16 priority:10} -edge: {sourcename: "n401" targetname: "n402" label: "1" class:16 priority:10} -node: {title: "n248" label: "ProjX 0 248" info1: "mode: X +edge: {sourcename: "n285" targetname: "n243" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n285" targetname: "n271" label: "1" class:17 priority:10 color:blue} +node: {title: "n256" label: "ProjX 0 256" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 1 "color: yellow} -edge: {sourcename: "n248" targetname: "n247" label: "0" class:13 priority:60 color:red} -node: {title: "n249" label: "ProjX 1 249" info1: "mode: X +edge: {sourcename: "n256" targetname: "n255" label: "0" class:13 priority:60 color:red} +node: {title: "n257" label: "ProjX 1 257" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 1 "color: yellow} -edge: {sourcename: "n249" targetname: "n247" label: "0" class:13 priority:60 color:red} -node: {title: "n247" label: "Cond 247" info1: "mode: T +edge: {sourcename: "n257" targetname: "n255" label: "0" class:13 priority:60 color:red} +node: {title: "n255" label: "Cond 255" info1: "mode: T visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 1 "} -edge: {sourcename: "n247" targetname: "n246" label: "0" class:1 priority:50} -node: {title: "n246" label: "Projb Gt 246" info1: "mode: b +edge: {sourcename: "n255" targetname: "n254" label: "0" class:1 priority:50} +node: {title: "n254" label: "Projb Gt 254" info1: "mode: b visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 1 "color: yellow} -edge: {sourcename: "n246" targetname: "n245" label: "0" class:1 priority:50} -node: {title: "n245" label: "CmpT 245" info1: "mode: T +edge: {sourcename: "n254" targetname: "n253" label: "0" class:1 priority:50} +node: {title: "n253" label: "CmpT 253" info1: "mode: T visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 2 "} -node: {title: "n245n244" label: "0xAIs 244" info1: "mode: Is +node: {title: "n253n252" label: "0xAIs 252" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n245" targetname: "n245n244" label: "0" class:16 priority:10} -edge: {sourcename: "n245" targetname: "n276" label: "1" class:1 priority:50} -node: {title: "n276" label: "PhiIs 276" info1: "mode: Is +edge: {sourcename: "n253" targetname: "n253n252" label: "0" class:16 priority:10} +edge: {sourcename: "n253" targetname: "n286" label: "1" class:1 priority:50} +node: {title: "n286" label: "PhiIs 286" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 2 backedges: "color: green} -node: {title: "n276n239" label: "0x0Is 239" info1: "mode: Is +node: {title: "n286n247" label: "0x0Is 247" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n276" targetname: "n276n239" label: "0" class:16 priority:10} -edge: {sourcename: "n276" targetname: "n254" label: "1" class:16 priority:10} +edge: {sourcename: "n286" targetname: "n286n247" label: "0" class:16 priority:10} +edge: {sourcename: "n286" targetname: "n262" label: "1" class:16 priority:10} } -graph: { title: "n238" label: "Block 238" status:clustered color:yellow -edge: {sourcename: "n238" targetname: "n232" label: "0" class:13 priority:60 color:red} -node: {title: "n241" label: "Jmp 241" info1: "mode: X +graph: { title: "n246" label: "Block 246" status:clustered color:yellow +edge: {sourcename: "n246" targetname: "n240" label: "0" class:13 priority:60 color:red} +node: {title: "n249" label: "Jmp 249" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 "} } -graph: { title: "n250" label: "Block 250" status:clustered color:yellow -edge: {sourcename: "n250" targetname: "n249" label: "0" class:13 priority:60 color:red} -node: {title: "n261" label: "ProjM 0 261" info1: "mode: M +graph: { title: "n258" label: "Block 258" status:clustered color:yellow +edge: {sourcename: "n258" targetname: "n257" label: "0" class:13 priority:60 color:red} +node: {title: "n271" label: "ProjM 0 271" info1: "mode: M visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 1 "color: yellow} -edge: {sourcename: "n261" targetname: "n259" label: "0" class:17 priority:10 color:blue} -node: {title: "n259" label: "Store 259" info1: "mode: T +edge: {sourcename: "n271" targetname: "n269" label: "0" class:17 priority:10 color:blue} +node: {title: "n269" label: "Store 269" info1: "mode: T visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 3 volatility: volatility_non_volatile "} -edge: {sourcename: "n259" targetname: "n275" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n259" targetname: "n403" label: "1" class:1 priority:50} -edge: {sourcename: "n259" targetname: "n254" label: "2" class:1 priority:50} -node: {title: "n403" label: "AddP 403" info1: "mode: P +edge: {sourcename: "n269" targetname: "n285" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n269" targetname: "n267" label: "1" class:1 priority:50} +edge: {sourcename: "n269" targetname: "n262" label: "2" class:1 priority:50} +node: {title: "n267" label: "AddP 267" info1: "mode: P visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 2 "} -node: {title: "n403n240" label: "SymC &a 240" info1: "mode: P +node: {title: "n267n248" label: "SymC &a 248" info1: "mode: P visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 kind addr_ent -entity GlobalType.a (225) +entity GlobalType.a (233) "} -edge: {sourcename: "n403" targetname: "n403n240" label: "0" class:16 priority:10} -edge: {sourcename: "n403" targetname: "n402" label: "1" class:1 priority:50} -node: {title: "n402" label: "AddIs 402" info1: "mode: Is +edge: {sourcename: "n267" targetname: "n265" label: "0" class:1 priority:50} +edge: {sourcename: "n267" targetname: "n267n248" label: "1" class:16 priority:10} +node: {title: "n265" label: "ShlIs 265" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 2 "} -node: {title: "n402n252" label: "0x4Is 252" info1: "mode: Is +node: {title: "n265n264" label: "0x2Iu 264" info1: "mode: Iu visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n402" targetname: "n402n252" label: "0" class:16 priority:10} -edge: {sourcename: "n402" targetname: "n401" label: "1" class:16 priority:10} -node: {title: "n262" label: "Jmp 262" info1: "mode: X +edge: {sourcename: "n265" targetname: "n262" label: "0" class:1 priority:50} +edge: {sourcename: "n265" targetname: "n265n264" label: "1" class:16 priority:10} +node: {title: "n272" label: "Jmp 272" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 "} -node: {title: "n254" label: "AddIs 254" info1: "mode: Is +node: {title: "n262" label: "AddIs 262" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 2 "} -node: {title: "n254n251" label: "0x1Is 251" info1: "mode: Is +node: {title: "n262n259" label: "0x1Is 259" info1: "mode: Is visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n254" targetname: "n254n251" label: "0" class:16 priority:10} -edge: {sourcename: "n254" targetname: "n276" label: "1" class:16 priority:10} +edge: {sourcename: "n262" targetname: "n262n259" label: "0" class:16 priority:10} +edge: {sourcename: "n262" targetname: "n286" label: "1" class:16 priority:10} } -graph: { title: "n229" label: "Block 229" status:clustered color:yellow -edge: {sourcename: "n229" targetname: "n232" label: "0" class:13 priority:60 color:red} -node: {title: "n235" label: "ProjM 1 235" info1: "mode: M +graph: { title: "n237" label: "Block 237" status:clustered color:yellow +edge: {sourcename: "n237" targetname: "n240" label: "0" class:13 priority:60 color:red} +node: {title: "n243" label: "ProjM 1 243" info1: "mode: M visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 1 "color: yellow} -edge: {sourcename: "n235" targetname: "n230" label: "0" class:17 priority:10 color:blue} -node: {title: "n232" label: "ProjX 0 232" info1: "mode: X +edge: {sourcename: "n243" targetname: "n238" label: "0" class:17 priority:10 color:blue} +node: {title: "n240" label: "ProjX 0 240" info1: "mode: X visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 1 "color: yellow} -edge: {sourcename: "n232" targetname: "n230" label: "0" class:13 priority:60 color:red} -node: {title: "n230" label: "Start 230" info1: "mode: T +edge: {sourcename: "n240" targetname: "n238" label: "0" class:13 priority:60 color:red} +node: {title: "n238" label: "Start 238" info1: "mode: T visited: 25 irg: STRENGTH_RED_EXAMPLE_m4 arity: 0 diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5-strength_reduced.vcg index f8b626e85..c174c86ec 100644 --- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5-strength_reduced.vcg +++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5-strength_reduced.vcg @@ -51,179 +51,192 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -graph: { title: "g297" label: "STRENGTH_RED_EXAMPLE_m5" status:clustered color:white -graph: { title: "n287" label: "Block 287" status:clustered color:yellow -edge: {sourcename: "n287" targetname: "n332" label: "0" class:13 priority:60 color:red} -node: {title: "n288" label: "End 288" info1: "mode: X +graph: { title: "g307" label: "STRENGTH_RED_EXAMPLE_m5" status:clustered color:white +graph: { title: "n297" label: "Block 297" status:clustered color:yellow +edge: {sourcename: "n297" targetname: "n344" label: "0" class:13 priority:60 color:red} +node: {title: "n298" label: "End 298" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 1 "color: blue} } -graph: { title: "n329" label: "Block 329" status:clustered color:yellow -edge: {sourcename: "n329" targetname: "n308" label: "0" class:13 priority:60 color:red} -node: {title: "n332" label: "Return 332" info1: "mode: X +graph: { title: "n341" label: "Block 341" status:clustered color:yellow +edge: {sourcename: "n341" targetname: "n318" label: "0" class:13 priority:60 color:red} +node: {title: "n344" label: "Return 344" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 2 return in method of type STRENGTH_RED_EXAMPLE_meth_tp res 0 type: int "} -node: {title: "n332n312" label: "0x4Is 312" info1: "mode: Is +node: {title: "n344n322" label: "0x4Is 322" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n332" targetname: "n336" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n332" targetname: "n332n312" label: "1" class:16 priority:10} +edge: {sourcename: "n344" targetname: "n348" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n344" targetname: "n344n322" label: "1" class:16 priority:10} } -graph: { title: "n302" label: "Block 302" status:clustered color:yellow -edge: {sourcename: "n302" targetname: "n301" label: "0" class:13 priority:60 color:red} -backedge: {sourcename: "n302" targetname: "n323" label: "1" linestyle:dashed class:13 priority:60 color:red} -node: {title: "n336" label: "PhiM 336" info1: "mode: M +graph: { title: "n312" label: "Block 312" status:clustered color:yellow +edge: {sourcename: "n312" targetname: "n311" label: "0" class:13 priority:60 color:red} +backedge: {sourcename: "n312" targetname: "n335" label: "1" linestyle:dashed class:13 priority:60 color:red} +node: {title: "n348" label: "PhiM 348" info1: "mode: M visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 2 backedges: "color: green} -edge: {sourcename: "n336" targetname: "n295" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n336" targetname: "n322" label: "1" class:17 priority:10 color:blue} -node: {title: "n308" label: "ProjX 0 308" info1: "mode: X +edge: {sourcename: "n348" targetname: "n305" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n348" targetname: "n334" label: "1" class:17 priority:10 color:blue} +node: {title: "n318" label: "ProjX 0 318" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 1 "color: yellow} -edge: {sourcename: "n308" targetname: "n307" label: "0" class:13 priority:60 color:red} -node: {title: "n309" label: "ProjX 1 309" info1: "mode: X +edge: {sourcename: "n318" targetname: "n317" label: "0" class:13 priority:60 color:red} +node: {title: "n319" label: "ProjX 1 319" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 1 "color: yellow} -edge: {sourcename: "n309" targetname: "n307" label: "0" class:13 priority:60 color:red} -node: {title: "n307" label: "Cond 307" info1: "mode: T +edge: {sourcename: "n319" targetname: "n317" label: "0" class:13 priority:60 color:red} +node: {title: "n317" label: "Cond 317" info1: "mode: T visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 1 "} -edge: {sourcename: "n307" targetname: "n306" label: "0" class:1 priority:50} -node: {title: "n306" label: "Projb Lt 306" info1: "mode: b +edge: {sourcename: "n317" targetname: "n316" label: "0" class:1 priority:50} +node: {title: "n316" label: "Projb Lt 316" info1: "mode: b visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 1 "color: yellow} -edge: {sourcename: "n306" targetname: "n420" label: "0" class:1 priority:50} -node: {title: "n420" label: "CmpT 420" info1: "mode: T +edge: {sourcename: "n316" targetname: "n315" label: "0" class:1 priority:50} +node: {title: "n315" label: "CmpT 315" info1: "mode: T visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 2 "} -node: {title: "n420n304" label: "0x0Is 304" info1: "mode: Is +node: {title: "n315n314" label: "0x0Is 314" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n420" targetname: "n415" label: "0" class:1 priority:50} -edge: {sourcename: "n420" targetname: "n420n304" label: "1" class:16 priority:10} -node: {title: "n415" label: "PhiIs 415" info1: "mode: Is +edge: {sourcename: "n315" targetname: "n315n314" label: "0" class:16 priority:10} +edge: {sourcename: "n315" targetname: "n349" label: "1" class:1 priority:50} +node: {title: "n349" label: "PhiIs 349" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 2 backedges: "color: green} -node: {title: "n415n413" label: "0x28Is 413" info1: "mode: Is +node: {title: "n349n309" label: "0xAIs 309" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n415" targetname: "n415n413" label: "0" class:16 priority:10} -edge: {sourcename: "n415" targetname: "n416" label: "1" class:16 priority:10} +edge: {sourcename: "n349" targetname: "n349n309" label: "0" class:16 priority:10} +edge: {sourcename: "n349" targetname: "n324" label: "1" class:16 priority:10} } -graph: { title: "n298" label: "Block 298" status:clustered color:yellow -edge: {sourcename: "n298" targetname: "n292" label: "0" class:13 priority:60 color:red} -node: {title: "n301" label: "Jmp 301" info1: "mode: X +graph: { title: "n308" label: "Block 308" status:clustered color:yellow +edge: {sourcename: "n308" targetname: "n302" label: "0" class:13 priority:60 color:red} +node: {title: "n311" label: "Jmp 311" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 "} } -graph: { title: "n310" label: "Block 310" status:clustered color:yellow -edge: {sourcename: "n310" targetname: "n309" label: "0" class:13 priority:60 color:red} -node: {title: "n322" label: "ProjM 0 322" info1: "mode: M +graph: { title: "n320" label: "Block 320" status:clustered color:yellow +edge: {sourcename: "n320" targetname: "n319" label: "0" class:13 priority:60 color:red} +node: {title: "n334" label: "ProjM 0 334" info1: "mode: M visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 1 "color: yellow} -edge: {sourcename: "n322" targetname: "n320" label: "0" class:17 priority:10 color:blue} -node: {title: "n320" label: "Store 320" info1: "mode: T +edge: {sourcename: "n334" targetname: "n332" label: "0" class:17 priority:10 color:blue} +node: {title: "n332" label: "Store 332" info1: "mode: T visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 3 volatility: volatility_non_volatile "} -node: {title: "n320n318" label: "0x13Is 318" info1: "mode: Is +node: {title: "n332n330" label: "0x13Is 330" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n320" targetname: "n336" label: "0" class:17 priority:10 color:blue} -edge: {sourcename: "n320" targetname: "n417" label: "1" class:1 priority:50} -edge: {sourcename: "n320" targetname: "n320n318" label: "2" class:16 priority:10} -node: {title: "n417" label: "AddP 417" info1: "mode: P +edge: {sourcename: "n332" targetname: "n348" label: "0" class:17 priority:10 color:blue} +edge: {sourcename: "n332" targetname: "n329" label: "1" class:1 priority:50} +edge: {sourcename: "n332" targetname: "n332n330" label: "2" class:16 priority:10} +node: {title: "n329" label: "AddP 329" info1: "mode: P visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 2 "} -node: {title: "n417n300" label: "SymC &a 300" info1: "mode: P +node: {title: "n329n310" label: "SymC &a 310" info1: "mode: P visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 kind addr_ent -entity GlobalType.a (285) +entity GlobalType.a (295) "} -edge: {sourcename: "n417" targetname: "n417n300" label: "0" class:16 priority:10} -edge: {sourcename: "n417" targetname: "n416" label: "1" class:1 priority:50} -node: {title: "n323" label: "Jmp 323" info1: "mode: X +edge: {sourcename: "n329" targetname: "n327" label: "0" class:1 priority:50} +edge: {sourcename: "n329" targetname: "n329n310" label: "1" class:16 priority:10} +node: {title: "n327" label: "ShlIs 327" info1: "mode: Is +visited: 24 +irg: STRENGTH_RED_EXAMPLE_m5 +arity: 2 +"} +node: {title: "n327n326" label: "0x2Iu 326" info1: "mode: Iu +visited: 24 +irg: STRENGTH_RED_EXAMPLE_m5 +arity: 0 +Const of type type_unknown +"color: yellow} +edge: {sourcename: "n327" targetname: "n324" label: "0" class:1 priority:50} +edge: {sourcename: "n327" targetname: "n327n326" label: "1" class:16 priority:10} +node: {title: "n335" label: "Jmp 335" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 "} -node: {title: "n416" label: "SubIs 416" info1: "mode: Is +node: {title: "n324" label: "SubIs 324" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 2 "} -node: {title: "n416n312" label: "0x4Is 312" info1: "mode: Is +node: {title: "n324n321" label: "0x1Is 321" info1: "mode: Is visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 Const of type type_unknown "color: yellow} -edge: {sourcename: "n416" targetname: "n415" label: "0" class:16 priority:10} -edge: {sourcename: "n416" targetname: "n416n312" label: "1" class:16 priority:10} +edge: {sourcename: "n324" targetname: "n349" label: "0" class:16 priority:10} +edge: {sourcename: "n324" targetname: "n324n321" label: "1" class:16 priority:10} } -graph: { title: "n289" label: "Block 289" status:clustered color:yellow -edge: {sourcename: "n289" targetname: "n292" label: "0" class:13 priority:60 color:red} -node: {title: "n295" label: "ProjM 1 295" info1: "mode: M +graph: { title: "n299" label: "Block 299" status:clustered color:yellow +edge: {sourcename: "n299" targetname: "n302" label: "0" class:13 priority:60 color:red} +node: {title: "n305" label: "ProjM 1 305" info1: "mode: M visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 1 "color: yellow} -edge: {sourcename: "n295" targetname: "n290" label: "0" class:17 priority:10 color:blue} -node: {title: "n292" label: "ProjX 0 292" info1: "mode: X +edge: {sourcename: "n305" targetname: "n300" label: "0" class:17 priority:10 color:blue} +node: {title: "n302" label: "ProjX 0 302" info1: "mode: X visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 1 "color: yellow} -edge: {sourcename: "n292" targetname: "n290" label: "0" class:13 priority:60 color:red} -node: {title: "n290" label: "Start 290" info1: "mode: T +edge: {sourcename: "n302" targetname: "n300" label: "0" class:13 priority:60 color:red} +node: {title: "n300" label: "Start 300" info1: "mode: T visited: 24 irg: STRENGTH_RED_EXAMPLE_m5 arity: 0 diff --git a/testprograms/ref-results/run-result.txt b/testprograms/ref-results/run-result.txt index 5436a627f..2321b9a96 100644 --- a/testprograms/ref-results/run-result.txt +++ b/testprograms/ref-results/run-result.txt @@ -153,51 +153,11 @@ Use xvcg to view these graphs: Creating an IR graph: IF_EXAMPLE... Done building the graph. Dumping and optimizing it. -The constant of Reducing node is: reduce_itervar(l.221) ConstIs: 47 (0x80f3a38) -The Phi node isreduce_itervar(l.222) PhiIs: 65 (0x80f3f2c) -Reducing node: reduce_itervar(l.223) MulIs: 50 (0x80f3b10) - iter var is reduce_itervar(l.224) AddIs: 57 (0x80f3d2c) - in graph reduce_itervar(l.225) graph STRENGTH_RED_EXAMPLE_m1: 33 (0x80f3220) in class GlobalType. -The constant of Reducing node is: reduce_itervar(l.221) ConstIs: 47 (0x80f3a38) -The Phi node isreduce_itervar(l.222) PhiIs: 89 (0x80f5bf8) -Reducing node: reduce_itervar(l.223) MulIs: 76 (0x80f427c) - iter var is reduce_itervar(l.224) SubIs: 83 (0x80f5a54) - in graph reduce_itervar(l.225) graph STRENGTH_RED_EXAMPLE_m1: 33 (0x80f3220) in class GlobalType. Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m1 -.The constant of Reducing node is: reduce_itervar(l.221) ConstIs: 131 (0x80f7398) -The Phi node isreduce_itervar(l.222) PhiIs: 156 (0x80f7a28) -Reducing node: reduce_itervar(l.223) MulIs: 133 (0x80f7424) - iter var is reduce_itervar(l.224) AddIs: 141 (0x80f7688) - in graph reduce_itervar(l.225) graph STRENGTH_RED_EXAMPLE_m2: 116 (0x80f6b20) in class GlobalType. -It is possibale to exchange the Cmp with a new Cmp -The constant of Cmp node is: reduce_itervar(l.291) ConstIs: 123 (0x80f7128) -The Phi node is reduce_itervar(l.292) PhiIs: 156 (0x80f7a28) -Cmp node: reduce_itervar(l.293) CmpT: 124 (0x80f7170) - in graph reduce_itervar(l.294) graph STRENGTH_RED_EXAMPLE_m2: 116 (0x80f6b20) in class GlobalType. -Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m2 -.The constant of Reducing node is: reduce_itervar(l.221) ConstIs: 192 (0x80f9c18) -The Phi node isreduce_itervar(l.222) PhiIs: 216 (0x80fa260) -Reducing node: reduce_itervar(l.223) MulIs: 194 (0x80f9ca4) - iter var is reduce_itervar(l.224) SubIs: 201 (0x80f9ec0) - in graph reduce_itervar(l.225) graph STRENGTH_RED_EXAMPLE_m3: 177 (0x80f93d0) in class GlobalType. -Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m3 -.The constant of Reducing node is: reduce_itervar(l.221) ConstIs: 252 (0x80fc4b0) -The Phi node isreduce_itervar(l.222) PhiIs: 276 (0x80fcaf8) -Reducing node: reduce_itervar(l.223) MulIs: 255 (0x80fc584) - iter var is reduce_itervar(l.224) AddIs: 254 (0x80fc53c) - in graph reduce_itervar(l.225) graph STRENGTH_RED_EXAMPLE_m4: 237 (0x80fbc38) in class GlobalType. -Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m4 -.The constant of Reducing node is: reduce_itervar(l.221) ConstIs: 312 (0x80fed68) -The Phi node isreduce_itervar(l.222) PhiIs: 337 (0x80ff3f8) -Reducing node: reduce_itervar(l.223) MulIs: 315 (0x80fee3c) - iter var is reduce_itervar(l.224) SubIs: 314 (0x80fedf4) - in graph reduce_itervar(l.225) graph STRENGTH_RED_EXAMPLE_m5: 297 (0x80fe520) in class GlobalType. -It is possibale to exchange the Cmp with a new Cmp -The constant of Cmp node is: reduce_itervar(l.291) ConstIs: 304 (0x80feaf8) -The Phi node is reduce_itervar(l.292) PhiIs: 337 (0x80ff3f8) -Cmp node: reduce_itervar(l.293) CmpT: 305 (0x80feb40) - in graph reduce_itervar(l.294) graph STRENGTH_RED_EXAMPLE_m5: 297 (0x80fe520) in class GlobalType. -Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m5 +.Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m2 +.Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m3 +.Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m4 +.Reduced 0 iteration variables in graph GlobalType.STRENGTH_RED_EXAMPLE_m5 . Creating an IR graph: THREE_CFPRED_EXAMPLE ... Optimizing ...