From f9030157d40829a99c5d7f9fe49061a1162d8358 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=B6tz=20Lindenmaier?= Date: Mon, 29 Mar 2004 08:59:38 +0000 Subject: [PATCH] new reference after adding class to edges [r2570] --- .../ARRAY-HEAP_EXAMPLE_main-type.vcg | 3 + .../ref-results/ARRAY-HEAP_EXAMPLE_main.vcg | 25 +-- .../ARRAY-STACK_EXAMPLE_main-wtypes.vcg | 27 ++-- testprograms/ref-results/All_graphs.vcg | 67 ++++---- testprograms/ref-results/All_types.vcg | 3 + .../ref-results/CALL_STR_EXAMPLE_main.vcg | 19 ++- .../ref-results/COND_EXAMPLE_main.vcg | 25 +-- .../ref-results/CONST_EVAL_EXAMPLE_main.vcg | 15 +- .../ref-results/DEAD_BLOCK_main-cfg.vcg | 3 + testprograms/ref-results/DEAD_BLOCK_main.vcg | 15 +- testprograms/ref-results/EMPTY_main.vcg | 15 +- .../ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg | 27 ++-- .../ref-results/FLOAT_EXAMPLE_main.vcg | 15 +- .../ref-results/GLOBAL_CSE_EXAMPLE_main.vcg | 27 ++-- .../GLOBAL_VAR_main-pure-wtypes.vcg | 43 ++--- testprograms/ref-results/GLOBAL_VAR_main.vcg | 21 +-- .../GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg | 67 ++++---- ...alType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg | 145 +++++++++-------- ...OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg | 153 +++++++++--------- ...lobalType_OO_PROGRAM_EXAMPLE_main-type.vcg | 3 + ...Type_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg | 75 ++++----- ...balType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg | 43 ++--- .../ref-results/IF_ELSE_EXAMPLE_main.vcg | 15 +- testprograms/ref-results/IF_EXAMPLE_main.vcg | 25 +-- .../IF_WHILE_EXAMPLE_main-pure.vcg | 63 ++++---- .../ref-results/IRREGULAR_CF_main-cfg.vcg | 3 + .../ref-results/IRREGULAR_CF_main.vcg | 37 +++-- .../ref-results/IRR_LOOP_main-cfg.vcg | 3 + testprograms/ref-results/IRR_LOOP_main.vcg | 51 +++--- .../ref-results/MEMORY_EXAMPLE_main.vcg | 61 +++---- .../OO_INLINE_EXAMPLE_main-wtypes.vcg | 41 ++--- .../ref-results/OO_INLINE_EXAMPLE_main.vcg | 33 ++-- .../OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg | 75 ++++----- .../OO_PROGRAM_EXAMPLE_main-pure.vcg | 63 ++++---- .../ref-results/OO_PROGRAM_EXAMPLE_main.vcg | 31 ++-- .../ref-results/PRIMA_INLINE_c-wtypes.vcg | 25 +-- testprograms/ref-results/PRIMA_INLINE_c.vcg | 23 +-- .../ref-results/PRIMA_INLINE_set_a-wtypes.vcg | 23 +-- .../ref-results/PRIMA_INLINE_set_a.vcg | 21 +-- .../ref-results/PRIMA_c-pure-wtypes.vcg | 49 +++--- testprograms/ref-results/PRIMA_c-pure.vcg | 47 +++--- testprograms/ref-results/PRIMA_c-type.vcg | 3 + testprograms/ref-results/PRIMA_c-wtypes.vcg | 23 +-- testprograms/ref-results/PRIMA_c.vcg | 21 +-- .../ref-results/PRIMA_set_a-pure-wtypes.vcg | 45 +++--- testprograms/ref-results/PRIMA_set_a-pure.vcg | 43 ++--- testprograms/ref-results/PRIMA_set_a-type.vcg | 3 + .../ref-results/PRIMA_set_a-wtypes.vcg | 23 +-- testprograms/ref-results/PRIMA_set_a.vcg | 21 +-- .../THREE_CFPRED_EXAMPLE_main-cfg.vcg | 3 + .../ref-results/THREE_CFPRED_EXAMPLE_main.vcg | 37 +++-- .../ref-results/WHILE_EXAMPLE_main.vcg | 27 ++-- testprograms/ref-results/class_hierarchy.vcg | 3 + testprograms/ref-results/main-type.vcg | 3 + testprograms/ref-results/main.vcg | 23 +-- 55 files changed, 984 insertions(+), 819 deletions(-) diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg index 0165f28ec..0c77d986f 100644 --- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg index 6ea32861d..78b223745 100644 --- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg +++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g32" label: "ARRAY-HEAP_EXAMPLE_main" status:clustered color:white graph: { title: "n49" label: "Block 49" status:clustered color:yellow -edge: {sourcename: "n49" targetname: "n50" label: "0" color: red} +edge: {sourcename: "n49" targetname: "n50" label: "0" class:13 color:red} node: {title: "n48" label: "End 48" color: blue info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 0 @@ -27,20 +30,20 @@ arity: 0 } graph: { title: "n51" label: "Block 51" status:clustered color:yellow -edge: {sourcename: "n51" targetname: "n52" label: "0" color: red} +edge: {sourcename: "n51" targetname: "n52" label: "0" class:13 color:red} node: {title: "n50" label: "Return 50" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 2 return in method of type ARRAY-HEAP_EXAMPLE_main res 0 type: int "} -edge: {sourcename: "n50" targetname: "n64" label: "0" color: blue} +edge: {sourcename: "n50" targetname: "n64" label: "0" class:14 color:blue} edge: {sourcename: "n50" targetname: "n55" label: "1" } node: {title: "n64" label: "ProjM 0 64" color: yellow info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n64" targetname: "n56" label: "0" color: blue} +edge: {sourcename: "n64" targetname: "n56" label: "0" class:14 color:blue} node: {title: "n55" label: "ProjIs 2 55" color: yellow info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 @@ -50,7 +53,7 @@ node: {title: "n56" label: "Load 56" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n56" targetname: "n63" label: "0" color: blue} +edge: {sourcename: "n56" targetname: "n63" label: "0" class:14 color:blue} edge: {sourcename: "n56" targetname: "n57" label: "1" } node: {title: "n57" label: "Sel a_elem_ent 57" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main @@ -58,14 +61,14 @@ arity: 3 Selecting entity of type int from entity of type a "} -edge: {sourcename: "n57" targetname: "n63" label: "0" color: blue} +edge: {sourcename: "n57" targetname: "n63" label: "0" class:14 color:blue} edge: {sourcename: "n57" targetname: "n59" label: "1" } edge: {sourcename: "n57" targetname: "n58" label: "2" } node: {title: "n63" label: "ProjM 0 63" color: yellow info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n63" targetname: "n60" label: "0" color: blue} +edge: {sourcename: "n63" targetname: "n60" label: "0" class:14 color:blue} node: {title: "n59" label: "ProjP 2 59" color: yellow info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 @@ -76,17 +79,17 @@ irg: ARRAY-HEAP_EXAMPLE_main arity: 2 allocating entity of type a "} -edge: {sourcename: "n60" targetname: "n62" label: "0" color: blue} +edge: {sourcename: "n60" targetname: "n62" label: "0" class:14 color:blue} edge: {sourcename: "n60" targetname: "n61" label: "1" } } graph: { title: "n53" label: "Block 53" status:clustered color:yellow -edge: {sourcename: "n53" targetname: "n52" label: "0" color: red} +edge: {sourcename: "n53" targetname: "n52" label: "0" class:13 color:red} node: {title: "n62" label: "ProjM 1 62" color: yellow info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n62" targetname: "n54" label: "0" color: blue} +edge: {sourcename: "n62" targetname: "n54" label: "0" class:14 color:blue} node: {title: "n61" label: "0x28Iu 61" color: yellow info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 0 @@ -101,7 +104,7 @@ node: {title: "n52" label: "ProjX 0 52" color: yellow info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n52" targetname: "n54" label: "0" color: red} +edge: {sourcename: "n52" targetname: "n54" label: "0" class:13 color:red} node: {title: "n54" label: "Start 54" color: blue info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg index 6816898ae..a06d6dd77 100644 --- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g33" label: "ARRAY-STACK_EXAMPLE_main" status:clustered color:white graph: { title: "n47" label: "Block 47" status:clustered color:yellow -edge: {sourcename: "n47" targetname: "n48" label: "0" color: red} +edge: {sourcename: "n47" targetname: "n48" label: "0" class:13 color:red} node: {title: "n46" label: "End 46" color: blue info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 0 @@ -27,20 +30,20 @@ arity: 0 } graph: { title: "n49" label: "Block 49" status:clustered color:yellow -edge: {sourcename: "n49" targetname: "n50" label: "0" color: red} +edge: {sourcename: "n49" targetname: "n50" label: "0" class:13 color:red} node: {title: "n48" label: "Return 48" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 2 return in method of type main res 0 type: int "} -edge: {sourcename: "n48" targetname: "n60" label: "0" color: blue} +edge: {sourcename: "n48" targetname: "n60" label: "0" class:14 color:blue} edge: {sourcename: "n48" targetname: "n53" label: "1" } node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n60" targetname: "n54" label: "0" color: blue} +edge: {sourcename: "n60" targetname: "n54" label: "0" class:14 color:blue} node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 @@ -50,7 +53,7 @@ node: {title: "n54" label: "Load 54" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n54" targetname: "n59" label: "0" color: blue} +edge: {sourcename: "n54" targetname: "n59" label: "0" class:14 color:blue} edge: {sourcename: "n54" targetname: "n55" label: "1" } node: {title: "n55" label: "Sel a_tp_elem_ent 55" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main @@ -58,7 +61,7 @@ arity: 3 Selecting entity of type int from entity of type a_tp "} -edge: {sourcename: "n55" targetname: "n59" label: "0" color: blue} +edge: {sourcename: "n55" targetname: "n59" label: "0" class:14 color:blue} edge: {sourcename: "n55" targetname: "n57" label: "1" } edge: {sourcename: "n55" targetname: "n56" label: "2" } node: {title: "n57" label: "Sel a 57" info1: "visited: 10 @@ -67,17 +70,17 @@ arity: 2 Selecting entity of type a_tp from entity of type mainframe_tp "} -edge: {sourcename: "n57" targetname: "n59" label: "0" color: blue} +edge: {sourcename: "n57" targetname: "n59" label: "0" class:14 color:blue} edge: {sourcename: "n57" targetname: "n58" label: "1" } } graph: { title: "n51" label: "Block 51" status:clustered color:yellow -edge: {sourcename: "n51" targetname: "n50" label: "0" color: red} +edge: {sourcename: "n51" targetname: "n50" label: "0" class:13 color:red} node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue} +edge: {sourcename: "n59" targetname: "n52" label: "0" class:14 color:blue} node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 @@ -92,7 +95,7 @@ node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n50" targetname: "n52" label: "0" color: red} +edge: {sourcename: "n50" targetname: "n52" label: "0" class:13 color:red} node: {title: "n52" label: "Start 52" color: blue info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 0 @@ -181,6 +184,6 @@ mode: P, size: 4B, "} edge: { sourcename: "t13" targetname: "t11"class: 6 label: "res 0" color: green} -edge: { sourcename: "n55" targetname: "e19"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n57" targetname: "e35"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n55" targetname: "e19"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n57" targetname: "e35"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/All_graphs.vcg b/testprograms/ref-results/All_graphs.vcg index 902d5ea00..512b7301e 100644 --- a/testprograms/ref-results/All_graphs.vcg +++ b/testprograms/ref-results/All_graphs.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g35" label: "GlobalType_OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 @@ -27,12 +30,12 @@ arity: 0 } graph: { title: "n106" label: "Block 106" status:clustered color:yellow -edge: {sourcename: "n106" targetname: "n191" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} node: {title: "n105" label: "Return 105" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n105" targetname: "n193" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -40,7 +43,7 @@ arity: 1 backedges: intra predecessor nodes: CallT 112 "} -edge: {sourcename: "n193" targetname: "n161" label: "0" color: blue} +edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: @@ -51,19 +54,19 @@ edge: {sourcename: "n194" targetname: "n153" label: "0" } } graph: { title: "n188" label: "Block 188" status:clustered color:yellow -edge: {sourcename: "n188" targetname: "n185" label: "0" color: red} +edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 "} -edge: {sourcename: "n187" targetname: "n136" label: "0" color: blue} +edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n192" targetname: "n190" label: "0" color: red} +edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -79,12 +82,12 @@ edge: {sourcename: "n190" targetname: "n190n165" label: "0" } } graph: { title: "n182" label: "Block 182" status:clustered color:yellow -edge: {sourcename: "n182" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -99,13 +102,13 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n186" targetname: "n184" label: "0" color: red} +edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -121,17 +124,17 @@ edge: {sourcename: "n184" targetname: "n184n166" label: "0" } } graph: { title: "n108" label: "Block 108" status:clustered color:yellow -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 @@ -143,12 +146,12 @@ start of method of type OO_PROGRAM_EXAMPLE_main graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n179" label: "Block 179" status:clustered color:yellow -edge: {sourcename: "n179" targetname: "n178" label: "0" color: red} +edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 48 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n185" targetname: "n180" label: "0" color: red} +edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 48 irg: PRIMA_set_a arity: 0 @@ -156,17 +159,17 @@ arity: 0 } graph: { title: "n132" label: "Block 132" status:clustered color:yellow -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 48 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 48 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } node: {title: "n140" label: "Sel a 140" info1: "visited: 48 @@ -175,7 +178,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n176" label: "1" } node: {title: "n178" label: "Jmp 178" info1: "visited: 48 irg: PRIMA_set_a @@ -184,14 +187,14 @@ arity: 0 } graph: { title: "n134" label: "Block 134" status:clustered color:yellow -edge: {sourcename: "n134" targetname: "n186" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 48 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 "} -edge: {sourcename: "n175" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 48 irg: PRIMA_set_a arity: 1 backedges: @@ -215,7 +218,7 @@ node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 48 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 48 irg: PRIMA_set_a arity: 0 @@ -229,12 +232,12 @@ start of method of type set_a graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n171" label: "Block 171" status:clustered color:yellow -edge: {sourcename: "n171" targetname: "n170" label: "0" color: red} +edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 48 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n191" targetname: "n172" label: "0" color: red} +edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 48 irg: PRIMA_c arity: 0 @@ -242,12 +245,12 @@ arity: 0 } graph: { title: "n149" label: "Block 149" status:clustered color:yellow -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 48 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 48 irg: PRIMA_c arity: 2 @@ -263,7 +266,7 @@ node: {title: "n155" label: "Load 155" info1: "visited: 48 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 48 irg: PRIMA_c @@ -271,7 +274,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n169" label: "1" } node: {title: "n170" label: "Jmp 170" info1: "visited: 48 irg: PRIMA_c @@ -280,14 +283,14 @@ arity: 0 } graph: { title: "n151" label: "Block 151" status:clustered color:yellow -edge: {sourcename: "n151" targetname: "n192" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 48 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 "} -edge: {sourcename: "n168" targetname: "n187" label: "0" color: blue} +edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 48 irg: PRIMA_c arity: 1 backedges: @@ -311,7 +314,7 @@ node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 48 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 48 irg: PRIMA_c arity: 0 diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg index 9f42b9317..37b5275c4 100644 --- a/testprograms/ref-results/All_types.vcg +++ b/testprograms/ref-results/All_types.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg index 6ca397353..a6cb93a11 100644 --- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg +++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g45" label: "CALL_STR_EXAMPLE_main" status:clustered color:white graph: { title: "n56" label: "Block 56" status:clustered color:yellow -edge: {sourcename: "n56" targetname: "n57" label: "0" color: red} +edge: {sourcename: "n56" targetname: "n57" label: "0" class:13 color:red} node: {title: "n55" label: "End 55" color: blue info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 0 @@ -27,36 +30,36 @@ arity: 0 } graph: { title: "n58" label: "Block 58" status:clustered color:yellow -edge: {sourcename: "n58" targetname: "n59" label: "0" color: red} +edge: {sourcename: "n58" targetname: "n59" label: "0" class:13 color:red} node: {title: "n57" label: "Return 57" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 1 return in method of type CALL_STR_EXAMPLE_main "} -edge: {sourcename: "n57" targetname: "n62" label: "0" color: blue} +edge: {sourcename: "n57" targetname: "n62" label: "0" class:14 color:blue} node: {title: "n62" label: "ProjM 0 62" color: yellow info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n62" targetname: "n63" label: "0" color: blue} +edge: {sourcename: "n62" targetname: "n63" label: "0" class:14 color:blue} node: {title: "n63" label: "Call 63" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 3 calling method of type f param 0 type: ptr_to_string "} -edge: {sourcename: "n63" targetname: "n66" label: "0" color: blue} +edge: {sourcename: "n63" targetname: "n66" label: "0" class:14 color:blue} edge: {sourcename: "n63" targetname: "n65" label: "1" } edge: {sourcename: "n63" targetname: "n64" label: "2" } } graph: { title: "n60" label: "Block 60" status:clustered color:yellow -edge: {sourcename: "n60" targetname: "n59" label: "0" color: red} +edge: {sourcename: "n60" targetname: "n59" label: "0" class:13 color:red} node: {title: "n66" label: "ProjM 1 66" color: yellow info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n66" targetname: "n61" label: "0" color: blue} +edge: {sourcename: "n66" targetname: "n61" label: "0" class:14 color:blue} node: {title: "n65" label: "SymC f 65" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 0 @@ -70,7 +73,7 @@ node: {title: "n59" label: "ProjX 0 59" color: yellow info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n59" targetname: "n61" label: "0" color: red} +edge: {sourcename: "n59" targetname: "n61" label: "0" class:13 color:red} node: {title: "n61" label: "Start 61" color: blue info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg index b039ecaaa..077e227bd 100644 --- a/testprograms/ref-results/COND_EXAMPLE_main.vcg +++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g27" label: "COND_EXAMPLE_main" status:clustered color:white graph: { title: "n59" label: "Block 59" status:clustered color:yellow -edge: {sourcename: "n59" targetname: "n60" label: "0" color: red} +edge: {sourcename: "n59" targetname: "n60" label: "0" class:13 color:red} node: {title: "n58" label: "End 58" color: blue info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 @@ -27,15 +30,15 @@ arity: 0 } graph: { title: "n61" label: "Block 61" status:clustered color:yellow -edge: {sourcename: "n61" targetname: "n82" label: "0" color: red} -edge: {sourcename: "n61" targetname: "n62" label: "1" color: red} +edge: {sourcename: "n61" targetname: "n82" label: "0" class:13 color:red} +edge: {sourcename: "n61" targetname: "n62" label: "1" class:13 color:red} node: {title: "n60" label: "Return 60" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 2 return in method of type main res 0 type: int "} -edge: {sourcename: "n60" targetname: "n87" label: "0" color: blue} +edge: {sourcename: "n60" targetname: "n87" label: "0" class:14 color:blue} edge: {sourcename: "n60" targetname: "n85" label: "1" } node: {title: "n85" label: "PhiIs 85" color: green info1: "visited: 9 irg: COND_EXAMPLE_main @@ -46,7 +49,7 @@ edge: {sourcename: "n85" targetname: "n76" label: "1" } } graph: { title: "n83" label: "Block 83" status:clustered color:yellow -edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} +edge: {sourcename: "n83" targetname: "n84" label: "0" class:13 color:red} node: {title: "n82" label: "Jmp 82" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 @@ -54,17 +57,17 @@ arity: 0 } graph: { title: "n63" label: "Block 63" status:clustered color:yellow -edge: {sourcename: "n63" targetname: "n64" label: "0" color: red} +edge: {sourcename: "n63" targetname: "n64" label: "0" class:13 color:red} node: {title: "n84" label: "ProjX 1 84" color: yellow info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n84" targetname: "n67" label: "0" color: red} +edge: {sourcename: "n84" targetname: "n67" label: "0" class:13 color:red} node: {title: "n62" label: "ProjX 0 62" color: yellow info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n62" targetname: "n67" label: "0" color: red} +edge: {sourcename: "n62" targetname: "n67" label: "0" class:13 color:red} node: {title: "n67" label: "Cond 67" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 @@ -127,12 +130,12 @@ edge: {sourcename: "n76" targetname: "n77" label: "0" } } graph: { title: "n65" label: "Block 65" status:clustered color:yellow -edge: {sourcename: "n65" targetname: "n64" label: "0" color: red} +edge: {sourcename: "n65" targetname: "n64" label: "0" class:13 color:red} node: {title: "n87" label: "ProjM 1 87" color: yellow info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n87" targetname: "n66" label: "0" color: blue} +edge: {sourcename: "n87" targetname: "n66" label: "0" class:14 color:blue} node: {title: "n86" label: "0x1Is 86" color: yellow info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 @@ -162,7 +165,7 @@ node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n64" targetname: "n66" label: "0" color: red} +edge: {sourcename: "n64" targetname: "n66" label: "0" class:13 color:red} node: {title: "n66" label: "Start 66" color: blue info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg index aec640571..6494e7b66 100644 --- a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg +++ b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g27" label: "CONST_EVAL_EXAMPLE_main" status:clustered color:white graph: { title: "n44" label: "Block 44" status:clustered color:yellow -edge: {sourcename: "n44" targetname: "n45" label: "0" color: red} +edge: {sourcename: "n44" targetname: "n45" label: "0" class:13 color:red} node: {title: "n43" label: "End 43" color: blue info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 0 @@ -27,7 +30,7 @@ arity: 0 } graph: { title: "n46" label: "Block 46" status:clustered color:yellow -edge: {sourcename: "n46" targetname: "n47" label: "0" color: red} +edge: {sourcename: "n46" targetname: "n47" label: "0" class:13 color:red} node: {title: "n45" label: "Return 45" info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 3 @@ -35,18 +38,18 @@ return in method of type main res 0 type: int res 1 type: int "} -edge: {sourcename: "n45" targetname: "n51" label: "0" color: blue} +edge: {sourcename: "n45" targetname: "n51" label: "0" class:14 color:blue} edge: {sourcename: "n45" targetname: "n50" label: "1" } edge: {sourcename: "n45" targetname: "n50" label: "2" } } graph: { title: "n48" label: "Block 48" status:clustered color:yellow -edge: {sourcename: "n48" targetname: "n47" label: "0" color: red} +edge: {sourcename: "n48" targetname: "n47" label: "0" class:13 color:red} node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n51" targetname: "n49" label: "0" color: blue} +edge: {sourcename: "n51" targetname: "n49" label: "0" class:14 color:blue} node: {title: "n50" label: "0xCIs 50" color: yellow info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 0 @@ -56,7 +59,7 @@ node: {title: "n47" label: "ProjX 0 47" color: yellow info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n47" targetname: "n49" label: "0" color: red} +edge: {sourcename: "n47" targetname: "n49" label: "0" class:13 color:red} node: {title: "n49" label: "Start 49" color: blue info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg index 32b15eb77..a5de53b02 100644 --- a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg +++ b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/DEAD_BLOCK_main.vcg b/testprograms/ref-results/DEAD_BLOCK_main.vcg index b45f73ecd..13de3fa7a 100644 --- a/testprograms/ref-results/DEAD_BLOCK_main.vcg +++ b/testprograms/ref-results/DEAD_BLOCK_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g27" label: "DEAD_BLOCK_main" status:clustered color:white graph: { title: "n57" label: "Block 57" status:clustered color:yellow -edge: {sourcename: "n57" targetname: "n58" label: "0" color: red} +edge: {sourcename: "n57" targetname: "n58" label: "0" class:13 color:red} node: {title: "n56" label: "End 56" color: blue info1: "visited: 9 irg: DEAD_BLOCK_main arity: 0 @@ -27,24 +30,24 @@ arity: 0 } graph: { title: "n65" label: "Block 65" status:clustered color:yellow -edge: {sourcename: "n65" targetname: "n62" label: "0" color: red} +edge: {sourcename: "n65" targetname: "n62" label: "0" class:13 color:red} node: {title: "n58" label: "Return 58" info1: "visited: 9 irg: DEAD_BLOCK_main arity: 2 return in method of type main res 0 type: int "} -edge: {sourcename: "n58" targetname: "n67" label: "0" color: blue} +edge: {sourcename: "n58" targetname: "n67" label: "0" class:14 color:blue} edge: {sourcename: "n58" targetname: "n66" label: "1" } } graph: { title: "n61" label: "Block 61" status:clustered color:yellow -edge: {sourcename: "n61" targetname: "n62" label: "0" color: red} +edge: {sourcename: "n61" targetname: "n62" label: "0" class:13 color:red} node: {title: "n67" label: "ProjM 1 67" color: yellow info1: "visited: 9 irg: DEAD_BLOCK_main arity: 1 "} -edge: {sourcename: "n67" targetname: "n63" label: "0" color: blue} +edge: {sourcename: "n67" targetname: "n63" label: "0" class:14 color:blue} node: {title: "n66" label: "0x2Is 66" color: yellow info1: "visited: 9 irg: DEAD_BLOCK_main arity: 0 @@ -54,7 +57,7 @@ node: {title: "n62" label: "ProjX 0 62" color: yellow info1: "visited: 9 irg: DEAD_BLOCK_main arity: 1 "} -edge: {sourcename: "n62" targetname: "n63" label: "0" color: red} +edge: {sourcename: "n62" targetname: "n63" label: "0" class:13 color:red} node: {title: "n63" label: "Start 63" color: blue info1: "visited: 9 irg: DEAD_BLOCK_main arity: 0 diff --git a/testprograms/ref-results/EMPTY_main.vcg b/testprograms/ref-results/EMPTY_main.vcg index 3549fc976..dce13563d 100644 --- a/testprograms/ref-results/EMPTY_main.vcg +++ b/testprograms/ref-results/EMPTY_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g25" label: "EMPTY_main" status:clustered color:white graph: { title: "n15" label: "Block 15" status:clustered color:yellow -edge: {sourcename: "n15" targetname: "n28" label: "0" color: red} +edge: {sourcename: "n15" targetname: "n28" label: "0" class:13 color:red} node: {title: "n16" label: "End 16" color: blue info1: "visited: 4 irg: EMPTY_main arity: 0 @@ -27,27 +30,27 @@ arity: 0 } graph: { title: "n26" label: "Block 26" status:clustered color:yellow -edge: {sourcename: "n26" targetname: "n20" label: "0" color: red} +edge: {sourcename: "n26" targetname: "n20" label: "0" class:13 color:red} node: {title: "n28" label: "Return 28" info1: "visited: 4 irg: EMPTY_main arity: 1 return in method of type EMPTY_main "} -edge: {sourcename: "n28" targetname: "n21" label: "0" color: blue} +edge: {sourcename: "n28" targetname: "n21" label: "0" class:14 color:blue} } graph: { title: "n17" label: "Block 17" status:clustered color:yellow -edge: {sourcename: "n17" targetname: "n20" label: "0" color: red} +edge: {sourcename: "n17" targetname: "n20" label: "0" class:13 color:red} node: {title: "n21" label: "ProjM 1 21" color: yellow info1: "visited: 4 irg: EMPTY_main arity: 1 "} -edge: {sourcename: "n21" targetname: "n18" label: "0" color: blue} +edge: {sourcename: "n21" targetname: "n18" label: "0" class:14 color:blue} node: {title: "n20" label: "ProjX 0 20" color: yellow info1: "visited: 4 irg: EMPTY_main arity: 1 "} -edge: {sourcename: "n20" targetname: "n18" label: "0" color: red} +edge: {sourcename: "n20" targetname: "n18" label: "0" class:13 color:red} node: {title: "n18" label: "Start 18" color: blue info1: "visited: 4 irg: EMPTY_main arity: 0 diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg index b31c449e9..0f54d72a3 100644 --- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg +++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,24 +22,24 @@ classname 12: "Member" graph: { title: "g27" label: "ENDLESS_LOOP_EXAMPLE_main" status:clustered color:white graph: { title: "n78" label: "Block 78" status:clustered color:yellow -edge: {sourcename: "n78" targetname: "n82" label: "0" color: red} -edge: {sourcename: "n78" targetname: "n79" label: "1" color: red} +edge: {sourcename: "n78" targetname: "n82" label: "0" class:13 color:red} +edge: {sourcename: "n78" targetname: "n79" label: "1" class:13 color:red} node: {title: "n84" label: "PhiM 84" color: green info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 2 backedges: "} -edge: {sourcename: "n84" targetname: "n94" label: "0" color: blue} -edge: {sourcename: "n84" targetname: "n85" label: "1" color: blue} +edge: {sourcename: "n84" targetname: "n94" label: "0" class:14 color:blue} +edge: {sourcename: "n84" targetname: "n85" label: "1" class:14 color:blue} node: {title: "n85" label: "ProjM 0 85" color: yellow info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n85" targetname: "n86" label: "0" color: blue} +edge: {sourcename: "n85" targetname: "n86" label: "0" class:14 color:blue} node: {title: "n86" label: "Store 86" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n86" targetname: "n84" label: "0" color: blue} +edge: {sourcename: "n86" targetname: "n84" label: "0" class:14 color:blue} edge: {sourcename: "n86" targetname: "n92" label: "1" } edge: {sourcename: "n86" targetname: "n87" label: "2" } node: {title: "n92" label: "Sel VAR_A 92" info1: "visited: 19 @@ -45,7 +48,7 @@ arity: 2 Selecting entity of type int from entity of type GlobalType "} -edge: {sourcename: "n92" targetname: "n84" label: "0" color: blue} +edge: {sourcename: "n92" targetname: "n84" label: "0" class:14 color:blue} edge: {sourcename: "n92" targetname: "n93" label: "1" } node: {title: "n87" label: "PhiIs 87" color: green info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main @@ -66,7 +69,7 @@ arity: 0 } graph: { title: "n83" label: "Block 83" status:clustered color:yellow -edge: {sourcename: "n83" targetname: "n76" label: "0" color: red} +edge: {sourcename: "n83" targetname: "n76" label: "0" class:13 color:red} node: {title: "n90" label: "ProjIs 0 90" color: yellow info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 @@ -79,12 +82,12 @@ arity: 0 } graph: { title: "n75" label: "Block 75" status:clustered color:yellow -edge: {sourcename: "n75" targetname: "n76" label: "0" color: red} +edge: {sourcename: "n75" targetname: "n76" label: "0" class:13 color:red} node: {title: "n94" label: "ProjM 1 94" color: yellow info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n94" targetname: "n77" label: "0" color: blue} +edge: {sourcename: "n94" targetname: "n77" label: "0" class:14 color:blue} node: {title: "n93" label: "ProjP 3 93" color: yellow info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 @@ -104,7 +107,7 @@ node: {title: "n76" label: "ProjX 0 76" color: yellow info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n76" targetname: "n77" label: "0" color: red} +edge: {sourcename: "n76" targetname: "n77" label: "0" class:13 color:red} node: {title: "n77" label: "Start 77" color: blue info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 0 @@ -118,7 +121,7 @@ node: {title: "n72" label: "End 72" color: blue info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n72" targetname: "n78" label: "0" color: red} +edge: {sourcename: "n72" targetname: "n78" label: "0" class:13 color:red} edge: {sourcename: "n72" targetname: "n84" label: "1" } } diff --git a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg index 504e7b44d..d2f55564f 100644 --- a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg +++ b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g26" label: "FLOAT_EXAMPLE_main" status:clustered color:white graph: { title: "n16" label: "Block 16" status:clustered color:yellow -edge: {sourcename: "n16" targetname: "n30" label: "0" color: red} +edge: {sourcename: "n16" targetname: "n30" label: "0" class:13 color:red} node: {title: "n17" label: "End 17" color: blue info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 0 @@ -27,24 +30,24 @@ arity: 0 } graph: { title: "n27" label: "Block 27" status:clustered color:yellow -edge: {sourcename: "n27" targetname: "n21" label: "0" color: red} +edge: {sourcename: "n27" targetname: "n21" label: "0" class:13 color:red} node: {title: "n30" label: "Return 30" info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 2 return in method of type FLOAT_EXAMPLE_main res 0 type: dbl "} -edge: {sourcename: "n30" targetname: "n22" label: "0" color: blue} +edge: {sourcename: "n30" targetname: "n22" label: "0" class:14 color:blue} edge: {sourcename: "n30" targetname: "n28" label: "1" } } graph: { title: "n18" label: "Block 18" status:clustered color:yellow -edge: {sourcename: "n18" targetname: "n21" label: "0" color: red} +edge: {sourcename: "n18" targetname: "n21" label: "0" class:13 color:red} node: {title: "n22" label: "ProjM 1 22" color: yellow info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n22" targetname: "n19" label: "0" color: blue} +edge: {sourcename: "n22" targetname: "n19" label: "0" class:14 color:blue} node: {title: "n28" label: "1.234567890123456716800000000000E+19D 28" color: yellow info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 0 @@ -54,7 +57,7 @@ node: {title: "n21" label: "ProjX 0 21" color: yellow info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n21" targetname: "n19" label: "0" color: red} +edge: {sourcename: "n21" targetname: "n19" label: "0" class:13 color:red} node: {title: "n19" label: "Start 19" color: blue info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg index 2643ec69a..9ec7c1bbf 100644 --- a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g26" label: "GLOBAL_CSE_EXAMPLE_main" status:clustered color:white graph: { title: "n62" label: "Block 62" status:clustered color:yellow -edge: {sourcename: "n62" targetname: "n63" label: "0" color: red} +edge: {sourcename: "n62" targetname: "n63" label: "0" class:13 color:red} node: {title: "n61" label: "End 61" color: blue info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 @@ -30,7 +33,7 @@ node: {title: "n86" label: "ProjM 1 86" color: yellow info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n86" targetname: "n71" label: "0" color: blue} +edge: {sourcename: "n86" targetname: "n71" label: "0" class:14 color:blue} node: {title: "n84" label: "AddIs 84" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 2 @@ -54,15 +57,15 @@ arity: 0 Const of type type_unknown "} graph: { title: "n64" label: "Block 64" status:clustered color:yellow -edge: {sourcename: "n64" targetname: "n78" label: "0" color: red} -edge: {sourcename: "n64" targetname: "n65" label: "1" color: red} +edge: {sourcename: "n64" targetname: "n78" label: "0" class:13 color:red} +edge: {sourcename: "n64" targetname: "n65" label: "1" class:13 color:red} node: {title: "n63" label: "Return 63" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 2 return in method of type GLOBAL_CSE_EXAMPLE_main res 0 type: int "} -edge: {sourcename: "n63" targetname: "n86" label: "0" color: blue} +edge: {sourcename: "n63" targetname: "n86" label: "0" class:14 color:blue} edge: {sourcename: "n63" targetname: "n81" label: "1" } node: {title: "n81" label: "PhiIs 81" color: green info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main @@ -73,7 +76,7 @@ edge: {sourcename: "n81" targetname: "n82" label: "1" } } graph: { title: "n79" label: "Block 79" status:clustered color:yellow -edge: {sourcename: "n79" targetname: "n80" label: "0" color: red} +edge: {sourcename: "n79" targetname: "n80" label: "0" class:13 color:red} node: {title: "n78" label: "Jmp 78" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 @@ -84,9 +87,9 @@ node: {title: "n80" label: "ProjX 0 80" color: yellow info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n80" targetname: "n72" label: "0" color: red} +edge: {sourcename: "n80" targetname: "n72" label: "0" class:13 color:red} graph: { title: "n66" label: "Block 66" status:clustered color:yellow -edge: {sourcename: "n66" targetname: "n67" label: "0" color: red} +edge: {sourcename: "n66" targetname: "n67" label: "0" class:13 color:red} node: {title: "n65" label: "Jmp 65" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 @@ -97,7 +100,7 @@ node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n67" targetname: "n72" label: "0" color: red} +edge: {sourcename: "n67" targetname: "n72" label: "0" class:13 color:red} node: {title: "n73" label: "Projb Eq 73" color: yellow info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 @@ -125,7 +128,7 @@ arity: 0 Const of type type_unknown "} graph: { title: "n68" label: "Block 68" status:clustered color:yellow -edge: {sourcename: "n68" targetname: "n69" label: "0" color: red} +edge: {sourcename: "n68" targetname: "n69" label: "0" class:13 color:red} node: {title: "n72" label: "Cond 72" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 @@ -137,9 +140,9 @@ node: {title: "n69" label: "ProjX 0 69" color: yellow info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n69" targetname: "n71" label: "0" color: red} +edge: {sourcename: "n69" targetname: "n71" label: "0" class:13 color:red} graph: { title: "n70" label: "Block 70" status:clustered color:yellow -edge: {sourcename: "n70" targetname: "n69" label: "0" color: red} +edge: {sourcename: "n70" targetname: "n69" label: "0" class:13 color:red} node: {title: "n71" label: "Start 71" color: blue info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg index 4eb3c614b..969444bb4 100644 --- a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg +++ b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,82 +24,82 @@ node: {title: "n42" label: "Block 42" color: lightyellow info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 backedges: "} -edge: {sourcename: "n42" targetname: "n41" label: "0" color: red} +edge: {sourcename: "n42" targetname: "n41" label: "0" class:13 color:red} node: {title: "n43" label: "Start 43" color: blue info1: "visited: 8 irg: GLOBAL_VAR_main arity: 0 start of method of type GLOBAL_VAR_main "} -edge: { sourcename: "n43" targetname: "n42" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n43" targetname: "n42" class:2 priority:2 linestyle:dotted} node: {title: "n41" label: "ProjX 0 41" color: yellow info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 "} -edge: {sourcename: "n41" targetname: "n43" label: "0" color: red} -edge: { sourcename: "n41" targetname: "n42" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n41" targetname: "n43" label: "0" class:13 color:red} +edge: { sourcename: "n41" targetname: "n42" class:2 priority:2 linestyle:dotted} node: {title: "n40" label: "Block 40" color: lightyellow info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 backedges: "} -edge: {sourcename: "n40" targetname: "n41" label: "0" color: red} +edge: {sourcename: "n40" targetname: "n41" label: "0" class:13 color:red} node: {title: "n46" label: "0x2Is 46" color: yellow info1: "visited: 8 irg: GLOBAL_VAR_main arity: 0 Const of type type_unknown "} -edge: { sourcename: "n46" targetname: "n42" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n46" targetname: "n42" class:2 priority:2 linestyle:dotted} node: {title: "n48" label: "ProjP 3 48" color: yellow info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 "} edge: {sourcename: "n48" targetname: "n43" label: "0" } -edge: { sourcename: "n48" targetname: "n42" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n48" targetname: "n42" class:2 priority:2 linestyle:dotted} node: {title: "n49" label: "ProjM 1 49" color: yellow info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 "} -edge: {sourcename: "n49" targetname: "n43" label: "0" color: blue} -edge: { sourcename: "n49" targetname: "n42" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n49" targetname: "n43" label: "0" class:14 color:blue} +edge: { sourcename: "n49" targetname: "n42" class:2 priority:2 linestyle:dotted} node: {title: "n47" label: "Sel i 47" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 2 Selecting entity of type int from entity of type GlobalType "} -edge: {sourcename: "n47" targetname: "n49" label: "0" color: blue} +edge: {sourcename: "n47" targetname: "n49" label: "0" class:14 color:blue} edge: {sourcename: "n47" targetname: "n48" label: "1" } -edge: { sourcename: "n47" targetname: "n40" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n47" targetname: "n40" class:2 priority:2 linestyle:dotted} node: {title: "n45" label: "Store 45" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 3 "} -edge: {sourcename: "n45" targetname: "n49" label: "0" color: blue} +edge: {sourcename: "n45" targetname: "n49" label: "0" class:14 color:blue} edge: {sourcename: "n45" targetname: "n47" label: "1" } edge: {sourcename: "n45" targetname: "n46" label: "2" } -edge: { sourcename: "n45" targetname: "n40" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n45" targetname: "n40" class:2 priority:2 linestyle:dotted} node: {title: "n44" label: "ProjM 0 44" color: yellow info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 "} -edge: {sourcename: "n44" targetname: "n45" label: "0" color: blue} -edge: { sourcename: "n44" targetname: "n40" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n44" targetname: "n45" label: "0" class:14 color:blue} +edge: { sourcename: "n44" targetname: "n40" class:2 priority:2 linestyle:dotted} node: {title: "n39" label: "Return 39" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 return in method of type GLOBAL_VAR_main "} -edge: {sourcename: "n39" targetname: "n44" label: "0" color: blue} -edge: { sourcename: "n39" targetname: "n40" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n39" targetname: "n44" label: "0" class:14 color:blue} +edge: { sourcename: "n39" targetname: "n40" class:2 priority:2 linestyle:dotted} node: {title: "n38" label: "Block 38" color: lightyellow info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 backedges: "} -edge: {sourcename: "n38" targetname: "n39" label: "0" color: red} +edge: {sourcename: "n38" targetname: "n39" label: "0" class:13 color:red} node: {title: "n37" label: "End 37" color: blue info1: "visited: 8 irg: GLOBAL_VAR_main arity: 0 "} -edge: { sourcename: "n37" targetname: "n38" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n37" targetname: "n38" class:2 priority:2 linestyle:dotted} node: {title: "e15" label: "ent i" color: yellow info1: " id: e15 @@ -147,5 +150,5 @@ node: {title: "t16" label: "class GLOBAL_VAR_mainframe_tp" info1: "state: layout size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n47" targetname: "e15"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n47" targetname: "e15"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/GLOBAL_VAR_main.vcg b/testprograms/ref-results/GLOBAL_VAR_main.vcg index 67826e47c..547e671f9 100644 --- a/testprograms/ref-results/GLOBAL_VAR_main.vcg +++ b/testprograms/ref-results/GLOBAL_VAR_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g27" label: "GLOBAL_VAR_main" status:clustered color:white graph: { title: "n38" label: "Block 38" status:clustered color:yellow -edge: {sourcename: "n38" targetname: "n39" label: "0" color: red} +edge: {sourcename: "n38" targetname: "n39" label: "0" class:13 color:red} node: {title: "n37" label: "End 37" color: blue info1: "visited: 7 irg: GLOBAL_VAR_main arity: 0 @@ -27,23 +30,23 @@ arity: 0 } graph: { title: "n40" label: "Block 40" status:clustered color:yellow -edge: {sourcename: "n40" targetname: "n41" label: "0" color: red} +edge: {sourcename: "n40" targetname: "n41" label: "0" class:13 color:red} node: {title: "n39" label: "Return 39" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 return in method of type GLOBAL_VAR_main "} -edge: {sourcename: "n39" targetname: "n44" label: "0" color: blue} +edge: {sourcename: "n39" targetname: "n44" label: "0" class:14 color:blue} node: {title: "n44" label: "ProjM 0 44" color: yellow info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 "} -edge: {sourcename: "n44" targetname: "n45" label: "0" color: blue} +edge: {sourcename: "n44" targetname: "n45" label: "0" class:14 color:blue} node: {title: "n45" label: "Store 45" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 3 "} -edge: {sourcename: "n45" targetname: "n49" label: "0" color: blue} +edge: {sourcename: "n45" targetname: "n49" label: "0" class:14 color:blue} edge: {sourcename: "n45" targetname: "n47" label: "1" } edge: {sourcename: "n45" targetname: "n46" label: "2" } node: {title: "n47" label: "Sel i 47" info1: "visited: 7 @@ -52,17 +55,17 @@ arity: 2 Selecting entity of type int from entity of type GlobalType "} -edge: {sourcename: "n47" targetname: "n49" label: "0" color: blue} +edge: {sourcename: "n47" targetname: "n49" label: "0" class:14 color:blue} edge: {sourcename: "n47" targetname: "n48" label: "1" } } graph: { title: "n42" label: "Block 42" status:clustered color:yellow -edge: {sourcename: "n42" targetname: "n41" label: "0" color: red} +edge: {sourcename: "n42" targetname: "n41" label: "0" class:13 color:red} node: {title: "n49" label: "ProjM 1 49" color: yellow info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 "} -edge: {sourcename: "n49" targetname: "n43" label: "0" color: blue} +edge: {sourcename: "n49" targetname: "n43" label: "0" class:14 color:blue} node: {title: "n48" label: "ProjP 3 48" color: yellow info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 @@ -77,7 +80,7 @@ node: {title: "n41" label: "ProjX 0 41" color: yellow info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 "} -edge: {sourcename: "n41" targetname: "n43" label: "0" color: red} +edge: {sourcename: "n41" targetname: "n43" label: "0" class:13 color:red} node: {title: "n43" label: "Start 43" color: blue info1: "visited: 7 irg: GLOBAL_VAR_main arity: 0 diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg index c694abb35..2c2f00cbf 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g35" label: "GlobalType_OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 @@ -27,12 +30,12 @@ arity: 0 } graph: { title: "n106" label: "Block 106" status:clustered color:yellow -edge: {sourcename: "n106" targetname: "n191" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} node: {title: "n105" label: "Return 105" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n105" targetname: "n193" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -40,7 +43,7 @@ arity: 1 backedges: intra predecessor nodes: CallT 112 "} -edge: {sourcename: "n193" targetname: "n161" label: "0" color: blue} +edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: @@ -51,19 +54,19 @@ edge: {sourcename: "n194" targetname: "n153" label: "0" } } graph: { title: "n188" label: "Block 188" status:clustered color:yellow -edge: {sourcename: "n188" targetname: "n185" label: "0" color: red} +edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 "} -edge: {sourcename: "n187" targetname: "n136" label: "0" color: blue} +edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n192" targetname: "n190" label: "0" color: red} +edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -79,12 +82,12 @@ edge: {sourcename: "n190" targetname: "n190n165" label: "0" } } graph: { title: "n182" label: "Block 182" status:clustered color:yellow -edge: {sourcename: "n182" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -99,13 +102,13 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n186" targetname: "n184" label: "0" color: red} +edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -121,17 +124,17 @@ edge: {sourcename: "n184" targetname: "n184n166" label: "0" } } graph: { title: "n108" label: "Block 108" status:clustered color:yellow -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 @@ -143,12 +146,12 @@ start of method of type OO_PROGRAM_EXAMPLE_main graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n179" label: "Block 179" status:clustered color:yellow -edge: {sourcename: "n179" targetname: "n178" label: "0" color: red} +edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 31 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n185" targetname: "n180" label: "0" color: red} +edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 31 irg: PRIMA_set_a arity: 0 @@ -156,17 +159,17 @@ arity: 0 } graph: { title: "n132" label: "Block 132" status:clustered color:yellow -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 31 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 31 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } node: {title: "n140" label: "Sel a 140" info1: "visited: 31 @@ -175,7 +178,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n176" label: "1" } node: {title: "n178" label: "Jmp 178" info1: "visited: 31 irg: PRIMA_set_a @@ -184,14 +187,14 @@ arity: 0 } graph: { title: "n134" label: "Block 134" status:clustered color:yellow -edge: {sourcename: "n134" targetname: "n186" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 31 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 "} -edge: {sourcename: "n175" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 31 irg: PRIMA_set_a arity: 1 backedges: @@ -215,7 +218,7 @@ node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 31 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 31 irg: PRIMA_set_a arity: 0 @@ -229,12 +232,12 @@ start of method of type set_a graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n171" label: "Block 171" status:clustered color:yellow -edge: {sourcename: "n171" targetname: "n170" label: "0" color: red} +edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 31 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n191" targetname: "n172" label: "0" color: red} +edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 31 irg: PRIMA_c arity: 0 @@ -242,12 +245,12 @@ arity: 0 } graph: { title: "n149" label: "Block 149" status:clustered color:yellow -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 31 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 31 irg: PRIMA_c arity: 2 @@ -263,7 +266,7 @@ node: {title: "n155" label: "Load 155" info1: "visited: 31 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 31 irg: PRIMA_c @@ -271,7 +274,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n169" label: "1" } node: {title: "n170" label: "Jmp 170" info1: "visited: 31 irg: PRIMA_c @@ -280,14 +283,14 @@ arity: 0 } graph: { title: "n151" label: "Block 151" status:clustered color:yellow -edge: {sourcename: "n151" targetname: "n192" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 31 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 "} -edge: {sourcename: "n168" targetname: "n187" label: "0" color: blue} +edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 31 irg: PRIMA_c arity: 1 backedges: @@ -311,7 +314,7 @@ node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 31 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 31 irg: PRIMA_c arity: 0 diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg index 1fac634ad..257c86ead 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,24 +24,24 @@ node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main "} -edge: { sourcename: "n109" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n109" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} -edge: { sourcename: "n107" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} +edge: { sourcename: "n107" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n182" label: "Block 182" color: lightyellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n182" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -51,18 +54,18 @@ arity: 0 Const of type type_unknown "} edge: {sourcename: "n184" targetname: "n184n166" label: "0" } -edge: { sourcename: "n184" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n184" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n186" targetname: "n184" label: "0" color: red} -edge: { sourcename: "n186" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} +edge: { sourcename: "n186" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n134" label: "Block 134" color: lightyellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n134" targetname: "n186" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 29 irg: PRIMA_set_a arity: 0 @@ -70,44 +73,44 @@ start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} -edge: { sourcename: "n135" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n135" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} -edge: { sourcename: "n133" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} +edge: { sourcename: "n133" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n132" label: "Block 132" color: lightyellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n178" label: "Jmp 178" info1: "visited: 29 irg: PRIMA_set_a arity: 0 "} -edge: { sourcename: "n178" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n178" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n179" label: "Block 179" color: lightyellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n179" targetname: "n178" label: "0" color: red} +edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 29 irg: PRIMA_set_a arity: 0 "} -edge: { sourcename: "n180" targetname: "n179" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n180" targetname: "n179" class:2 priority:2 linestyle:dotted} node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n185" targetname: "n180" label: "0" color: red} -edge: { sourcename: "n185" targetname: "n179" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} +edge: { sourcename: "n185" targetname: "n179" class:2 priority:2 linestyle:dotted} node: {title: "n188" label: "Block 188" color: lightyellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n188" targetname: "n185" label: "0" color: red} +edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -120,18 +123,18 @@ arity: 0 Const of type type_unknown "} edge: {sourcename: "n190" targetname: "n190n165" label: "0" } -edge: { sourcename: "n190" targetname: "n188" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n190" targetname: "n188" class:2 priority:2 linestyle:dotted} node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n192" targetname: "n190" label: "0" color: red} -edge: { sourcename: "n192" targetname: "n188" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} +edge: { sourcename: "n192" targetname: "n188" class:2 priority:2 linestyle:dotted} node: {title: "n151" label: "Block 151" color: lightyellow info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n151" targetname: "n192" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 29 irg: PRIMA_c arity: 0 @@ -139,44 +142,44 @@ start of method of type c param 0 type: class_prima_ptr param 1 type: int "} -edge: { sourcename: "n152" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n152" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 29 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} -edge: { sourcename: "n150" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} +edge: { sourcename: "n150" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n149" label: "Block 149" color: lightyellow info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n170" label: "Jmp 170" info1: "visited: 29 irg: PRIMA_c arity: 0 "} -edge: { sourcename: "n170" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n170" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n171" label: "Block 171" color: lightyellow info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n171" targetname: "n170" label: "0" color: red} +edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 29 irg: PRIMA_c arity: 0 "} -edge: { sourcename: "n172" targetname: "n171" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n172" targetname: "n171" class:2 priority:2 linestyle:dotted} node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 29 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n191" targetname: "n172" label: "0" color: red} -edge: { sourcename: "n191" targetname: "n171" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} +edge: { sourcename: "n191" targetname: "n171" class:2 priority:2 linestyle:dotted} node: {title: "n106" label: "Block 106" color: lightyellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n106" targetname: "n191" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} node: {title: "n167" label: "FilterIs 1 167" color: yellow info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: @@ -189,13 +192,13 @@ arity: 0 Const of type type_unknown "} edge: {sourcename: "n167" targetname: "n167n113" label: "0" } -edge: { sourcename: "n167" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n167" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} -edge: { sourcename: "n117" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} +edge: { sourcename: "n117" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n115" label: "Alloc 115" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 @@ -205,15 +208,15 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } -edge: { sourcename: "n115" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n115" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} edge: {sourcename: "n114" targetname: "n115" label: "0" } -edge: { sourcename: "n114" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n114" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: @@ -221,7 +224,7 @@ intra predecessor nodes: ProjT 158 "} edge: {sourcename: "n169" targetname: "n114" label: "0" } -edge: { sourcename: "n169" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n169" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n177" label: "FilterIs 1 177" color: yellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: @@ -234,7 +237,7 @@ arity: 0 Const of type type_unknown "} edge: {sourcename: "n177" targetname: "n177n121" label: "0" } -edge: { sourcename: "n177" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n177" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: @@ -242,89 +245,89 @@ intra predecessor nodes: ProjT 139 "} edge: {sourcename: "n176" targetname: "n114" label: "0" } -edge: { sourcename: "n176" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n176" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} -edge: { sourcename: "n123" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} +edge: { sourcename: "n123" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 "} -edge: {sourcename: "n175" targetname: "n123" label: "0" color: blue} -edge: { sourcename: "n175" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} +edge: { sourcename: "n175" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n140" label: "Sel a 140" info1: "visited: 29 irg: PRIMA_set_a arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n176" label: "1" } -edge: { sourcename: "n140" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n140" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n137" label: "Store 137" info1: "visited: 29 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } -edge: { sourcename: "n137" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n137" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 29 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} -edge: { sourcename: "n136" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} +edge: { sourcename: "n136" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 "} -edge: {sourcename: "n187" targetname: "n136" label: "0" color: blue} -edge: { sourcename: "n187" targetname: "n188" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} +edge: { sourcename: "n187" targetname: "n188" class:2 priority:2 linestyle:dotted} node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 "} -edge: {sourcename: "n168" targetname: "n187" label: "0" color: blue} -edge: { sourcename: "n168" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} +edge: { sourcename: "n168" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n156" label: "Sel a 156" info1: "visited: 29 irg: PRIMA_c arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n169" label: "1" } -edge: { sourcename: "n156" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n156" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n155" label: "Load 155" info1: "visited: 29 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } -edge: { sourcename: "n155" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n155" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 29 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n154" targetname: "n155" label: "0" } -edge: { sourcename: "n154" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n154" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n153" label: "AddIs 153" info1: "visited: 29 irg: PRIMA_c arity: 2 "} edge: {sourcename: "n153" targetname: "n154" label: "0" } edge: {sourcename: "n153" targetname: "n167" label: "1" } -edge: { sourcename: "n153" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n153" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: @@ -332,36 +335,36 @@ intra predecessor nodes: ProjT 111 "} edge: {sourcename: "n194" targetname: "n153" label: "0" } -edge: { sourcename: "n194" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n194" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 29 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} -edge: { sourcename: "n161" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} +edge: { sourcename: "n161" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 112 "} -edge: {sourcename: "n193" targetname: "n161" label: "0" color: blue} -edge: { sourcename: "n193" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} +edge: { sourcename: "n193" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n105" label: "Return 105" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n105" targetname: "n193" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } -edge: { sourcename: "n105" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n105" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n104" label: "Block 104" color: lightyellow info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: { sourcename: "n103" targetname: "n104" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n103" targetname: "n104" class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg index f77de5bb5..13e7ed83a 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,24 +24,24 @@ node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main "} -edge: { sourcename: "n109" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n109" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} -edge: { sourcename: "n107" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} +edge: { sourcename: "n107" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n182" label: "Block 182" color: lightyellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n182" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -51,18 +54,18 @@ arity: 0 Const of type type_unknown "} edge: {sourcename: "n184" targetname: "n184n166" label: "0" } -edge: { sourcename: "n184" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n184" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n186" targetname: "n184" label: "0" color: red} -edge: { sourcename: "n186" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} +edge: { sourcename: "n186" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n134" label: "Block 134" color: lightyellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n134" targetname: "n186" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 33 irg: PRIMA_set_a arity: 0 @@ -70,44 +73,44 @@ start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} -edge: { sourcename: "n135" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n135" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} -edge: { sourcename: "n133" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} +edge: { sourcename: "n133" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n132" label: "Block 132" color: lightyellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n178" label: "Jmp 178" info1: "visited: 33 irg: PRIMA_set_a arity: 0 "} -edge: { sourcename: "n178" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n178" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n179" label: "Block 179" color: lightyellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n179" targetname: "n178" label: "0" color: red} +edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 33 irg: PRIMA_set_a arity: 0 "} -edge: { sourcename: "n180" targetname: "n179" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n180" targetname: "n179" class:2 priority:2 linestyle:dotted} node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n185" targetname: "n180" label: "0" color: red} -edge: { sourcename: "n185" targetname: "n179" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} +edge: { sourcename: "n185" targetname: "n179" class:2 priority:2 linestyle:dotted} node: {title: "n188" label: "Block 188" color: lightyellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n188" targetname: "n185" label: "0" color: red} +edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -120,18 +123,18 @@ arity: 0 Const of type type_unknown "} edge: {sourcename: "n190" targetname: "n190n165" label: "0" } -edge: { sourcename: "n190" targetname: "n188" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n190" targetname: "n188" class:2 priority:2 linestyle:dotted} node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n192" targetname: "n190" label: "0" color: red} -edge: { sourcename: "n192" targetname: "n188" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} +edge: { sourcename: "n192" targetname: "n188" class:2 priority:2 linestyle:dotted} node: {title: "n151" label: "Block 151" color: lightyellow info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n151" targetname: "n192" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 33 irg: PRIMA_c arity: 0 @@ -139,44 +142,44 @@ start of method of type c param 0 type: class_prima_ptr param 1 type: int "} -edge: { sourcename: "n152" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n152" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 33 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} -edge: { sourcename: "n150" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} +edge: { sourcename: "n150" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n149" label: "Block 149" color: lightyellow info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n170" label: "Jmp 170" info1: "visited: 33 irg: PRIMA_c arity: 0 "} -edge: { sourcename: "n170" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n170" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n171" label: "Block 171" color: lightyellow info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n171" targetname: "n170" label: "0" color: red} +edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 33 irg: PRIMA_c arity: 0 "} -edge: { sourcename: "n172" targetname: "n171" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n172" targetname: "n171" class:2 priority:2 linestyle:dotted} node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 33 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n191" targetname: "n172" label: "0" color: red} -edge: { sourcename: "n191" targetname: "n171" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} +edge: { sourcename: "n191" targetname: "n171" class:2 priority:2 linestyle:dotted} node: {title: "n106" label: "Block 106" color: lightyellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n106" targetname: "n191" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} node: {title: "n167" label: "FilterIs 1 167" color: yellow info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: @@ -189,13 +192,13 @@ arity: 0 Const of type type_unknown "} edge: {sourcename: "n167" targetname: "n167n113" label: "0" } -edge: { sourcename: "n167" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n167" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} -edge: { sourcename: "n117" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} +edge: { sourcename: "n117" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n115" label: "Alloc 115" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 @@ -205,15 +208,15 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } -edge: { sourcename: "n115" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n115" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} edge: {sourcename: "n114" targetname: "n115" label: "0" } -edge: { sourcename: "n114" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n114" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: @@ -221,7 +224,7 @@ intra predecessor nodes: ProjT 158 "} edge: {sourcename: "n169" targetname: "n114" label: "0" } -edge: { sourcename: "n169" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n169" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n177" label: "FilterIs 1 177" color: yellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: @@ -234,7 +237,7 @@ arity: 0 Const of type type_unknown "} edge: {sourcename: "n177" targetname: "n177n121" label: "0" } -edge: { sourcename: "n177" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n177" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: @@ -242,89 +245,89 @@ intra predecessor nodes: ProjT 139 "} edge: {sourcename: "n176" targetname: "n114" label: "0" } -edge: { sourcename: "n176" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n176" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} -edge: { sourcename: "n123" targetname: "n182" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} +edge: { sourcename: "n123" targetname: "n182" class:2 priority:2 linestyle:dotted} node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 "} -edge: {sourcename: "n175" targetname: "n123" label: "0" color: blue} -edge: { sourcename: "n175" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} +edge: { sourcename: "n175" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n140" label: "Sel a 140" info1: "visited: 33 irg: PRIMA_set_a arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n176" label: "1" } -edge: { sourcename: "n140" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n140" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n137" label: "Store 137" info1: "visited: 33 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } -edge: { sourcename: "n137" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n137" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 33 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} -edge: { sourcename: "n136" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} +edge: { sourcename: "n136" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 "} -edge: {sourcename: "n187" targetname: "n136" label: "0" color: blue} -edge: { sourcename: "n187" targetname: "n188" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} +edge: { sourcename: "n187" targetname: "n188" class:2 priority:2 linestyle:dotted} node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 "} -edge: {sourcename: "n168" targetname: "n187" label: "0" color: blue} -edge: { sourcename: "n168" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} +edge: { sourcename: "n168" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n156" label: "Sel a 156" info1: "visited: 33 irg: PRIMA_c arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n169" label: "1" } -edge: { sourcename: "n156" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n156" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n155" label: "Load 155" info1: "visited: 33 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } -edge: { sourcename: "n155" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n155" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 33 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n154" targetname: "n155" label: "0" } -edge: { sourcename: "n154" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n154" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n153" label: "AddIs 153" info1: "visited: 33 irg: PRIMA_c arity: 2 "} edge: {sourcename: "n153" targetname: "n154" label: "0" } edge: {sourcename: "n153" targetname: "n167" label: "1" } -edge: { sourcename: "n153" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n153" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: @@ -332,38 +335,38 @@ intra predecessor nodes: ProjT 111 "} edge: {sourcename: "n194" targetname: "n153" label: "0" } -edge: { sourcename: "n194" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n194" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 33 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} -edge: { sourcename: "n161" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} +edge: { sourcename: "n161" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 112 "} -edge: {sourcename: "n193" targetname: "n161" label: "0" color: blue} -edge: { sourcename: "n193" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} +edge: { sourcename: "n193" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n105" label: "Return 105" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n105" targetname: "n193" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } -edge: { sourcename: "n105" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n105" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n104" label: "Block 104" color: lightyellow info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: { sourcename: "n103" targetname: "n104" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n103" targetname: "n104" class:2 priority:2 linestyle:dotted} node: {title: "e14" label: "ent a" color: yellow info1: " id: e14 @@ -477,8 +480,8 @@ node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n156" targetname: "e14"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n115" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n116" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n140" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n156" targetname: "e14"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n115" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n116" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n140" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg index fb7e68d37..442bbe567 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg index 837f51e07..513a7e71c 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g35" label: "GlobalType_OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 @@ -27,12 +30,12 @@ arity: 0 } graph: { title: "n106" label: "Block 106" status:clustered color:yellow -edge: {sourcename: "n106" targetname: "n191" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} node: {title: "n105" label: "Return 105" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n105" targetname: "n193" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -40,7 +43,7 @@ arity: 1 backedges: intra predecessor nodes: CallT 112 "} -edge: {sourcename: "n193" targetname: "n161" label: "0" color: blue} +edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: @@ -51,19 +54,19 @@ edge: {sourcename: "n194" targetname: "n153" label: "0" } } graph: { title: "n188" label: "Block 188" status:clustered color:yellow -edge: {sourcename: "n188" targetname: "n185" label: "0" color: red} +edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 "} -edge: {sourcename: "n187" targetname: "n136" label: "0" color: blue} +edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n192" targetname: "n190" label: "0" color: red} +edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -79,12 +82,12 @@ edge: {sourcename: "n190" targetname: "n190n165" label: "0" } } graph: { title: "n182" label: "Block 182" status:clustered color:yellow -edge: {sourcename: "n182" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -99,13 +102,13 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n186" targetname: "n184" label: "0" color: red} +edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -121,17 +124,17 @@ edge: {sourcename: "n184" targetname: "n184n166" label: "0" } } graph: { title: "n108" label: "Block 108" status:clustered color:yellow -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 @@ -143,12 +146,12 @@ start of method of type OO_PROGRAM_EXAMPLE_main graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n179" label: "Block 179" status:clustered color:yellow -edge: {sourcename: "n179" targetname: "n178" label: "0" color: red} +edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 41 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n185" targetname: "n180" label: "0" color: red} +edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 41 irg: PRIMA_set_a arity: 0 @@ -156,17 +159,17 @@ arity: 0 } graph: { title: "n132" label: "Block 132" status:clustered color:yellow -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 41 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 41 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } node: {title: "n140" label: "Sel a 140" info1: "visited: 41 @@ -175,7 +178,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n175" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n176" label: "1" } node: {title: "n178" label: "Jmp 178" info1: "visited: 41 irg: PRIMA_set_a @@ -184,14 +187,14 @@ arity: 0 } graph: { title: "n134" label: "Block 134" status:clustered color:yellow -edge: {sourcename: "n134" targetname: "n186" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 41 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 "} -edge: {sourcename: "n175" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 41 irg: PRIMA_set_a arity: 1 backedges: @@ -215,7 +218,7 @@ node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 41 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 41 irg: PRIMA_set_a arity: 0 @@ -229,12 +232,12 @@ start of method of type set_a graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n171" label: "Block 171" status:clustered color:yellow -edge: {sourcename: "n171" targetname: "n170" label: "0" color: red} +edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 41 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n191" targetname: "n172" label: "0" color: red} +edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 41 irg: PRIMA_c arity: 0 @@ -242,12 +245,12 @@ arity: 0 } graph: { title: "n149" label: "Block 149" status:clustered color:yellow -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 41 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 41 irg: PRIMA_c arity: 2 @@ -263,7 +266,7 @@ node: {title: "n155" label: "Load 155" info1: "visited: 41 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 41 irg: PRIMA_c @@ -271,7 +274,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n168" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n169" label: "1" } node: {title: "n170" label: "Jmp 170" info1: "visited: 41 irg: PRIMA_c @@ -280,14 +283,14 @@ arity: 0 } graph: { title: "n151" label: "Block 151" status:clustered color:yellow -edge: {sourcename: "n151" targetname: "n192" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 41 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 "} -edge: {sourcename: "n168" targetname: "n187" label: "0" color: blue} +edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 41 irg: PRIMA_c arity: 1 backedges: @@ -311,7 +314,7 @@ node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 41 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 41 irg: PRIMA_c arity: 0 @@ -436,8 +439,8 @@ node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n156" targetname: "e14"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n115" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n116" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n140" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n156" targetname: "e14"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n115" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n116" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n140" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg index 80d7ffa30..734a3c724 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g35" label: "GlobalType_OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 @@ -27,20 +30,20 @@ arity: 0 } graph: { title: "n106" label: "Block 106" status:clustered color:yellow -edge: {sourcename: "n106" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n107" label: "0" class:13 color:red} node: {title: "n105" label: "Return 105" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int "} -edge: {sourcename: "n105" targetname: "n124" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n124" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n110" label: "1" } node: {title: "n124" label: "ProjM 0 124" color: yellow info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n124" targetname: "n112" label: "0" color: blue} +edge: {sourcename: "n124" targetname: "n112" label: "0" class:14 color:blue} node: {title: "n110" label: "ProjIs 0 110" color: yellow info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -64,7 +67,7 @@ irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: {sourcename: "n112" targetname: "n119" label: "0" color: blue} +edge: {sourcename: "n112" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n118" label: "1" } edge: {sourcename: "n112" targetname: "n114" label: "2" } edge: {sourcename: "n112" targetname: "n112n113" label: "3" } @@ -74,13 +77,13 @@ arity: 2 Selecting entity of type c from entity of type PRIMA "} -edge: {sourcename: "n118" targetname: "n119" label: "0" color: blue} +edge: {sourcename: "n118" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n118" targetname: "n114" label: "1" } node: {title: "n119" label: "ProjM 0 119" color: yellow info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n119" targetname: "n120" label: "0" color: blue} +edge: {sourcename: "n119" targetname: "n120" label: "0" class:14 color:blue} node: {title: "n120" label: "Call 120" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 4 @@ -93,7 +96,7 @@ irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: {sourcename: "n120" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n120" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n120" targetname: "n122" label: "1" } edge: {sourcename: "n120" targetname: "n114" label: "2" } edge: {sourcename: "n120" targetname: "n120n121" label: "3" } @@ -103,13 +106,13 @@ arity: 2 Selecting entity of type set_a from entity of type PRIMA "} -edge: {sourcename: "n122" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n122" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n122" targetname: "n114" label: "1" } node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 @@ -124,22 +127,22 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } } graph: { title: "n108" label: "Block 108" status:clustered color:yellow -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} node: {title: "n109" label: "Start 109" color: blue info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 @@ -262,10 +265,10 @@ node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n112" targetname: "t18"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n115" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n116" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n118" targetname: "e20"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n120" targetname: "t15"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n122" targetname: "e17"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n112" targetname: "t18"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n115" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n116" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n118" targetname: "e20"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n120" targetname: "t15"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n122" targetname: "e17"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg index 93e058cb7..e29b39878 100644 --- a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g26" label: "IF_ELSE_EXAMPLE_main" status:clustered color:white graph: { title: "n60" label: "Block 60" status:clustered color:yellow -edge: {sourcename: "n60" targetname: "n61" label: "0" color: red} +edge: {sourcename: "n60" targetname: "n61" label: "0" class:13 color:red} node: {title: "n59" label: "End 59" color: blue info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 0 @@ -27,7 +30,7 @@ arity: 0 } graph: { title: "n64" label: "Block 64" status:clustered color:yellow -edge: {sourcename: "n64" targetname: "n65" label: "0" color: red} +edge: {sourcename: "n64" targetname: "n65" label: "0" class:13 color:red} node: {title: "n61" label: "Return 61" info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 3 @@ -35,18 +38,18 @@ return in method of type IF_ELSE_EXAMPLE_main res 0 type: int res 1 type: int "} -edge: {sourcename: "n61" targetname: "n71" label: "0" color: blue} +edge: {sourcename: "n61" targetname: "n71" label: "0" class:14 color:blue} edge: {sourcename: "n61" targetname: "n70" label: "1" } edge: {sourcename: "n61" targetname: "n69" label: "2" } } graph: { title: "n66" label: "Block 66" status:clustered color:yellow -edge: {sourcename: "n66" targetname: "n65" label: "0" color: red} +edge: {sourcename: "n66" targetname: "n65" label: "0" class:13 color:red} node: {title: "n71" label: "ProjM 1 71" color: yellow info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n71" targetname: "n67" label: "0" color: blue} +edge: {sourcename: "n71" targetname: "n67" label: "0" class:14 color:blue} node: {title: "n70" label: "0x0Is 70" color: yellow info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 0 @@ -61,7 +64,7 @@ node: {title: "n65" label: "ProjX 0 65" color: yellow info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n65" targetname: "n67" label: "0" color: red} +edge: {sourcename: "n65" targetname: "n67" label: "0" class:13 color:red} node: {title: "n67" label: "Start 67" color: blue info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/IF_EXAMPLE_main.vcg b/testprograms/ref-results/IF_EXAMPLE_main.vcg index 34f2e6239..8c6e695c7 100644 --- a/testprograms/ref-results/IF_EXAMPLE_main.vcg +++ b/testprograms/ref-results/IF_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g26" label: "IF_EXAMPLE_main" status:clustered color:white graph: { title: "n16" label: "Block 16" status:clustered color:yellow -edge: {sourcename: "n16" targetname: "n50" label: "0" color: red} +edge: {sourcename: "n16" targetname: "n50" label: "0" class:13 color:red} node: {title: "n17" label: "End 17" color: blue info1: "visited: 8 irg: IF_EXAMPLE_main arity: 0 @@ -27,15 +30,15 @@ arity: 0 } graph: { title: "n41" label: "Block 41" status:clustered color:yellow -edge: {sourcename: "n41" targetname: "n33" label: "0" color: red} -edge: {sourcename: "n41" targetname: "n40" label: "1" color: red} +edge: {sourcename: "n41" targetname: "n33" label: "0" class:13 color:red} +edge: {sourcename: "n41" targetname: "n40" label: "1" class:13 color:red} node: {title: "n50" label: "Return 50" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 2 return in method of type IF_EXAMPLE_main res 0 type: int "} -edge: {sourcename: "n50" targetname: "n22" label: "0" color: blue} +edge: {sourcename: "n50" targetname: "n22" label: "0" class:14 color:blue} edge: {sourcename: "n50" targetname: "n43" label: "1" } node: {title: "n43" label: "PhiIs 43" color: green info1: "visited: 8 irg: IF_EXAMPLE_main @@ -46,7 +49,7 @@ edge: {sourcename: "n43" targetname: "n38" label: "1" } } graph: { title: "n35" label: "Block 35" status:clustered color:yellow -edge: {sourcename: "n35" targetname: "n34" label: "0" color: red} +edge: {sourcename: "n35" targetname: "n34" label: "0" class:13 color:red} node: {title: "n38" label: "SubIs 38" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 2 @@ -60,17 +63,17 @@ arity: 0 } graph: { title: "n27" label: "Block 27" status:clustered color:yellow -edge: {sourcename: "n27" targetname: "n21" label: "0" color: red} +edge: {sourcename: "n27" targetname: "n21" label: "0" class:13 color:red} node: {title: "n33" label: "ProjX 0 33" color: yellow info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n33" targetname: "n32" label: "0" color: red} +edge: {sourcename: "n33" targetname: "n32" label: "0" class:13 color:red} node: {title: "n34" label: "ProjX 1 34" color: yellow info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n34" targetname: "n32" label: "0" color: red} +edge: {sourcename: "n34" targetname: "n32" label: "0" class:13 color:red} node: {title: "n32" label: "Cond 32" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 @@ -95,12 +98,12 @@ edge: {sourcename: "n28" targetname: "n25" label: "0" } } graph: { title: "n18" label: "Block 18" status:clustered color:yellow -edge: {sourcename: "n18" targetname: "n21" label: "0" color: red} +edge: {sourcename: "n18" targetname: "n21" label: "0" class:13 color:red} node: {title: "n22" label: "ProjM 1 22" color: yellow info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n22" targetname: "n19" label: "0" color: blue} +edge: {sourcename: "n22" targetname: "n19" label: "0" class:14 color:blue} node: {title: "n36" label: "0x3Is 36" color: yellow info1: "visited: 8 irg: IF_EXAMPLE_main arity: 0 @@ -120,7 +123,7 @@ node: {title: "n21" label: "ProjX 0 21" color: yellow info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n21" targetname: "n19" label: "0" color: red} +edge: {sourcename: "n21" targetname: "n19" label: "0" class:13 color:red} node: {title: "n19" label: "Start 19" color: blue info1: "visited: 8 irg: IF_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg index 8c8ec27ec..db8c868b3 100644 --- a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg +++ b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -22,144 +25,144 @@ irg: IF_WHILE_EXAMPLE_main arity: 0 start of method of type main "} -edge: { sourcename: "n88" targetname: "n86" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n88" targetname: "n86" class:2 priority:2 linestyle:dotted} node: {title: "n87" label: "ProjX 0 87" color: yellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n87" targetname: "n88" label: "0" color: red} -edge: { sourcename: "n87" targetname: "n86" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n87" targetname: "n88" label: "0" class:13 color:red} +edge: { sourcename: "n87" targetname: "n86" class:2 priority:2 linestyle:dotted} node: {title: "n86" label: "Block 86" color: lightyellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n86" targetname: "n87" label: "0" color: red} +edge: {sourcename: "n86" targetname: "n87" label: "0" class:13 color:red} node: {title: "n85" label: "0x0Iu 85" color: yellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: { sourcename: "n85" targetname: "n86" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n85" targetname: "n86" class:2 priority:2 linestyle:dotted} node: {title: "n84" label: "CmpT 84" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 "} edge: {sourcename: "n84" targetname: "n85" label: "0" } edge: {sourcename: "n84" targetname: "n85" label: "1" } -edge: { sourcename: "n84" targetname: "n78" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n84" targetname: "n78" class:2 priority:2 linestyle:dotted} node: {title: "n83" label: "Projb Eq 83" color: yellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 "} edge: {sourcename: "n83" targetname: "n84" label: "0" } -edge: { sourcename: "n83" targetname: "n78" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n83" targetname: "n78" class:2 priority:2 linestyle:dotted} node: {title: "n82" label: "Cond 82" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 "} edge: {sourcename: "n82" targetname: "n83" label: "0" } -edge: { sourcename: "n82" targetname: "n78" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n82" targetname: "n78" class:2 priority:2 linestyle:dotted} node: {title: "n81" label: "ProjX 1 81" color: yellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} -edge: { sourcename: "n81" targetname: "n78" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n81" targetname: "n82" label: "0" class:13 color:red} +edge: { sourcename: "n81" targetname: "n78" class:2 priority:2 linestyle:dotted} node: {title: "n80" label: "Block 80" color: lightyellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n80" targetname: "n81" label: "0" color: red} +edge: {sourcename: "n80" targetname: "n81" label: "0" class:13 color:red} node: {title: "n79" label: "Jmp 79" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 "} -edge: { sourcename: "n79" targetname: "n80" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n79" targetname: "n80" class:2 priority:2 linestyle:dotted} node: {title: "n90" label: "Block 90" color: lightyellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n90" targetname: "n87" label: "0" color: red} +edge: {sourcename: "n90" targetname: "n87" label: "0" class:13 color:red} node: {title: "n89" label: "Jmp 89" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 "} -edge: { sourcename: "n89" targetname: "n90" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n89" targetname: "n90" class:2 priority:2 linestyle:dotted} node: {title: "n78" label: "Block 78" color: lightyellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 backedges: "} -edge: {sourcename: "n78" targetname: "n89" label: "0" color: red} -edge: {sourcename: "n78" targetname: "n79" label: "1" color: red} +edge: {sourcename: "n78" targetname: "n89" label: "0" class:13 color:red} +edge: {sourcename: "n78" targetname: "n79" label: "1" class:13 color:red} node: {title: "n77" label: "ProjX 0 77" color: yellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n77" targetname: "n82" label: "0" color: red} -edge: { sourcename: "n77" targetname: "n78" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n77" targetname: "n82" label: "0" class:13 color:red} +edge: { sourcename: "n77" targetname: "n78" class:2 priority:2 linestyle:dotted} node: {title: "n76" label: "Block 76" color: lightyellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n76" targetname: "n77" label: "0" color: red} +edge: {sourcename: "n76" targetname: "n77" label: "0" class:13 color:red} node: {title: "n94" label: "0x0Iu 94" color: yellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: { sourcename: "n94" targetname: "n86" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n94" targetname: "n86" class:2 priority:2 linestyle:dotted} node: {title: "n93" label: "PhiIu 93" color: green info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 backedges: "} edge: {sourcename: "n93" targetname: "n94" label: "0" } edge: {sourcename: "n93" targetname: "n92" label: "1" } -edge: { sourcename: "n93" targetname: "n78" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n93" targetname: "n78" class:2 priority:2 linestyle:dotted} node: {title: "n95" label: "0x1Iu 95" color: yellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: { sourcename: "n95" targetname: "n86" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n95" targetname: "n86" class:2 priority:2 linestyle:dotted} node: {title: "n92" label: "PhiIu 92" color: green info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 backedges: "} edge: {sourcename: "n92" targetname: "n95" label: "0" } edge: {sourcename: "n92" targetname: "n93" label: "1" } -edge: { sourcename: "n92" targetname: "n78" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n92" targetname: "n78" class:2 priority:2 linestyle:dotted} node: {title: "n91" label: "SubIu 91" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 "} edge: {sourcename: "n91" targetname: "n93" label: "0" } edge: {sourcename: "n91" targetname: "n92" label: "1" } -edge: { sourcename: "n91" targetname: "n76" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n91" targetname: "n76" class:2 priority:2 linestyle:dotted} node: {title: "n96" label: "ProjM 1 96" color: yellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n96" targetname: "n88" label: "0" color: blue} -edge: { sourcename: "n96" targetname: "n86" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n96" targetname: "n88" label: "0" class:14 color:blue} +edge: { sourcename: "n96" targetname: "n86" class:2 priority:2 linestyle:dotted} node: {title: "n75" label: "Return 75" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 return in method of type main res 0 type: int "} -edge: {sourcename: "n75" targetname: "n96" label: "0" color: blue} +edge: {sourcename: "n75" targetname: "n96" label: "0" class:14 color:blue} edge: {sourcename: "n75" targetname: "n91" label: "1" } -edge: { sourcename: "n75" targetname: "n76" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n75" targetname: "n76" class:2 priority:2 linestyle:dotted} node: {title: "n74" label: "Block 74" color: lightyellow info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n74" targetname: "n75" label: "0" color: red} +edge: {sourcename: "n74" targetname: "n75" label: "0" class:13 color:red} node: {title: "n73" label: "End 73" color: blue info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 "} -edge: { sourcename: "n73" targetname: "n74" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n73" targetname: "n74" class:2 priority:2 linestyle:dotted} edge: {sourcename: "n88" targetname: "n87" color: red linestyle: dashed} edge: {sourcename: "n88" targetname: "n96" color: red linestyle: dashed} edge: {sourcename: "n87" targetname: "n90" color: red linestyle: dashed} diff --git a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg index 087586e9f..1caf415d7 100644 --- a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg +++ b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/IRREGULAR_CF_main.vcg b/testprograms/ref-results/IRREGULAR_CF_main.vcg index 985e01efa..1e948ae15 100644 --- a/testprograms/ref-results/IRREGULAR_CF_main.vcg +++ b/testprograms/ref-results/IRREGULAR_CF_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g26" label: "IRREGULAR_CF_main" status:clustered color:white graph: { title: "n63" label: "Block 63" status:clustered color:yellow -edge: {sourcename: "n63" targetname: "n64" label: "0" color: red} +edge: {sourcename: "n63" targetname: "n64" label: "0" class:13 color:red} node: {title: "n62" label: "End 62" color: blue info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 @@ -27,18 +30,18 @@ arity: 0 } graph: { title: "n65" label: "Block 65" status:clustered color:yellow -edge: {sourcename: "n65" targetname: "n87" label: "0" color: red} -edge: {sourcename: "n65" targetname: "n66" label: "1" color: red} +edge: {sourcename: "n65" targetname: "n87" label: "0" class:13 color:red} +edge: {sourcename: "n65" targetname: "n66" label: "1" class:13 color:red} node: {title: "n64" label: "Return 64" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 return in method of type main "} -edge: {sourcename: "n64" targetname: "n90" label: "0" color: blue} +edge: {sourcename: "n64" targetname: "n90" label: "0" class:14 color:blue} } graph: { title: "n88" label: "Block 88" status:clustered color:yellow -edge: {sourcename: "n88" targetname: "n89" label: "0" color: red} +edge: {sourcename: "n88" targetname: "n89" label: "0" class:13 color:red} node: {title: "n87" label: "Jmp 87" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 @@ -46,8 +49,8 @@ arity: 0 } graph: { title: "n67" label: "Block 67" status:clustered color:yellow -edge: {sourcename: "n67" targetname: "n80" label: "0" color: red} -edge: {sourcename: "n67" targetname: "n68" label: "1" color: red} +edge: {sourcename: "n67" targetname: "n80" label: "0" class:13 color:red} +edge: {sourcename: "n67" targetname: "n68" label: "1" class:13 color:red} node: {title: "n66" label: "Jmp 66" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 @@ -55,17 +58,17 @@ arity: 0 } graph: { title: "n81" label: "Block 81" status:clustered color:yellow -edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} +edge: {sourcename: "n81" targetname: "n82" label: "0" class:13 color:red} node: {title: "n89" label: "ProjX 0 89" color: yellow info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 "} -edge: {sourcename: "n89" targetname: "n83" label: "0" color: red} +edge: {sourcename: "n89" targetname: "n83" label: "0" class:13 color:red} node: {title: "n80" label: "ProjX 1 80" color: yellow info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 "} -edge: {sourcename: "n80" targetname: "n83" label: "0" color: red} +edge: {sourcename: "n80" targetname: "n83" label: "0" class:13 color:red} node: {title: "n83" label: "Cond 83" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 @@ -85,7 +88,7 @@ edge: {sourcename: "n85" targetname: "n86" label: "1" } } graph: { title: "n69" label: "Block 69" status:clustered color:yellow -edge: {sourcename: "n69" targetname: "n70" label: "0" color: red} +edge: {sourcename: "n69" targetname: "n70" label: "0" class:13 color:red} node: {title: "n68" label: "Jmp 68" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 @@ -93,17 +96,17 @@ arity: 0 } graph: { title: "n71" label: "Block 71" status:clustered color:yellow -edge: {sourcename: "n71" targetname: "n72" label: "0" color: red} +edge: {sourcename: "n71" targetname: "n72" label: "0" class:13 color:red} node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 "} -edge: {sourcename: "n82" targetname: "n75" label: "0" color: red} +edge: {sourcename: "n82" targetname: "n75" label: "0" class:13 color:red} node: {title: "n70" label: "ProjX 1 70" color: yellow info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 "} -edge: {sourcename: "n70" targetname: "n75" label: "0" color: red} +edge: {sourcename: "n70" targetname: "n75" label: "0" class:13 color:red} node: {title: "n75" label: "Cond 75" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 @@ -123,12 +126,12 @@ edge: {sourcename: "n77" targetname: "n78" label: "1" } } graph: { title: "n73" label: "Block 73" status:clustered color:yellow -edge: {sourcename: "n73" targetname: "n72" label: "0" color: red} +edge: {sourcename: "n73" targetname: "n72" label: "0" class:13 color:red} node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 "} -edge: {sourcename: "n90" targetname: "n74" label: "0" color: blue} +edge: {sourcename: "n90" targetname: "n74" label: "0" class:14 color:blue} node: {title: "n86" label: "0x2Is 86" color: yellow info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 @@ -148,7 +151,7 @@ node: {title: "n72" label: "ProjX 0 72" color: yellow info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 "} -edge: {sourcename: "n72" targetname: "n74" label: "0" color: red} +edge: {sourcename: "n72" targetname: "n74" label: "0" class:13 color:red} node: {title: "n74" label: "Start 74" color: blue info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 diff --git a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg index 822c6cf62..20932e404 100644 --- a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg +++ b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/IRR_LOOP_main.vcg b/testprograms/ref-results/IRR_LOOP_main.vcg index 1c71618a0..8f63c7359 100644 --- a/testprograms/ref-results/IRR_LOOP_main.vcg +++ b/testprograms/ref-results/IRR_LOOP_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g26" label: "IRR_LOOP_main" status:clustered color:white graph: { title: "n60" label: "Block 60" status:clustered color:yellow -edge: {sourcename: "n60" targetname: "n61" label: "0" color: red} +edge: {sourcename: "n60" targetname: "n61" label: "0" class:13 color:red} node: {title: "n59" label: "End 59" color: blue info1: "visited: 5 irg: IRR_LOOP_main arity: 3 @@ -27,41 +30,41 @@ arity: 3 } graph: { title: "n62" label: "Block 62" status:clustered color:yellow -edge: {sourcename: "n62" targetname: "n86" label: "0" color: red} -edge: {sourcename: "n62" targetname: "n63" label: "1" color: red} +edge: {sourcename: "n62" targetname: "n86" label: "0" class:13 color:red} +edge: {sourcename: "n62" targetname: "n63" label: "1" class:13 color:red} node: {title: "n61" label: "Return 61" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 return in method of type main "} -edge: {sourcename: "n61" targetname: "n87" label: "0" color: blue} +edge: {sourcename: "n61" targetname: "n87" label: "0" class:14 color:blue} node: {title: "n87" label: "PhiM 87" color: green info1: "visited: 5 irg: IRR_LOOP_main arity: 2 backedges: "} -edge: {sourcename: "n87" targetname: "n89" label: "0" color: blue} -edge: {sourcename: "n87" targetname: "n88" label: "1" color: blue} +edge: {sourcename: "n87" targetname: "n89" label: "0" class:14 color:blue} +edge: {sourcename: "n87" targetname: "n88" label: "1" class:14 color:blue} } graph: { title: "n64" label: "Block 64" status:clustered color:yellow -edge: {sourcename: "n64" targetname: "n85" label: "0" color: red} -edge: {sourcename: "n64" targetname: "n65" label: "1" color: red} +edge: {sourcename: "n64" targetname: "n85" label: "0" class:13 color:red} +edge: {sourcename: "n64" targetname: "n65" label: "1" class:13 color:red} node: {title: "n88" label: "PhiM 88" color: green info1: "visited: 5 irg: IRR_LOOP_main arity: 2 backedges: "} -edge: {sourcename: "n88" targetname: "n90" label: "0" color: blue} -edge: {sourcename: "n88" targetname: "n89" label: "1" color: blue} +edge: {sourcename: "n88" targetname: "n90" label: "0" class:14 color:blue} +edge: {sourcename: "n88" targetname: "n89" label: "1" class:14 color:blue} node: {title: "n63" label: "ProjX 0 63" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 1 "} -edge: {sourcename: "n63" targetname: "n68" label: "0" color: red} +edge: {sourcename: "n63" targetname: "n68" label: "0" class:13 color:red} node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 1 "} -edge: {sourcename: "n67" targetname: "n68" label: "0" color: red} +edge: {sourcename: "n67" targetname: "n68" label: "0" class:13 color:red} node: {title: "n68" label: "Cond 68" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 @@ -81,24 +84,24 @@ edge: {sourcename: "n70" targetname: "n71" label: "1" } } graph: { title: "n66" label: "Block 66" status:clustered color:yellow -edge: {sourcename: "n66" targetname: "n76" label: "0" color: red} -edge: {sourcename: "n66" targetname: "n67" label: "1" color: red} +edge: {sourcename: "n66" targetname: "n76" label: "0" class:13 color:red} +edge: {sourcename: "n66" targetname: "n67" label: "1" class:13 color:red} node: {title: "n89" label: "PhiM 89" color: green info1: "visited: 5 irg: IRR_LOOP_main arity: 2 backedges: "} -edge: {sourcename: "n89" targetname: "n90" label: "0" color: blue} -edge: {sourcename: "n89" targetname: "n88" label: "1" color: blue} +edge: {sourcename: "n89" targetname: "n90" label: "0" class:14 color:blue} +edge: {sourcename: "n89" targetname: "n88" label: "1" class:14 color:blue} node: {title: "n86" label: "ProjX 0 86" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 1 "} -edge: {sourcename: "n86" targetname: "n82" label: "0" color: red} +edge: {sourcename: "n86" targetname: "n82" label: "0" class:13 color:red} node: {title: "n65" label: "ProjX 1 65" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 1 "} -edge: {sourcename: "n65" targetname: "n82" label: "0" color: red} +edge: {sourcename: "n65" targetname: "n82" label: "0" class:13 color:red} node: {title: "n82" label: "Cond 82" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 @@ -118,17 +121,17 @@ edge: {sourcename: "n84" targetname: "n71" label: "1" } } graph: { title: "n77" label: "Block 77" status:clustered color:yellow -edge: {sourcename: "n77" targetname: "n73" label: "0" color: red} +edge: {sourcename: "n77" targetname: "n73" label: "0" class:13 color:red} node: {title: "n85" label: "ProjX 1 85" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 1 "} -edge: {sourcename: "n85" targetname: "n78" label: "0" color: red} +edge: {sourcename: "n85" targetname: "n78" label: "0" class:13 color:red} node: {title: "n76" label: "ProjX 0 76" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 1 "} -edge: {sourcename: "n76" targetname: "n78" label: "0" color: red} +edge: {sourcename: "n76" targetname: "n78" label: "0" class:13 color:red} node: {title: "n78" label: "Cond 78" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 @@ -148,12 +151,12 @@ edge: {sourcename: "n80" targetname: "n81" label: "1" } } graph: { title: "n72" label: "Block 72" status:clustered color:yellow -edge: {sourcename: "n72" targetname: "n73" label: "0" color: red} +edge: {sourcename: "n72" targetname: "n73" label: "0" class:13 color:red} node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 1 "} -edge: {sourcename: "n90" targetname: "n74" label: "0" color: blue} +edge: {sourcename: "n90" targetname: "n74" label: "0" class:14 color:blue} node: {title: "n81" label: "0x1Is 81" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 0 @@ -173,7 +176,7 @@ node: {title: "n73" label: "ProjX 0 73" color: yellow info1: "visited: 5 irg: IRR_LOOP_main arity: 1 "} -edge: {sourcename: "n73" targetname: "n74" label: "0" color: red} +edge: {sourcename: "n73" targetname: "n74" label: "0" class:13 color:red} node: {title: "n74" label: "Start 74" color: blue info1: "visited: 5 irg: IRR_LOOP_main arity: 0 diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg index 195717357..252345ebe 100644 --- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg +++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g27" label: "MEMORY_EXAMPLE_main" status:clustered color:white graph: { title: "n76" label: "Block 76" status:clustered color:yellow -edge: {sourcename: "n76" targetname: "n77" label: "0" color: red} +edge: {sourcename: "n76" targetname: "n77" label: "0" class:13 color:red} node: {title: "n75" label: "End 75" color: blue info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 @@ -27,20 +30,20 @@ arity: 1 } graph: { title: "n78" label: "Block 78" status:clustered color:yellow -edge: {sourcename: "n78" targetname: "n79" label: "0" color: red} +edge: {sourcename: "n78" targetname: "n79" label: "0" class:13 color:red} node: {title: "n77" label: "Return 77" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 return in method of type main res 0 type: int "} -edge: {sourcename: "n77" targetname: "n113" label: "0" color: blue} +edge: {sourcename: "n77" targetname: "n113" label: "0" class:14 color:blue} edge: {sourcename: "n77" targetname: "n111" label: "1" } node: {title: "n113" label: "ProjM 0 113" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n113" targetname: "n112" label: "0" color: blue} +edge: {sourcename: "n113" targetname: "n112" label: "0" class:14 color:blue} node: {title: "n111" label: "ProjIu 2 111" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 @@ -50,23 +53,23 @@ node: {title: "n112" label: "Load 112" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n112" targetname: "n95" label: "0" color: blue} +edge: {sourcename: "n112" targetname: "n95" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n87" label: "1" } } graph: { title: "n80" label: "Block 80" status:clustered color:yellow -edge: {sourcename: "n80" targetname: "n110" label: "0" color: red} -edge: {sourcename: "n80" targetname: "n81" label: "1" color: red} +edge: {sourcename: "n80" targetname: "n110" label: "0" class:13 color:red} +edge: {sourcename: "n80" targetname: "n81" label: "1" class:13 color:red} node: {title: "n79" label: "ProjX 1 79" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n79" targetname: "n82" label: "0" color: red} +edge: {sourcename: "n79" targetname: "n82" label: "0" class:13 color:red} node: {title: "n81" label: "ProjX 0 81" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} +edge: {sourcename: "n81" targetname: "n82" label: "0" class:13 color:red} node: {title: "n82" label: "Cond 82" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 @@ -92,43 +95,43 @@ node: {title: "n86" label: "Load 86" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n86" targetname: "n94" label: "0" color: blue} +edge: {sourcename: "n86" targetname: "n94" label: "0" class:14 color:blue} edge: {sourcename: "n86" targetname: "n87" label: "1" } node: {title: "n94" label: "PhiM 94" color: green info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 backedges: "} -edge: {sourcename: "n94" targetname: "n104" label: "0" color: blue} -edge: {sourcename: "n94" targetname: "n95" label: "1" color: blue} +edge: {sourcename: "n94" targetname: "n104" label: "0" class:14 color:blue} +edge: {sourcename: "n94" targetname: "n95" label: "1" class:14 color:blue} node: {title: "n95" label: "ProjM 0 95" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n95" targetname: "n96" label: "0" color: blue} +edge: {sourcename: "n95" targetname: "n96" label: "0" class:14 color:blue} node: {title: "n96" label: "Store 96" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n96" targetname: "n98" label: "0" color: blue} +edge: {sourcename: "n96" targetname: "n98" label: "0" class:14 color:blue} edge: {sourcename: "n96" targetname: "n97" label: "1" } edge: {sourcename: "n96" targetname: "n85" label: "2" } node: {title: "n98" label: "ProjM 0 98" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n98" targetname: "n99" label: "0" color: blue} +edge: {sourcename: "n98" targetname: "n99" label: "0" class:14 color:blue} node: {title: "n99" label: "Store 99" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n99" targetname: "n103" label: "0" color: blue} +edge: {sourcename: "n99" targetname: "n103" label: "0" class:14 color:blue} edge: {sourcename: "n99" targetname: "n87" label: "1" } edge: {sourcename: "n99" targetname: "n100" label: "2" } node: {title: "n103" label: "ProjM 0 103" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n103" targetname: "n101" label: "0" color: blue} +edge: {sourcename: "n103" targetname: "n101" label: "0" class:14 color:blue} node: {title: "n100" label: "ProjIu 2 100" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 @@ -138,17 +141,17 @@ node: {title: "n101" label: "Load 101" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 "} -edge: {sourcename: "n101" targetname: "n102" label: "0" color: blue} +edge: {sourcename: "n101" targetname: "n102" label: "0" class:14 color:blue} edge: {sourcename: "n101" targetname: "n97" label: "1" } node: {title: "n102" label: "ProjM 0 102" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n102" targetname: "n86" label: "0" color: blue} +edge: {sourcename: "n102" targetname: "n86" label: "0" class:14 color:blue} } graph: { title: "n88" label: "Block 88" status:clustered color:yellow -edge: {sourcename: "n88" targetname: "n89" label: "0" color: red} +edge: {sourcename: "n88" targetname: "n89" label: "0" class:13 color:red} node: {title: "n110" label: "Jmp 110" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 0 @@ -157,24 +160,24 @@ node: {title: "n104" label: "ProjM 0 104" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n104" targetname: "n105" label: "0" color: blue} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:14 color:blue} node: {title: "n105" label: "Store 105" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n105" targetname: "n107" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n107" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n97" label: "1" } edge: {sourcename: "n105" targetname: "n106" label: "2" } node: {title: "n107" label: "ProjM 0 107" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n108" label: "0" color: blue} +edge: {sourcename: "n107" targetname: "n108" label: "0" class:14 color:blue} node: {title: "n108" label: "Store 108" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n108" targetname: "n93" label: "0" color: blue} +edge: {sourcename: "n108" targetname: "n93" label: "0" class:14 color:blue} edge: {sourcename: "n108" targetname: "n87" label: "1" } edge: {sourcename: "n108" targetname: "n109" label: "2" } node: {title: "n97" label: "Sel VAR_B 97" info1: "visited: 15 @@ -183,7 +186,7 @@ arity: 2 Selecting entity of type int from entity of type GlobalType "} -edge: {sourcename: "n97" targetname: "n93" label: "0" color: blue} +edge: {sourcename: "n97" targetname: "n93" label: "0" class:14 color:blue} edge: {sourcename: "n97" targetname: "n92" label: "1" } node: {title: "n87" label: "Sel VAR_A 87" info1: "visited: 15 irg: MEMORY_EXAMPLE_main @@ -191,12 +194,12 @@ arity: 2 Selecting entity of type int from entity of type GlobalType "} -edge: {sourcename: "n87" targetname: "n93" label: "0" color: blue} +edge: {sourcename: "n87" targetname: "n93" label: "0" class:14 color:blue} edge: {sourcename: "n87" targetname: "n92" label: "1" } } graph: { title: "n90" label: "Block 90" status:clustered color:yellow -edge: {sourcename: "n90" targetname: "n89" label: "0" color: red} +edge: {sourcename: "n90" targetname: "n89" label: "0" class:13 color:red} node: {title: "n109" label: "0x0Iu 109" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 0 @@ -211,7 +214,7 @@ node: {title: "n93" label: "ProjM 1 93" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n93" targetname: "n91" label: "0" color: blue} +edge: {sourcename: "n93" targetname: "n91" label: "0" class:14 color:blue} node: {title: "n92" label: "ProjP 3 92" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 @@ -221,7 +224,7 @@ node: {title: "n89" label: "ProjX 0 89" color: yellow info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n89" targetname: "n91" label: "0" color: red} +edge: {sourcename: "n89" targetname: "n91" label: "0" class:13 color:red} node: {title: "n91" label: "Start 91" color: blue info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg index 3f06daff6..92e569c43 100644 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,19 +22,19 @@ classname 12: "Member" graph: { title: "g35" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white graph: { title: "n196" label: "Block 196" status:clustered color:yellow -edge: {sourcename: "n196" targetname: "n198" label: "0" color: red} -edge: {sourcename: "n196" targetname: "n197" label: "1" color: red} +edge: {sourcename: "n196" targetname: "n198" label: "0" class:13 color:red} +edge: {sourcename: "n196" targetname: "n197" label: "1" class:13 color:red} node: {title: "n200" label: "PhiM 200" color: green info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 2 backedges: "} -edge: {sourcename: "n200" targetname: "n211" label: "0" color: blue} -edge: {sourcename: "n200" targetname: "n201" label: "1" color: blue} +edge: {sourcename: "n200" targetname: "n211" label: "0" class:14 color:blue} +edge: {sourcename: "n200" targetname: "n201" label: "1" class:14 color:blue} node: {title: "n201" label: "Store 201" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n201" targetname: "n200" label: "0" color: blue} +edge: {sourcename: "n201" targetname: "n200" label: "0" class:14 color:blue} edge: {sourcename: "n201" targetname: "n206" label: "1" } edge: {sourcename: "n201" targetname: "n202" label: "2" } node: {title: "n206" label: "Sel a 206" info1: "visited: 22 @@ -40,7 +43,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA_INLINE "} -edge: {sourcename: "n206" targetname: "n200" label: "0" color: blue} +edge: {sourcename: "n206" targetname: "n200" label: "0" class:14 color:blue} edge: {sourcename: "n206" targetname: "n207" label: "1" } node: {title: "n202" label: "PhiIs 202" color: green info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main @@ -61,17 +64,17 @@ arity: 0 } graph: { title: "n199" label: "Block 199" status:clustered color:yellow -edge: {sourcename: "n199" targetname: "n194" label: "0" color: red} +edge: {sourcename: "n199" targetname: "n194" label: "0" class:13 color:red} node: {title: "n211" label: "ProjM 0 211" color: yellow info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n211" targetname: "n212" label: "0" color: blue} +edge: {sourcename: "n211" targetname: "n212" label: "0" class:14 color:blue} node: {title: "n212" label: "Store 212" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n212" targetname: "n215" label: "0" color: blue} +edge: {sourcename: "n212" targetname: "n215" label: "0" class:14 color:blue} edge: {sourcename: "n212" targetname: "n214" label: "1" } edge: {sourcename: "n212" targetname: "n213" label: "2" } node: {title: "n214" label: "Sel a 214" info1: "visited: 22 @@ -80,13 +83,13 @@ arity: 2 Selecting entity of type int from entity of type PRIMA_INLINE "} -edge: {sourcename: "n214" targetname: "n215" label: "0" color: blue} +edge: {sourcename: "n214" targetname: "n215" label: "0" class:14 color:blue} edge: {sourcename: "n214" targetname: "n207" label: "1" } node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n215" targetname: "n208" label: "0" color: blue} +edge: {sourcename: "n215" targetname: "n208" label: "0" class:14 color:blue} node: {title: "n207" label: "ProjP 2 207" color: yellow info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 @@ -97,7 +100,7 @@ irg: OO_INLINE_EXAMPLE_main arity: 2 allocating entity of type PRIMA_INLINE "} -edge: {sourcename: "n208" targetname: "n210" label: "0" color: blue} +edge: {sourcename: "n208" targetname: "n210" label: "0" class:14 color:blue} edge: {sourcename: "n208" targetname: "n209" label: "1" } node: {title: "n204" label: "0x0Is 204" color: yellow info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main @@ -111,7 +114,7 @@ arity: 0 } graph: { title: "n193" label: "Block 193" status:clustered color:yellow -edge: {sourcename: "n193" targetname: "n194" label: "0" color: red} +edge: {sourcename: "n193" targetname: "n194" label: "0" class:13 color:red} node: {title: "n213" label: "0x2Is 213" color: yellow info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 @@ -121,7 +124,7 @@ node: {title: "n210" label: "ProjM 1 210" color: yellow info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n210" targetname: "n195" label: "0" color: blue} +edge: {sourcename: "n210" targetname: "n195" label: "0" class:14 color:blue} node: {title: "n209" label: "SymC PRIMA_INLINE size 209" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 @@ -135,7 +138,7 @@ node: {title: "n194" label: "ProjX 0 194" color: yellow info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n194" targetname: "n195" label: "0" color: red} +edge: {sourcename: "n194" targetname: "n195" label: "0" class:13 color:red} node: {title: "n195" label: "Start 195" color: blue info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 @@ -265,8 +268,8 @@ node: {title: "t24" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "state: size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n206" targetname: "e14"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n208" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n209" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n214" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n206" targetname: "e14"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n208" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n209" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n214" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg index 0c3e5dcfc..0ca53481e 100644 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,19 +22,19 @@ classname 12: "Member" graph: { title: "g35" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white graph: { title: "n196" label: "Block 196" status:clustered color:yellow -edge: {sourcename: "n196" targetname: "n198" label: "0" color: red} -edge: {sourcename: "n196" targetname: "n197" label: "1" color: red} +edge: {sourcename: "n196" targetname: "n198" label: "0" class:13 color:red} +edge: {sourcename: "n196" targetname: "n197" label: "1" class:13 color:red} node: {title: "n200" label: "PhiM 200" color: green info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 2 backedges: "} -edge: {sourcename: "n200" targetname: "n211" label: "0" color: blue} -edge: {sourcename: "n200" targetname: "n201" label: "1" color: blue} +edge: {sourcename: "n200" targetname: "n211" label: "0" class:14 color:blue} +edge: {sourcename: "n200" targetname: "n201" label: "1" class:14 color:blue} node: {title: "n201" label: "Store 201" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n201" targetname: "n200" label: "0" color: blue} +edge: {sourcename: "n201" targetname: "n200" label: "0" class:14 color:blue} edge: {sourcename: "n201" targetname: "n206" label: "1" } edge: {sourcename: "n201" targetname: "n202" label: "2" } node: {title: "n206" label: "Sel a 206" info1: "visited: 21 @@ -40,7 +43,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA_INLINE "} -edge: {sourcename: "n206" targetname: "n200" label: "0" color: blue} +edge: {sourcename: "n206" targetname: "n200" label: "0" class:14 color:blue} edge: {sourcename: "n206" targetname: "n207" label: "1" } node: {title: "n202" label: "PhiIs 202" color: green info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main @@ -61,17 +64,17 @@ arity: 0 } graph: { title: "n199" label: "Block 199" status:clustered color:yellow -edge: {sourcename: "n199" targetname: "n194" label: "0" color: red} +edge: {sourcename: "n199" targetname: "n194" label: "0" class:13 color:red} node: {title: "n211" label: "ProjM 0 211" color: yellow info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n211" targetname: "n212" label: "0" color: blue} +edge: {sourcename: "n211" targetname: "n212" label: "0" class:14 color:blue} node: {title: "n212" label: "Store 212" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 3 "} -edge: {sourcename: "n212" targetname: "n215" label: "0" color: blue} +edge: {sourcename: "n212" targetname: "n215" label: "0" class:14 color:blue} edge: {sourcename: "n212" targetname: "n214" label: "1" } edge: {sourcename: "n212" targetname: "n213" label: "2" } node: {title: "n214" label: "Sel a 214" info1: "visited: 21 @@ -80,13 +83,13 @@ arity: 2 Selecting entity of type int from entity of type PRIMA_INLINE "} -edge: {sourcename: "n214" targetname: "n215" label: "0" color: blue} +edge: {sourcename: "n214" targetname: "n215" label: "0" class:14 color:blue} edge: {sourcename: "n214" targetname: "n207" label: "1" } node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n215" targetname: "n208" label: "0" color: blue} +edge: {sourcename: "n215" targetname: "n208" label: "0" class:14 color:blue} node: {title: "n207" label: "ProjP 2 207" color: yellow info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 @@ -97,7 +100,7 @@ irg: OO_INLINE_EXAMPLE_main arity: 2 allocating entity of type PRIMA_INLINE "} -edge: {sourcename: "n208" targetname: "n210" label: "0" color: blue} +edge: {sourcename: "n208" targetname: "n210" label: "0" class:14 color:blue} edge: {sourcename: "n208" targetname: "n209" label: "1" } node: {title: "n204" label: "0x0Is 204" color: yellow info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main @@ -111,7 +114,7 @@ arity: 0 } graph: { title: "n193" label: "Block 193" status:clustered color:yellow -edge: {sourcename: "n193" targetname: "n194" label: "0" color: red} +edge: {sourcename: "n193" targetname: "n194" label: "0" class:13 color:red} node: {title: "n213" label: "0x2Is 213" color: yellow info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 @@ -121,7 +124,7 @@ node: {title: "n210" label: "ProjM 1 210" color: yellow info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n210" targetname: "n195" label: "0" color: blue} +edge: {sourcename: "n210" targetname: "n195" label: "0" class:14 color:blue} node: {title: "n209" label: "SymC PRIMA_INLINE size 209" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 @@ -135,7 +138,7 @@ node: {title: "n194" label: "ProjX 0 194" color: yellow info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n194" targetname: "n195" label: "0" color: red} +edge: {sourcename: "n194" targetname: "n195" label: "0" class:13 color:red} node: {title: "n195" label: "Start 195" color: blue info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg index da6dbc258..866659c87 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,30 +24,30 @@ node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n109" label: "Start 109" color: blue info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main "} -edge: { sourcename: "n109" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n109" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} -edge: { sourcename: "n107" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} +edge: { sourcename: "n107" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n106" label: "Block 106" color: lightyellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n106" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n107" label: "0" class:13 color:red} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} -edge: { sourcename: "n117" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} +edge: { sourcename: "n117" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n115" label: "Alloc 115" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 2 @@ -54,30 +57,30 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } -edge: { sourcename: "n115" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n115" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} edge: {sourcename: "n114" targetname: "n115" label: "0" } -edge: { sourcename: "n114" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n114" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} -edge: { sourcename: "n123" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} +edge: { sourcename: "n123" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n122" label: "Sel PRIMA_set_a 122" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 2 Selecting entity of type set_a from entity of type PRIMA "} -edge: {sourcename: "n122" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n122" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n122" targetname: "n114" label: "1" } -edge: { sourcename: "n122" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n122" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n120" label: "Call 120" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 4 @@ -90,26 +93,26 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: {sourcename: "n120" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n120" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n120" targetname: "n122" label: "1" } edge: {sourcename: "n120" targetname: "n114" label: "2" } edge: {sourcename: "n120" targetname: "n120n121" label: "3" } -edge: { sourcename: "n120" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n120" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n119" label: "ProjM 0 119" color: yellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n119" targetname: "n120" label: "0" color: blue} -edge: { sourcename: "n119" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n119" targetname: "n120" label: "0" class:14 color:blue} +edge: { sourcename: "n119" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n118" label: "Sel PRIMA_c 118" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 2 Selecting entity of type c from entity of type PRIMA "} -edge: {sourcename: "n118" targetname: "n119" label: "0" color: blue} +edge: {sourcename: "n118" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n118" targetname: "n114" label: "1" } -edge: { sourcename: "n118" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n118" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n112" label: "Call 112" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 4 @@ -123,48 +126,48 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: {sourcename: "n112" targetname: "n119" label: "0" color: blue} +edge: {sourcename: "n112" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n118" label: "1" } edge: {sourcename: "n112" targetname: "n114" label: "2" } edge: {sourcename: "n112" targetname: "n112n113" label: "3" } -edge: { sourcename: "n112" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n112" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n111" label: "ProjT 2 111" color: yellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} edge: {sourcename: "n111" targetname: "n112" label: "0" } -edge: { sourcename: "n111" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n111" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n110" label: "ProjIs 0 110" color: yellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} edge: {sourcename: "n110" targetname: "n111" label: "0" } -edge: { sourcename: "n110" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n110" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n124" label: "ProjM 0 124" color: yellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n124" targetname: "n112" label: "0" color: blue} -edge: { sourcename: "n124" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n124" targetname: "n112" label: "0" class:14 color:blue} +edge: { sourcename: "n124" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n105" label: "Return 105" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 2 return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int "} -edge: {sourcename: "n105" targetname: "n124" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n124" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n110" label: "1" } -edge: { sourcename: "n105" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n105" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n104" label: "Block 104" color: lightyellow info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: { sourcename: "n103" targetname: "n104" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n103" targetname: "n104" class:2 priority:2 linestyle:dotted} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, @@ -278,10 +281,10 @@ node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n112" targetname: "t18"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n115" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n116" targetname: "t12"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n118" targetname: "e20"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n120" targetname: "t15"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n122" targetname: "e17"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n112" targetname: "t18"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n115" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n116" targetname: "t12"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n118" targetname: "e20"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n120" targetname: "t15"class:2 priority:2 linestyle:dotted} +edge: { sourcename: "n122" targetname: "e17"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg index bd44434de..2152d96ce 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,30 +24,30 @@ node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n109" label: "Start 109" color: blue info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main "} -edge: { sourcename: "n109" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n109" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} -edge: { sourcename: "n107" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} +edge: { sourcename: "n107" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n106" label: "Block 106" color: lightyellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n106" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n107" label: "0" class:13 color:red} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} -edge: { sourcename: "n117" targetname: "n108" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} +edge: { sourcename: "n117" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n115" label: "Alloc 115" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 2 @@ -54,30 +57,30 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } -edge: { sourcename: "n115" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n115" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} edge: {sourcename: "n114" targetname: "n115" label: "0" } -edge: { sourcename: "n114" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n114" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} -edge: { sourcename: "n123" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} +edge: { sourcename: "n123" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n122" label: "Sel PRIMA_set_a 122" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 2 Selecting entity of type set_a from entity of type PRIMA "} -edge: {sourcename: "n122" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n122" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n122" targetname: "n114" label: "1" } -edge: { sourcename: "n122" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n122" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n120" label: "Call 120" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 4 @@ -90,26 +93,26 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: {sourcename: "n120" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n120" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n120" targetname: "n122" label: "1" } edge: {sourcename: "n120" targetname: "n114" label: "2" } edge: {sourcename: "n120" targetname: "n120n121" label: "3" } -edge: { sourcename: "n120" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n120" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n119" label: "ProjM 0 119" color: yellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n119" targetname: "n120" label: "0" color: blue} -edge: { sourcename: "n119" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n119" targetname: "n120" label: "0" class:14 color:blue} +edge: { sourcename: "n119" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n118" label: "Sel PRIMA_c 118" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 2 Selecting entity of type c from entity of type PRIMA "} -edge: {sourcename: "n118" targetname: "n119" label: "0" color: blue} +edge: {sourcename: "n118" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n118" targetname: "n114" label: "1" } -edge: { sourcename: "n118" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n118" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n112" label: "Call 112" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 4 @@ -123,46 +126,46 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: {sourcename: "n112" targetname: "n119" label: "0" color: blue} +edge: {sourcename: "n112" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n118" label: "1" } edge: {sourcename: "n112" targetname: "n114" label: "2" } edge: {sourcename: "n112" targetname: "n112n113" label: "3" } -edge: { sourcename: "n112" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n112" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n111" label: "ProjT 2 111" color: yellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} edge: {sourcename: "n111" targetname: "n112" label: "0" } -edge: { sourcename: "n111" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n111" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n110" label: "ProjIs 0 110" color: yellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} edge: {sourcename: "n110" targetname: "n111" label: "0" } -edge: { sourcename: "n110" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n110" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n124" label: "ProjM 0 124" color: yellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n124" targetname: "n112" label: "0" color: blue} -edge: { sourcename: "n124" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n124" targetname: "n112" label: "0" class:14 color:blue} +edge: { sourcename: "n124" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n105" label: "Return 105" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 2 return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int "} -edge: {sourcename: "n105" targetname: "n124" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n124" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n110" label: "1" } -edge: { sourcename: "n105" targetname: "n106" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n105" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n104" label: "Block 104" color: lightyellow info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: "} -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: { sourcename: "n103" targetname: "n104" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n103" targetname: "n104" class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg index 63f827111..c6b18bac0 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g35" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow -edge: {sourcename: "n104" targetname: "n105" label: "0" color: red} +edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} node: {title: "n103" label: "End 103" color: blue info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 0 @@ -27,20 +30,20 @@ arity: 0 } graph: { title: "n106" label: "Block 106" status:clustered color:yellow -edge: {sourcename: "n106" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n106" targetname: "n107" label: "0" class:13 color:red} node: {title: "n105" label: "Return 105" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 2 return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int "} -edge: {sourcename: "n105" targetname: "n124" label: "0" color: blue} +edge: {sourcename: "n105" targetname: "n124" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n110" label: "1" } node: {title: "n124" label: "ProjM 0 124" color: yellow info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n124" targetname: "n112" label: "0" color: blue} +edge: {sourcename: "n124" targetname: "n112" label: "0" class:14 color:blue} node: {title: "n110" label: "ProjIs 0 110" color: yellow info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 @@ -64,7 +67,7 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: {sourcename: "n112" targetname: "n119" label: "0" color: blue} +edge: {sourcename: "n112" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n118" label: "1" } edge: {sourcename: "n112" targetname: "n114" label: "2" } edge: {sourcename: "n112" targetname: "n112n113" label: "3" } @@ -74,13 +77,13 @@ arity: 2 Selecting entity of type c from entity of type PRIMA "} -edge: {sourcename: "n118" targetname: "n119" label: "0" color: blue} +edge: {sourcename: "n118" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n118" targetname: "n114" label: "1" } node: {title: "n119" label: "ProjM 0 119" color: yellow info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n119" targetname: "n120" label: "0" color: blue} +edge: {sourcename: "n119" targetname: "n120" label: "0" class:14 color:blue} node: {title: "n120" label: "Call 120" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 4 @@ -93,7 +96,7 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown "} -edge: {sourcename: "n120" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n120" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n120" targetname: "n122" label: "1" } edge: {sourcename: "n120" targetname: "n114" label: "2" } edge: {sourcename: "n120" targetname: "n120n121" label: "3" } @@ -103,13 +106,13 @@ arity: 2 Selecting entity of type set_a from entity of type PRIMA "} -edge: {sourcename: "n122" targetname: "n123" label: "0" color: blue} +edge: {sourcename: "n122" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n122" targetname: "n114" label: "1" } node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n123" targetname: "n115" label: "0" color: blue} +edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 @@ -124,22 +127,22 @@ node: {title: "n115n116" label: "SymC PRIMA size 116" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 0 "} -edge: {sourcename: "n115" targetname: "n117" label: "0" color: blue} +edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } } graph: { title: "n108" label: "Block 108" status:clustered color:yellow -edge: {sourcename: "n108" targetname: "n107" label: "0" color: red} +edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n117" targetname: "n109" label: "0" color: blue} +edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n107" targetname: "n109" label: "0" color: red} +edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} node: {title: "n109" label: "Start 109" color: blue info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg index 74e615739..5dd5c9a75 100644 --- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,19 +22,19 @@ classname 12: "Member" graph: { title: "g90" label: "PRIMA_INLINE_c" status:clustered color:white graph: { title: "n242" label: "Block 242" status:clustered color:yellow -edge: {sourcename: "n242" targetname: "n244" label: "0" color: red} -edge: {sourcename: "n242" targetname: "n243" label: "1" color: red} +edge: {sourcename: "n242" targetname: "n244" label: "0" class:13 color:red} +edge: {sourcename: "n242" targetname: "n243" label: "1" class:13 color:red} node: {title: "n246" label: "PhiM 246" color: green info1: "visited: 22 irg: PRIMA_INLINE_c arity: 2 backedges: "} -edge: {sourcename: "n246" targetname: "n255" label: "0" color: blue} -edge: {sourcename: "n246" targetname: "n247" label: "1" color: blue} +edge: {sourcename: "n246" targetname: "n255" label: "0" class:14 color:blue} +edge: {sourcename: "n246" targetname: "n247" label: "1" class:14 color:blue} node: {title: "n247" label: "Store 247" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 3 "} -edge: {sourcename: "n247" targetname: "n246" label: "0" color: blue} +edge: {sourcename: "n247" targetname: "n246" label: "0" class:14 color:blue} edge: {sourcename: "n247" targetname: "n253" label: "1" } edge: {sourcename: "n247" targetname: "n248" label: "2" } node: {title: "n253" label: "Sel a 253" info1: "visited: 22 @@ -40,7 +43,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA_INLINE "} -edge: {sourcename: "n253" targetname: "n246" label: "0" color: blue} +edge: {sourcename: "n253" targetname: "n246" label: "0" class:14 color:blue} edge: {sourcename: "n253" targetname: "n254" label: "1" } node: {title: "n248" label: "PhiIs 248" color: green info1: "visited: 22 irg: PRIMA_INLINE_c @@ -61,7 +64,7 @@ arity: 0 } graph: { title: "n245" label: "Block 245" status:clustered color:yellow -edge: {sourcename: "n245" targetname: "n240" label: "0" color: red} +edge: {sourcename: "n245" targetname: "n240" label: "0" class:13 color:red} node: {title: "n254" label: "ProjP 0 254" color: yellow info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 @@ -79,12 +82,12 @@ arity: 0 } graph: { title: "n239" label: "Block 239" status:clustered color:yellow -edge: {sourcename: "n239" targetname: "n240" label: "0" color: red} +edge: {sourcename: "n239" targetname: "n240" label: "0" class:13 color:red} node: {title: "n255" label: "ProjM 1 255" color: yellow info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 "} -edge: {sourcename: "n255" targetname: "n241" label: "0" color: blue} +edge: {sourcename: "n255" targetname: "n241" label: "0" class:14 color:blue} node: {title: "n252" label: "ProjT 4 252" color: yellow info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 @@ -99,7 +102,7 @@ node: {title: "n240" label: "ProjX 0 240" color: yellow info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 "} -edge: {sourcename: "n240" targetname: "n241" label: "0" color: red} +edge: {sourcename: "n240" targetname: "n241" label: "0" class:13 color:red} node: {title: "n241" label: "Start 241" color: blue info1: "visited: 22 irg: PRIMA_INLINE_c arity: 0 @@ -202,5 +205,5 @@ node: {title: "t79" label: "class cframe_tp" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n253" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n253" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_INLINE_c.vcg b/testprograms/ref-results/PRIMA_INLINE_c.vcg index 58fb38e92..91c544489 100644 --- a/testprograms/ref-results/PRIMA_INLINE_c.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_c.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,19 +22,19 @@ classname 12: "Member" graph: { title: "g90" label: "PRIMA_INLINE_c" status:clustered color:white graph: { title: "n242" label: "Block 242" status:clustered color:yellow -edge: {sourcename: "n242" targetname: "n244" label: "0" color: red} -edge: {sourcename: "n242" targetname: "n243" label: "1" color: red} +edge: {sourcename: "n242" targetname: "n244" label: "0" class:13 color:red} +edge: {sourcename: "n242" targetname: "n243" label: "1" class:13 color:red} node: {title: "n246" label: "PhiM 246" color: green info1: "visited: 21 irg: PRIMA_INLINE_c arity: 2 backedges: "} -edge: {sourcename: "n246" targetname: "n255" label: "0" color: blue} -edge: {sourcename: "n246" targetname: "n247" label: "1" color: blue} +edge: {sourcename: "n246" targetname: "n255" label: "0" class:14 color:blue} +edge: {sourcename: "n246" targetname: "n247" label: "1" class:14 color:blue} node: {title: "n247" label: "Store 247" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 3 "} -edge: {sourcename: "n247" targetname: "n246" label: "0" color: blue} +edge: {sourcename: "n247" targetname: "n246" label: "0" class:14 color:blue} edge: {sourcename: "n247" targetname: "n253" label: "1" } edge: {sourcename: "n247" targetname: "n248" label: "2" } node: {title: "n253" label: "Sel a 253" info1: "visited: 21 @@ -40,7 +43,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA_INLINE "} -edge: {sourcename: "n253" targetname: "n246" label: "0" color: blue} +edge: {sourcename: "n253" targetname: "n246" label: "0" class:14 color:blue} edge: {sourcename: "n253" targetname: "n254" label: "1" } node: {title: "n248" label: "PhiIs 248" color: green info1: "visited: 21 irg: PRIMA_INLINE_c @@ -61,7 +64,7 @@ arity: 0 } graph: { title: "n245" label: "Block 245" status:clustered color:yellow -edge: {sourcename: "n245" targetname: "n240" label: "0" color: red} +edge: {sourcename: "n245" targetname: "n240" label: "0" class:13 color:red} node: {title: "n254" label: "ProjP 0 254" color: yellow info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 @@ -79,12 +82,12 @@ arity: 0 } graph: { title: "n239" label: "Block 239" status:clustered color:yellow -edge: {sourcename: "n239" targetname: "n240" label: "0" color: red} +edge: {sourcename: "n239" targetname: "n240" label: "0" class:13 color:red} node: {title: "n255" label: "ProjM 1 255" color: yellow info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 "} -edge: {sourcename: "n255" targetname: "n241" label: "0" color: blue} +edge: {sourcename: "n255" targetname: "n241" label: "0" class:14 color:blue} node: {title: "n252" label: "ProjT 4 252" color: yellow info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 @@ -99,7 +102,7 @@ node: {title: "n240" label: "ProjX 0 240" color: yellow info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 "} -edge: {sourcename: "n240" targetname: "n241" label: "0" color: red} +edge: {sourcename: "n240" targetname: "n241" label: "0" class:13 color:red} node: {title: "n241" label: "Start 241" color: blue info1: "visited: 21 irg: PRIMA_INLINE_c arity: 0 diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg index c23992e56..d98ce4395 100644 --- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g68" label: "PRIMA_INLINE_set_a" status:clustered color:white graph: { title: "n220" label: "Block 220" status:clustered color:yellow -edge: {sourcename: "n220" targetname: "n221" label: "0" color: red} +edge: {sourcename: "n220" targetname: "n221" label: "0" class:13 color:red} node: {title: "n219" label: "End 219" color: blue info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 0 @@ -27,23 +30,23 @@ arity: 0 } graph: { title: "n222" label: "Block 222" status:clustered color:yellow -edge: {sourcename: "n222" targetname: "n223" label: "0" color: red} +edge: {sourcename: "n222" targetname: "n223" label: "0" class:13 color:red} node: {title: "n221" label: "Return 221" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 return in method of type set_a "} -edge: {sourcename: "n221" targetname: "n226" label: "0" color: blue} +edge: {sourcename: "n221" targetname: "n226" label: "0" class:14 color:blue} node: {title: "n226" label: "ProjM 0 226" color: yellow info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 "} -edge: {sourcename: "n226" targetname: "n227" label: "0" color: blue} +edge: {sourcename: "n226" targetname: "n227" label: "0" class:14 color:blue} node: {title: "n227" label: "Store 227" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 3 "} -edge: {sourcename: "n227" targetname: "n232" label: "0" color: blue} +edge: {sourcename: "n227" targetname: "n232" label: "0" class:14 color:blue} edge: {sourcename: "n227" targetname: "n230" label: "1" } edge: {sourcename: "n227" targetname: "n228" label: "2" } node: {title: "n230" label: "Sel a 230" info1: "visited: 17 @@ -52,7 +55,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA_INLINE "} -edge: {sourcename: "n230" targetname: "n232" label: "0" color: blue} +edge: {sourcename: "n230" targetname: "n232" label: "0" class:14 color:blue} edge: {sourcename: "n230" targetname: "n231" label: "1" } node: {title: "n231" label: "ProjP 0 231" color: yellow info1: "visited: 17 irg: PRIMA_INLINE_set_a @@ -67,12 +70,12 @@ edge: {sourcename: "n228" targetname: "n229" label: "0" } } graph: { title: "n224" label: "Block 224" status:clustered color:yellow -edge: {sourcename: "n224" targetname: "n223" label: "0" color: red} +edge: {sourcename: "n224" targetname: "n223" label: "0" class:13 color:red} node: {title: "n232" label: "ProjM 1 232" color: yellow info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 "} -edge: {sourcename: "n232" targetname: "n225" label: "0" color: blue} +edge: {sourcename: "n232" targetname: "n225" label: "0" class:14 color:blue} node: {title: "n229" label: "ProjT 4 229" color: yellow info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 @@ -82,7 +85,7 @@ node: {title: "n223" label: "ProjX 0 223" color: yellow info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 "} -edge: {sourcename: "n223" targetname: "n225" label: "0" color: red} +edge: {sourcename: "n223" targetname: "n225" label: "0" class:13 color:red} node: {title: "n225" label: "Start 225" color: blue info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 0 @@ -178,5 +181,5 @@ node: {title: "t57" label: "class set_aframe_tp" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n230" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n230" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg index ca1c34053..1b86bd9c2 100644 --- a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g68" label: "PRIMA_INLINE_set_a" status:clustered color:white graph: { title: "n220" label: "Block 220" status:clustered color:yellow -edge: {sourcename: "n220" targetname: "n221" label: "0" color: red} +edge: {sourcename: "n220" targetname: "n221" label: "0" class:13 color:red} node: {title: "n219" label: "End 219" color: blue info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 0 @@ -27,23 +30,23 @@ arity: 0 } graph: { title: "n222" label: "Block 222" status:clustered color:yellow -edge: {sourcename: "n222" targetname: "n223" label: "0" color: red} +edge: {sourcename: "n222" targetname: "n223" label: "0" class:13 color:red} node: {title: "n221" label: "Return 221" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 return in method of type set_a "} -edge: {sourcename: "n221" targetname: "n226" label: "0" color: blue} +edge: {sourcename: "n221" targetname: "n226" label: "0" class:14 color:blue} node: {title: "n226" label: "ProjM 0 226" color: yellow info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 "} -edge: {sourcename: "n226" targetname: "n227" label: "0" color: blue} +edge: {sourcename: "n226" targetname: "n227" label: "0" class:14 color:blue} node: {title: "n227" label: "Store 227" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 3 "} -edge: {sourcename: "n227" targetname: "n232" label: "0" color: blue} +edge: {sourcename: "n227" targetname: "n232" label: "0" class:14 color:blue} edge: {sourcename: "n227" targetname: "n230" label: "1" } edge: {sourcename: "n227" targetname: "n228" label: "2" } node: {title: "n230" label: "Sel a 230" info1: "visited: 16 @@ -52,7 +55,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA_INLINE "} -edge: {sourcename: "n230" targetname: "n232" label: "0" color: blue} +edge: {sourcename: "n230" targetname: "n232" label: "0" class:14 color:blue} edge: {sourcename: "n230" targetname: "n231" label: "1" } node: {title: "n231" label: "ProjP 0 231" color: yellow info1: "visited: 16 irg: PRIMA_INLINE_set_a @@ -67,12 +70,12 @@ edge: {sourcename: "n228" targetname: "n229" label: "0" } } graph: { title: "n224" label: "Block 224" status:clustered color:yellow -edge: {sourcename: "n224" targetname: "n223" label: "0" color: red} +edge: {sourcename: "n224" targetname: "n223" label: "0" class:13 color:red} node: {title: "n232" label: "ProjM 1 232" color: yellow info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 "} -edge: {sourcename: "n232" targetname: "n225" label: "0" color: blue} +edge: {sourcename: "n232" targetname: "n225" label: "0" class:14 color:blue} node: {title: "n229" label: "ProjT 4 229" color: yellow info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 @@ -82,7 +85,7 @@ node: {title: "n223" label: "ProjX 0 223" color: yellow info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 "} -edge: {sourcename: "n223" targetname: "n225" label: "0" color: red} +edge: {sourcename: "n223" targetname: "n225" label: "0" class:13 color:red} node: {title: "n225" label: "Start 225" color: blue info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 0 diff --git a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg index 371870c48..05320eb6d 100644 --- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,7 +24,7 @@ node: {title: "n151" label: "Block 151" color: lightyellow info1: "visited: 10 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n151" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n150" label: "0" class:13 color:red} node: {title: "n152" label: "Start 152" color: blue info1: "visited: 10 irg: PRIMA_c arity: 0 @@ -29,96 +32,96 @@ start of method of type c param 0 type: class_prima_ptr param 1 type: int "} -edge: { sourcename: "n152" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n152" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 10 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} -edge: { sourcename: "n150" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} +edge: { sourcename: "n150" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n149" label: "Block 149" color: lightyellow info1: "visited: 10 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n158" label: "ProjT 4 158" color: yellow info1: "visited: 10 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n158" targetname: "n152" label: "0" } -edge: { sourcename: "n158" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n158" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n157" label: "ProjP 0 157" color: yellow info1: "visited: 10 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n157" targetname: "n158" label: "0" } -edge: { sourcename: "n157" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n157" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n159" label: "ProjM 1 159" color: yellow info1: "visited: 10 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n159" targetname: "n152" label: "0" color: blue} -edge: { sourcename: "n159" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n159" targetname: "n152" label: "0" class:14 color:blue} +edge: { sourcename: "n159" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n156" label: "Sel a 156" info1: "visited: 10 irg: PRIMA_c arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n159" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n157" label: "1" } -edge: { sourcename: "n156" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n156" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n155" label: "Load 155" info1: "visited: 10 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n159" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } -edge: { sourcename: "n155" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n155" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 10 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n154" targetname: "n155" label: "0" } -edge: { sourcename: "n154" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n154" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n160" label: "ProjIs 1 160" color: yellow info1: "visited: 10 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n160" targetname: "n158" label: "0" } -edge: { sourcename: "n160" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n160" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n153" label: "AddIs 153" info1: "visited: 10 irg: PRIMA_c arity: 2 "} edge: {sourcename: "n153" targetname: "n160" label: "0" } edge: {sourcename: "n153" targetname: "n154" label: "1" } -edge: { sourcename: "n153" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n153" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 10 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} -edge: { sourcename: "n161" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} +edge: { sourcename: "n161" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n148" label: "Return 148" info1: "visited: 10 irg: PRIMA_c arity: 2 return in method of type c res 0 type: int "} -edge: {sourcename: "n148" targetname: "n161" label: "0" color: blue} +edge: {sourcename: "n148" targetname: "n161" label: "0" class:14 color:blue} edge: {sourcename: "n148" targetname: "n153" label: "1" } -edge: { sourcename: "n148" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n148" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n147" label: "Block 147" color: lightyellow info1: "visited: 10 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n147" targetname: "n148" label: "0" color: red} +edge: {sourcename: "n147" targetname: "n148" label: "0" class:13 color:red} node: {title: "n146" label: "End 146" color: blue info1: "visited: 10 irg: PRIMA_c arity: 0 "} -edge: { sourcename: "n146" targetname: "n147" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n146" targetname: "n147" class:2 priority:2 linestyle:dotted} node: {title: "e14" label: "ent a" color: yellow info1: " id: e14 @@ -203,5 +206,5 @@ node: {title: "t79" label: "class cframe_tp" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n156" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n156" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_c-pure.vcg b/testprograms/ref-results/PRIMA_c-pure.vcg index 6ffe9b6de..41c2639cc 100644 --- a/testprograms/ref-results/PRIMA_c-pure.vcg +++ b/testprograms/ref-results/PRIMA_c-pure.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,7 +24,7 @@ node: {title: "n151" label: "Block 151" color: lightyellow info1: "visited: 8 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n151" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n150" label: "0" class:13 color:red} node: {title: "n152" label: "Start 152" color: blue info1: "visited: 8 irg: PRIMA_c arity: 0 @@ -29,94 +32,94 @@ start of method of type c param 0 type: class_prima_ptr param 1 type: int "} -edge: { sourcename: "n152" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n152" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 8 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} -edge: { sourcename: "n150" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} +edge: { sourcename: "n150" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n149" label: "Block 149" color: lightyellow info1: "visited: 8 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n158" label: "ProjT 4 158" color: yellow info1: "visited: 8 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n158" targetname: "n152" label: "0" } -edge: { sourcename: "n158" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n158" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n157" label: "ProjP 0 157" color: yellow info1: "visited: 8 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n157" targetname: "n158" label: "0" } -edge: { sourcename: "n157" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n157" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n159" label: "ProjM 1 159" color: yellow info1: "visited: 8 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n159" targetname: "n152" label: "0" color: blue} -edge: { sourcename: "n159" targetname: "n151" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n159" targetname: "n152" label: "0" class:14 color:blue} +edge: { sourcename: "n159" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n156" label: "Sel a 156" info1: "visited: 8 irg: PRIMA_c arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n159" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n157" label: "1" } -edge: { sourcename: "n156" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n156" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n155" label: "Load 155" info1: "visited: 8 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n159" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } -edge: { sourcename: "n155" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n155" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 8 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n154" targetname: "n155" label: "0" } -edge: { sourcename: "n154" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n154" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n160" label: "ProjIs 1 160" color: yellow info1: "visited: 8 irg: PRIMA_c arity: 1 "} edge: {sourcename: "n160" targetname: "n158" label: "0" } -edge: { sourcename: "n160" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n160" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n153" label: "AddIs 153" info1: "visited: 8 irg: PRIMA_c arity: 2 "} edge: {sourcename: "n153" targetname: "n160" label: "0" } edge: {sourcename: "n153" targetname: "n154" label: "1" } -edge: { sourcename: "n153" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n153" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 8 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} -edge: { sourcename: "n161" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} +edge: { sourcename: "n161" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n148" label: "Return 148" info1: "visited: 8 irg: PRIMA_c arity: 2 return in method of type c res 0 type: int "} -edge: {sourcename: "n148" targetname: "n161" label: "0" color: blue} +edge: {sourcename: "n148" targetname: "n161" label: "0" class:14 color:blue} edge: {sourcename: "n148" targetname: "n153" label: "1" } -edge: { sourcename: "n148" targetname: "n149" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n148" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n147" label: "Block 147" color: lightyellow info1: "visited: 8 irg: PRIMA_c arity: 1 backedges: "} -edge: {sourcename: "n147" targetname: "n148" label: "0" color: red} +edge: {sourcename: "n147" targetname: "n148" label: "0" class:13 color:red} node: {title: "n146" label: "End 146" color: blue info1: "visited: 8 irg: PRIMA_c arity: 0 "} -edge: { sourcename: "n146" targetname: "n147" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n146" targetname: "n147" class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_c-type.vcg b/testprograms/ref-results/PRIMA_c-type.vcg index 5895a87af..dd150539c 100644 --- a/testprograms/ref-results/PRIMA_c-type.vcg +++ b/testprograms/ref-results/PRIMA_c-type.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg index 02b4f58bf..2710f7c37 100644 --- a/testprograms/ref-results/PRIMA_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n147" label: "Block 147" status:clustered color:yellow -edge: {sourcename: "n147" targetname: "n148" label: "0" color: red} +edge: {sourcename: "n147" targetname: "n148" label: "0" class:13 color:red} node: {title: "n146" label: "End 146" color: blue info1: "visited: 13 irg: PRIMA_c arity: 0 @@ -27,20 +30,20 @@ arity: 0 } graph: { title: "n149" label: "Block 149" status:clustered color:yellow -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n148" label: "Return 148" info1: "visited: 13 irg: PRIMA_c arity: 2 return in method of type c res 0 type: int "} -edge: {sourcename: "n148" targetname: "n161" label: "0" color: blue} +edge: {sourcename: "n148" targetname: "n161" label: "0" class:14 color:blue} edge: {sourcename: "n148" targetname: "n153" label: "1" } node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 13 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 13 irg: PRIMA_c arity: 2 @@ -61,7 +64,7 @@ node: {title: "n155" label: "Load 155" info1: "visited: 13 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n159" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 13 irg: PRIMA_c @@ -69,7 +72,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n159" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n157" label: "1" } node: {title: "n157" label: "ProjP 0 157" color: yellow info1: "visited: 13 irg: PRIMA_c @@ -79,12 +82,12 @@ edge: {sourcename: "n157" targetname: "n158" label: "0" } } graph: { title: "n151" label: "Block 151" status:clustered color:yellow -edge: {sourcename: "n151" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n150" label: "0" class:13 color:red} node: {title: "n159" label: "ProjM 1 159" color: yellow info1: "visited: 13 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n159" targetname: "n152" label: "0" color: blue} +edge: {sourcename: "n159" targetname: "n152" label: "0" class:14 color:blue} node: {title: "n158" label: "ProjT 4 158" color: yellow info1: "visited: 13 irg: PRIMA_c arity: 1 @@ -94,7 +97,7 @@ node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 13 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} node: {title: "n152" label: "Start 152" color: blue info1: "visited: 13 irg: PRIMA_c arity: 0 @@ -190,5 +193,5 @@ node: {title: "t79" label: "class cframe_tp" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n156" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n156" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_c.vcg b/testprograms/ref-results/PRIMA_c.vcg index eb8335e98..62f9bf287 100644 --- a/testprograms/ref-results/PRIMA_c.vcg +++ b/testprograms/ref-results/PRIMA_c.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n147" label: "Block 147" status:clustered color:yellow -edge: {sourcename: "n147" targetname: "n148" label: "0" color: red} +edge: {sourcename: "n147" targetname: "n148" label: "0" class:13 color:red} node: {title: "n146" label: "End 146" color: blue info1: "visited: 9 irg: PRIMA_c arity: 0 @@ -27,20 +30,20 @@ arity: 0 } graph: { title: "n149" label: "Block 149" status:clustered color:yellow -edge: {sourcename: "n149" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n148" label: "Return 148" info1: "visited: 9 irg: PRIMA_c arity: 2 return in method of type c res 0 type: int "} -edge: {sourcename: "n148" targetname: "n161" label: "0" color: blue} +edge: {sourcename: "n148" targetname: "n161" label: "0" class:14 color:blue} edge: {sourcename: "n148" targetname: "n153" label: "1" } node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 9 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n161" targetname: "n155" label: "0" color: blue} +edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 9 irg: PRIMA_c arity: 2 @@ -61,7 +64,7 @@ node: {title: "n155" label: "Load 155" info1: "visited: 9 irg: PRIMA_c arity: 2 "} -edge: {sourcename: "n155" targetname: "n159" label: "0" color: blue} +edge: {sourcename: "n155" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 9 irg: PRIMA_c @@ -69,7 +72,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n156" targetname: "n159" label: "0" color: blue} +edge: {sourcename: "n156" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n157" label: "1" } node: {title: "n157" label: "ProjP 0 157" color: yellow info1: "visited: 9 irg: PRIMA_c @@ -79,12 +82,12 @@ edge: {sourcename: "n157" targetname: "n158" label: "0" } } graph: { title: "n151" label: "Block 151" status:clustered color:yellow -edge: {sourcename: "n151" targetname: "n150" label: "0" color: red} +edge: {sourcename: "n151" targetname: "n150" label: "0" class:13 color:red} node: {title: "n159" label: "ProjM 1 159" color: yellow info1: "visited: 9 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n159" targetname: "n152" label: "0" color: blue} +edge: {sourcename: "n159" targetname: "n152" label: "0" class:14 color:blue} node: {title: "n158" label: "ProjT 4 158" color: yellow info1: "visited: 9 irg: PRIMA_c arity: 1 @@ -94,7 +97,7 @@ node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 9 irg: PRIMA_c arity: 1 "} -edge: {sourcename: "n150" targetname: "n152" label: "0" color: red} +edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} node: {title: "n152" label: "Start 152" color: blue info1: "visited: 9 irg: PRIMA_c arity: 0 diff --git a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg index 53b30b97a..76ae01a22 100644 --- a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,7 +24,7 @@ node: {title: "n134" label: "Block 134" color: lightyellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n134" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n133" label: "0" class:13 color:red} node: {title: "n135" label: "Start 135" color: blue info1: "visited: 10 irg: PRIMA_set_a arity: 0 @@ -29,82 +32,82 @@ start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} -edge: { sourcename: "n135" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n135" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} -edge: { sourcename: "n133" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} +edge: { sourcename: "n133" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n132" label: "Block 132" color: lightyellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n139" label: "ProjT 4 139" color: yellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 "} edge: {sourcename: "n139" targetname: "n135" label: "0" } -edge: { sourcename: "n139" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n139" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n138" label: "ProjIs 1 138" color: yellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 "} edge: {sourcename: "n138" targetname: "n139" label: "0" } -edge: { sourcename: "n138" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n138" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n141" label: "ProjP 0 141" color: yellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 "} edge: {sourcename: "n141" targetname: "n139" label: "0" } -edge: { sourcename: "n141" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n141" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n142" label: "ProjM 1 142" color: yellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n142" targetname: "n135" label: "0" color: blue} -edge: { sourcename: "n142" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n142" targetname: "n135" label: "0" class:14 color:blue} +edge: { sourcename: "n142" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n140" label: "Sel a 140" info1: "visited: 10 irg: PRIMA_set_a arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n142" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n141" label: "1" } -edge: { sourcename: "n140" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n140" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n137" label: "Store 137" info1: "visited: 10 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n142" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n138" label: "2" } -edge: { sourcename: "n137" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n137" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} -edge: { sourcename: "n136" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} +edge: { sourcename: "n136" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n131" label: "Return 131" info1: "visited: 10 irg: PRIMA_set_a arity: 1 return in method of type set_a "} -edge: {sourcename: "n131" targetname: "n136" label: "0" color: blue} -edge: { sourcename: "n131" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n131" targetname: "n136" label: "0" class:14 color:blue} +edge: { sourcename: "n131" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n130" label: "Block 130" color: lightyellow info1: "visited: 10 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n130" targetname: "n131" label: "0" color: red} +edge: {sourcename: "n130" targetname: "n131" label: "0" class:13 color:red} node: {title: "n129" label: "End 129" color: blue info1: "visited: 10 irg: PRIMA_set_a arity: 0 "} -edge: { sourcename: "n129" targetname: "n130" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n129" targetname: "n130" class:2 priority:2 linestyle:dotted} node: {title: "e14" label: "ent a" color: yellow info1: " id: e14 @@ -189,5 +192,5 @@ node: {title: "t57" label: "class set_aframe_tp" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n140" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n140" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_set_a-pure.vcg b/testprograms/ref-results/PRIMA_set_a-pure.vcg index 70216f4d8..a9739f543 100644 --- a/testprograms/ref-results/PRIMA_set_a-pure.vcg +++ b/testprograms/ref-results/PRIMA_set_a-pure.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -21,7 +24,7 @@ node: {title: "n134" label: "Block 134" color: lightyellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n134" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n133" label: "0" class:13 color:red} node: {title: "n135" label: "Start 135" color: blue info1: "visited: 8 irg: PRIMA_set_a arity: 0 @@ -29,80 +32,80 @@ start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} -edge: { sourcename: "n135" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n135" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} -edge: { sourcename: "n133" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} +edge: { sourcename: "n133" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n132" label: "Block 132" color: lightyellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n139" label: "ProjT 4 139" color: yellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 "} edge: {sourcename: "n139" targetname: "n135" label: "0" } -edge: { sourcename: "n139" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n139" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n138" label: "ProjIs 1 138" color: yellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 "} edge: {sourcename: "n138" targetname: "n139" label: "0" } -edge: { sourcename: "n138" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n138" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n141" label: "ProjP 0 141" color: yellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 "} edge: {sourcename: "n141" targetname: "n139" label: "0" } -edge: { sourcename: "n141" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n141" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n142" label: "ProjM 1 142" color: yellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n142" targetname: "n135" label: "0" color: blue} -edge: { sourcename: "n142" targetname: "n134" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n142" targetname: "n135" label: "0" class:14 color:blue} +edge: { sourcename: "n142" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n140" label: "Sel a 140" info1: "visited: 8 irg: PRIMA_set_a arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n142" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n141" label: "1" } -edge: { sourcename: "n140" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n140" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n137" label: "Store 137" info1: "visited: 8 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n142" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n138" label: "2" } -edge: { sourcename: "n137" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n137" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} -edge: { sourcename: "n136" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} +edge: { sourcename: "n136" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n131" label: "Return 131" info1: "visited: 8 irg: PRIMA_set_a arity: 1 return in method of type set_a "} -edge: {sourcename: "n131" targetname: "n136" label: "0" color: blue} -edge: { sourcename: "n131" targetname: "n132" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n131" targetname: "n136" label: "0" class:14 color:blue} +edge: { sourcename: "n131" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n130" label: "Block 130" color: lightyellow info1: "visited: 8 irg: PRIMA_set_a arity: 1 backedges: "} -edge: {sourcename: "n130" targetname: "n131" label: "0" color: red} +edge: {sourcename: "n130" targetname: "n131" label: "0" class:13 color:red} node: {title: "n129" label: "End 129" color: blue info1: "visited: 8 irg: PRIMA_set_a arity: 0 "} -edge: { sourcename: "n129" targetname: "n130" class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n129" targetname: "n130" class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_set_a-type.vcg b/testprograms/ref-results/PRIMA_set_a-type.vcg index bcdd0f37b..37c79e5dd 100644 --- a/testprograms/ref-results/PRIMA_set_a-type.vcg +++ b/testprograms/ref-results/PRIMA_set_a-type.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg index c09c56808..f6dbebc94 100644 --- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n130" label: "Block 130" status:clustered color:yellow -edge: {sourcename: "n130" targetname: "n131" label: "0" color: red} +edge: {sourcename: "n130" targetname: "n131" label: "0" class:13 color:red} node: {title: "n129" label: "End 129" color: blue info1: "visited: 13 irg: PRIMA_set_a arity: 0 @@ -27,23 +30,23 @@ arity: 0 } graph: { title: "n132" label: "Block 132" status:clustered color:yellow -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n131" label: "Return 131" info1: "visited: 13 irg: PRIMA_set_a arity: 1 return in method of type set_a "} -edge: {sourcename: "n131" targetname: "n136" label: "0" color: blue} +edge: {sourcename: "n131" targetname: "n136" label: "0" class:14 color:blue} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 13 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 13 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n142" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n138" label: "2" } node: {title: "n140" label: "Sel a 140" info1: "visited: 13 @@ -52,7 +55,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n142" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n141" label: "1" } node: {title: "n141" label: "ProjP 0 141" color: yellow info1: "visited: 13 irg: PRIMA_set_a @@ -67,12 +70,12 @@ edge: {sourcename: "n138" targetname: "n139" label: "0" } } graph: { title: "n134" label: "Block 134" status:clustered color:yellow -edge: {sourcename: "n134" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n133" label: "0" class:13 color:red} node: {title: "n142" label: "ProjM 1 142" color: yellow info1: "visited: 13 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n142" targetname: "n135" label: "0" color: blue} +edge: {sourcename: "n142" targetname: "n135" label: "0" class:14 color:blue} node: {title: "n139" label: "ProjT 4 139" color: yellow info1: "visited: 13 irg: PRIMA_set_a arity: 1 @@ -82,7 +85,7 @@ node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 13 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} node: {title: "n135" label: "Start 135" color: blue info1: "visited: 13 irg: PRIMA_set_a arity: 0 @@ -178,5 +181,5 @@ node: {title: "t57" label: "class set_aframe_tp" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent " color: green} -edge: { sourcename: "n140" targetname: "e14"class: 2 priority: 2 linestyle: dotted} +edge: { sourcename: "n140" targetname: "e14"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_set_a.vcg b/testprograms/ref-results/PRIMA_set_a.vcg index 1dbbe0ee2..6eec15139 100644 --- a/testprograms/ref-results/PRIMA_set_a.vcg +++ b/testprograms/ref-results/PRIMA_set_a.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n130" label: "Block 130" status:clustered color:yellow -edge: {sourcename: "n130" targetname: "n131" label: "0" color: red} +edge: {sourcename: "n130" targetname: "n131" label: "0" class:13 color:red} node: {title: "n129" label: "End 129" color: blue info1: "visited: 9 irg: PRIMA_set_a arity: 0 @@ -27,23 +30,23 @@ arity: 0 } graph: { title: "n132" label: "Block 132" status:clustered color:yellow -edge: {sourcename: "n132" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n131" label: "Return 131" info1: "visited: 9 irg: PRIMA_set_a arity: 1 return in method of type set_a "} -edge: {sourcename: "n131" targetname: "n136" label: "0" color: blue} +edge: {sourcename: "n131" targetname: "n136" label: "0" class:14 color:blue} node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 9 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n136" targetname: "n137" label: "0" color: blue} +edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 9 irg: PRIMA_set_a arity: 3 "} -edge: {sourcename: "n137" targetname: "n142" label: "0" color: blue} +edge: {sourcename: "n137" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n138" label: "2" } node: {title: "n140" label: "Sel a 140" info1: "visited: 9 @@ -52,7 +55,7 @@ arity: 2 Selecting entity of type int from entity of type PRIMA "} -edge: {sourcename: "n140" targetname: "n142" label: "0" color: blue} +edge: {sourcename: "n140" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n141" label: "1" } node: {title: "n141" label: "ProjP 0 141" color: yellow info1: "visited: 9 irg: PRIMA_set_a @@ -67,12 +70,12 @@ edge: {sourcename: "n138" targetname: "n139" label: "0" } } graph: { title: "n134" label: "Block 134" status:clustered color:yellow -edge: {sourcename: "n134" targetname: "n133" label: "0" color: red} +edge: {sourcename: "n134" targetname: "n133" label: "0" class:13 color:red} node: {title: "n142" label: "ProjM 1 142" color: yellow info1: "visited: 9 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n142" targetname: "n135" label: "0" color: blue} +edge: {sourcename: "n142" targetname: "n135" label: "0" class:14 color:blue} node: {title: "n139" label: "ProjT 4 139" color: yellow info1: "visited: 9 irg: PRIMA_set_a arity: 1 @@ -82,7 +85,7 @@ node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 9 irg: PRIMA_set_a arity: 1 "} -edge: {sourcename: "n133" targetname: "n135" label: "0" color: red} +edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} node: {title: "n135" label: "Start 135" color: blue info1: "visited: 9 irg: PRIMA_set_a arity: 0 diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg index 696354540..041cfc3fd 100644 --- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg +++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg index e8d8f38ad..857f0f593 100644 --- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg +++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g26" label: "THREE_CFPRED_EXAMPLE_main" status:clustered color:white graph: { title: "n75" label: "Block 75" status:clustered color:yellow -edge: {sourcename: "n75" targetname: "n76" label: "0" color: red} +edge: {sourcename: "n75" targetname: "n76" label: "0" class:13 color:red} node: {title: "n74" label: "End 74" color: blue info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 @@ -27,16 +30,16 @@ arity: 0 } graph: { title: "n77" label: "Block 77" status:clustered color:yellow -edge: {sourcename: "n77" targetname: "n100" label: "0" color: red} -edge: {sourcename: "n77" targetname: "n97" label: "1" color: red} -edge: {sourcename: "n77" targetname: "n78" label: "2" color: red} +edge: {sourcename: "n77" targetname: "n100" label: "0" class:13 color:red} +edge: {sourcename: "n77" targetname: "n97" label: "1" class:13 color:red} +edge: {sourcename: "n77" targetname: "n78" label: "2" class:13 color:red} node: {title: "n76" label: "Return 76" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 2 return in method of type THREE_CFPRED_EXAMPLE_main res 0 type: int "} -edge: {sourcename: "n76" targetname: "n106" label: "0" color: blue} +edge: {sourcename: "n76" targetname: "n106" label: "0" class:14 color:blue} edge: {sourcename: "n76" targetname: "n103" label: "1" } node: {title: "n103" label: "PhiIs 103" color: green info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main @@ -48,7 +51,7 @@ edge: {sourcename: "n103" targetname: "n104" label: "2" } } graph: { title: "n101" label: "Block 101" status:clustered color:yellow -edge: {sourcename: "n101" targetname: "n102" label: "0" color: red} +edge: {sourcename: "n101" targetname: "n102" label: "0" class:13 color:red} node: {title: "n100" label: "Jmp 100" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 @@ -56,7 +59,7 @@ arity: 0 } graph: { title: "n98" label: "Block 98" status:clustered color:yellow -edge: {sourcename: "n98" targetname: "n99" label: "0" color: red} +edge: {sourcename: "n98" targetname: "n99" label: "0" class:13 color:red} node: {title: "n97" label: "Jmp 97" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 @@ -64,7 +67,7 @@ arity: 0 } graph: { title: "n79" label: "Block 79" status:clustered color:yellow -edge: {sourcename: "n79" targetname: "n80" label: "0" color: red} +edge: {sourcename: "n79" targetname: "n80" label: "0" class:13 color:red} node: {title: "n78" label: "Jmp 78" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 @@ -72,17 +75,17 @@ arity: 0 } graph: { title: "n81" label: "Block 81" status:clustered color:yellow -edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} +edge: {sourcename: "n81" targetname: "n82" label: "0" class:13 color:red} node: {title: "n99" label: "ProjX 0 99" color: yellow info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n99" targetname: "n93" label: "0" color: red} +edge: {sourcename: "n99" targetname: "n93" label: "0" class:13 color:red} node: {title: "n80" label: "ProjX 1 80" color: yellow info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n80" targetname: "n93" label: "0" color: red} +edge: {sourcename: "n80" targetname: "n93" label: "0" class:13 color:red} node: {title: "n93" label: "Cond 93" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 @@ -102,17 +105,17 @@ edge: {sourcename: "n95" targetname: "n90" label: "1" } } graph: { title: "n83" label: "Block 83" status:clustered color:yellow -edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} +edge: {sourcename: "n83" targetname: "n84" label: "0" class:13 color:red} node: {title: "n102" label: "ProjX 1 102" color: yellow info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n102" targetname: "n87" label: "0" color: red} +edge: {sourcename: "n102" targetname: "n87" label: "0" class:13 color:red} node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n82" targetname: "n87" label: "0" color: red} +edge: {sourcename: "n82" targetname: "n87" label: "0" class:13 color:red} node: {title: "n87" label: "Cond 87" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 @@ -137,12 +140,12 @@ edge: {sourcename: "n90" targetname: "n91" label: "0" } } graph: { title: "n85" label: "Block 85" status:clustered color:yellow -edge: {sourcename: "n85" targetname: "n84" label: "0" color: red} +edge: {sourcename: "n85" targetname: "n84" label: "0" class:13 color:red} node: {title: "n106" label: "ProjM 1 106" color: yellow info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n106" targetname: "n86" label: "0" color: blue} +edge: {sourcename: "n106" targetname: "n86" label: "0" class:14 color:blue} node: {title: "n105" label: "0x5Is 105" color: yellow info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 @@ -172,7 +175,7 @@ node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n84" targetname: "n86" label: "0" color: red} +edge: {sourcename: "n84" targetname: "n86" label: "0" class:13 color:red} node: {title: "n86" label: "Start 86" color: blue info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg index 8c058fd75..57e467735 100644 --- a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g27" label: "WHILE_EXAMPLE_main" status:clustered color:white graph: { title: "n65" label: "Block 65" status:clustered color:yellow -edge: {sourcename: "n65" targetname: "n66" label: "0" color: red} +edge: {sourcename: "n65" targetname: "n66" label: "0" class:13 color:red} node: {title: "n64" label: "End 64" color: blue info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 @@ -27,14 +30,14 @@ arity: 0 } graph: { title: "n67" label: "Block 67" status:clustered color:yellow -edge: {sourcename: "n67" targetname: "n68" label: "0" color: red} +edge: {sourcename: "n67" targetname: "n68" label: "0" class:13 color:red} node: {title: "n66" label: "Return 66" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 2 return in method of type main_tp res 0 type: int "} -edge: {sourcename: "n66" targetname: "n88" label: "0" color: blue} +edge: {sourcename: "n66" targetname: "n88" label: "0" class:14 color:blue} edge: {sourcename: "n66" targetname: "n87" label: "1" } node: {title: "n87" label: "SubIs 87" info1: "visited: 15 irg: WHILE_EXAMPLE_main @@ -45,18 +48,18 @@ edge: {sourcename: "n87" targetname: "n76" label: "1" } } graph: { title: "n69" label: "Block 69" status:clustered color:yellow -edge: {sourcename: "n69" targetname: "n86" label: "0" color: red} -edge: {sourcename: "n69" targetname: "n70" label: "1" color: red} +edge: {sourcename: "n69" targetname: "n86" label: "0" class:13 color:red} +edge: {sourcename: "n69" targetname: "n70" label: "1" class:13 color:red} node: {title: "n68" label: "ProjX 0 68" color: yellow info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n68" targetname: "n73" label: "0" color: red} +edge: {sourcename: "n68" targetname: "n73" label: "0" class:13 color:red} node: {title: "n72" label: "ProjX 1 72" color: yellow info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n72" targetname: "n73" label: "0" color: red} +edge: {sourcename: "n72" targetname: "n73" label: "0" class:13 color:red} node: {title: "n73" label: "Cond 73" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 @@ -88,7 +91,7 @@ edge: {sourcename: "n77" targetname: "n76" label: "1" } } graph: { title: "n71" label: "Block 71" status:clustered color:yellow -edge: {sourcename: "n71" targetname: "n72" label: "0" color: red} +edge: {sourcename: "n71" targetname: "n72" label: "0" class:13 color:red} node: {title: "n70" label: "Jmp 70" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 @@ -96,7 +99,7 @@ arity: 0 } graph: { title: "n79" label: "Block 79" status:clustered color:yellow -edge: {sourcename: "n79" targetname: "n80" label: "0" color: red} +edge: {sourcename: "n79" targetname: "n80" label: "0" class:13 color:red} node: {title: "n86" label: "Jmp 86" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 @@ -109,12 +112,12 @@ edge: {sourcename: "n78" targetname: "n83" label: "0" } } graph: { title: "n81" label: "Block 81" status:clustered color:yellow -edge: {sourcename: "n81" targetname: "n80" label: "0" color: red} +edge: {sourcename: "n81" targetname: "n80" label: "0" class:13 color:red} node: {title: "n88" label: "ProjM 1 88" color: yellow info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n88" targetname: "n82" label: "0" color: blue} +edge: {sourcename: "n88" targetname: "n82" label: "0" class:14 color:blue} node: {title: "n85" label: "0x0Is 85" color: yellow info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 @@ -134,7 +137,7 @@ node: {title: "n80" label: "ProjX 0 80" color: yellow info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 "} -edge: {sourcename: "n80" targetname: "n82" label: "0" color: red} +edge: {sourcename: "n80" targetname: "n82" label: "0" class:13 color:red} node: {title: "n82" label: "Start 82" color: blue info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 diff --git a/testprograms/ref-results/class_hierarchy.vcg b/testprograms/ref-results/class_hierarchy.vcg index 72c81a3a1..03d2d1ca5 100644 --- a/testprograms/ref-results/class_hierarchy.vcg +++ b/testprograms/ref-results/class_hierarchy.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/main-type.vcg b/testprograms/ref-results/main-type.vcg index 0c97862d4..3c7f1f413 100644 --- a/testprograms/ref-results/main-type.vcg +++ b/testprograms/ref-results/main-type.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" diff --git a/testprograms/ref-results/main.vcg b/testprograms/ref-results/main.vcg index ad6b7d41f..a186661b0 100644 --- a/testprograms/ref-results/main.vcg +++ b/testprograms/ref-results/main.vcg @@ -6,6 +6,9 @@ port_sharing: no orientation: bottom_to_top classname 1: "Data" classname 2: "Block" +classname 13:"Control Flow" +classname 14:"Memory" +classname 15:"Dominators" classname 3: "Entity type" classname 4: "Entity owner" classname 5: "Method Param" @@ -19,7 +22,7 @@ classname 12: "Member" graph: { title: "g33" label: "main" status:clustered color:white graph: { title: "n47" label: "Block 47" status:clustered color:yellow -edge: {sourcename: "n47" targetname: "n48" label: "0" color: red} +edge: {sourcename: "n47" targetname: "n48" label: "0" class:13 color:red} node: {title: "n46" label: "End 46" color: blue info1: "visited: 8 irg: main arity: 0 @@ -27,20 +30,20 @@ arity: 0 } graph: { title: "n49" label: "Block 49" status:clustered color:yellow -edge: {sourcename: "n49" targetname: "n50" label: "0" color: red} +edge: {sourcename: "n49" targetname: "n50" label: "0" class:13 color:red} node: {title: "n48" label: "Return 48" info1: "visited: 8 irg: main arity: 2 return in method of type main res 0 type: int "} -edge: {sourcename: "n48" targetname: "n60" label: "0" color: blue} +edge: {sourcename: "n48" targetname: "n60" label: "0" class:14 color:blue} edge: {sourcename: "n48" targetname: "n53" label: "1" } node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 8 irg: main arity: 1 "} -edge: {sourcename: "n60" targetname: "n54" label: "0" color: blue} +edge: {sourcename: "n60" targetname: "n54" label: "0" class:14 color:blue} node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 8 irg: main arity: 1 @@ -50,7 +53,7 @@ node: {title: "n54" label: "Load 54" info1: "visited: 8 irg: main arity: 2 "} -edge: {sourcename: "n54" targetname: "n59" label: "0" color: blue} +edge: {sourcename: "n54" targetname: "n59" label: "0" class:14 color:blue} edge: {sourcename: "n54" targetname: "n55" label: "1" } node: {title: "n55" label: "Sel a_tp_elem_ent 55" info1: "visited: 8 irg: main @@ -58,7 +61,7 @@ arity: 3 Selecting entity of type int from entity of type a_tp "} -edge: {sourcename: "n55" targetname: "n59" label: "0" color: blue} +edge: {sourcename: "n55" targetname: "n59" label: "0" class:14 color:blue} edge: {sourcename: "n55" targetname: "n57" label: "1" } edge: {sourcename: "n55" targetname: "n56" label: "2" } node: {title: "n57" label: "Sel a 57" info1: "visited: 8 @@ -67,17 +70,17 @@ arity: 2 Selecting entity of type a_tp from entity of type mainframe_tp "} -edge: {sourcename: "n57" targetname: "n59" label: "0" color: blue} +edge: {sourcename: "n57" targetname: "n59" label: "0" class:14 color:blue} edge: {sourcename: "n57" targetname: "n58" label: "1" } } graph: { title: "n51" label: "Block 51" status:clustered color:yellow -edge: {sourcename: "n51" targetname: "n50" label: "0" color: red} +edge: {sourcename: "n51" targetname: "n50" label: "0" class:13 color:red} node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 8 irg: main arity: 1 "} -edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue} +edge: {sourcename: "n59" targetname: "n52" label: "0" class:14 color:blue} node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 8 irg: main arity: 1 @@ -92,7 +95,7 @@ node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 8 irg: main arity: 1 "} -edge: {sourcename: "n50" targetname: "n52" label: "0" color: red} +edge: {sourcename: "n50" targetname: "n52" label: "0" class:13 color:red} node: {title: "n52" label: "Start 52" color: blue info1: "visited: 8 irg: main arity: 0 -- 2.20.1