From a62dbf4020404a644db7449831b30b33bf63f0c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=B6tz=20Lindenmaier?= Date: Tue, 2 Dec 2003 16:25:38 +0000 Subject: [PATCH] bugfix in ircgcons and some addinitonal features [r2171] --- testprograms/Makefile.in | 3 +- testprograms/oo_program_example.c | 3 +- .../ref-results/ARRAY-HEAP_EXAMPLE_main.vcg | 14 ++ .../ARRAY-STACK_EXAMPLE_main-wtypes.vcg | 12 ++ testprograms/ref-results/All_graphs.vcg | 180 +++++++++++------ .../ref-results/CALL_STR_EXAMPLE_main.vcg | 9 + .../ref-results/COND_EXAMPLE_main.vcg | 25 +++ .../ref-results/CONST_EVAL_EXAMPLE_main.vcg | 6 + .../ref-results/DEAD_BLOCK_main-cfg.vcg | 1 + testprograms/ref-results/DEAD_BLOCK_main.vcg | 6 + testprograms/ref-results/EMPTY_main.vcg | 5 + .../ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg | 16 ++ .../ref-results/FLOAT_EXAMPLE_main.vcg | 6 + .../ref-results/GLOBAL_CSE_EXAMPLE_main.vcg | 20 ++ .../GLOBAL_VAR_main-pure-wtypes.vcg | 13 ++ testprograms/ref-results/GLOBAL_VAR_main.vcg | 10 + .../GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg | 102 ++++++++-- ...alType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg | 118 ++++++++--- ...OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg | 124 +++++++++--- ...lobalType_OO_PROGRAM_EXAMPLE_main-type.vcg | 2 +- ...Type_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg | 186 ++++++++++++------ ...balType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg | 43 ++-- .../ref-results/IF_ELSE_EXAMPLE_main.vcg | 7 + testprograms/ref-results/IF_EXAMPLE_main.vcg | 17 ++ .../IF_WHILE_EXAMPLE_main-pure.vcg | 24 +++ .../ref-results/IRREGULAR_CF_main-cfg.vcg | 1 + .../ref-results/IRREGULAR_CF_main.vcg | 21 ++ .../ref-results/IRR_LOOP_main-cfg.vcg | 1 + testprograms/ref-results/IRR_LOOP_main.vcg | 26 +++ .../ref-results/MEMORY_EXAMPLE_main.vcg | 34 ++++ .../OO_INLINE_EXAMPLE_main-wtypes.vcg | 21 ++ .../ref-results/OO_INLINE_EXAMPLE_main.vcg | 21 ++ .../OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg | 49 +++-- .../OO_PROGRAM_EXAMPLE_main-pure.vcg | 49 +++-- .../ref-results/OO_PROGRAM_EXAMPLE_main.vcg | 43 ++-- .../ref-results/PRIMA_INLINE_c-wtypes.vcg | 15 ++ testprograms/ref-results/PRIMA_INLINE_c.vcg | 15 ++ .../ref-results/PRIMA_INLINE_set_a-wtypes.vcg | 11 ++ .../ref-results/PRIMA_INLINE_set_a.vcg | 11 ++ .../ref-results/PRIMA_c-pure-wtypes.vcg | 18 +- testprograms/ref-results/PRIMA_c-pure.vcg | 18 +- testprograms/ref-results/PRIMA_c-type.vcg | 2 +- testprograms/ref-results/PRIMA_c-wtypes.vcg | 15 +- testprograms/ref-results/PRIMA_c.vcg | 15 +- .../ref-results/PRIMA_set_a-pure-wtypes.vcg | 16 +- testprograms/ref-results/PRIMA_set_a-pure.vcg | 16 +- testprograms/ref-results/PRIMA_set_a-type.vcg | 2 +- .../ref-results/PRIMA_set_a-wtypes.vcg | 13 +- testprograms/ref-results/PRIMA_set_a.vcg | 13 +- .../THREE_CFPRED_EXAMPLE_main-cfg.vcg | 1 + .../ref-results/THREE_CFPRED_EXAMPLE_main.vcg | 25 +++ .../ref-results/WHILE_EXAMPLE_main.vcg | 19 ++ testprograms/ref-results/class_hierarchy.vcg | 2 +- testprograms/ref-results/main.vcg | 12 ++ 54 files changed, 1194 insertions(+), 263 deletions(-) diff --git a/testprograms/Makefile.in b/testprograms/Makefile.in index d314671fc..b9a8bd6d2 100644 --- a/testprograms/Makefile.in +++ b/testprograms/Makefile.in @@ -42,8 +42,7 @@ SOURCES := Makefile.in \ oo_inline_example.c \ oo_program_example.c \ three_cfpred_example.c \ - while_example.c \ - run-results.txt + while_example.c GENFILES = %.vcg results.txt diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c index 3af37675b..0c2de25ac 100644 --- a/testprograms/oo_program_example.c +++ b/testprograms/oo_program_example.c @@ -248,6 +248,8 @@ main(void) get_entity_ld_ident(proc_set_a_e); get_entity_ld_ident(proc_c_e); + dump_consts_local(1); + turn_off_edge_labels(); dump_all_ir_graphs(dump_ir_graph); dump_all_ir_graphs(dump_ir_block_graph); @@ -257,7 +259,6 @@ main(void) dump_all_types(); dump_class_hierarchy (true); - entity **free_methods; int arr_len; cgana(&arr_len, &free_methods); diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg index 20b3a959c..6860b9f52 100644 --- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg +++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg @@ -21,28 +21,34 @@ graph: { title: "g32" label: "ARRAY-HEAP_EXAMPLE_main" status:clustered color:wh graph: { title: "n49" label: "Block 49" status:clustered color:yellow edge: {sourcename: "n49" targetname: "n50" label: "0" color: red} node: {title: "n48" label: "End 48" color: blue info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main "} } graph: { title: "n51" label: "Block 51" status:clustered color:yellow edge: {sourcename: "n51" targetname: "n52" label: "0" color: red} node: {title: "n50" label: "Return 50" info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main 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: "n55" label: "1" } node: {title: "n64" label: "ProjM 0 64" color: yellow info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main "} edge: {sourcename: "n64" targetname: "n56" label: "0" color: blue} node: {title: "n55" label: "ProjIs 2 55" color: yellow info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main "} edge: {sourcename: "n55" targetname: "n56" label: "0" } node: {title: "n56" label: "Load 56" info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main "} edge: {sourcename: "n56" targetname: "n63" label: "0" 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 Selecting entity of type int from entity of type a "} @@ -50,12 +56,15 @@ edge: {sourcename: "n57" targetname: "n63" label: "0" 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 "} edge: {sourcename: "n63" targetname: "n60" label: "0" color: blue} node: {title: "n59" label: "ProjP 2 59" color: yellow info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main "} edge: {sourcename: "n59" targetname: "n60" label: "0" } node: {title: "n60" label: "Alloc 60" info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main allocating entity of type a "} edge: {sourcename: "n60" targetname: "n62" label: "0" color: blue} @@ -65,18 +74,23 @@ 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} node: {title: "n62" label: "ProjM 1 62" color: yellow info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main "} edge: {sourcename: "n62" targetname: "n54" label: "0" color: blue} node: {title: "n61" label: "0x28Iu 61" color: yellow info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main Const of type type_unknown "} node: {title: "n58" label: "0x3Iu 58" color: yellow info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main Const of type type_unknown "} node: {title: "n52" label: "ProjX 0 52" color: yellow info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main "} edge: {sourcename: "n52" targetname: "n54" label: "0" color: red} node: {title: "n54" label: "Start 54" color: blue info1: "visited: 8 +irg: ARRAY-HEAP_EXAMPLE_main start of method of type ARRAY-HEAP_EXAMPLE_main "} } diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg index 09ea2f0d7..579f83e1e 100644 --- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg @@ -21,28 +21,34 @@ 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} node: {title: "n46" label: "End 46" color: blue info1: "visited: 10 +irg: main "} } graph: { title: "n49" label: "Block 49" status:clustered color:yellow edge: {sourcename: "n49" targetname: "n50" label: "0" color: red} node: {title: "n48" label: "Return 48" info1: "visited: 10 +irg: main return in method of type main res 0 type: int "} edge: {sourcename: "n48" targetname: "n60" label: "0" color: blue} edge: {sourcename: "n48" targetname: "n53" label: "1" } node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 10 +irg: main "} edge: {sourcename: "n60" targetname: "n54" label: "0" color: blue} node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 10 +irg: main "} edge: {sourcename: "n53" targetname: "n54" label: "0" } node: {title: "n54" label: "Load 54" info1: "visited: 10 +irg: main "} edge: {sourcename: "n54" targetname: "n59" label: "0" color: blue} edge: {sourcename: "n54" targetname: "n55" label: "1" } node: {title: "n55" label: "Sel a_tp_elem_ent 55" info1: "visited: 10 +irg: main Selecting entity of type int from entity of type a_tp "} @@ -50,6 +56,7 @@ edge: {sourcename: "n55" targetname: "n59" label: "0" 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 +irg: main Selecting entity of type a_tp from entity of type mainframe_tp "} @@ -60,18 +67,23 @@ 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} node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 10 +irg: main "} edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue} node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 10 +irg: main "} edge: {sourcename: "n58" targetname: "n52" label: "0" } node: {title: "n56" label: "0x3Iu 56" color: yellow info1: "visited: 10 +irg: main Const of type type_unknown "} node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 10 +irg: main "} edge: {sourcename: "n50" targetname: "n52" label: "0" color: red} node: {title: "n52" label: "Start 52" color: blue info1: "visited: 10 +irg: main start of method of type main "} } diff --git a/testprograms/ref-results/All_graphs.vcg b/testprograms/ref-results/All_graphs.vcg index 347ee8071..ef2afcfd8 100644 --- a/testprograms/ref-results/All_graphs.vcg +++ b/testprograms/ref-results/All_graphs.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of All_graphs" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -20,81 +20,99 @@ classname 12: "Member" graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} -node: {title: "n107" label: "End 107" color: blue info1: "visited: 46 +node: {title: "n107" label: "End 107" color: blue info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} } graph: { title: "n110" label: "Block 110" status:clustered color:yellow edge: {sourcename: "n110" targetname: "n198" label: "0" color: red} -node: {title: "n109" label: "Return 109" info1: "visited: 46 +node: {title: "n109" label: "Return 109" info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n109" targetname: "n200" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n201" label: "1" } -node: {title: "n200" label: "FilterM 0 200" color: yellow info1: "visited: 46 +node: {title: "n200" label: "FilterM 0 200" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 116 "} edge: {sourcename: "n200" targetname: "n167" label: "0" color: blue} -node: {title: "n201" label: "FilterIs 0 201" color: yellow info1: "visited: 46 +node: {title: "n201" label: "FilterIs 0 201" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + ProjT 115 "} edge: {sourcename: "n201" targetname: "n159" label: "0" } } graph: { title: "n195" label: "Block 195" status:clustered color:yellow edge: {sourcename: "n195" targetname: "n192" label: "0" color: red} -node: {title: "n194" label: "FilterM 0 194" color: yellow info1: "visited: 46 +node: {title: "n194" label: "FilterM 0 194" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 124 "} edge: {sourcename: "n194" targetname: "n141" label: "0" color: blue} -node: {title: "n199" label: "ProjX 0 199" color: yellow info1: "visited: 46 +node: {title: "n199" label: "ProjX 0 199" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n199" targetname: "n197" label: "0" color: red} -node: {title: "n197" label: "CallBegin 197" info1: "visited: 46 +node: {title: "n197" label: "CallBegin 197" info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} -edge: {sourcename: "n197" targetname: "n172" label: "0" } +node: {title: "n197n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} +edge: {sourcename: "n197" targetname: "n197n172" label: "0" } } graph: { title: "n189" label: "Block 189" status:clustered color:yellow edge: {sourcename: "n189" targetname: "n111" label: "0" color: red} -node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 46 +node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} -node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 46 +node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } -node: {title: "n119" label: "Alloc 119" info1: "visited: 46 +node: {title: "n119" label: "Alloc 119" info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } -node: {title: "n193" label: "ProjX 0 193" color: yellow info1: "visited: 46 +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } +node: {title: "n193" label: "ProjX 0 193" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n193" targetname: "n191" label: "0" color: red} -node: {title: "n191" label: "CallBegin 191" info1: "visited: 46 +node: {title: "n191" label: "CallBegin 191" info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +"} +node: {title: "n191n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n191" targetname: "n173" label: "0" } +edge: {sourcename: "n191" targetname: "n191n173" label: "0" } } graph: { title: "n112" label: "Block 112" status:clustered color:yellow edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 46 -Const of type type_unknown -"} -node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 46 +node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 46 -"} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 46 -Const of type type_unknown -"} -node: {title: "n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 46 -Const of type type_unknown -"} -node: {title: "n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 46 -Const of type type_unknown -"} -node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 46 +node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} -node: {title: "n113" label: "Start OO_PROGRAM_EXAMPLE_main 113" color: blue info1: "visited: 46 +node: {title: "n113" label: "Start OO_PROGRAM_EXAMPLE_main 113" color: blue info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} } @@ -104,48 +122,69 @@ start of method of type OO_PROGRAM_EXAMPLE_main graph: { title: "g71" label: "set_a" status:clustered color:white graph: { title: "n186" label: "Block 186" status:clustered color:yellow edge: {sourcename: "n186" targetname: "n185" label: "0" color: red} -node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 46 +node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 48 +irg: set_a "} edge: {sourcename: "n192" targetname: "n187" label: "0" color: red} -node: {title: "n187" label: "EndReg 187" color: blue info1: "visited: 46 +node: {title: "n187" label: "EndReg 187" color: blue info1: "visited: 48 +irg: set_a "} } graph: { title: "n137" label: "Block 137" status:clustered color:yellow edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} -node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 46 +node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 48 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} -node: {title: "n142" label: "Store 142" info1: "visited: 46 +node: {title: "n142" label: "Store 142" info1: "visited: 48 +irg: set_a "} edge: {sourcename: "n142" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n184" label: "2" } -node: {title: "n145" label: "Sel a 145" info1: "visited: 46 +node: {title: "n145" label: "Sel a 145" info1: "visited: 48 +irg: set_a Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n145" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n183" label: "1" } -node: {title: "n185" label: "Jmp 185" info1: "visited: 46 +node: {title: "n185" label: "Jmp 185" info1: "visited: 48 +irg: set_a "} } graph: { title: "n139" label: "Block 139" status:clustered color:yellow edge: {sourcename: "n139" targetname: "n193" label: "0" color: red} -node: {title: "n182" label: "FilterM 1 182" color: yellow info1: "visited: 46 +node: {title: "n182" label: "FilterM 1 182" color: yellow info1: "visited: 48 +irg: set_a +intra predecessor nodes: + StartT 140 "} edge: {sourcename: "n182" targetname: "n127" label: "0" color: blue} -node: {title: "n183" label: "FilterP 0 183" color: yellow info1: "visited: 46 +node: {title: "n183" label: "FilterP 0 183" color: yellow info1: "visited: 48 +irg: set_a +intra predecessor nodes: + ProjT 144 "} edge: {sourcename: "n183" targetname: "n118" label: "0" } -node: {title: "n184" label: "FilterIs 1 184" color: yellow info1: "visited: 46 +node: {title: "n184" label: "FilterIs 1 184" color: yellow info1: "visited: 48 +irg: set_a +intra predecessor nodes: + ProjT 144 "} -edge: {sourcename: "n184" targetname: "n125" label: "0" } -node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 46 +node: {title: "n184n125" label: "0x2Is 125" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} +edge: {sourcename: "n184" targetname: "n184n125" label: "0" } +node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 48 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} -node: {title: "n140" label: "Start set_a 140" color: blue info1: "visited: 46 +node: {title: "n140" label: "Start set_a 140" color: blue info1: "visited: 48 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int @@ -157,54 +196,77 @@ start of method of type set_a graph: { title: "g94" label: "c" status:clustered color:white graph: { title: "n178" label: "Block 178" status:clustered color:yellow edge: {sourcename: "n178" targetname: "n177" label: "0" color: red} -node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 46 +node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 48 +irg: c "} edge: {sourcename: "n198" targetname: "n179" label: "0" color: red} -node: {title: "n179" label: "EndReg 179" color: blue info1: "visited: 46 +node: {title: "n179" label: "EndReg 179" color: blue info1: "visited: 48 +irg: c "} } graph: { title: "n155" label: "Block 155" status:clustered color:yellow edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} -node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 46 +node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 48 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} -node: {title: "n159" label: "AddIs 159" info1: "visited: 46 +node: {title: "n159" label: "AddIs 159" info1: "visited: 48 +irg: c "} edge: {sourcename: "n159" targetname: "n160" label: "0" } edge: {sourcename: "n159" targetname: "n174" label: "1" } -node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 46 +node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 48 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } -node: {title: "n161" label: "Load 161" info1: "visited: 46 +node: {title: "n161" label: "Load 161" info1: "visited: 48 +irg: c "} edge: {sourcename: "n161" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } -node: {title: "n162" label: "Sel a 162" info1: "visited: 46 +node: {title: "n162" label: "Sel a 162" info1: "visited: 48 +irg: c Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n162" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n176" label: "1" } -node: {title: "n177" label: "Jmp 177" info1: "visited: 46 +node: {title: "n177" label: "Jmp 177" info1: "visited: 48 +irg: c "} } graph: { title: "n157" label: "Block 157" status:clustered color:yellow edge: {sourcename: "n157" targetname: "n199" label: "0" color: red} -node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 46 +node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 48 +irg: c +intra predecessor nodes: + StartT 158 "} edge: {sourcename: "n175" targetname: "n194" label: "0" color: blue} -node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 46 +node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 48 +irg: c +intra predecessor nodes: + ProjT 164 "} edge: {sourcename: "n176" targetname: "n118" label: "0" } -node: {title: "n174" label: "FilterIs 1 174" color: yellow info1: "visited: 46 +node: {title: "n174" label: "FilterIs 1 174" color: yellow info1: "visited: 48 +irg: c +intra predecessor nodes: + ProjT 164 +"} +node: {title: "n174n117" label: "0x5Is 117" color: yellow info1: "visited: 48 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n174" targetname: "n117" label: "0" } -node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 46 +edge: {sourcename: "n174" targetname: "n174n117" label: "0" } +node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 48 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} -node: {title: "n158" label: "Start c 158" color: blue info1: "visited: 46 +node: {title: "n158" label: "Start c 158" color: blue info1: "visited: 48 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int diff --git a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg index f214d0ff0..65365872d 100644 --- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg +++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg @@ -21,19 +21,23 @@ graph: { title: "g45" label: "CALL_STR_EXAMPLE_main" status:clustered color:whit graph: { title: "n56" label: "Block 56" status:clustered color:yellow edge: {sourcename: "n56" targetname: "n57" label: "0" color: red} node: {title: "n55" label: "End 55" color: blue info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main "} } graph: { title: "n58" label: "Block 58" status:clustered color:yellow edge: {sourcename: "n58" targetname: "n59" label: "0" color: red} node: {title: "n57" label: "Return 57" info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main return in method of type CALL_STR_EXAMPLE_main "} edge: {sourcename: "n57" targetname: "n62" label: "0" color: blue} node: {title: "n62" label: "ProjM 0 62" color: yellow info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main "} edge: {sourcename: "n62" targetname: "n63" label: "0" color: blue} node: {title: "n63" label: "Call 63" info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main calling method of type f param 0 type: ptr_to_string "} @@ -45,17 +49,22 @@ 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} node: {title: "n66" label: "ProjM 1 66" color: yellow info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main "} edge: {sourcename: "n66" targetname: "n61" label: "0" color: blue} node: {title: "n65" label: "SymC f 65" info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main "} node: {title: "n64" label: "&(GlobalType_constStr)P 64" color: yellow info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main Const of type ptr_to_string "} node: {title: "n59" label: "ProjX 0 59" color: yellow info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main "} edge: {sourcename: "n59" targetname: "n61" label: "0" color: red} node: {title: "n61" label: "Start 61" color: blue info1: "visited: 6 +irg: CALL_STR_EXAMPLE_main start of method of type CALL_STR_EXAMPLE_main "} } diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg index ae28cea07..4887833f6 100644 --- a/testprograms/ref-results/COND_EXAMPLE_main.vcg +++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg @@ -21,6 +21,7 @@ graph: { title: "g29" label: "main" status:clustered color:white graph: { title: "n61" label: "Block 61" status:clustered color:yellow edge: {sourcename: "n61" targetname: "n62" label: "0" color: red} node: {title: "n60" label: "End 60" color: blue info1: "visited: 9 +irg: main "} } @@ -28,12 +29,14 @@ graph: { title: "n63" label: "Block 63" status:clustered color:yellow edge: {sourcename: "n63" targetname: "n84" label: "0" color: red} edge: {sourcename: "n63" targetname: "n64" label: "1" color: red} node: {title: "n62" label: "Return 62" info1: "visited: 9 +irg: main return in method of type main res 0 type: int "} edge: {sourcename: "n62" targetname: "n89" label: "0" color: blue} edge: {sourcename: "n62" targetname: "n87" label: "1" } node: {title: "n87" label: "PhiIs 87" color: green info1: "visited: 9 +irg: main "} edge: {sourcename: "n87" targetname: "n88" label: "0" } edge: {sourcename: "n87" targetname: "n78" label: "1" } @@ -42,52 +45,66 @@ edge: {sourcename: "n87" targetname: "n78" label: "1" } graph: { title: "n85" label: "Block 85" status:clustered color:yellow edge: {sourcename: "n85" targetname: "n86" label: "0" color: red} node: {title: "n84" label: "Jmp 84" info1: "visited: 9 +irg: main "} } graph: { title: "n65" label: "Block 65" status:clustered color:yellow edge: {sourcename: "n65" targetname: "n66" label: "0" color: red} node: {title: "n86" label: "ProjX 1 86" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n86" targetname: "n69" label: "0" color: red} node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n64" targetname: "n69" label: "0" color: red} node: {title: "n69" label: "Cond 69" info1: "visited: 9 +irg: main "} edge: {sourcename: "n69" targetname: "n70" label: "0" } node: {title: "n70" label: "Projb Ne 70" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n70" targetname: "n71" label: "0" } node: {title: "n71" label: "CmpT 71" info1: "visited: 9 +irg: main "} edge: {sourcename: "n71" targetname: "n73" label: "0" } edge: {sourcename: "n71" targetname: "n72" label: "1" } node: {title: "n73" label: "AndIs 73" info1: "visited: 9 +irg: main "} edge: {sourcename: "n73" targetname: "n80" label: "0" } edge: {sourcename: "n73" targetname: "n74" label: "1" } node: {title: "n80" label: "ConvIs 80" info1: "visited: 9 +irg: main "} edge: {sourcename: "n80" targetname: "n81" label: "0" } node: {title: "n81" label: "Projb Gt 81" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n81" targetname: "n82" label: "0" } node: {title: "n82" label: "CmpT 82" info1: "visited: 9 +irg: main "} edge: {sourcename: "n82" targetname: "n78" label: "0" } edge: {sourcename: "n82" targetname: "n83" label: "1" } node: {title: "n74" label: "ConvIs 74" info1: "visited: 9 +irg: main "} edge: {sourcename: "n74" targetname: "n75" label: "0" } node: {title: "n75" label: "Projb Lt 75" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n75" targetname: "n76" label: "0" } node: {title: "n76" label: "CmpT 76" info1: "visited: 9 +irg: main "} edge: {sourcename: "n76" targetname: "n78" label: "0" } edge: {sourcename: "n76" targetname: "n77" label: "1" } node: {title: "n78" label: "ProjIs 0 78" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n78" targetname: "n79" label: "0" } } @@ -95,27 +112,35 @@ edge: {sourcename: "n78" targetname: "n79" label: "0" } graph: { title: "n67" label: "Block 67" status:clustered color:yellow edge: {sourcename: "n67" targetname: "n66" label: "0" color: red} node: {title: "n89" label: "ProjM 1 89" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n89" targetname: "n68" label: "0" color: blue} node: {title: "n88" label: "0x1Is 88" color: yellow info1: "visited: 9 +irg: main Const of type type_unknown "} node: {title: "n83" label: "0x2Is 83" color: yellow info1: "visited: 9 +irg: main Const of type type_unknown "} node: {title: "n79" label: "ProjT 4 79" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n79" targetname: "n68" label: "0" } node: {title: "n77" label: "0xAIs 77" color: yellow info1: "visited: 9 +irg: main Const of type type_unknown "} node: {title: "n72" label: "0x0Is 72" color: yellow info1: "visited: 9 +irg: main Const of type type_unknown "} node: {title: "n66" label: "ProjX 0 66" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n66" targetname: "n68" label: "0" color: red} node: {title: "n68" label: "Start 68" color: blue info1: "visited: 9 +irg: main start of method of type main param 0 type: int "} diff --git a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg index 284f90104..4a0c58312 100644 --- a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg +++ b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg @@ -21,12 +21,14 @@ graph: { title: "g29" label: "main" status:clustered color:white graph: { title: "n46" label: "Block 46" status:clustered color:yellow edge: {sourcename: "n46" targetname: "n47" label: "0" color: red} node: {title: "n45" label: "End 45" color: blue info1: "visited: 4 +irg: main "} } graph: { title: "n48" label: "Block 48" status:clustered color:yellow edge: {sourcename: "n48" targetname: "n49" label: "0" color: red} node: {title: "n47" label: "Return 47" info1: "visited: 4 +irg: main return in method of type main res 0 type: int res 1 type: int @@ -39,15 +41,19 @@ edge: {sourcename: "n47" targetname: "n52" label: "2" } graph: { title: "n50" label: "Block 50" status:clustered color:yellow edge: {sourcename: "n50" targetname: "n49" label: "0" color: red} node: {title: "n53" label: "ProjM 1 53" color: yellow info1: "visited: 4 +irg: main "} edge: {sourcename: "n53" targetname: "n51" label: "0" color: blue} node: {title: "n52" label: "0xCIs 52" color: yellow info1: "visited: 4 +irg: main Const of type type_unknown "} node: {title: "n49" label: "ProjX 0 49" color: yellow info1: "visited: 4 +irg: main "} edge: {sourcename: "n49" targetname: "n51" label: "0" color: red} node: {title: "n51" label: "Start 51" color: blue info1: "visited: 4 +irg: main start of method of type main "} } diff --git a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg index 9a5563545..a0645690c 100644 --- a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg +++ b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg @@ -24,5 +24,6 @@ edge: { sourcename: "n67" targetname: "n63"} node: {title: "n63" label: "Block n63" } edge: { sourcename: "n63" targetname: "n63"} node: {title: "n62" label: "Bad 62" info1: "visited: 0 +irg: main "} } diff --git a/testprograms/ref-results/DEAD_BLOCK_main.vcg b/testprograms/ref-results/DEAD_BLOCK_main.vcg index 238f7ea7a..73fafbfe5 100644 --- a/testprograms/ref-results/DEAD_BLOCK_main.vcg +++ b/testprograms/ref-results/DEAD_BLOCK_main.vcg @@ -21,12 +21,14 @@ graph: { title: "g29" label: "main" status:clustered color:white graph: { title: "n59" label: "Block 59" status:clustered color:yellow edge: {sourcename: "n59" targetname: "n60" label: "0" color: red} node: {title: "n58" label: "End 58" color: blue info1: "visited: 9 +irg: main "} } graph: { title: "n67" label: "Block 67" status:clustered color:yellow edge: {sourcename: "n67" targetname: "n64" label: "0" color: red} node: {title: "n60" label: "Return 60" info1: "visited: 9 +irg: main return in method of type main res 0 type: int "} @@ -37,15 +39,19 @@ edge: {sourcename: "n60" targetname: "n68" label: "1" } graph: { title: "n63" label: "Block 63" status:clustered color:yellow edge: {sourcename: "n63" targetname: "n64" label: "0" color: red} node: {title: "n69" label: "ProjM 1 69" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n69" targetname: "n65" label: "0" color: blue} node: {title: "n68" label: "0x2Is 68" color: yellow info1: "visited: 9 +irg: main Const of type type_unknown "} node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 9 +irg: main "} edge: {sourcename: "n64" targetname: "n65" label: "0" color: red} node: {title: "n65" label: "Start 65" color: blue info1: "visited: 9 +irg: main start of method of type main "} } diff --git a/testprograms/ref-results/EMPTY_main.vcg b/testprograms/ref-results/EMPTY_main.vcg index 015f2e499..b9ed76b98 100644 --- a/testprograms/ref-results/EMPTY_main.vcg +++ b/testprograms/ref-results/EMPTY_main.vcg @@ -21,12 +21,14 @@ graph: { title: "g27" label: "EMPTY_main" status:clustered color:white graph: { title: "n16" label: "Block 16" status:clustered color:yellow edge: {sourcename: "n16" targetname: "n30" label: "0" color: red} node: {title: "n17" label: "End 17" color: blue info1: "visited: 4 +irg: EMPTY_main "} } graph: { title: "n28" label: "Block 28" status:clustered color:yellow edge: {sourcename: "n28" targetname: "n22" label: "0" color: red} node: {title: "n30" label: "Return 30" info1: "visited: 4 +irg: EMPTY_main return in method of type EMPTY_main "} edge: {sourcename: "n30" targetname: "n23" label: "0" color: blue} @@ -35,12 +37,15 @@ edge: {sourcename: "n30" targetname: "n23" label: "0" color: blue} graph: { title: "n18" label: "Block 18" status:clustered color:yellow edge: {sourcename: "n18" targetname: "n22" label: "0" color: red} node: {title: "n23" label: "ProjM 1 23" color: yellow info1: "visited: 4 +irg: EMPTY_main "} edge: {sourcename: "n23" targetname: "n19" label: "0" color: blue} node: {title: "n22" label: "ProjX 0 22" color: yellow info1: "visited: 4 +irg: EMPTY_main "} edge: {sourcename: "n22" targetname: "n19" label: "0" color: red} node: {title: "n19" label: "Start 19" color: blue info1: "visited: 4 +irg: EMPTY_main start of method of type EMPTY_main "} } diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg index dd94c185d..3536c1a44 100644 --- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg +++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg @@ -22,62 +22,77 @@ graph: { title: "n80" label: "Block 80" status:clustered color:yellow edge: {sourcename: "n80" targetname: "n84" label: "0" color: red} edge: {sourcename: "n80" targetname: "n81" label: "1" color: red} node: {title: "n86" label: "PhiM 86" color: green info1: "visited: 19 +irg: main "} edge: {sourcename: "n86" targetname: "n96" label: "0" color: blue} edge: {sourcename: "n86" targetname: "n87" label: "1" color: blue} node: {title: "n87" label: "ProjM 0 87" color: yellow info1: "visited: 19 +irg: main "} edge: {sourcename: "n87" targetname: "n88" label: "0" color: blue} node: {title: "n88" label: "Store 88" info1: "visited: 19 +irg: main "} edge: {sourcename: "n88" targetname: "n86" label: "0" color: blue} edge: {sourcename: "n88" targetname: "n94" label: "1" } edge: {sourcename: "n88" targetname: "n89" label: "2" } node: {title: "n94" label: "Sel VAR_A 94" info1: "visited: 19 +irg: main Selecting entity of type int from entity of type GlobalType "} edge: {sourcename: "n94" targetname: "n86" label: "0" color: blue} edge: {sourcename: "n94" targetname: "n95" label: "1" } node: {title: "n89" label: "PhiIs 89" color: green info1: "visited: 19 +irg: main "} edge: {sourcename: "n89" targetname: "n92" label: "0" } edge: {sourcename: "n89" targetname: "n90" label: "1" } node: {title: "n90" label: "PhiIs 90" color: green info1: "visited: 19 +irg: main "} edge: {sourcename: "n90" targetname: "n91" label: "0" } edge: {sourcename: "n90" targetname: "n89" label: "1" } node: {title: "n81" label: "Jmp 81" info1: "visited: 19 +irg: main "} } graph: { title: "n85" label: "Block 85" status:clustered color:yellow edge: {sourcename: "n85" targetname: "n78" label: "0" color: red} node: {title: "n92" label: "ProjIs 0 92" color: yellow info1: "visited: 19 +irg: main "} edge: {sourcename: "n92" targetname: "n93" label: "0" } node: {title: "n84" label: "Jmp 84" info1: "visited: 19 +irg: main "} } graph: { title: "n77" label: "Block 77" status:clustered color:yellow edge: {sourcename: "n77" targetname: "n78" label: "0" color: red} node: {title: "n96" label: "ProjM 1 96" color: yellow info1: "visited: 19 +irg: main "} edge: {sourcename: "n96" targetname: "n79" label: "0" color: blue} node: {title: "n95" label: "ProjP 3 95" color: yellow info1: "visited: 19 +irg: main "} edge: {sourcename: "n95" targetname: "n79" label: "0" } node: {title: "n93" label: "ProjT 4 93" color: yellow info1: "visited: 19 +irg: main "} edge: {sourcename: "n93" targetname: "n79" label: "0" } node: {title: "n91" label: "0x1Is 91" color: yellow info1: "visited: 19 +irg: main Const of type type_unknown "} node: {title: "n78" label: "ProjX 0 78" color: yellow info1: "visited: 19 +irg: main "} edge: {sourcename: "n78" targetname: "n79" label: "0" color: red} node: {title: "n79" label: "Start 79" color: blue info1: "visited: 19 +irg: main start of method of type main_tp param 0 type: int "} @@ -85,6 +100,7 @@ start of method of type main_tp graph: { title: "n75" label: "Block 75" status:clustered color:yellow node: {title: "n74" label: "End 74" color: blue info1: "visited: 19 +irg: main "} edge: {sourcename: "n74" targetname: "n80" label: "0" color: red} edge: {sourcename: "n74" targetname: "n86" label: "1" } diff --git a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg index acc6a9636..f380b049f 100644 --- a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg +++ b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg @@ -21,12 +21,14 @@ graph: { title: "g28" label: "FLOAT_EXAMPLE_main" status:clustered color:white graph: { title: "n17" label: "Block 17" status:clustered color:yellow edge: {sourcename: "n17" targetname: "n32" label: "0" color: red} node: {title: "n18" label: "End 18" color: blue info1: "visited: 4 +irg: FLOAT_EXAMPLE_main "} } graph: { title: "n29" label: "Block 29" status:clustered color:yellow edge: {sourcename: "n29" targetname: "n23" label: "0" color: red} node: {title: "n32" label: "Return 32" info1: "visited: 4 +irg: FLOAT_EXAMPLE_main return in method of type FLOAT_EXAMPLE_main res 0 type: dbl "} @@ -37,15 +39,19 @@ edge: {sourcename: "n32" targetname: "n30" label: "1" } graph: { title: "n19" label: "Block 19" status:clustered color:yellow edge: {sourcename: "n19" targetname: "n23" label: "0" color: red} node: {title: "n24" label: "ProjM 1 24" color: yellow info1: "visited: 4 +irg: FLOAT_EXAMPLE_main "} edge: {sourcename: "n24" targetname: "n20" label: "0" color: blue} node: {title: "n30" label: "1.234567890123456716800000000000E+19D 30" color: yellow info1: "visited: 4 +irg: FLOAT_EXAMPLE_main Const of type type_unknown "} node: {title: "n23" label: "ProjX 0 23" color: yellow info1: "visited: 4 +irg: FLOAT_EXAMPLE_main "} edge: {sourcename: "n23" targetname: "n20" label: "0" color: red} node: {title: "n20" label: "Start 20" color: blue info1: "visited: 4 +irg: FLOAT_EXAMPLE_main start of method of type FLOAT_EXAMPLE_main "} } diff --git a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg index 07a5a1d04..3273f5553 100644 --- a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg @@ -21,36 +21,44 @@ graph: { title: "g28" label: "GLOBAL_CSE_EXAMPLE_main" status:clustered color:wh graph: { title: "n64" label: "Block 64" status:clustered color:yellow edge: {sourcename: "n64" targetname: "n65" label: "0" color: red} node: {title: "n63" label: "End 63" color: blue info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} } node: {title: "n88" label: "ProjM 1 88" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n88" targetname: "n73" label: "0" color: blue} node: {title: "n86" label: "AddIs 86" info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n86" targetname: "n84" label: "0" } edge: {sourcename: "n86" targetname: "n87" label: "1" } node: {title: "n87" label: "0x5Is 87" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main Const of type type_unknown "} node: {title: "n84" label: "SubIs 84" info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n84" targetname: "n78" label: "0" } edge: {sourcename: "n84" targetname: "n85" label: "1" } node: {title: "n85" label: "0x3Is 85" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main Const of type type_unknown "} graph: { title: "n66" label: "Block 66" status:clustered color:yellow edge: {sourcename: "n66" targetname: "n80" label: "0" color: red} edge: {sourcename: "n66" targetname: "n67" label: "1" color: red} node: {title: "n65" label: "Return 65" info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main return in method of type GLOBAL_CSE_EXAMPLE_main res 0 type: int "} edge: {sourcename: "n65" targetname: "n88" label: "0" color: blue} edge: {sourcename: "n65" targetname: "n83" label: "1" } node: {title: "n83" label: "PhiIs 83" color: green info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n83" targetname: "n86" label: "0" } edge: {sourcename: "n83" targetname: "n84" label: "1" } @@ -59,50 +67,62 @@ edge: {sourcename: "n83" targetname: "n84" label: "1" } graph: { title: "n81" label: "Block 81" status:clustered color:yellow edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} node: {title: "n80" label: "Jmp 80" info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} } node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n82" targetname: "n74" label: "0" color: red} graph: { title: "n68" label: "Block 68" status:clustered color:yellow edge: {sourcename: "n68" targetname: "n69" label: "0" color: red} node: {title: "n67" label: "Jmp 67" info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} } node: {title: "n69" label: "ProjX 1 69" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n69" targetname: "n74" label: "0" color: red} node: {title: "n75" label: "Projb Eq 75" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n75" targetname: "n76" label: "0" } node: {title: "n76" label: "CmpT 76" info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n76" targetname: "n78" label: "0" } edge: {sourcename: "n76" targetname: "n77" label: "1" } node: {title: "n78" label: "ProjIs 0 78" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n78" targetname: "n79" label: "0" } node: {title: "n79" label: "ProjT 4 79" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n79" targetname: "n73" label: "0" } node: {title: "n77" label: "0x2Is 77" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main Const of type type_unknown "} graph: { title: "n70" label: "Block 70" status:clustered color:yellow edge: {sourcename: "n70" targetname: "n71" label: "0" color: red} node: {title: "n74" label: "Cond 74" info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n74" targetname: "n75" label: "0" } } node: {title: "n71" label: "ProjX 0 71" color: yellow info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main "} edge: {sourcename: "n71" targetname: "n73" label: "0" color: red} graph: { title: "n72" label: "Block 72" status:clustered color:yellow edge: {sourcename: "n72" targetname: "n71" label: "0" color: red} node: {title: "n73" label: "Start 73" color: blue info1: "visited: 12 +irg: GLOBAL_CSE_EXAMPLE_main start of method of type GLOBAL_CSE_EXAMPLE_main param 0 type: int "} diff --git a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg index c459dcd1c..0a86e6449 100644 --- a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg +++ b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg @@ -18,32 +18,40 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n44" label: "Block 44" color: lightyellow info1: "visited: 8 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n44" targetname: "n43" label: "0" color: red} node: {title: "n45" label: "Start 45" color: blue info1: "visited: 8 +irg: GLOBAL_VAR_main start of method of type GLOBAL_VAR_main "} edge: { sourcename: "n45" targetname: "n44" class: 2 priority: 2 linestyle: dotted} node: {title: "n43" label: "ProjX 0 43" color: yellow info1: "visited: 8 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n43" targetname: "n45" label: "0" color: red} edge: { sourcename: "n43" targetname: "n44" class: 2 priority: 2 linestyle: dotted} node: {title: "n42" label: "Block 42" color: lightyellow info1: "visited: 8 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n42" targetname: "n43" label: "0" color: red} node: {title: "n48" label: "0x2Is 48" color: yellow info1: "visited: 8 +irg: GLOBAL_VAR_main Const of type type_unknown "} edge: { sourcename: "n48" targetname: "n44" class: 2 priority: 2 linestyle: dotted} node: {title: "n50" label: "ProjP 3 50" color: yellow info1: "visited: 8 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n50" targetname: "n45" label: "0" } edge: { sourcename: "n50" targetname: "n44" class: 2 priority: 2 linestyle: dotted} node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 8 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n51" targetname: "n45" label: "0" color: blue} edge: { sourcename: "n51" targetname: "n44" class: 2 priority: 2 linestyle: dotted} node: {title: "n49" label: "Sel i 49" info1: "visited: 8 +irg: GLOBAL_VAR_main Selecting entity of type int from entity of type GlobalType "} @@ -51,24 +59,29 @@ edge: {sourcename: "n49" targetname: "n51" label: "0" color: blue} edge: {sourcename: "n49" targetname: "n50" label: "1" } edge: { sourcename: "n49" targetname: "n42" class: 2 priority: 2 linestyle: dotted} node: {title: "n47" label: "Store 47" info1: "visited: 8 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n47" targetname: "n51" label: "0" color: blue} edge: {sourcename: "n47" targetname: "n49" label: "1" } edge: {sourcename: "n47" targetname: "n48" label: "2" } edge: { sourcename: "n47" targetname: "n42" class: 2 priority: 2 linestyle: dotted} node: {title: "n46" label: "ProjM 0 46" color: yellow info1: "visited: 8 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n46" targetname: "n47" label: "0" color: blue} edge: { sourcename: "n46" targetname: "n42" class: 2 priority: 2 linestyle: dotted} node: {title: "n41" label: "Return 41" info1: "visited: 8 +irg: GLOBAL_VAR_main return in method of type GLOBAL_VAR_main "} edge: {sourcename: "n41" targetname: "n46" label: "0" color: blue} 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 "} edge: {sourcename: "n40" targetname: "n41" label: "0" color: red} node: {title: "n39" label: "End 39" color: blue info1: "visited: 8 +irg: GLOBAL_VAR_main "} edge: { sourcename: "n39" targetname: "n40" class: 2 priority: 2 linestyle: dotted} node: {title: "e16" label: "ent i" color: yellow diff --git a/testprograms/ref-results/GLOBAL_VAR_main.vcg b/testprograms/ref-results/GLOBAL_VAR_main.vcg index a7a0405b4..48e97a8bf 100644 --- a/testprograms/ref-results/GLOBAL_VAR_main.vcg +++ b/testprograms/ref-results/GLOBAL_VAR_main.vcg @@ -21,24 +21,29 @@ graph: { title: "g29" label: "GLOBAL_VAR_main" status:clustered color:white graph: { title: "n40" label: "Block 40" status:clustered color:yellow edge: {sourcename: "n40" targetname: "n41" label: "0" color: red} node: {title: "n39" label: "End 39" color: blue info1: "visited: 7 +irg: GLOBAL_VAR_main "} } graph: { title: "n42" label: "Block 42" status:clustered color:yellow edge: {sourcename: "n42" targetname: "n43" label: "0" color: red} node: {title: "n41" label: "Return 41" info1: "visited: 7 +irg: GLOBAL_VAR_main return in method of type GLOBAL_VAR_main "} edge: {sourcename: "n41" targetname: "n46" label: "0" color: blue} node: {title: "n46" label: "ProjM 0 46" color: yellow info1: "visited: 7 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n46" targetname: "n47" label: "0" color: blue} node: {title: "n47" label: "Store 47" info1: "visited: 7 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n47" targetname: "n51" label: "0" color: blue} edge: {sourcename: "n47" targetname: "n49" label: "1" } edge: {sourcename: "n47" targetname: "n48" label: "2" } node: {title: "n49" label: "Sel i 49" info1: "visited: 7 +irg: GLOBAL_VAR_main Selecting entity of type int from entity of type GlobalType "} @@ -49,18 +54,23 @@ edge: {sourcename: "n49" targetname: "n50" label: "1" } graph: { title: "n44" label: "Block 44" status:clustered color:yellow edge: {sourcename: "n44" targetname: "n43" label: "0" color: red} node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 7 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n51" targetname: "n45" label: "0" color: blue} node: {title: "n50" label: "ProjP 3 50" color: yellow info1: "visited: 7 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n50" targetname: "n45" label: "0" } node: {title: "n48" label: "0x2Is 48" color: yellow info1: "visited: 7 +irg: GLOBAL_VAR_main Const of type type_unknown "} node: {title: "n43" label: "ProjX 0 43" color: yellow info1: "visited: 7 +irg: GLOBAL_VAR_main "} edge: {sourcename: "n43" targetname: "n45" label: "0" color: red} node: {title: "n45" label: "Start 45" color: blue info1: "visited: 7 +irg: GLOBAL_VAR_main start of method of type GLOBAL_VAR_main "} } 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 6463f20a5..332a27fa5 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of GlobalType_OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -21,19 +21,27 @@ graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:wh graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} node: {title: "n107" label: "End 107" color: blue info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} } graph: { title: "n110" label: "Block 110" status:clustered color:yellow edge: {sourcename: "n110" targetname: "n198" label: "0" color: red} node: {title: "n109" label: "Return 109" info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n109" targetname: "n200" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n201" label: "1" } node: {title: "n200" label: "FilterM 0 200" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 116 "} edge: {sourcename: "n200" targetname: "n167" label: "0" color: blue} node: {title: "n201" label: "FilterIs 0 201" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + ProjT 115 "} edge: {sourcename: "n201" targetname: "n159" label: "0" } } @@ -41,60 +49,70 @@ edge: {sourcename: "n201" targetname: "n159" label: "0" } graph: { title: "n195" label: "Block 195" status:clustered color:yellow edge: {sourcename: "n195" targetname: "n192" label: "0" color: red} node: {title: "n194" label: "FilterM 0 194" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 124 "} edge: {sourcename: "n194" targetname: "n141" label: "0" color: blue} node: {title: "n199" label: "ProjX 0 199" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n199" targetname: "n197" label: "0" color: red} node: {title: "n197" label: "CallBegin 197" info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} -edge: {sourcename: "n197" targetname: "n172" label: "0" } +node: {title: "n197n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} +edge: {sourcename: "n197" targetname: "n197n172" label: "0" } } graph: { title: "n189" label: "Block 189" status:clustered color:yellow edge: {sourcename: "n189" targetname: "n111" label: "0" color: red} node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } node: {title: "n119" label: "Alloc 119" info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } node: {title: "n193" label: "ProjX 0 193" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n193" targetname: "n191" label: "0" color: red} node: {title: "n191" label: "CallBegin 191" info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +"} +node: {title: "n191n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n191" targetname: "n173" label: "0" } +edge: {sourcename: "n191" targetname: "n191n173" label: "0" } } graph: { title: "n112" label: "Block 112" status:clustered color:yellow edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 31 -Const of type type_unknown -"} node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 31 -"} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 31 -Const of type type_unknown -"} -node: {title: "n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 31 -Const of type type_unknown -"} -node: {title: "n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 31 -Const of type type_unknown -"} node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} node: {title: "n113" label: "Start OO_PROGRAM_EXAMPLE_main 113" color: blue info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} } @@ -105,47 +123,68 @@ graph: { title: "g71" label: "set_a" status:clustered color:white graph: { title: "n186" label: "Block 186" status:clustered color:yellow edge: {sourcename: "n186" targetname: "n185" label: "0" color: red} node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 31 +irg: set_a "} edge: {sourcename: "n192" targetname: "n187" label: "0" color: red} node: {title: "n187" label: "EndReg 187" color: blue info1: "visited: 31 +irg: set_a "} } graph: { title: "n137" label: "Block 137" status:clustered color:yellow edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 31 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} node: {title: "n142" label: "Store 142" info1: "visited: 31 +irg: set_a "} edge: {sourcename: "n142" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n184" label: "2" } node: {title: "n145" label: "Sel a 145" info1: "visited: 31 +irg: set_a Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n145" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n183" label: "1" } node: {title: "n185" label: "Jmp 185" info1: "visited: 31 +irg: set_a "} } graph: { title: "n139" label: "Block 139" status:clustered color:yellow edge: {sourcename: "n139" targetname: "n193" label: "0" color: red} node: {title: "n182" label: "FilterM 1 182" color: yellow info1: "visited: 31 +irg: set_a +intra predecessor nodes: + StartT 140 "} edge: {sourcename: "n182" targetname: "n127" label: "0" color: blue} node: {title: "n183" label: "FilterP 0 183" color: yellow info1: "visited: 31 +irg: set_a +intra predecessor nodes: + ProjT 144 "} edge: {sourcename: "n183" targetname: "n118" label: "0" } node: {title: "n184" label: "FilterIs 1 184" color: yellow info1: "visited: 31 +irg: set_a +intra predecessor nodes: + ProjT 144 "} -edge: {sourcename: "n184" targetname: "n125" label: "0" } +node: {title: "n184n125" label: "0x2Is 125" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} +edge: {sourcename: "n184" targetname: "n184n125" label: "0" } node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 31 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} node: {title: "n140" label: "Start set_a 140" color: blue info1: "visited: 31 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int @@ -158,53 +197,76 @@ graph: { title: "g94" label: "c" status:clustered color:white graph: { title: "n178" label: "Block 178" status:clustered color:yellow edge: {sourcename: "n178" targetname: "n177" label: "0" color: red} node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 31 +irg: c "} edge: {sourcename: "n198" targetname: "n179" label: "0" color: red} node: {title: "n179" label: "EndReg 179" color: blue info1: "visited: 31 +irg: c "} } graph: { title: "n155" label: "Block 155" status:clustered color:yellow edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 31 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} node: {title: "n159" label: "AddIs 159" info1: "visited: 31 +irg: c "} edge: {sourcename: "n159" targetname: "n160" label: "0" } edge: {sourcename: "n159" targetname: "n174" label: "1" } node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 31 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } node: {title: "n161" label: "Load 161" info1: "visited: 31 +irg: c "} edge: {sourcename: "n161" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } node: {title: "n162" label: "Sel a 162" info1: "visited: 31 +irg: c Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n162" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n176" label: "1" } node: {title: "n177" label: "Jmp 177" info1: "visited: 31 +irg: c "} } graph: { title: "n157" label: "Block 157" status:clustered color:yellow edge: {sourcename: "n157" targetname: "n199" label: "0" color: red} node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 31 +irg: c +intra predecessor nodes: + StartT 158 "} edge: {sourcename: "n175" targetname: "n194" label: "0" color: blue} node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 31 +irg: c +intra predecessor nodes: + ProjT 164 "} edge: {sourcename: "n176" targetname: "n118" label: "0" } node: {title: "n174" label: "FilterIs 1 174" color: yellow info1: "visited: 31 +irg: c +intra predecessor nodes: + ProjT 164 +"} +node: {title: "n174n117" label: "0x5Is 117" color: yellow info1: "visited: 31 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n174" targetname: "n117" label: "0" } +edge: {sourcename: "n174" targetname: "n174n117" label: "0" } node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 31 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} node: {title: "n158" label: "Start c 158" color: blue info1: "visited: 31 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int 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 ee49c4c45..831f62402 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 @@ -1,5 +1,5 @@ graph: { title: "ir graph of GlobalType_OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -18,157 +18,203 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n112" label: "Block 112" color: lightyellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} node: {title: "n113" label: "Start OO_PROGRAM_EXAMPLE_main 113" color: blue info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} edge: { sourcename: "n113" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} edge: { sourcename: "n111" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n189" label: "Block 189" color: lightyellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n189" targetname: "n111" label: "0" color: red} -node: {title: "n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 29 -Const of type type_unknown -"} -edge: { sourcename: "n173" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n191" label: "CallBegin 191" info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} -edge: {sourcename: "n191" targetname: "n173" label: "0" } +node: {title: "n191n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} +edge: {sourcename: "n191" targetname: "n191n173" label: "0" } edge: { sourcename: "n191" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n193" label: "ProjX 0 193" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n193" targetname: "n191" label: "0" color: red} edge: { sourcename: "n193" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n139" label: "Block 139" color: lightyellow info1: "visited: 29 +irg: set_a "} edge: {sourcename: "n139" targetname: "n193" label: "0" color: red} node: {title: "n140" label: "Start set_a 140" color: blue info1: "visited: 29 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} edge: { sourcename: "n140" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 29 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} edge: { sourcename: "n138" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n137" label: "Block 137" color: lightyellow info1: "visited: 29 +irg: set_a "} edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} node: {title: "n185" label: "Jmp 185" info1: "visited: 29 +irg: set_a "} edge: { sourcename: "n185" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n186" label: "Block 186" color: lightyellow info1: "visited: 29 +irg: set_a "} edge: {sourcename: "n186" targetname: "n185" label: "0" color: red} node: {title: "n187" label: "EndReg 187" color: blue info1: "visited: 29 +irg: set_a "} edge: { sourcename: "n187" targetname: "n186" class: 2 priority: 2 linestyle: dotted} node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 29 +irg: set_a "} edge: {sourcename: "n192" targetname: "n187" label: "0" color: red} edge: { sourcename: "n192" targetname: "n186" class: 2 priority: 2 linestyle: dotted} node: {title: "n195" label: "Block 195" color: lightyellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n195" targetname: "n192" label: "0" color: red} -node: {title: "n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 29 -Const of type type_unknown -"} -edge: { sourcename: "n172" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n197" label: "CallBegin 197" info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +"} +node: {title: "n197n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n197" targetname: "n172" label: "0" } +edge: {sourcename: "n197" targetname: "n197n172" label: "0" } edge: { sourcename: "n197" targetname: "n195" class: 2 priority: 2 linestyle: dotted} node: {title: "n199" label: "ProjX 0 199" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n199" targetname: "n197" label: "0" color: red} edge: { sourcename: "n199" targetname: "n195" class: 2 priority: 2 linestyle: dotted} node: {title: "n157" label: "Block 157" color: lightyellow info1: "visited: 29 +irg: c "} edge: {sourcename: "n157" targetname: "n199" label: "0" color: red} node: {title: "n158" label: "Start c 158" color: blue info1: "visited: 29 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int "} edge: { sourcename: "n158" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 29 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} edge: { sourcename: "n156" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n155" label: "Block 155" color: lightyellow info1: "visited: 29 +irg: c "} edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} node: {title: "n177" label: "Jmp 177" info1: "visited: 29 +irg: c "} edge: { sourcename: "n177" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n178" label: "Block 178" color: lightyellow info1: "visited: 29 +irg: c "} edge: {sourcename: "n178" targetname: "n177" label: "0" color: red} node: {title: "n179" label: "EndReg 179" color: blue info1: "visited: 29 +irg: c "} edge: { sourcename: "n179" targetname: "n178" class: 2 priority: 2 linestyle: dotted} node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 29 +irg: c "} edge: {sourcename: "n198" targetname: "n179" label: "0" color: red} edge: { sourcename: "n198" targetname: "n178" class: 2 priority: 2 linestyle: dotted} node: {title: "n110" label: "Block 110" color: lightyellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n110" targetname: "n198" label: "0" color: red} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 29 -Const of type type_unknown -"} -edge: { sourcename: "n117" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n174" label: "FilterIs 1 174" color: yellow info1: "visited: 29 +irg: c +intra predecessor nodes: + ProjT 164 "} -edge: {sourcename: "n174" targetname: "n117" label: "0" } -edge: { sourcename: "n174" targetname: "n157" class: 2 priority: 2 linestyle: dotted} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 29 +node: {title: "n174n117" label: "0x5Is 117" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: { sourcename: "n120" targetname: "n112" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n174" targetname: "n174n117" label: "0" } +edge: { sourcename: "n174" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} edge: { sourcename: "n121" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n119" label: "Alloc 119" info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } edge: { sourcename: "n119" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } edge: { sourcename: "n118" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 29 +irg: c +intra predecessor nodes: + ProjT 164 "} edge: {sourcename: "n176" targetname: "n118" label: "0" } edge: { sourcename: "n176" targetname: "n157" class: 2 priority: 2 linestyle: dotted} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 29 -Const of type type_unknown -"} -edge: { sourcename: "n125" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n184" label: "FilterIs 1 184" color: yellow info1: "visited: 29 +irg: set_a +intra predecessor nodes: + ProjT 144 +"} +node: {title: "n184n125" label: "0x2Is 125" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n184" targetname: "n125" label: "0" } +edge: {sourcename: "n184" targetname: "n184n125" label: "0" } edge: { sourcename: "n184" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n183" label: "FilterP 0 183" color: yellow info1: "visited: 29 +irg: set_a +intra predecessor nodes: + ProjT 144 "} edge: {sourcename: "n183" targetname: "n118" label: "0" } edge: { sourcename: "n183" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} edge: { sourcename: "n127" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n182" label: "FilterM 1 182" color: yellow info1: "visited: 29 +irg: set_a +intra predecessor nodes: + StartT 140 "} edge: {sourcename: "n182" targetname: "n127" label: "0" color: blue} edge: { sourcename: "n182" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n145" label: "Sel a 145" info1: "visited: 29 +irg: set_a Selecting entity of type int from entity of type PRIMA "} @@ -176,24 +222,33 @@ edge: {sourcename: "n145" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n183" label: "1" } edge: { sourcename: "n145" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n142" label: "Store 142" info1: "visited: 29 +irg: set_a "} edge: {sourcename: "n142" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n184" label: "2" } edge: { sourcename: "n142" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 29 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} edge: { sourcename: "n141" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n194" label: "FilterM 0 194" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 124 "} edge: {sourcename: "n194" targetname: "n141" label: "0" color: blue} edge: { sourcename: "n194" targetname: "n195" class: 2 priority: 2 linestyle: dotted} node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 29 +irg: c +intra predecessor nodes: + StartT 158 "} edge: {sourcename: "n175" targetname: "n194" label: "0" color: blue} edge: { sourcename: "n175" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n162" label: "Sel a 162" info1: "visited: 29 +irg: c Selecting entity of type int from entity of type PRIMA "} @@ -201,40 +256,53 @@ edge: {sourcename: "n162" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n176" label: "1" } edge: { sourcename: "n162" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n161" label: "Load 161" info1: "visited: 29 +irg: c "} edge: {sourcename: "n161" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } edge: { sourcename: "n161" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 29 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } edge: { sourcename: "n160" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n159" label: "AddIs 159" info1: "visited: 29 +irg: c "} edge: {sourcename: "n159" targetname: "n160" label: "0" } edge: {sourcename: "n159" targetname: "n174" label: "1" } edge: { sourcename: "n159" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n201" label: "FilterIs 0 201" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + ProjT 115 "} edge: {sourcename: "n201" targetname: "n159" label: "0" } edge: { sourcename: "n201" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 29 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} edge: { sourcename: "n167" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n200" label: "FilterM 0 200" color: yellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 116 "} edge: {sourcename: "n200" targetname: "n167" label: "0" color: blue} edge: { sourcename: "n200" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n109" label: "Return 109" info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n109" targetname: "n200" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n201" label: "1" } edge: { sourcename: "n109" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} node: {title: "n107" label: "End 107" color: blue info1: "visited: 29 +irg: OO_PROGRAM_EXAMPLE_main "} edge: { sourcename: "n107" targetname: "n108" 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 2345b2096..cc9836a1a 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 @@ -1,5 +1,5 @@ graph: { title: "ir graph of GlobalType_OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -18,157 +18,203 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n112" label: "Block 112" color: lightyellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} node: {title: "n113" label: "Start OO_PROGRAM_EXAMPLE_main 113" color: blue info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} edge: { sourcename: "n113" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} edge: { sourcename: "n111" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n189" label: "Block 189" color: lightyellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n189" targetname: "n111" label: "0" color: red} -node: {title: "n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 33 -Const of type type_unknown -"} -edge: { sourcename: "n173" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n191" label: "CallBegin 191" info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} -edge: {sourcename: "n191" targetname: "n173" label: "0" } +node: {title: "n191n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} +edge: {sourcename: "n191" targetname: "n191n173" label: "0" } edge: { sourcename: "n191" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n193" label: "ProjX 0 193" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n193" targetname: "n191" label: "0" color: red} edge: { sourcename: "n193" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n139" label: "Block 139" color: lightyellow info1: "visited: 33 +irg: set_a "} edge: {sourcename: "n139" targetname: "n193" label: "0" color: red} node: {title: "n140" label: "Start set_a 140" color: blue info1: "visited: 33 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} edge: { sourcename: "n140" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 33 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} edge: { sourcename: "n138" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n137" label: "Block 137" color: lightyellow info1: "visited: 33 +irg: set_a "} edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} node: {title: "n185" label: "Jmp 185" info1: "visited: 33 +irg: set_a "} edge: { sourcename: "n185" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n186" label: "Block 186" color: lightyellow info1: "visited: 33 +irg: set_a "} edge: {sourcename: "n186" targetname: "n185" label: "0" color: red} node: {title: "n187" label: "EndReg 187" color: blue info1: "visited: 33 +irg: set_a "} edge: { sourcename: "n187" targetname: "n186" class: 2 priority: 2 linestyle: dotted} node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 33 +irg: set_a "} edge: {sourcename: "n192" targetname: "n187" label: "0" color: red} edge: { sourcename: "n192" targetname: "n186" class: 2 priority: 2 linestyle: dotted} node: {title: "n195" label: "Block 195" color: lightyellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n195" targetname: "n192" label: "0" color: red} -node: {title: "n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 33 -Const of type type_unknown -"} -edge: { sourcename: "n172" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n197" label: "CallBegin 197" info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +"} +node: {title: "n197n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n197" targetname: "n172" label: "0" } +edge: {sourcename: "n197" targetname: "n197n172" label: "0" } edge: { sourcename: "n197" targetname: "n195" class: 2 priority: 2 linestyle: dotted} node: {title: "n199" label: "ProjX 0 199" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n199" targetname: "n197" label: "0" color: red} edge: { sourcename: "n199" targetname: "n195" class: 2 priority: 2 linestyle: dotted} node: {title: "n157" label: "Block 157" color: lightyellow info1: "visited: 33 +irg: c "} edge: {sourcename: "n157" targetname: "n199" label: "0" color: red} node: {title: "n158" label: "Start c 158" color: blue info1: "visited: 33 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int "} edge: { sourcename: "n158" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 33 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} edge: { sourcename: "n156" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n155" label: "Block 155" color: lightyellow info1: "visited: 33 +irg: c "} edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} node: {title: "n177" label: "Jmp 177" info1: "visited: 33 +irg: c "} edge: { sourcename: "n177" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n178" label: "Block 178" color: lightyellow info1: "visited: 33 +irg: c "} edge: {sourcename: "n178" targetname: "n177" label: "0" color: red} node: {title: "n179" label: "EndReg 179" color: blue info1: "visited: 33 +irg: c "} edge: { sourcename: "n179" targetname: "n178" class: 2 priority: 2 linestyle: dotted} node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 33 +irg: c "} edge: {sourcename: "n198" targetname: "n179" label: "0" color: red} edge: { sourcename: "n198" targetname: "n178" class: 2 priority: 2 linestyle: dotted} node: {title: "n110" label: "Block 110" color: lightyellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n110" targetname: "n198" label: "0" color: red} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 33 -Const of type type_unknown -"} -edge: { sourcename: "n117" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n174" label: "FilterIs 1 174" color: yellow info1: "visited: 33 +irg: c +intra predecessor nodes: + ProjT 164 "} -edge: {sourcename: "n174" targetname: "n117" label: "0" } -edge: { sourcename: "n174" targetname: "n157" class: 2 priority: 2 linestyle: dotted} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 33 +node: {title: "n174n117" label: "0x5Is 117" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: { sourcename: "n120" targetname: "n112" class: 2 priority: 2 linestyle: dotted} +edge: {sourcename: "n174" targetname: "n174n117" label: "0" } +edge: { sourcename: "n174" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} edge: { sourcename: "n121" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n119" label: "Alloc 119" info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } edge: { sourcename: "n119" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } edge: { sourcename: "n118" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 33 +irg: c +intra predecessor nodes: + ProjT 164 "} edge: {sourcename: "n176" targetname: "n118" label: "0" } edge: { sourcename: "n176" targetname: "n157" class: 2 priority: 2 linestyle: dotted} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 33 -Const of type type_unknown -"} -edge: { sourcename: "n125" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n184" label: "FilterIs 1 184" color: yellow info1: "visited: 33 +irg: set_a +intra predecessor nodes: + ProjT 144 +"} +node: {title: "n184n125" label: "0x2Is 125" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n184" targetname: "n125" label: "0" } +edge: {sourcename: "n184" targetname: "n184n125" label: "0" } edge: { sourcename: "n184" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n183" label: "FilterP 0 183" color: yellow info1: "visited: 33 +irg: set_a +intra predecessor nodes: + ProjT 144 "} edge: {sourcename: "n183" targetname: "n118" label: "0" } edge: { sourcename: "n183" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} edge: { sourcename: "n127" targetname: "n189" class: 2 priority: 2 linestyle: dotted} node: {title: "n182" label: "FilterM 1 182" color: yellow info1: "visited: 33 +irg: set_a +intra predecessor nodes: + StartT 140 "} edge: {sourcename: "n182" targetname: "n127" label: "0" color: blue} edge: { sourcename: "n182" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n145" label: "Sel a 145" info1: "visited: 33 +irg: set_a Selecting entity of type int from entity of type PRIMA "} @@ -176,24 +222,33 @@ edge: {sourcename: "n145" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n183" label: "1" } edge: { sourcename: "n145" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n142" label: "Store 142" info1: "visited: 33 +irg: set_a "} edge: {sourcename: "n142" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n184" label: "2" } edge: { sourcename: "n142" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 33 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} edge: { sourcename: "n141" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n194" label: "FilterM 0 194" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 124 "} edge: {sourcename: "n194" targetname: "n141" label: "0" color: blue} edge: { sourcename: "n194" targetname: "n195" class: 2 priority: 2 linestyle: dotted} node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 33 +irg: c +intra predecessor nodes: + StartT 158 "} edge: {sourcename: "n175" targetname: "n194" label: "0" color: blue} edge: { sourcename: "n175" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n162" label: "Sel a 162" info1: "visited: 33 +irg: c Selecting entity of type int from entity of type PRIMA "} @@ -201,40 +256,53 @@ edge: {sourcename: "n162" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n176" label: "1" } edge: { sourcename: "n162" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n161" label: "Load 161" info1: "visited: 33 +irg: c "} edge: {sourcename: "n161" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } edge: { sourcename: "n161" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 33 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } edge: { sourcename: "n160" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n159" label: "AddIs 159" info1: "visited: 33 +irg: c "} edge: {sourcename: "n159" targetname: "n160" label: "0" } edge: {sourcename: "n159" targetname: "n174" label: "1" } edge: { sourcename: "n159" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n201" label: "FilterIs 0 201" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + ProjT 115 "} edge: {sourcename: "n201" targetname: "n159" label: "0" } edge: { sourcename: "n201" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 33 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} edge: { sourcename: "n167" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n200" label: "FilterM 0 200" color: yellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 116 "} edge: {sourcename: "n200" targetname: "n167" label: "0" color: blue} edge: { sourcename: "n200" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n109" label: "Return 109" info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n109" targetname: "n200" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n201" label: "1" } edge: { sourcename: "n109" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} node: {title: "n107" label: "End 107" color: blue info1: "visited: 33 +irg: OO_PROGRAM_EXAMPLE_main "} edge: { sourcename: "n107" targetname: "n108" class: 2 priority: 2 linestyle: dotted} node: {title: "e15" label: "ent a" color: yellow @@ -272,7 +340,7 @@ irg = g71" } edge: { sourcename: "e18" targetname: "t16"class: 3 label: "type" color: red} edge: { sourcename: "e18" targetname: "n17"label: "value 0"} -node: {title: "n17" label: "&(PRIMA_set_a)P 17" color: yellow info1: "visited: 35 +node: {title: "n17" label: "&(PRIMA_set_a)P 17" color: yellow info1: "visited: 36 Const of type type_unknown "} node: {title: "t16" label: "method set_a" info1: "state: layout_fixed, @@ -305,7 +373,7 @@ irg = g94" } edge: { sourcename: "e21" targetname: "t19"class: 3 label: "type" color: red} edge: { sourcename: "e21" targetname: "n20"label: "value 0"} -node: {title: "n20" label: "&(PRIMA_c)P 20" color: yellow info1: "visited: 36 +node: {title: "n20" label: "&(PRIMA_c)P 20" color: yellow info1: "visited: 37 Const of type type_unknown "} node: {title: "t19" label: "method c" info1: "state: layout_fixed, @@ -330,7 +398,7 @@ irg = g37" } edge: { sourcename: "e24" targetname: "t22"class: 3 label: "type" color: red} edge: { sourcename: "e24" targetname: "n23"label: "value 0"} -node: {title: "n23" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 23" color: yellow info1: "visited: 37 +node: {title: "n23" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 23" color: yellow info1: "visited: 38 Const of type type_unknown "} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined 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 51a91c8cd..014e20961 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of GlobalType_OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no 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 589ef3681..75f331572 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 @@ -1,5 +1,5 @@ graph: { title: "ir graph of GlobalType_OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -20,81 +20,99 @@ classname 12: "Member" graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} -node: {title: "n107" label: "End 107" color: blue info1: "visited: 40 +node: {title: "n107" label: "End 107" color: blue info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} } graph: { title: "n110" label: "Block 110" status:clustered color:yellow edge: {sourcename: "n110" targetname: "n198" label: "0" color: red} -node: {title: "n109" label: "Return 109" info1: "visited: 40 +node: {title: "n109" label: "Return 109" info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n109" targetname: "n200" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n201" label: "1" } -node: {title: "n200" label: "FilterM 0 200" color: yellow info1: "visited: 40 +node: {title: "n200" label: "FilterM 0 200" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 116 "} edge: {sourcename: "n200" targetname: "n167" label: "0" color: blue} -node: {title: "n201" label: "FilterIs 0 201" color: yellow info1: "visited: 40 +node: {title: "n201" label: "FilterIs 0 201" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + ProjT 115 "} edge: {sourcename: "n201" targetname: "n159" label: "0" } } graph: { title: "n195" label: "Block 195" status:clustered color:yellow edge: {sourcename: "n195" targetname: "n192" label: "0" color: red} -node: {title: "n194" label: "FilterM 0 194" color: yellow info1: "visited: 40 +node: {title: "n194" label: "FilterM 0 194" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +intra predecessor nodes: + CallT 124 "} edge: {sourcename: "n194" targetname: "n141" label: "0" color: blue} -node: {title: "n199" label: "ProjX 0 199" color: yellow info1: "visited: 40 +node: {title: "n199" label: "ProjX 0 199" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n199" targetname: "n197" label: "0" color: red} -node: {title: "n197" label: "CallBegin 197" info1: "visited: 40 +node: {title: "n197" label: "CallBegin 197" info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} -edge: {sourcename: "n197" targetname: "n172" label: "0" } +node: {title: "n197n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} +edge: {sourcename: "n197" targetname: "n197n172" label: "0" } } graph: { title: "n189" label: "Block 189" status:clustered color:yellow edge: {sourcename: "n189" targetname: "n111" label: "0" color: red} -node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 40 +node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} -node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 40 +node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } -node: {title: "n119" label: "Alloc 119" info1: "visited: 40 +node: {title: "n119" label: "Alloc 119" info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } -node: {title: "n193" label: "ProjX 0 193" color: yellow info1: "visited: 40 +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } +node: {title: "n193" label: "ProjX 0 193" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n193" targetname: "n191" label: "0" color: red} -node: {title: "n191" label: "CallBegin 191" info1: "visited: 40 +node: {title: "n191" label: "CallBegin 191" info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +"} +node: {title: "n191n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n191" targetname: "n173" label: "0" } +edge: {sourcename: "n191" targetname: "n191n173" label: "0" } } graph: { title: "n112" label: "Block 112" status:clustered color:yellow edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 40 -Const of type type_unknown -"} -node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 40 +node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 40 -"} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 40 -Const of type type_unknown -"} -node: {title: "n172" label: "&(PRIMA_c)P 172" color: yellow info1: "visited: 40 -Const of type type_unknown -"} -node: {title: "n173" label: "&(PRIMA_set_a)P 173" color: yellow info1: "visited: 40 -Const of type type_unknown -"} -node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 40 +node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} -node: {title: "n113" label: "Start OO_PROGRAM_EXAMPLE_main 113" color: blue info1: "visited: 40 +node: {title: "n113" label: "Start OO_PROGRAM_EXAMPLE_main 113" color: blue info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} } @@ -104,48 +122,69 @@ start of method of type OO_PROGRAM_EXAMPLE_main graph: { title: "g71" label: "set_a" status:clustered color:white graph: { title: "n186" label: "Block 186" status:clustered color:yellow edge: {sourcename: "n186" targetname: "n185" label: "0" color: red} -node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 40 +node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 41 +irg: set_a "} edge: {sourcename: "n192" targetname: "n187" label: "0" color: red} -node: {title: "n187" label: "EndReg 187" color: blue info1: "visited: 40 +node: {title: "n187" label: "EndReg 187" color: blue info1: "visited: 41 +irg: set_a "} } graph: { title: "n137" label: "Block 137" status:clustered color:yellow edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} -node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 40 +node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 41 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} -node: {title: "n142" label: "Store 142" info1: "visited: 40 +node: {title: "n142" label: "Store 142" info1: "visited: 41 +irg: set_a "} edge: {sourcename: "n142" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n184" label: "2" } -node: {title: "n145" label: "Sel a 145" info1: "visited: 40 +node: {title: "n145" label: "Sel a 145" info1: "visited: 41 +irg: set_a Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n145" targetname: "n182" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n183" label: "1" } -node: {title: "n185" label: "Jmp 185" info1: "visited: 40 +node: {title: "n185" label: "Jmp 185" info1: "visited: 41 +irg: set_a "} } graph: { title: "n139" label: "Block 139" status:clustered color:yellow edge: {sourcename: "n139" targetname: "n193" label: "0" color: red} -node: {title: "n182" label: "FilterM 1 182" color: yellow info1: "visited: 40 +node: {title: "n182" label: "FilterM 1 182" color: yellow info1: "visited: 41 +irg: set_a +intra predecessor nodes: + StartT 140 "} edge: {sourcename: "n182" targetname: "n127" label: "0" color: blue} -node: {title: "n183" label: "FilterP 0 183" color: yellow info1: "visited: 40 +node: {title: "n183" label: "FilterP 0 183" color: yellow info1: "visited: 41 +irg: set_a +intra predecessor nodes: + ProjT 144 "} edge: {sourcename: "n183" targetname: "n118" label: "0" } -node: {title: "n184" label: "FilterIs 1 184" color: yellow info1: "visited: 40 +node: {title: "n184" label: "FilterIs 1 184" color: yellow info1: "visited: 41 +irg: set_a +intra predecessor nodes: + ProjT 144 "} -edge: {sourcename: "n184" targetname: "n125" label: "0" } -node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 40 +node: {title: "n184n125" label: "0x2Is 125" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} +edge: {sourcename: "n184" targetname: "n184n125" label: "0" } +node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 41 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} -node: {title: "n140" label: "Start set_a 140" color: blue info1: "visited: 40 +node: {title: "n140" label: "Start set_a 140" color: blue info1: "visited: 41 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int @@ -157,54 +196,77 @@ start of method of type set_a graph: { title: "g94" label: "c" status:clustered color:white graph: { title: "n178" label: "Block 178" status:clustered color:yellow edge: {sourcename: "n178" targetname: "n177" label: "0" color: red} -node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 40 +node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 41 +irg: c "} edge: {sourcename: "n198" targetname: "n179" label: "0" color: red} -node: {title: "n179" label: "EndReg 179" color: blue info1: "visited: 40 +node: {title: "n179" label: "EndReg 179" color: blue info1: "visited: 41 +irg: c "} } graph: { title: "n155" label: "Block 155" status:clustered color:yellow edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} -node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 40 +node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 41 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} -node: {title: "n159" label: "AddIs 159" info1: "visited: 40 +node: {title: "n159" label: "AddIs 159" info1: "visited: 41 +irg: c "} edge: {sourcename: "n159" targetname: "n160" label: "0" } edge: {sourcename: "n159" targetname: "n174" label: "1" } -node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 40 +node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 41 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } -node: {title: "n161" label: "Load 161" info1: "visited: 40 +node: {title: "n161" label: "Load 161" info1: "visited: 41 +irg: c "} edge: {sourcename: "n161" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } -node: {title: "n162" label: "Sel a 162" info1: "visited: 40 +node: {title: "n162" label: "Sel a 162" info1: "visited: 41 +irg: c Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n162" targetname: "n175" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n176" label: "1" } -node: {title: "n177" label: "Jmp 177" info1: "visited: 40 +node: {title: "n177" label: "Jmp 177" info1: "visited: 41 +irg: c "} } graph: { title: "n157" label: "Block 157" status:clustered color:yellow edge: {sourcename: "n157" targetname: "n199" label: "0" color: red} -node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 40 +node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 41 +irg: c +intra predecessor nodes: + StartT 158 "} edge: {sourcename: "n175" targetname: "n194" label: "0" color: blue} -node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 40 +node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 41 +irg: c +intra predecessor nodes: + ProjT 164 "} edge: {sourcename: "n176" targetname: "n118" label: "0" } -node: {title: "n174" label: "FilterIs 1 174" color: yellow info1: "visited: 40 +node: {title: "n174" label: "FilterIs 1 174" color: yellow info1: "visited: 41 +irg: c +intra predecessor nodes: + ProjT 164 +"} +node: {title: "n174n117" label: "0x5Is 117" color: yellow info1: "visited: 41 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown "} -edge: {sourcename: "n174" targetname: "n117" label: "0" } -node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 40 +edge: {sourcename: "n174" targetname: "n174n117" label: "0" } +node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 41 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} -node: {title: "n158" label: "Start c 158" color: blue info1: "visited: 40 +node: {title: "n158" label: "Start c 158" color: blue info1: "visited: 41 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int @@ -248,7 +310,7 @@ irg = g71" } edge: { sourcename: "e18" targetname: "t16"class: 3 label: "type" color: red} edge: { sourcename: "e18" targetname: "n17"label: "value 0"} -node: {title: "n17" label: "&(PRIMA_set_a)P 17" color: yellow info1: "visited: 42 +node: {title: "n17" label: "&(PRIMA_set_a)P 17" color: yellow info1: "visited: 44 Const of type type_unknown "} node: {title: "t16" label: "method set_a" info1: "state: layout_fixed, @@ -281,7 +343,7 @@ irg = g94" } edge: { sourcename: "e21" targetname: "t19"class: 3 label: "type" color: red} edge: { sourcename: "e21" targetname: "n20"label: "value 0"} -node: {title: "n20" label: "&(PRIMA_c)P 20" color: yellow info1: "visited: 43 +node: {title: "n20" label: "&(PRIMA_c)P 20" color: yellow info1: "visited: 45 Const of type type_unknown "} node: {title: "t19" label: "method c" info1: "state: layout_fixed, @@ -306,7 +368,7 @@ irg = g37" } edge: { sourcename: "e24" targetname: "t22"class: 3 label: "type" color: red} edge: { sourcename: "e24" targetname: "n23"label: "value 0"} -node: {title: "n23" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 23" color: yellow info1: "visited: 44 +node: {title: "n23" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 23" color: yellow info1: "visited: 46 Const of type type_unknown "} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined 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 6ca99a0e2..f24f97877 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of GlobalType_OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -21,90 +21,109 @@ graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:wh graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} node: {title: "n107" label: "End 107" color: blue info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} } graph: { title: "n110" label: "Block 110" status:clustered color:yellow edge: {sourcename: "n110" targetname: "n111" label: "0" color: red} node: {title: "n109" label: "Return 109" info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int "} edge: {sourcename: "n109" targetname: "n128" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n114" label: "1" } node: {title: "n128" label: "ProjM 0 128" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n128" targetname: "n116" label: "0" color: blue} node: {title: "n114" label: "ProjIs 0 114" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n114" targetname: "n115" label: "0" } node: {title: "n115" label: "ProjT 2 115" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n115" targetname: "n116" label: "0" } node: {title: "n116" label: "Call 116" info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main calling method of type c param 0 type: class_prima_ptr param 1 type: int resul 0 type: int "} +node: {title: "n116n117" label: "0x5Is 117" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} edge: {sourcename: "n116" targetname: "n123" label: "0" color: blue} edge: {sourcename: "n116" targetname: "n122" label: "1" } edge: {sourcename: "n116" targetname: "n118" label: "2" } -edge: {sourcename: "n116" targetname: "n117" label: "3" } +edge: {sourcename: "n116" targetname: "n116n117" label: "3" } node: {title: "n122" label: "Sel c 122" info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main Selecting entity of type c from entity of type PRIMA "} edge: {sourcename: "n122" targetname: "n123" label: "0" color: blue} edge: {sourcename: "n122" targetname: "n118" label: "1" } node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n123" targetname: "n124" label: "0" color: blue} node: {title: "n124" label: "Call 124" info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main calling method of type set_a param 0 type: class_prima_ptr param 1 type: int "} +node: {title: "n124n125" label: "0x2Is 125" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} edge: {sourcename: "n124" targetname: "n127" label: "0" color: blue} edge: {sourcename: "n124" targetname: "n126" label: "1" } edge: {sourcename: "n124" targetname: "n118" label: "2" } -edge: {sourcename: "n124" targetname: "n125" label: "3" } +edge: {sourcename: "n124" targetname: "n124n125" label: "3" } node: {title: "n126" label: "Sel set_a 126" info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main Selecting entity of type set_a from entity of type PRIMA "} edge: {sourcename: "n126" targetname: "n127" label: "0" color: blue} edge: {sourcename: "n126" targetname: "n118" label: "1" } node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } node: {title: "n119" label: "Alloc 119" info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } } graph: { title: "n112" label: "Block 112" status:clustered color:yellow edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 20 -Const of type type_unknown -"} node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 20 -"} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 20 -Const of type type_unknown -"} node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} node: {title: "n113" label: "Start 113" color: blue info1: "visited: 20 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} } diff --git a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg index 58970069b..9d6d4771c 100644 --- a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg @@ -21,12 +21,14 @@ graph: { title: "g28" label: "IF_ELSE_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} node: {title: "n61" label: "End 61" color: blue info1: "visited: 13 +irg: IF_ELSE_EXAMPLE_main "} } graph: { title: "n66" label: "Block 66" status:clustered color:yellow edge: {sourcename: "n66" targetname: "n67" label: "0" color: red} node: {title: "n63" label: "Return 63" info1: "visited: 13 +irg: IF_ELSE_EXAMPLE_main return in method of type IF_ELSE_EXAMPLE_main res 0 type: int res 1 type: int @@ -39,18 +41,23 @@ edge: {sourcename: "n63" targetname: "n71" label: "2" } graph: { title: "n68" label: "Block 68" status:clustered color:yellow edge: {sourcename: "n68" targetname: "n67" label: "0" color: red} node: {title: "n73" label: "ProjM 1 73" color: yellow info1: "visited: 13 +irg: IF_ELSE_EXAMPLE_main "} edge: {sourcename: "n73" targetname: "n69" label: "0" color: blue} node: {title: "n72" label: "0x0Is 72" color: yellow info1: "visited: 13 +irg: IF_ELSE_EXAMPLE_main Const of type type_unknown "} node: {title: "n71" label: "0x2Is 71" color: yellow info1: "visited: 13 +irg: IF_ELSE_EXAMPLE_main Const of type type_unknown "} node: {title: "n67" label: "ProjX 0 67" color: yellow info1: "visited: 13 +irg: IF_ELSE_EXAMPLE_main "} edge: {sourcename: "n67" targetname: "n69" label: "0" color: red} node: {title: "n69" label: "Start 69" color: blue info1: "visited: 13 +irg: IF_ELSE_EXAMPLE_main start of method of type IF_ELSE_EXAMPLE_main "} } diff --git a/testprograms/ref-results/IF_EXAMPLE_main.vcg b/testprograms/ref-results/IF_EXAMPLE_main.vcg index 59e1c2fa8..1344503f7 100644 --- a/testprograms/ref-results/IF_EXAMPLE_main.vcg +++ b/testprograms/ref-results/IF_EXAMPLE_main.vcg @@ -21,6 +21,7 @@ graph: { title: "g28" label: "IF_EXAMPLE_main" status:clustered color:white graph: { title: "n17" label: "Block 17" status:clustered color:yellow edge: {sourcename: "n17" targetname: "n52" label: "0" color: red} node: {title: "n18" label: "End 18" color: blue info1: "visited: 8 +irg: IF_EXAMPLE_main "} } @@ -28,12 +29,14 @@ graph: { title: "n43" label: "Block 43" status:clustered color:yellow edge: {sourcename: "n43" targetname: "n35" label: "0" color: red} edge: {sourcename: "n43" targetname: "n42" label: "1" color: red} node: {title: "n52" label: "Return 52" info1: "visited: 8 +irg: IF_EXAMPLE_main return in method of type IF_EXAMPLE_main res 0 type: int "} edge: {sourcename: "n52" targetname: "n24" label: "0" color: blue} edge: {sourcename: "n52" targetname: "n45" label: "1" } node: {title: "n45" label: "PhiIs 45" color: green info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n45" targetname: "n30" label: "0" } edge: {sourcename: "n45" targetname: "n40" label: "1" } @@ -42,32 +45,40 @@ edge: {sourcename: "n45" targetname: "n40" label: "1" } graph: { title: "n37" label: "Block 37" status:clustered color:yellow edge: {sourcename: "n37" targetname: "n36" label: "0" color: red} node: {title: "n40" label: "SubIs 40" info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n40" targetname: "n30" label: "0" } edge: {sourcename: "n40" targetname: "n38" label: "1" } node: {title: "n42" label: "Jmp 42" info1: "visited: 8 +irg: IF_EXAMPLE_main "} } graph: { title: "n29" label: "Block 29" status:clustered color:yellow edge: {sourcename: "n29" targetname: "n23" label: "0" color: red} node: {title: "n35" label: "ProjX 0 35" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n35" targetname: "n34" label: "0" color: red} node: {title: "n36" label: "ProjX 1 36" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n36" targetname: "n34" label: "0" color: red} node: {title: "n34" label: "Cond 34" info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n34" targetname: "n33" label: "0" } node: {title: "n33" label: "Projb Eq 33" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n33" targetname: "n32" label: "0" } node: {title: "n32" label: "CmpT 32" info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n32" targetname: "n30" label: "0" } edge: {sourcename: "n32" targetname: "n31" label: "1" } node: {title: "n30" label: "ProjIs 0 30" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n30" targetname: "n27" label: "0" } } @@ -75,21 +86,27 @@ edge: {sourcename: "n30" targetname: "n27" label: "0" } graph: { title: "n19" label: "Block 19" status:clustered color:yellow edge: {sourcename: "n19" targetname: "n23" label: "0" color: red} node: {title: "n24" label: "ProjM 1 24" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n24" targetname: "n20" label: "0" color: blue} node: {title: "n38" label: "0x3Is 38" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main Const of type type_unknown "} node: {title: "n27" label: "ProjT 4 27" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n27" targetname: "n20" label: "0" } node: {title: "n31" label: "0x2Is 31" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main Const of type type_unknown "} node: {title: "n23" label: "ProjX 0 23" color: yellow info1: "visited: 8 +irg: IF_EXAMPLE_main "} edge: {sourcename: "n23" targetname: "n20" label: "0" color: red} node: {title: "n20" label: "Start 20" color: blue info1: "visited: 8 +irg: IF_EXAMPLE_main start of method of type IF_EXAMPLE_main param 0 type: int "} diff --git a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg index f7cb5138a..376c10741 100644 --- a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg +++ b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg @@ -18,88 +18,110 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n90" label: "Start 90" color: blue info1: "visited: 14 +irg: main start of method of type main "} edge: { sourcename: "n90" targetname: "n88" class: 2 priority: 2 linestyle: dotted} node: {title: "n89" label: "ProjX 0 89" color: yellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n89" targetname: "n90" label: "0" color: red} edge: { sourcename: "n89" targetname: "n88" class: 2 priority: 2 linestyle: dotted} node: {title: "n88" label: "Block 88" color: lightyellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n88" targetname: "n89" label: "0" color: red} node: {title: "n87" label: "0x0Iu 87" color: yellow info1: "visited: 14 +irg: main Const of type type_unknown "} edge: { sourcename: "n87" targetname: "n88" class: 2 priority: 2 linestyle: dotted} node: {title: "n86" label: "CmpT 86" info1: "visited: 14 +irg: main "} edge: {sourcename: "n86" targetname: "n87" label: "0" } edge: {sourcename: "n86" targetname: "n87" label: "1" } edge: { sourcename: "n86" targetname: "n80" class: 2 priority: 2 linestyle: dotted} node: {title: "n85" label: "Projb Eq 85" color: yellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n85" targetname: "n86" label: "0" } edge: { sourcename: "n85" targetname: "n80" class: 2 priority: 2 linestyle: dotted} node: {title: "n84" label: "Cond 84" info1: "visited: 14 +irg: main "} edge: {sourcename: "n84" targetname: "n85" label: "0" } edge: { sourcename: "n84" targetname: "n80" class: 2 priority: 2 linestyle: dotted} node: {title: "n83" label: "ProjX 1 83" color: yellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} edge: { sourcename: "n83" targetname: "n80" class: 2 priority: 2 linestyle: dotted} node: {title: "n82" label: "Block 82" color: lightyellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n82" targetname: "n83" label: "0" color: red} node: {title: "n81" label: "Jmp 81" info1: "visited: 14 +irg: main "} edge: { sourcename: "n81" targetname: "n82" class: 2 priority: 2 linestyle: dotted} node: {title: "n92" label: "Block 92" color: lightyellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n92" targetname: "n89" label: "0" color: red} node: {title: "n91" label: "Jmp 91" info1: "visited: 14 +irg: main "} edge: { sourcename: "n91" targetname: "n92" class: 2 priority: 2 linestyle: dotted} node: {title: "n80" label: "Block 80" color: lightyellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n80" targetname: "n91" label: "0" color: red} edge: {sourcename: "n80" targetname: "n81" label: "1" color: red} node: {title: "n79" label: "ProjX 0 79" color: yellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n79" targetname: "n84" label: "0" color: red} edge: { sourcename: "n79" targetname: "n80" class: 2 priority: 2 linestyle: dotted} node: {title: "n78" label: "Block 78" color: lightyellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n78" targetname: "n79" label: "0" color: red} node: {title: "n96" label: "0x0Iu 96" color: yellow info1: "visited: 14 +irg: main Const of type type_unknown "} edge: { sourcename: "n96" targetname: "n88" class: 2 priority: 2 linestyle: dotted} node: {title: "n95" label: "PhiIu 95" color: green info1: "visited: 14 +irg: main "} edge: {sourcename: "n95" targetname: "n96" label: "0" } edge: {sourcename: "n95" targetname: "n94" label: "1" } edge: { sourcename: "n95" targetname: "n80" class: 2 priority: 2 linestyle: dotted} node: {title: "n97" label: "0x1Iu 97" color: yellow info1: "visited: 14 +irg: main Const of type type_unknown "} edge: { sourcename: "n97" targetname: "n88" class: 2 priority: 2 linestyle: dotted} node: {title: "n94" label: "PhiIu 94" color: green info1: "visited: 14 +irg: main "} edge: {sourcename: "n94" targetname: "n97" label: "0" } edge: {sourcename: "n94" targetname: "n95" label: "1" } edge: { sourcename: "n94" targetname: "n80" class: 2 priority: 2 linestyle: dotted} node: {title: "n93" label: "SubIu 93" info1: "visited: 14 +irg: main "} edge: {sourcename: "n93" targetname: "n95" label: "0" } edge: {sourcename: "n93" targetname: "n94" label: "1" } edge: { sourcename: "n93" targetname: "n78" class: 2 priority: 2 linestyle: dotted} node: {title: "n98" label: "ProjM 1 98" color: yellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n98" targetname: "n90" label: "0" color: blue} edge: { sourcename: "n98" targetname: "n88" class: 2 priority: 2 linestyle: dotted} node: {title: "n77" label: "Return 77" info1: "visited: 14 +irg: main return in method of type main res 0 type: int "} @@ -107,9 +129,11 @@ edge: {sourcename: "n77" targetname: "n98" label: "0" color: blue} edge: {sourcename: "n77" targetname: "n93" label: "1" } edge: { sourcename: "n77" targetname: "n78" class: 2 priority: 2 linestyle: dotted} node: {title: "n76" label: "Block 76" color: lightyellow info1: "visited: 14 +irg: main "} edge: {sourcename: "n76" targetname: "n77" label: "0" color: red} node: {title: "n75" label: "End 75" color: blue info1: "visited: 14 +irg: main "} edge: { sourcename: "n75" targetname: "n76" class: 2 priority: 2 linestyle: dotted} edge: {sourcename: "n90" targetname: "n89" 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 65b1578ef..e9370dc37 100644 --- a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg +++ b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg @@ -36,5 +36,6 @@ edge: { sourcename: "n83" targetname: "n73"} node: {title: "n90" label: "Block n90" } edge: { sourcename: "n90" targetname: "n83"} node: {title: "n96" label: "Bad 96" info1: "visited: 0 +irg: main "} } diff --git a/testprograms/ref-results/IRREGULAR_CF_main.vcg b/testprograms/ref-results/IRREGULAR_CF_main.vcg index a9077bb65..67db9090d 100644 --- a/testprograms/ref-results/IRREGULAR_CF_main.vcg +++ b/testprograms/ref-results/IRREGULAR_CF_main.vcg @@ -21,6 +21,7 @@ graph: { title: "g28" label: "main" status:clustered color:white graph: { title: "n65" label: "Block 65" status:clustered color:yellow edge: {sourcename: "n65" targetname: "n66" label: "0" color: red} node: {title: "n64" label: "End 64" color: blue info1: "visited: 5 +irg: main "} } @@ -28,6 +29,7 @@ graph: { title: "n67" label: "Block 67" status:clustered color:yellow edge: {sourcename: "n67" targetname: "n89" label: "0" color: red} edge: {sourcename: "n67" targetname: "n68" label: "1" color: red} node: {title: "n66" label: "Return 66" info1: "visited: 5 +irg: main return in method of type main "} edge: {sourcename: "n66" targetname: "n92" label: "0" color: blue} @@ -36,6 +38,7 @@ edge: {sourcename: "n66" targetname: "n92" label: "0" color: blue} graph: { title: "n90" label: "Block 90" status:clustered color:yellow edge: {sourcename: "n90" targetname: "n91" label: "0" color: red} node: {title: "n89" label: "Jmp 89" info1: "visited: 5 +irg: main "} } @@ -43,24 +46,30 @@ graph: { title: "n69" label: "Block 69" status:clustered color:yellow edge: {sourcename: "n69" targetname: "n82" label: "0" color: red} edge: {sourcename: "n69" targetname: "n70" label: "1" color: red} node: {title: "n68" label: "Jmp 68" info1: "visited: 5 +irg: main "} } graph: { title: "n83" label: "Block 83" status:clustered color:yellow edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} node: {title: "n91" label: "ProjX 0 91" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n91" targetname: "n85" label: "0" color: red} node: {title: "n82" label: "ProjX 1 82" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n82" targetname: "n85" label: "0" color: red} node: {title: "n85" label: "Cond 85" info1: "visited: 5 +irg: main "} edge: {sourcename: "n85" targetname: "n86" label: "0" } node: {title: "n86" label: "Projb Eq 86" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n86" targetname: "n87" label: "0" } node: {title: "n87" label: "CmpT 87" info1: "visited: 5 +irg: main "} edge: {sourcename: "n87" targetname: "n81" label: "0" } edge: {sourcename: "n87" targetname: "n88" label: "1" } @@ -69,24 +78,30 @@ edge: {sourcename: "n87" targetname: "n88" label: "1" } graph: { title: "n71" label: "Block 71" status:clustered color:yellow edge: {sourcename: "n71" targetname: "n72" label: "0" color: red} node: {title: "n70" label: "Jmp 70" info1: "visited: 5 +irg: main "} } graph: { title: "n73" label: "Block 73" status:clustered color:yellow edge: {sourcename: "n73" targetname: "n74" label: "0" color: red} node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n84" targetname: "n77" label: "0" color: red} node: {title: "n72" label: "ProjX 1 72" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n72" targetname: "n77" label: "0" color: red} node: {title: "n77" label: "Cond 77" info1: "visited: 5 +irg: main "} edge: {sourcename: "n77" targetname: "n78" label: "0" } node: {title: "n78" label: "Projb Eq 78" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n78" targetname: "n79" label: "0" } node: {title: "n79" label: "CmpT 79" info1: "visited: 5 +irg: main "} edge: {sourcename: "n79" targetname: "n81" label: "0" } edge: {sourcename: "n79" targetname: "n80" label: "1" } @@ -95,21 +110,27 @@ edge: {sourcename: "n79" targetname: "n80" label: "1" } graph: { title: "n75" label: "Block 75" status:clustered color:yellow edge: {sourcename: "n75" targetname: "n74" label: "0" color: red} node: {title: "n92" label: "ProjM 1 92" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n92" targetname: "n76" label: "0" color: blue} node: {title: "n88" label: "0x2Is 88" color: yellow info1: "visited: 5 +irg: main Const of type type_unknown "} node: {title: "n81" label: "0x0Is 81" color: yellow info1: "visited: 5 +irg: main Const of type type_unknown "} node: {title: "n80" label: "0x1Is 80" color: yellow info1: "visited: 5 +irg: main Const of type type_unknown "} node: {title: "n74" label: "ProjX 0 74" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n74" targetname: "n76" label: "0" color: red} node: {title: "n76" label: "Start 76" color: blue info1: "visited: 5 +irg: main start of method of type main "} } diff --git a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg index e3b8da186..337d11c84 100644 --- a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg +++ b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg @@ -33,5 +33,6 @@ edge: { sourcename: "n79" targetname: "n74"} node: {title: "n74" label: "Block n74" } edge: { sourcename: "n74" targetname: "n74"} node: {title: "n96" label: "Bad 96" info1: "visited: 0 +irg: main "} } diff --git a/testprograms/ref-results/IRR_LOOP_main.vcg b/testprograms/ref-results/IRR_LOOP_main.vcg index 863d68fec..5e09647f0 100644 --- a/testprograms/ref-results/IRR_LOOP_main.vcg +++ b/testprograms/ref-results/IRR_LOOP_main.vcg @@ -21,6 +21,7 @@ graph: { title: "g28" label: "main" status:clustered color:white graph: { title: "n62" label: "Block 62" status:clustered color:yellow edge: {sourcename: "n62" targetname: "n63" label: "0" color: red} node: {title: "n61" label: "End 61" color: blue info1: "visited: 5 +irg: main "} } @@ -28,10 +29,12 @@ graph: { title: "n64" label: "Block 64" status:clustered color:yellow edge: {sourcename: "n64" targetname: "n88" label: "0" color: red} edge: {sourcename: "n64" targetname: "n65" label: "1" color: red} node: {title: "n63" label: "Return 63" info1: "visited: 5 +irg: main return in method of type main "} edge: {sourcename: "n63" targetname: "n89" label: "0" color: blue} node: {title: "n89" label: "PhiM 89" color: green info1: "visited: 5 +irg: main "} edge: {sourcename: "n89" targetname: "n91" label: "0" color: blue} edge: {sourcename: "n89" targetname: "n90" label: "1" color: blue} @@ -41,22 +44,28 @@ graph: { title: "n66" label: "Block 66" status:clustered color:yellow edge: {sourcename: "n66" targetname: "n87" label: "0" color: red} edge: {sourcename: "n66" targetname: "n67" label: "1" color: red} node: {title: "n90" label: "PhiM 90" color: green info1: "visited: 5 +irg: main "} edge: {sourcename: "n90" targetname: "n92" label: "0" color: blue} edge: {sourcename: "n90" targetname: "n91" label: "1" color: blue} node: {title: "n65" label: "ProjX 0 65" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n65" targetname: "n70" label: "0" color: red} node: {title: "n69" label: "ProjX 1 69" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n69" targetname: "n70" label: "0" color: red} node: {title: "n70" label: "Cond 70" info1: "visited: 5 +irg: main "} edge: {sourcename: "n70" targetname: "n71" label: "0" } node: {title: "n71" label: "Projb Eq 71" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n71" targetname: "n72" label: "0" } node: {title: "n72" label: "CmpT 72" info1: "visited: 5 +irg: main "} edge: {sourcename: "n72" targetname: "n77" label: "0" } edge: {sourcename: "n72" targetname: "n73" label: "1" } @@ -66,22 +75,28 @@ graph: { title: "n68" label: "Block 68" status:clustered color:yellow edge: {sourcename: "n68" targetname: "n78" label: "0" color: red} edge: {sourcename: "n68" targetname: "n69" label: "1" color: red} node: {title: "n91" label: "PhiM 91" color: green info1: "visited: 5 +irg: main "} edge: {sourcename: "n91" targetname: "n92" label: "0" color: blue} edge: {sourcename: "n91" targetname: "n90" label: "1" color: blue} node: {title: "n88" label: "ProjX 0 88" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n88" targetname: "n84" label: "0" color: red} node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n67" targetname: "n84" label: "0" color: red} node: {title: "n84" label: "Cond 84" info1: "visited: 5 +irg: main "} edge: {sourcename: "n84" targetname: "n85" label: "0" } node: {title: "n85" label: "Projb Eq 85" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n85" targetname: "n86" label: "0" } node: {title: "n86" label: "CmpT 86" info1: "visited: 5 +irg: main "} edge: {sourcename: "n86" targetname: "n77" label: "0" } edge: {sourcename: "n86" targetname: "n73" label: "1" } @@ -90,18 +105,23 @@ edge: {sourcename: "n86" targetname: "n73" label: "1" } graph: { title: "n79" label: "Block 79" status:clustered color:yellow edge: {sourcename: "n79" targetname: "n75" label: "0" color: red} node: {title: "n87" label: "ProjX 1 87" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n87" targetname: "n80" label: "0" color: red} node: {title: "n78" label: "ProjX 0 78" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n78" targetname: "n80" label: "0" color: red} node: {title: "n80" label: "Cond 80" info1: "visited: 5 +irg: main "} edge: {sourcename: "n80" targetname: "n81" label: "0" } node: {title: "n81" label: "Projb Eq 81" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n81" targetname: "n82" label: "0" } node: {title: "n82" label: "CmpT 82" info1: "visited: 5 +irg: main "} edge: {sourcename: "n82" targetname: "n77" label: "0" } edge: {sourcename: "n82" targetname: "n83" label: "1" } @@ -110,21 +130,27 @@ edge: {sourcename: "n82" targetname: "n83" label: "1" } graph: { title: "n74" label: "Block 74" status:clustered color:yellow edge: {sourcename: "n74" targetname: "n75" label: "0" color: red} node: {title: "n92" label: "ProjM 1 92" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n92" targetname: "n76" label: "0" color: blue} node: {title: "n83" label: "0x1Is 83" color: yellow info1: "visited: 5 +irg: main Const of type type_unknown "} node: {title: "n77" label: "0x0Is 77" color: yellow info1: "visited: 5 +irg: main Const of type type_unknown "} node: {title: "n73" label: "0x2Is 73" color: yellow info1: "visited: 5 +irg: main Const of type type_unknown "} node: {title: "n75" label: "ProjX 0 75" color: yellow info1: "visited: 5 +irg: main "} edge: {sourcename: "n75" targetname: "n76" label: "0" color: red} node: {title: "n76" label: "Start 76" color: blue info1: "visited: 5 +irg: main start of method of type main "} } diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg index 01418daa9..22655544b 100644 --- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg +++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg @@ -21,24 +21,29 @@ graph: { title: "g29" label: "main" status:clustered color:white graph: { title: "n78" label: "Block 78" status:clustered color:yellow edge: {sourcename: "n78" targetname: "n79" label: "0" color: red} node: {title: "n77" label: "End 77" color: blue info1: "visited: 15 +irg: main "} } graph: { title: "n80" label: "Block 80" status:clustered color:yellow edge: {sourcename: "n80" targetname: "n81" label: "0" color: red} node: {title: "n79" label: "Return 79" info1: "visited: 15 +irg: main return in method of type main res 0 type: int "} edge: {sourcename: "n79" targetname: "n115" label: "0" color: blue} edge: {sourcename: "n79" targetname: "n113" label: "1" } node: {title: "n115" label: "ProjM 0 115" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n115" targetname: "n114" label: "0" color: blue} node: {title: "n113" label: "ProjIu 2 113" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n113" targetname: "n114" label: "0" } node: {title: "n114" label: "Load 114" info1: "visited: 15 +irg: main "} edge: {sourcename: "n114" targetname: "n97" label: "0" color: blue} edge: {sourcename: "n114" targetname: "n89" label: "1" } @@ -48,59 +53,75 @@ graph: { title: "n82" label: "Block 82" status:clustered color:yellow edge: {sourcename: "n82" targetname: "n112" label: "0" color: red} edge: {sourcename: "n82" targetname: "n83" label: "1" color: red} node: {title: "n81" label: "ProjX 1 81" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n81" targetname: "n84" label: "0" color: red} node: {title: "n83" label: "ProjX 0 83" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} node: {title: "n84" label: "Cond 84" info1: "visited: 15 +irg: main "} edge: {sourcename: "n84" targetname: "n85" label: "0" } node: {title: "n85" label: "Projb Gt 85" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n85" targetname: "n86" label: "0" } node: {title: "n86" label: "CmpT 86" info1: "visited: 15 +irg: main "} edge: {sourcename: "n86" targetname: "n111" label: "0" } edge: {sourcename: "n86" targetname: "n87" label: "1" } node: {title: "n87" label: "ProjIu 2 87" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n87" targetname: "n88" label: "0" } node: {title: "n88" label: "Load 88" info1: "visited: 15 +irg: main "} edge: {sourcename: "n88" targetname: "n96" label: "0" color: blue} edge: {sourcename: "n88" targetname: "n89" label: "1" } node: {title: "n96" label: "PhiM 96" color: green info1: "visited: 15 +irg: main "} edge: {sourcename: "n96" targetname: "n106" label: "0" color: blue} edge: {sourcename: "n96" targetname: "n97" label: "1" color: blue} node: {title: "n97" label: "ProjM 0 97" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n97" targetname: "n98" label: "0" color: blue} node: {title: "n98" label: "Store 98" info1: "visited: 15 +irg: main "} edge: {sourcename: "n98" targetname: "n100" label: "0" color: blue} edge: {sourcename: "n98" targetname: "n99" label: "1" } edge: {sourcename: "n98" targetname: "n87" label: "2" } node: {title: "n100" label: "ProjM 0 100" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n100" targetname: "n101" label: "0" color: blue} node: {title: "n101" label: "Store 101" info1: "visited: 15 +irg: main "} edge: {sourcename: "n101" targetname: "n105" label: "0" color: blue} edge: {sourcename: "n101" targetname: "n89" label: "1" } edge: {sourcename: "n101" targetname: "n102" label: "2" } node: {title: "n105" label: "ProjM 0 105" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n105" targetname: "n103" label: "0" color: blue} node: {title: "n102" label: "ProjIu 2 102" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n102" targetname: "n103" label: "0" } node: {title: "n103" label: "Load 103" info1: "visited: 15 +irg: main "} edge: {sourcename: "n103" targetname: "n104" label: "0" color: blue} edge: {sourcename: "n103" targetname: "n99" label: "1" } node: {title: "n104" label: "ProjM 0 104" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n104" targetname: "n88" label: "0" color: blue} } @@ -108,30 +129,37 @@ edge: {sourcename: "n104" targetname: "n88" label: "0" color: blue} graph: { title: "n90" label: "Block 90" status:clustered color:yellow edge: {sourcename: "n90" targetname: "n91" label: "0" color: red} node: {title: "n112" label: "Jmp 112" info1: "visited: 15 +irg: main "} node: {title: "n106" label: "ProjM 0 106" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n106" targetname: "n107" label: "0" color: blue} node: {title: "n107" label: "Store 107" info1: "visited: 15 +irg: main "} edge: {sourcename: "n107" targetname: "n109" label: "0" color: blue} edge: {sourcename: "n107" targetname: "n99" label: "1" } edge: {sourcename: "n107" targetname: "n108" label: "2" } node: {title: "n109" label: "ProjM 0 109" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n109" targetname: "n110" label: "0" color: blue} node: {title: "n110" label: "Store 110" info1: "visited: 15 +irg: main "} edge: {sourcename: "n110" targetname: "n95" label: "0" color: blue} edge: {sourcename: "n110" targetname: "n89" label: "1" } edge: {sourcename: "n110" targetname: "n111" label: "2" } node: {title: "n99" label: "Sel VAR_B 99" info1: "visited: 15 +irg: main Selecting entity of type int from entity of type GlobalType "} edge: {sourcename: "n99" targetname: "n95" label: "0" color: blue} edge: {sourcename: "n99" targetname: "n94" label: "1" } node: {title: "n89" label: "Sel VAR_A 89" info1: "visited: 15 +irg: main Selecting entity of type int from entity of type GlobalType "} @@ -142,21 +170,27 @@ edge: {sourcename: "n89" targetname: "n94" label: "1" } graph: { title: "n92" label: "Block 92" status:clustered color:yellow edge: {sourcename: "n92" targetname: "n91" label: "0" color: red} node: {title: "n111" label: "0x0Iu 111" color: yellow info1: "visited: 15 +irg: main Const of type type_unknown "} node: {title: "n108" label: "0x1Iu 108" color: yellow info1: "visited: 15 +irg: main Const of type type_unknown "} node: {title: "n95" label: "ProjM 1 95" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n95" targetname: "n93" label: "0" color: blue} node: {title: "n94" label: "ProjP 3 94" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n94" targetname: "n93" label: "0" } node: {title: "n91" label: "ProjX 0 91" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n91" targetname: "n93" label: "0" color: red} node: {title: "n93" label: "Start 93" color: blue info1: "visited: 15 +irg: main start of method of type main "} } diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg index 86cae8d6f..13737063a 100644 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg @@ -22,89 +22,110 @@ graph: { title: "n200" label: "Block 200" status:clustered color:yellow edge: {sourcename: "n200" targetname: "n202" label: "0" color: red} edge: {sourcename: "n200" targetname: "n201" label: "1" color: red} node: {title: "n204" label: "PhiM 204" color: green info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n204" targetname: "n215" label: "0" color: blue} edge: {sourcename: "n204" targetname: "n205" label: "1" color: blue} node: {title: "n205" label: "Store 205" info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n205" targetname: "n204" label: "0" color: blue} edge: {sourcename: "n205" targetname: "n210" label: "1" } edge: {sourcename: "n205" targetname: "n206" label: "2" } node: {title: "n210" label: "Sel a 210" info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main Selecting entity of type int from entity of type PRIMA_INLINE "} edge: {sourcename: "n210" targetname: "n204" label: "0" color: blue} edge: {sourcename: "n210" targetname: "n211" label: "1" } node: {title: "n206" label: "PhiIs 206" color: green info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n206" targetname: "n209" label: "0" } edge: {sourcename: "n206" targetname: "n207" label: "1" } node: {title: "n207" label: "PhiIs 207" color: green info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n207" targetname: "n208" label: "0" } edge: {sourcename: "n207" targetname: "n206" label: "1" } node: {title: "n201" label: "Jmp 201" info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} } graph: { title: "n203" label: "Block 203" status:clustered color:yellow edge: {sourcename: "n203" targetname: "n198" label: "0" color: red} node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n215" targetname: "n216" label: "0" color: blue} node: {title: "n216" label: "Store 216" info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n216" targetname: "n219" label: "0" color: blue} edge: {sourcename: "n216" targetname: "n218" label: "1" } edge: {sourcename: "n216" targetname: "n217" label: "2" } node: {title: "n218" label: "Sel a 218" info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main Selecting entity of type int from entity of type PRIMA_INLINE "} edge: {sourcename: "n218" targetname: "n219" label: "0" color: blue} edge: {sourcename: "n218" targetname: "n211" label: "1" } node: {title: "n219" label: "ProjM 0 219" color: yellow info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n219" targetname: "n212" label: "0" color: blue} node: {title: "n211" label: "ProjP 2 211" color: yellow info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n211" targetname: "n212" label: "0" } node: {title: "n212" label: "Alloc 212" info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main allocating entity of type PRIMA_INLINE "} edge: {sourcename: "n212" targetname: "n214" label: "0" color: blue} edge: {sourcename: "n212" targetname: "n213" label: "1" } node: {title: "n208" label: "0x0Is 208" color: yellow info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main Const of type type_unknown "} node: {title: "n202" label: "Jmp 202" info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} } graph: { title: "n197" label: "Block 197" status:clustered color:yellow edge: {sourcename: "n197" targetname: "n198" label: "0" color: red} node: {title: "n217" label: "0x2Is 217" color: yellow info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main Const of type type_unknown "} node: {title: "n214" label: "ProjM 1 214" color: yellow info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n214" targetname: "n199" label: "0" color: blue} node: {title: "n213" label: "SymC PRIMA_INLINE size 213" info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} node: {title: "n209" label: "0x5Is 209" color: yellow info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main Const of type type_unknown "} node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n198" targetname: "n199" label: "0" color: red} node: {title: "n199" label: "Start 199" color: blue info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main start of method of type OO_INLINE_EXAMPLE_main "} } graph: { title: "n195" label: "Block 195" status:clustered color:yellow node: {title: "n194" label: "End 194" color: blue info1: "visited: 22 +irg: OO_INLINE_EXAMPLE_main "} } diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg index 13852d2eb..db6416cf6 100644 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg @@ -22,89 +22,110 @@ graph: { title: "n200" label: "Block 200" status:clustered color:yellow edge: {sourcename: "n200" targetname: "n202" label: "0" color: red} edge: {sourcename: "n200" targetname: "n201" label: "1" color: red} node: {title: "n204" label: "PhiM 204" color: green info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n204" targetname: "n215" label: "0" color: blue} edge: {sourcename: "n204" targetname: "n205" label: "1" color: blue} node: {title: "n205" label: "Store 205" info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n205" targetname: "n204" label: "0" color: blue} edge: {sourcename: "n205" targetname: "n210" label: "1" } edge: {sourcename: "n205" targetname: "n206" label: "2" } node: {title: "n210" label: "Sel a 210" info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main Selecting entity of type int from entity of type PRIMA_INLINE "} edge: {sourcename: "n210" targetname: "n204" label: "0" color: blue} edge: {sourcename: "n210" targetname: "n211" label: "1" } node: {title: "n206" label: "PhiIs 206" color: green info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n206" targetname: "n209" label: "0" } edge: {sourcename: "n206" targetname: "n207" label: "1" } node: {title: "n207" label: "PhiIs 207" color: green info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n207" targetname: "n208" label: "0" } edge: {sourcename: "n207" targetname: "n206" label: "1" } node: {title: "n201" label: "Jmp 201" info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} } graph: { title: "n203" label: "Block 203" status:clustered color:yellow edge: {sourcename: "n203" targetname: "n198" label: "0" color: red} node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n215" targetname: "n216" label: "0" color: blue} node: {title: "n216" label: "Store 216" info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n216" targetname: "n219" label: "0" color: blue} edge: {sourcename: "n216" targetname: "n218" label: "1" } edge: {sourcename: "n216" targetname: "n217" label: "2" } node: {title: "n218" label: "Sel a 218" info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main Selecting entity of type int from entity of type PRIMA_INLINE "} edge: {sourcename: "n218" targetname: "n219" label: "0" color: blue} edge: {sourcename: "n218" targetname: "n211" label: "1" } node: {title: "n219" label: "ProjM 0 219" color: yellow info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n219" targetname: "n212" label: "0" color: blue} node: {title: "n211" label: "ProjP 2 211" color: yellow info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n211" targetname: "n212" label: "0" } node: {title: "n212" label: "Alloc 212" info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main allocating entity of type PRIMA_INLINE "} edge: {sourcename: "n212" targetname: "n214" label: "0" color: blue} edge: {sourcename: "n212" targetname: "n213" label: "1" } node: {title: "n208" label: "0x0Is 208" color: yellow info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main Const of type type_unknown "} node: {title: "n202" label: "Jmp 202" info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} } graph: { title: "n197" label: "Block 197" status:clustered color:yellow edge: {sourcename: "n197" targetname: "n198" label: "0" color: red} node: {title: "n217" label: "0x2Is 217" color: yellow info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main Const of type type_unknown "} node: {title: "n214" label: "ProjM 1 214" color: yellow info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n214" targetname: "n199" label: "0" color: blue} node: {title: "n213" label: "SymC PRIMA_INLINE size 213" info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} node: {title: "n209" label: "0x5Is 209" color: yellow info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main Const of type type_unknown "} node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} edge: {sourcename: "n198" targetname: "n199" label: "0" color: red} node: {title: "n199" label: "Start 199" color: blue info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main start of method of type OO_INLINE_EXAMPLE_main "} } graph: { title: "n195" label: "Block 195" status:clustered color:yellow node: {title: "n194" label: "End 194" color: blue info1: "visited: 21 +irg: OO_INLINE_EXAMPLE_main "} } 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 fd359e46a..823ab96d5 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -18,49 +18,50 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n112" label: "Block 112" color: lightyellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} node: {title: "n113" label: "Start 113" color: blue info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} edge: { sourcename: "n113" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} edge: { sourcename: "n111" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n110" label: "Block 110" color: lightyellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n110" targetname: "n111" label: "0" color: red} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 17 -Const of type type_unknown -"} -edge: { sourcename: "n117" targetname: "n112" class: 2 priority: 2 linestyle: dotted} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 17 -"} -edge: { sourcename: "n120" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} edge: { sourcename: "n121" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n119" label: "Alloc 119" info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } edge: { sourcename: "n119" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } edge: { sourcename: "n118" targetname: "n110" class: 2 priority: 2 linestyle: dotted} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 17 -Const of type type_unknown -"} -edge: { sourcename: "n125" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} edge: { sourcename: "n127" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n126" label: "Sel set_a 126" info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main Selecting entity of type set_a from entity of type PRIMA "} @@ -68,20 +69,27 @@ edge: {sourcename: "n126" targetname: "n127" label: "0" color: blue} edge: {sourcename: "n126" targetname: "n118" label: "1" } edge: { sourcename: "n126" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n124" label: "Call 124" info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main calling method of type set_a param 0 type: class_prima_ptr param 1 type: int "} +node: {title: "n124n125" label: "0x2Is 125" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} edge: {sourcename: "n124" targetname: "n127" label: "0" color: blue} edge: {sourcename: "n124" targetname: "n126" label: "1" } edge: {sourcename: "n124" targetname: "n118" label: "2" } -edge: {sourcename: "n124" targetname: "n125" label: "3" } +edge: {sourcename: "n124" targetname: "n124n125" label: "3" } edge: { sourcename: "n124" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n123" targetname: "n124" label: "0" color: blue} edge: { sourcename: "n123" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n122" label: "Sel c 122" info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main Selecting entity of type c from entity of type PRIMA "} @@ -89,29 +97,38 @@ edge: {sourcename: "n122" targetname: "n123" label: "0" color: blue} edge: {sourcename: "n122" targetname: "n118" label: "1" } edge: { sourcename: "n122" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n116" label: "Call 116" info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main calling method of type c param 0 type: class_prima_ptr param 1 type: int resul 0 type: int "} +node: {title: "n116n117" label: "0x5Is 117" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} edge: {sourcename: "n116" targetname: "n123" label: "0" color: blue} edge: {sourcename: "n116" targetname: "n122" label: "1" } edge: {sourcename: "n116" targetname: "n118" label: "2" } -edge: {sourcename: "n116" targetname: "n117" label: "3" } +edge: {sourcename: "n116" targetname: "n116n117" label: "3" } edge: { sourcename: "n116" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n115" label: "ProjT 2 115" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n115" targetname: "n116" label: "0" } edge: { sourcename: "n115" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n114" label: "ProjIs 0 114" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n114" targetname: "n115" label: "0" } edge: { sourcename: "n114" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n128" label: "ProjM 0 128" color: yellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n128" targetname: "n116" label: "0" color: blue} edge: { sourcename: "n128" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n109" label: "Return 109" info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int "} @@ -119,9 +136,11 @@ edge: {sourcename: "n109" targetname: "n128" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n114" label: "1" } edge: { sourcename: "n109" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} node: {title: "n107" label: "End 107" color: blue info1: "visited: 17 +irg: OO_PROGRAM_EXAMPLE_main "} edge: { sourcename: "n107" targetname: "n108" class: 2 priority: 2 linestyle: dotted} node: {title: "t19" label: "method c" info1: "state: layout_fixed, diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg index 72508eb24..4d6b89491 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -18,49 +18,50 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n112" label: "Block 112" color: lightyellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} node: {title: "n113" label: "Start 113" color: blue info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} edge: { sourcename: "n113" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} edge: { sourcename: "n111" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n110" label: "Block 110" color: lightyellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n110" targetname: "n111" label: "0" color: red} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 15 -Const of type type_unknown -"} -edge: { sourcename: "n117" targetname: "n112" class: 2 priority: 2 linestyle: dotted} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 15 -"} -edge: { sourcename: "n120" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} edge: { sourcename: "n121" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n119" label: "Alloc 119" info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } edge: { sourcename: "n119" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } edge: { sourcename: "n118" targetname: "n110" class: 2 priority: 2 linestyle: dotted} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 15 -Const of type type_unknown -"} -edge: { sourcename: "n125" targetname: "n112" class: 2 priority: 2 linestyle: dotted} node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} edge: { sourcename: "n127" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n126" label: "Sel set_a 126" info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main Selecting entity of type set_a from entity of type PRIMA "} @@ -68,20 +69,27 @@ edge: {sourcename: "n126" targetname: "n127" label: "0" color: blue} edge: {sourcename: "n126" targetname: "n118" label: "1" } edge: { sourcename: "n126" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n124" label: "Call 124" info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main calling method of type set_a param 0 type: class_prima_ptr param 1 type: int "} +node: {title: "n124n125" label: "0x2Is 125" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} edge: {sourcename: "n124" targetname: "n127" label: "0" color: blue} edge: {sourcename: "n124" targetname: "n126" label: "1" } edge: {sourcename: "n124" targetname: "n118" label: "2" } -edge: {sourcename: "n124" targetname: "n125" label: "3" } +edge: {sourcename: "n124" targetname: "n124n125" label: "3" } edge: { sourcename: "n124" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n123" targetname: "n124" label: "0" color: blue} edge: { sourcename: "n123" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n122" label: "Sel c 122" info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main Selecting entity of type c from entity of type PRIMA "} @@ -89,29 +97,38 @@ edge: {sourcename: "n122" targetname: "n123" label: "0" color: blue} edge: {sourcename: "n122" targetname: "n118" label: "1" } edge: { sourcename: "n122" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n116" label: "Call 116" info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main calling method of type c param 0 type: class_prima_ptr param 1 type: int resul 0 type: int "} +node: {title: "n116n117" label: "0x5Is 117" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} edge: {sourcename: "n116" targetname: "n123" label: "0" color: blue} edge: {sourcename: "n116" targetname: "n122" label: "1" } edge: {sourcename: "n116" targetname: "n118" label: "2" } -edge: {sourcename: "n116" targetname: "n117" label: "3" } +edge: {sourcename: "n116" targetname: "n116n117" label: "3" } edge: { sourcename: "n116" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n115" label: "ProjT 2 115" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n115" targetname: "n116" label: "0" } edge: { sourcename: "n115" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n114" label: "ProjIs 0 114" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n114" targetname: "n115" label: "0" } edge: { sourcename: "n114" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n128" label: "ProjM 0 128" color: yellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n128" targetname: "n116" label: "0" color: blue} edge: { sourcename: "n128" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n109" label: "Return 109" info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int "} @@ -119,9 +136,11 @@ edge: {sourcename: "n109" targetname: "n128" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n114" label: "1" } edge: { sourcename: "n109" targetname: "n110" class: 2 priority: 2 linestyle: dotted} node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} node: {title: "n107" label: "End 107" color: blue info1: "visited: 15 +irg: OO_PROGRAM_EXAMPLE_main "} edge: { sourcename: "n107" targetname: "n108" 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 53d71fe38..72190a600 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -21,90 +21,109 @@ graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:wh graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} node: {title: "n107" label: "End 107" color: blue info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} } graph: { title: "n110" label: "Block 110" status:clustered color:yellow edge: {sourcename: "n110" targetname: "n111" label: "0" color: red} node: {title: "n109" label: "Return 109" info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int "} edge: {sourcename: "n109" targetname: "n128" label: "0" color: blue} edge: {sourcename: "n109" targetname: "n114" label: "1" } node: {title: "n128" label: "ProjM 0 128" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n128" targetname: "n116" label: "0" color: blue} node: {title: "n114" label: "ProjIs 0 114" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n114" targetname: "n115" label: "0" } node: {title: "n115" label: "ProjT 2 115" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n115" targetname: "n116" label: "0" } node: {title: "n116" label: "Call 116" info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main calling method of type c param 0 type: class_prima_ptr param 1 type: int resul 0 type: int "} +node: {title: "n116n117" label: "0x5Is 117" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} edge: {sourcename: "n116" targetname: "n123" label: "0" color: blue} edge: {sourcename: "n116" targetname: "n122" label: "1" } edge: {sourcename: "n116" targetname: "n118" label: "2" } -edge: {sourcename: "n116" targetname: "n117" label: "3" } +edge: {sourcename: "n116" targetname: "n116n117" label: "3" } node: {title: "n122" label: "Sel c 122" info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main Selecting entity of type c from entity of type PRIMA "} edge: {sourcename: "n122" targetname: "n123" label: "0" color: blue} edge: {sourcename: "n122" targetname: "n118" label: "1" } node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n123" targetname: "n124" label: "0" color: blue} node: {title: "n124" label: "Call 124" info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main calling method of type set_a param 0 type: class_prima_ptr param 1 type: int "} +node: {title: "n124n125" label: "0x2Is 125" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main +Const of type type_unknown +"} edge: {sourcename: "n124" targetname: "n127" label: "0" color: blue} edge: {sourcename: "n124" targetname: "n126" label: "1" } edge: {sourcename: "n124" targetname: "n118" label: "2" } -edge: {sourcename: "n124" targetname: "n125" label: "3" } +edge: {sourcename: "n124" targetname: "n124n125" label: "3" } node: {title: "n126" label: "Sel set_a 126" info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main Selecting entity of type set_a from entity of type PRIMA "} edge: {sourcename: "n126" targetname: "n127" label: "0" color: blue} edge: {sourcename: "n126" targetname: "n118" label: "1" } node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n118" targetname: "n119" label: "0" } node: {title: "n119" label: "Alloc 119" info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main allocating entity of type PRIMA "} +node: {title: "n119n120" label: "SymC PRIMA size 120" info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main +"} edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } +edge: {sourcename: "n119" targetname: "n119n120" label: "1" } } graph: { title: "n112" label: "Block 112" status:clustered color:yellow edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 16 -Const of type type_unknown -"} node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 16 -"} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 16 -Const of type type_unknown -"} node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main "} edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} node: {title: "n113" label: "Start 113" color: blue info1: "visited: 16 +irg: OO_PROGRAM_EXAMPLE_main start of method of type OO_PROGRAM_EXAMPLE_main "} } diff --git a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg index 33f1e3adf..6e6a7fa65 100644 --- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg @@ -22,59 +22,73 @@ graph: { title: "n248" label: "Block 248" status:clustered color:yellow edge: {sourcename: "n248" targetname: "n250" label: "0" color: red} edge: {sourcename: "n248" targetname: "n249" label: "1" color: red} node: {title: "n252" label: "PhiM 252" color: green info1: "visited: 22 +irg: c "} edge: {sourcename: "n252" targetname: "n261" label: "0" color: blue} edge: {sourcename: "n252" targetname: "n253" label: "1" color: blue} node: {title: "n253" label: "Store 253" info1: "visited: 22 +irg: c "} edge: {sourcename: "n253" targetname: "n252" label: "0" color: blue} edge: {sourcename: "n253" targetname: "n259" label: "1" } edge: {sourcename: "n253" targetname: "n254" label: "2" } node: {title: "n259" label: "Sel a 259" info1: "visited: 22 +irg: c Selecting entity of type int from entity of type PRIMA_INLINE "} edge: {sourcename: "n259" targetname: "n252" label: "0" color: blue} edge: {sourcename: "n259" targetname: "n260" label: "1" } node: {title: "n254" label: "PhiIs 254" color: green info1: "visited: 22 +irg: c "} edge: {sourcename: "n254" targetname: "n257" label: "0" } edge: {sourcename: "n254" targetname: "n255" label: "1" } node: {title: "n255" label: "PhiIs 255" color: green info1: "visited: 22 +irg: c "} edge: {sourcename: "n255" targetname: "n256" label: "0" } edge: {sourcename: "n255" targetname: "n254" label: "1" } node: {title: "n249" label: "Jmp 249" info1: "visited: 22 +irg: c "} } graph: { title: "n251" label: "Block 251" status:clustered color:yellow edge: {sourcename: "n251" targetname: "n246" label: "0" color: red} node: {title: "n260" label: "ProjP 0 260" color: yellow info1: "visited: 22 +irg: c "} edge: {sourcename: "n260" targetname: "n258" label: "0" } node: {title: "n257" label: "ProjIs 1 257" color: yellow info1: "visited: 22 +irg: c "} edge: {sourcename: "n257" targetname: "n258" label: "0" } node: {title: "n250" label: "Jmp 250" info1: "visited: 22 +irg: c "} } graph: { title: "n245" label: "Block 245" status:clustered color:yellow edge: {sourcename: "n245" targetname: "n246" label: "0" color: red} node: {title: "n261" label: "ProjM 1 261" color: yellow info1: "visited: 22 +irg: c "} edge: {sourcename: "n261" targetname: "n247" label: "0" color: blue} node: {title: "n258" label: "ProjT 4 258" color: yellow info1: "visited: 22 +irg: c "} edge: {sourcename: "n258" targetname: "n247" label: "0" } node: {title: "n256" label: "0x0Is 256" color: yellow info1: "visited: 22 +irg: c Const of type type_unknown "} node: {title: "n246" label: "ProjX 0 246" color: yellow info1: "visited: 22 +irg: c "} edge: {sourcename: "n246" targetname: "n247" label: "0" color: red} node: {title: "n247" label: "Start 247" color: blue info1: "visited: 22 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int @@ -83,6 +97,7 @@ start of method of type c graph: { title: "n243" label: "Block 243" status:clustered color:yellow node: {title: "n242" label: "End 242" color: blue info1: "visited: 22 +irg: c "} } diff --git a/testprograms/ref-results/PRIMA_INLINE_c.vcg b/testprograms/ref-results/PRIMA_INLINE_c.vcg index c3e9ec947..cd685a319 100644 --- a/testprograms/ref-results/PRIMA_INLINE_c.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_c.vcg @@ -22,59 +22,73 @@ graph: { title: "n248" label: "Block 248" status:clustered color:yellow edge: {sourcename: "n248" targetname: "n250" label: "0" color: red} edge: {sourcename: "n248" targetname: "n249" label: "1" color: red} node: {title: "n252" label: "PhiM 252" color: green info1: "visited: 21 +irg: c "} edge: {sourcename: "n252" targetname: "n261" label: "0" color: blue} edge: {sourcename: "n252" targetname: "n253" label: "1" color: blue} node: {title: "n253" label: "Store 253" info1: "visited: 21 +irg: c "} edge: {sourcename: "n253" targetname: "n252" label: "0" color: blue} edge: {sourcename: "n253" targetname: "n259" label: "1" } edge: {sourcename: "n253" targetname: "n254" label: "2" } node: {title: "n259" label: "Sel a 259" info1: "visited: 21 +irg: c Selecting entity of type int from entity of type PRIMA_INLINE "} edge: {sourcename: "n259" targetname: "n252" label: "0" color: blue} edge: {sourcename: "n259" targetname: "n260" label: "1" } node: {title: "n254" label: "PhiIs 254" color: green info1: "visited: 21 +irg: c "} edge: {sourcename: "n254" targetname: "n257" label: "0" } edge: {sourcename: "n254" targetname: "n255" label: "1" } node: {title: "n255" label: "PhiIs 255" color: green info1: "visited: 21 +irg: c "} edge: {sourcename: "n255" targetname: "n256" label: "0" } edge: {sourcename: "n255" targetname: "n254" label: "1" } node: {title: "n249" label: "Jmp 249" info1: "visited: 21 +irg: c "} } graph: { title: "n251" label: "Block 251" status:clustered color:yellow edge: {sourcename: "n251" targetname: "n246" label: "0" color: red} node: {title: "n260" label: "ProjP 0 260" color: yellow info1: "visited: 21 +irg: c "} edge: {sourcename: "n260" targetname: "n258" label: "0" } node: {title: "n257" label: "ProjIs 1 257" color: yellow info1: "visited: 21 +irg: c "} edge: {sourcename: "n257" targetname: "n258" label: "0" } node: {title: "n250" label: "Jmp 250" info1: "visited: 21 +irg: c "} } graph: { title: "n245" label: "Block 245" status:clustered color:yellow edge: {sourcename: "n245" targetname: "n246" label: "0" color: red} node: {title: "n261" label: "ProjM 1 261" color: yellow info1: "visited: 21 +irg: c "} edge: {sourcename: "n261" targetname: "n247" label: "0" color: blue} node: {title: "n258" label: "ProjT 4 258" color: yellow info1: "visited: 21 +irg: c "} edge: {sourcename: "n258" targetname: "n247" label: "0" } node: {title: "n256" label: "0x0Is 256" color: yellow info1: "visited: 21 +irg: c Const of type type_unknown "} node: {title: "n246" label: "ProjX 0 246" color: yellow info1: "visited: 21 +irg: c "} edge: {sourcename: "n246" targetname: "n247" label: "0" color: red} node: {title: "n247" label: "Start 247" color: blue info1: "visited: 21 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int @@ -83,6 +97,7 @@ start of method of type c graph: { title: "n243" label: "Block 243" status:clustered color:yellow node: {title: "n242" label: "End 242" color: blue info1: "visited: 21 +irg: c "} } diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg index 3e29d2122..f35ab2b89 100644 --- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg @@ -21,33 +21,40 @@ graph: { title: "g71" label: "set_a" status:clustered color:white graph: { title: "n225" label: "Block 225" status:clustered color:yellow edge: {sourcename: "n225" targetname: "n226" label: "0" color: red} node: {title: "n224" label: "End 224" color: blue info1: "visited: 17 +irg: set_a "} } graph: { title: "n227" label: "Block 227" status:clustered color:yellow edge: {sourcename: "n227" targetname: "n228" label: "0" color: red} node: {title: "n226" label: "Return 226" info1: "visited: 17 +irg: set_a return in method of type set_a "} edge: {sourcename: "n226" targetname: "n231" label: "0" color: blue} node: {title: "n231" label: "ProjM 0 231" color: yellow info1: "visited: 17 +irg: set_a "} edge: {sourcename: "n231" targetname: "n232" label: "0" color: blue} node: {title: "n232" label: "Store 232" info1: "visited: 17 +irg: set_a "} edge: {sourcename: "n232" targetname: "n237" label: "0" color: blue} edge: {sourcename: "n232" targetname: "n235" label: "1" } edge: {sourcename: "n232" targetname: "n233" label: "2" } node: {title: "n235" label: "Sel a 235" info1: "visited: 17 +irg: set_a Selecting entity of type int from entity of type PRIMA_INLINE "} edge: {sourcename: "n235" targetname: "n237" label: "0" color: blue} edge: {sourcename: "n235" targetname: "n236" label: "1" } node: {title: "n236" label: "ProjP 0 236" color: yellow info1: "visited: 17 +irg: set_a "} edge: {sourcename: "n236" targetname: "n234" label: "0" } node: {title: "n233" label: "ProjIs 1 233" color: yellow info1: "visited: 17 +irg: set_a "} edge: {sourcename: "n233" targetname: "n234" label: "0" } } @@ -55,15 +62,19 @@ edge: {sourcename: "n233" targetname: "n234" label: "0" } graph: { title: "n229" label: "Block 229" status:clustered color:yellow edge: {sourcename: "n229" targetname: "n228" label: "0" color: red} node: {title: "n237" label: "ProjM 1 237" color: yellow info1: "visited: 17 +irg: set_a "} edge: {sourcename: "n237" targetname: "n230" label: "0" color: blue} node: {title: "n234" label: "ProjT 4 234" color: yellow info1: "visited: 17 +irg: set_a "} edge: {sourcename: "n234" targetname: "n230" label: "0" } node: {title: "n228" label: "ProjX 0 228" color: yellow info1: "visited: 17 +irg: set_a "} edge: {sourcename: "n228" targetname: "n230" label: "0" color: red} node: {title: "n230" label: "Start 230" color: blue info1: "visited: 17 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg index 8ae749c14..fde9b1cc9 100644 --- a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg @@ -21,33 +21,40 @@ graph: { title: "g71" label: "set_a" status:clustered color:white graph: { title: "n225" label: "Block 225" status:clustered color:yellow edge: {sourcename: "n225" targetname: "n226" label: "0" color: red} node: {title: "n224" label: "End 224" color: blue info1: "visited: 16 +irg: set_a "} } graph: { title: "n227" label: "Block 227" status:clustered color:yellow edge: {sourcename: "n227" targetname: "n228" label: "0" color: red} node: {title: "n226" label: "Return 226" info1: "visited: 16 +irg: set_a return in method of type set_a "} edge: {sourcename: "n226" targetname: "n231" label: "0" color: blue} node: {title: "n231" label: "ProjM 0 231" color: yellow info1: "visited: 16 +irg: set_a "} edge: {sourcename: "n231" targetname: "n232" label: "0" color: blue} node: {title: "n232" label: "Store 232" info1: "visited: 16 +irg: set_a "} edge: {sourcename: "n232" targetname: "n237" label: "0" color: blue} edge: {sourcename: "n232" targetname: "n235" label: "1" } edge: {sourcename: "n232" targetname: "n233" label: "2" } node: {title: "n235" label: "Sel a 235" info1: "visited: 16 +irg: set_a Selecting entity of type int from entity of type PRIMA_INLINE "} edge: {sourcename: "n235" targetname: "n237" label: "0" color: blue} edge: {sourcename: "n235" targetname: "n236" label: "1" } node: {title: "n236" label: "ProjP 0 236" color: yellow info1: "visited: 16 +irg: set_a "} edge: {sourcename: "n236" targetname: "n234" label: "0" } node: {title: "n233" label: "ProjIs 1 233" color: yellow info1: "visited: 16 +irg: set_a "} edge: {sourcename: "n233" targetname: "n234" label: "0" } } @@ -55,15 +62,19 @@ edge: {sourcename: "n233" targetname: "n234" label: "0" } graph: { title: "n229" label: "Block 229" status:clustered color:yellow edge: {sourcename: "n229" targetname: "n228" label: "0" color: red} node: {title: "n237" label: "ProjM 1 237" color: yellow info1: "visited: 16 +irg: set_a "} edge: {sourcename: "n237" targetname: "n230" label: "0" color: blue} node: {title: "n234" label: "ProjT 4 234" color: yellow info1: "visited: 16 +irg: set_a "} edge: {sourcename: "n234" targetname: "n230" label: "0" } node: {title: "n228" label: "ProjX 0 228" color: yellow info1: "visited: 16 +irg: set_a "} edge: {sourcename: "n228" targetname: "n230" label: "0" color: red} node: {title: "n230" label: "Start 230" color: blue info1: "visited: 16 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int diff --git a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg index c474bebf3..b993392b5 100644 --- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_c" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -18,34 +18,42 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n157" label: "Block 157" color: lightyellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n157" targetname: "n156" label: "0" color: red} node: {title: "n158" label: "Start 158" color: blue info1: "visited: 10 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int "} edge: { sourcename: "n158" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} edge: { sourcename: "n156" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n155" label: "Block 155" color: lightyellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} node: {title: "n164" label: "ProjT 4 164" color: yellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n164" targetname: "n158" label: "0" } edge: { sourcename: "n164" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n163" label: "ProjP 0 163" color: yellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n163" targetname: "n164" label: "0" } edge: { sourcename: "n163" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n165" label: "ProjM 1 165" color: yellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n165" targetname: "n158" label: "0" color: blue} edge: { sourcename: "n165" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n162" label: "Sel a 162" info1: "visited: 10 +irg: c Selecting entity of type int from entity of type PRIMA "} @@ -53,28 +61,34 @@ edge: {sourcename: "n162" targetname: "n165" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n163" label: "1" } edge: { sourcename: "n162" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n161" label: "Load 161" info1: "visited: 10 +irg: c "} edge: {sourcename: "n161" targetname: "n165" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } edge: { sourcename: "n161" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } edge: { sourcename: "n160" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n166" label: "ProjIs 1 166" color: yellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n166" targetname: "n164" label: "0" } edge: { sourcename: "n166" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n159" label: "AddIs 159" info1: "visited: 10 +irg: c "} edge: {sourcename: "n159" targetname: "n166" label: "0" } edge: {sourcename: "n159" targetname: "n160" label: "1" } edge: { sourcename: "n159" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} edge: { sourcename: "n167" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n154" label: "Return 154" info1: "visited: 10 +irg: c return in method of type c res 0 type: int "} @@ -82,9 +96,11 @@ edge: {sourcename: "n154" targetname: "n167" label: "0" color: blue} edge: {sourcename: "n154" targetname: "n159" label: "1" } edge: { sourcename: "n154" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n153" label: "Block 153" color: lightyellow info1: "visited: 10 +irg: c "} edge: {sourcename: "n153" targetname: "n154" label: "0" color: red} node: {title: "n152" label: "End 152" color: blue info1: "visited: 10 +irg: c "} edge: { sourcename: "n152" targetname: "n153" class: 2 priority: 2 linestyle: dotted} node: {title: "e15" label: "ent a" color: yellow diff --git a/testprograms/ref-results/PRIMA_c-pure.vcg b/testprograms/ref-results/PRIMA_c-pure.vcg index 63c9de68d..7fc5e2be1 100644 --- a/testprograms/ref-results/PRIMA_c-pure.vcg +++ b/testprograms/ref-results/PRIMA_c-pure.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_c" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -18,34 +18,42 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n157" label: "Block 157" color: lightyellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n157" targetname: "n156" label: "0" color: red} node: {title: "n158" label: "Start 158" color: blue info1: "visited: 8 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int "} edge: { sourcename: "n158" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} edge: { sourcename: "n156" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n155" label: "Block 155" color: lightyellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} node: {title: "n164" label: "ProjT 4 164" color: yellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n164" targetname: "n158" label: "0" } edge: { sourcename: "n164" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n163" label: "ProjP 0 163" color: yellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n163" targetname: "n164" label: "0" } edge: { sourcename: "n163" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n165" label: "ProjM 1 165" color: yellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n165" targetname: "n158" label: "0" color: blue} edge: { sourcename: "n165" targetname: "n157" class: 2 priority: 2 linestyle: dotted} node: {title: "n162" label: "Sel a 162" info1: "visited: 8 +irg: c Selecting entity of type int from entity of type PRIMA "} @@ -53,28 +61,34 @@ edge: {sourcename: "n162" targetname: "n165" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n163" label: "1" } edge: { sourcename: "n162" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n161" label: "Load 161" info1: "visited: 8 +irg: c "} edge: {sourcename: "n161" targetname: "n165" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } edge: { sourcename: "n161" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } edge: { sourcename: "n160" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n166" label: "ProjIs 1 166" color: yellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n166" targetname: "n164" label: "0" } edge: { sourcename: "n166" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n159" label: "AddIs 159" info1: "visited: 8 +irg: c "} edge: {sourcename: "n159" targetname: "n166" label: "0" } edge: {sourcename: "n159" targetname: "n160" label: "1" } edge: { sourcename: "n159" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} edge: { sourcename: "n167" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n154" label: "Return 154" info1: "visited: 8 +irg: c return in method of type c res 0 type: int "} @@ -82,9 +96,11 @@ edge: {sourcename: "n154" targetname: "n167" label: "0" color: blue} edge: {sourcename: "n154" targetname: "n159" label: "1" } edge: { sourcename: "n154" targetname: "n155" class: 2 priority: 2 linestyle: dotted} node: {title: "n153" label: "Block 153" color: lightyellow info1: "visited: 8 +irg: c "} edge: {sourcename: "n153" targetname: "n154" label: "0" color: red} node: {title: "n152" label: "End 152" color: blue info1: "visited: 8 +irg: c "} edge: { sourcename: "n152" targetname: "n153" 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 f905d4f91..5801340e5 100644 --- a/testprograms/ref-results/PRIMA_c-type.vcg +++ b/testprograms/ref-results/PRIMA_c-type.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_c" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg index cd9f8ae82..1855c9b1f 100644 --- a/testprograms/ref-results/PRIMA_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_c" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -21,41 +21,50 @@ graph: { title: "g94" label: "c" status:clustered color:white graph: { title: "n153" label: "Block 153" status:clustered color:yellow edge: {sourcename: "n153" targetname: "n154" label: "0" color: red} node: {title: "n152" label: "End 152" color: blue info1: "visited: 13 +irg: c "} } graph: { title: "n155" label: "Block 155" status:clustered color:yellow edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} node: {title: "n154" label: "Return 154" info1: "visited: 13 +irg: c return in method of type c res 0 type: int "} edge: {sourcename: "n154" targetname: "n167" label: "0" color: blue} edge: {sourcename: "n154" targetname: "n159" label: "1" } node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 13 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} node: {title: "n159" label: "AddIs 159" info1: "visited: 13 +irg: c "} edge: {sourcename: "n159" targetname: "n166" label: "0" } edge: {sourcename: "n159" targetname: "n160" label: "1" } node: {title: "n166" label: "ProjIs 1 166" color: yellow info1: "visited: 13 +irg: c "} edge: {sourcename: "n166" targetname: "n164" label: "0" } node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 13 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } node: {title: "n161" label: "Load 161" info1: "visited: 13 +irg: c "} edge: {sourcename: "n161" targetname: "n165" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } node: {title: "n162" label: "Sel a 162" info1: "visited: 13 +irg: c Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n162" targetname: "n165" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n163" label: "1" } node: {title: "n163" label: "ProjP 0 163" color: yellow info1: "visited: 13 +irg: c "} edge: {sourcename: "n163" targetname: "n164" label: "0" } } @@ -63,15 +72,19 @@ edge: {sourcename: "n163" targetname: "n164" label: "0" } graph: { title: "n157" label: "Block 157" status:clustered color:yellow edge: {sourcename: "n157" targetname: "n156" label: "0" color: red} node: {title: "n165" label: "ProjM 1 165" color: yellow info1: "visited: 13 +irg: c "} edge: {sourcename: "n165" targetname: "n158" label: "0" color: blue} node: {title: "n164" label: "ProjT 4 164" color: yellow info1: "visited: 13 +irg: c "} edge: {sourcename: "n164" targetname: "n158" label: "0" } node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 13 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} node: {title: "n158" label: "Start 158" color: blue info1: "visited: 13 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int diff --git a/testprograms/ref-results/PRIMA_c.vcg b/testprograms/ref-results/PRIMA_c.vcg index 75f655c5f..c2b64a211 100644 --- a/testprograms/ref-results/PRIMA_c.vcg +++ b/testprograms/ref-results/PRIMA_c.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_c" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -21,41 +21,50 @@ graph: { title: "g94" label: "c" status:clustered color:white graph: { title: "n153" label: "Block 153" status:clustered color:yellow edge: {sourcename: "n153" targetname: "n154" label: "0" color: red} node: {title: "n152" label: "End 152" color: blue info1: "visited: 9 +irg: c "} } graph: { title: "n155" label: "Block 155" status:clustered color:yellow edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} node: {title: "n154" label: "Return 154" info1: "visited: 9 +irg: c return in method of type c res 0 type: int "} edge: {sourcename: "n154" targetname: "n167" label: "0" color: blue} edge: {sourcename: "n154" targetname: "n159" label: "1" } node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 9 +irg: c "} edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} node: {title: "n159" label: "AddIs 159" info1: "visited: 9 +irg: c "} edge: {sourcename: "n159" targetname: "n166" label: "0" } edge: {sourcename: "n159" targetname: "n160" label: "1" } node: {title: "n166" label: "ProjIs 1 166" color: yellow info1: "visited: 9 +irg: c "} edge: {sourcename: "n166" targetname: "n164" label: "0" } node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 9 +irg: c "} edge: {sourcename: "n160" targetname: "n161" label: "0" } node: {title: "n161" label: "Load 161" info1: "visited: 9 +irg: c "} edge: {sourcename: "n161" targetname: "n165" label: "0" color: blue} edge: {sourcename: "n161" targetname: "n162" label: "1" } node: {title: "n162" label: "Sel a 162" info1: "visited: 9 +irg: c Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n162" targetname: "n165" label: "0" color: blue} edge: {sourcename: "n162" targetname: "n163" label: "1" } node: {title: "n163" label: "ProjP 0 163" color: yellow info1: "visited: 9 +irg: c "} edge: {sourcename: "n163" targetname: "n164" label: "0" } } @@ -63,15 +72,19 @@ edge: {sourcename: "n163" targetname: "n164" label: "0" } graph: { title: "n157" label: "Block 157" status:clustered color:yellow edge: {sourcename: "n157" targetname: "n156" label: "0" color: red} node: {title: "n165" label: "ProjM 1 165" color: yellow info1: "visited: 9 +irg: c "} edge: {sourcename: "n165" targetname: "n158" label: "0" color: blue} node: {title: "n164" label: "ProjT 4 164" color: yellow info1: "visited: 9 +irg: c "} edge: {sourcename: "n164" targetname: "n158" label: "0" } node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 9 +irg: c "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} node: {title: "n158" label: "Start 158" color: blue info1: "visited: 9 +irg: c start of method of type c param 0 type: class_prima_ptr param 1 type: int diff --git a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg index c31bc28b8..807eb0404 100644 --- a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_set_a" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -18,38 +18,47 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n139" label: "Block 139" color: lightyellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n139" targetname: "n138" label: "0" color: red} node: {title: "n140" label: "Start 140" color: blue info1: "visited: 10 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} edge: { sourcename: "n140" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} edge: { sourcename: "n138" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n137" label: "Block 137" color: lightyellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} node: {title: "n144" label: "ProjT 4 144" color: yellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n144" targetname: "n140" label: "0" } edge: { sourcename: "n144" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n143" label: "ProjIs 1 143" color: yellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n143" targetname: "n144" label: "0" } edge: { sourcename: "n143" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n146" label: "ProjP 0 146" color: yellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n146" targetname: "n144" label: "0" } edge: { sourcename: "n146" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n147" label: "ProjM 1 147" color: yellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n147" targetname: "n140" label: "0" color: blue} edge: { sourcename: "n147" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n145" label: "Sel a 145" info1: "visited: 10 +irg: set_a Selecting entity of type int from entity of type PRIMA "} @@ -57,24 +66,29 @@ edge: {sourcename: "n145" targetname: "n147" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n146" label: "1" } edge: { sourcename: "n145" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n142" label: "Store 142" info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n142" targetname: "n147" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n143" label: "2" } edge: { sourcename: "n142" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} edge: { sourcename: "n141" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n136" label: "Return 136" info1: "visited: 10 +irg: set_a return in method of type set_a "} edge: {sourcename: "n136" targetname: "n141" label: "0" color: blue} edge: { sourcename: "n136" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n135" label: "Block 135" color: lightyellow info1: "visited: 10 +irg: set_a "} edge: {sourcename: "n135" targetname: "n136" label: "0" color: red} node: {title: "n134" label: "End 134" color: blue info1: "visited: 10 +irg: set_a "} edge: { sourcename: "n134" targetname: "n135" class: 2 priority: 2 linestyle: dotted} node: {title: "e15" label: "ent a" color: yellow diff --git a/testprograms/ref-results/PRIMA_set_a-pure.vcg b/testprograms/ref-results/PRIMA_set_a-pure.vcg index 263283f3a..2a21f236e 100644 --- a/testprograms/ref-results/PRIMA_set_a-pure.vcg +++ b/testprograms/ref-results/PRIMA_set_a-pure.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_set_a" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -18,38 +18,47 @@ classname 11: "Overwrites" classname 12: "Member" node: {title: "n139" label: "Block 139" color: lightyellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n139" targetname: "n138" label: "0" color: red} node: {title: "n140" label: "Start 140" color: blue info1: "visited: 8 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} edge: { sourcename: "n140" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} edge: { sourcename: "n138" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n137" label: "Block 137" color: lightyellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} node: {title: "n144" label: "ProjT 4 144" color: yellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n144" targetname: "n140" label: "0" } edge: { sourcename: "n144" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n143" label: "ProjIs 1 143" color: yellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n143" targetname: "n144" label: "0" } edge: { sourcename: "n143" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n146" label: "ProjP 0 146" color: yellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n146" targetname: "n144" label: "0" } edge: { sourcename: "n146" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n147" label: "ProjM 1 147" color: yellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n147" targetname: "n140" label: "0" color: blue} edge: { sourcename: "n147" targetname: "n139" class: 2 priority: 2 linestyle: dotted} node: {title: "n145" label: "Sel a 145" info1: "visited: 8 +irg: set_a Selecting entity of type int from entity of type PRIMA "} @@ -57,24 +66,29 @@ edge: {sourcename: "n145" targetname: "n147" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n146" label: "1" } edge: { sourcename: "n145" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n142" label: "Store 142" info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n142" targetname: "n147" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n143" label: "2" } edge: { sourcename: "n142" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} edge: { sourcename: "n141" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n136" label: "Return 136" info1: "visited: 8 +irg: set_a return in method of type set_a "} edge: {sourcename: "n136" targetname: "n141" label: "0" color: blue} edge: { sourcename: "n136" targetname: "n137" class: 2 priority: 2 linestyle: dotted} node: {title: "n135" label: "Block 135" color: lightyellow info1: "visited: 8 +irg: set_a "} edge: {sourcename: "n135" targetname: "n136" label: "0" color: red} node: {title: "n134" label: "End 134" color: blue info1: "visited: 8 +irg: set_a "} edge: { sourcename: "n134" targetname: "n135" 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 c5811323d..1ba36b4a0 100644 --- a/testprograms/ref-results/PRIMA_set_a-type.vcg +++ b/testprograms/ref-results/PRIMA_set_a-type.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_set_a" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no diff --git a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg index 215e02159..9f7a9fbfb 100644 --- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_set_a" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -21,33 +21,40 @@ graph: { title: "g71" label: "set_a" status:clustered color:white graph: { title: "n135" label: "Block 135" status:clustered color:yellow edge: {sourcename: "n135" targetname: "n136" label: "0" color: red} node: {title: "n134" label: "End 134" color: blue info1: "visited: 13 +irg: set_a "} } graph: { title: "n137" label: "Block 137" status:clustered color:yellow edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} node: {title: "n136" label: "Return 136" info1: "visited: 13 +irg: set_a return in method of type set_a "} edge: {sourcename: "n136" targetname: "n141" label: "0" color: blue} node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 13 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} node: {title: "n142" label: "Store 142" info1: "visited: 13 +irg: set_a "} edge: {sourcename: "n142" targetname: "n147" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n143" label: "2" } node: {title: "n145" label: "Sel a 145" info1: "visited: 13 +irg: set_a Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n145" targetname: "n147" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n146" label: "1" } node: {title: "n146" label: "ProjP 0 146" color: yellow info1: "visited: 13 +irg: set_a "} edge: {sourcename: "n146" targetname: "n144" label: "0" } node: {title: "n143" label: "ProjIs 1 143" color: yellow info1: "visited: 13 +irg: set_a "} edge: {sourcename: "n143" targetname: "n144" label: "0" } } @@ -55,15 +62,19 @@ edge: {sourcename: "n143" targetname: "n144" label: "0" } graph: { title: "n139" label: "Block 139" status:clustered color:yellow edge: {sourcename: "n139" targetname: "n138" label: "0" color: red} node: {title: "n147" label: "ProjM 1 147" color: yellow info1: "visited: 13 +irg: set_a "} edge: {sourcename: "n147" targetname: "n140" label: "0" color: blue} node: {title: "n144" label: "ProjT 4 144" color: yellow info1: "visited: 13 +irg: set_a "} edge: {sourcename: "n144" targetname: "n140" label: "0" } node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 13 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} node: {title: "n140" label: "Start 140" color: blue info1: "visited: 13 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int diff --git a/testprograms/ref-results/PRIMA_set_a.vcg b/testprograms/ref-results/PRIMA_set_a.vcg index d99c18b74..50be0509e 100644 --- a/testprograms/ref-results/PRIMA_set_a.vcg +++ b/testprograms/ref-results/PRIMA_set_a.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of PRIMA_set_a" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no @@ -21,33 +21,40 @@ graph: { title: "g71" label: "set_a" status:clustered color:white graph: { title: "n135" label: "Block 135" status:clustered color:yellow edge: {sourcename: "n135" targetname: "n136" label: "0" color: red} node: {title: "n134" label: "End 134" color: blue info1: "visited: 9 +irg: set_a "} } graph: { title: "n137" label: "Block 137" status:clustered color:yellow edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} node: {title: "n136" label: "Return 136" info1: "visited: 9 +irg: set_a return in method of type set_a "} edge: {sourcename: "n136" targetname: "n141" label: "0" color: blue} node: {title: "n141" label: "ProjM 0 141" color: yellow info1: "visited: 9 +irg: set_a "} edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} node: {title: "n142" label: "Store 142" info1: "visited: 9 +irg: set_a "} edge: {sourcename: "n142" targetname: "n147" label: "0" color: blue} edge: {sourcename: "n142" targetname: "n145" label: "1" } edge: {sourcename: "n142" targetname: "n143" label: "2" } node: {title: "n145" label: "Sel a 145" info1: "visited: 9 +irg: set_a Selecting entity of type int from entity of type PRIMA "} edge: {sourcename: "n145" targetname: "n147" label: "0" color: blue} edge: {sourcename: "n145" targetname: "n146" label: "1" } node: {title: "n146" label: "ProjP 0 146" color: yellow info1: "visited: 9 +irg: set_a "} edge: {sourcename: "n146" targetname: "n144" label: "0" } node: {title: "n143" label: "ProjIs 1 143" color: yellow info1: "visited: 9 +irg: set_a "} edge: {sourcename: "n143" targetname: "n144" label: "0" } } @@ -55,15 +62,19 @@ edge: {sourcename: "n143" targetname: "n144" label: "0" } graph: { title: "n139" label: "Block 139" status:clustered color:yellow edge: {sourcename: "n139" targetname: "n138" label: "0" color: red} node: {title: "n147" label: "ProjM 1 147" color: yellow info1: "visited: 9 +irg: set_a "} edge: {sourcename: "n147" targetname: "n140" label: "0" color: blue} node: {title: "n144" label: "ProjT 4 144" color: yellow info1: "visited: 9 +irg: set_a "} edge: {sourcename: "n144" targetname: "n140" label: "0" } node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 9 +irg: set_a "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} node: {title: "n140" label: "Start 140" color: blue info1: "visited: 9 +irg: set_a start of method of type set_a param 0 type: class_prima_ptr param 1 type: int diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg index e9803f0eb..a72de0234 100644 --- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg +++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg @@ -36,5 +36,6 @@ edge: { sourcename: "n100" targetname: "n83"} node: {title: "n103" label: "Block n103" } edge: { sourcename: "n103" targetname: "n85"} node: {title: "n111" label: "Bad 111" info1: "visited: 0 +irg: THREE_CFPRED_EXAMPLE_main "} } diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg index 3079b4b19..93d463322 100644 --- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg +++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg @@ -21,6 +21,7 @@ graph: { title: "g28" label: "THREE_CFPRED_EXAMPLE_main" status:clustered color: graph: { title: "n77" label: "Block 77" status:clustered color:yellow edge: {sourcename: "n77" targetname: "n78" label: "0" color: red} node: {title: "n76" label: "End 76" color: blue info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} } @@ -29,12 +30,14 @@ edge: {sourcename: "n79" targetname: "n102" label: "0" color: red} edge: {sourcename: "n79" targetname: "n99" label: "1" color: red} edge: {sourcename: "n79" targetname: "n80" label: "2" color: red} node: {title: "n78" label: "Return 78" info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main return in method of type THREE_CFPRED_EXAMPLE_main res 0 type: int "} edge: {sourcename: "n78" targetname: "n108" label: "0" color: blue} edge: {sourcename: "n78" targetname: "n105" label: "1" } node: {title: "n105" label: "PhiIs 105" color: green info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n105" targetname: "n107" label: "0" } edge: {sourcename: "n105" targetname: "n106" label: "1" } @@ -44,36 +47,44 @@ edge: {sourcename: "n105" targetname: "n106" label: "2" } graph: { title: "n103" label: "Block 103" status:clustered color:yellow edge: {sourcename: "n103" targetname: "n104" label: "0" color: red} node: {title: "n102" label: "Jmp 102" info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} } graph: { title: "n100" label: "Block 100" status:clustered color:yellow edge: {sourcename: "n100" targetname: "n101" label: "0" color: red} node: {title: "n99" label: "Jmp 99" info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} } graph: { title: "n81" label: "Block 81" status:clustered color:yellow edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} node: {title: "n80" label: "Jmp 80" info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} } graph: { title: "n83" label: "Block 83" status:clustered color:yellow edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} node: {title: "n101" label: "ProjX 0 101" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n101" targetname: "n95" label: "0" color: red} node: {title: "n82" label: "ProjX 1 82" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n82" targetname: "n95" label: "0" color: red} node: {title: "n95" label: "Cond 95" info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n95" targetname: "n96" label: "0" } node: {title: "n96" label: "Projb Eq 96" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n96" targetname: "n97" label: "0" } node: {title: "n97" label: "CmpT 97" info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n97" targetname: "n98" label: "0" } edge: {sourcename: "n97" targetname: "n92" label: "1" } @@ -82,22 +93,28 @@ edge: {sourcename: "n97" targetname: "n92" label: "1" } graph: { title: "n85" label: "Block 85" status:clustered color:yellow edge: {sourcename: "n85" targetname: "n86" label: "0" color: red} node: {title: "n104" label: "ProjX 1 104" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n104" targetname: "n89" label: "0" color: red} node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n84" targetname: "n89" label: "0" color: red} node: {title: "n89" label: "Cond 89" info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n89" targetname: "n90" label: "0" } node: {title: "n90" label: "Projb Eq 90" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n90" targetname: "n91" label: "0" } node: {title: "n91" label: "CmpT 91" info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n91" targetname: "n94" label: "0" } edge: {sourcename: "n91" targetname: "n92" label: "1" } node: {title: "n92" label: "ProjIs 0 92" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n92" targetname: "n93" label: "0" } } @@ -105,27 +122,35 @@ edge: {sourcename: "n92" targetname: "n93" label: "0" } graph: { title: "n87" label: "Block 87" status:clustered color:yellow edge: {sourcename: "n87" targetname: "n86" label: "0" color: red} node: {title: "n108" label: "ProjM 1 108" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n108" targetname: "n88" label: "0" color: blue} node: {title: "n107" label: "0x5Is 107" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main Const of type type_unknown "} node: {title: "n106" label: "0x6Is 106" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main Const of type type_unknown "} node: {title: "n98" label: "0x3Is 98" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main Const of type type_unknown "} node: {title: "n94" label: "0x1Is 94" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main Const of type type_unknown "} node: {title: "n93" label: "ProjT 4 93" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n93" targetname: "n88" label: "0" } node: {title: "n86" label: "ProjX 0 86" color: yellow info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main "} edge: {sourcename: "n86" targetname: "n88" label: "0" color: red} node: {title: "n88" label: "Start 88" color: blue info1: "visited: 8 +irg: THREE_CFPRED_EXAMPLE_main start of method of type THREE_CFPRED_EXAMPLE_main param 0 type: int "} diff --git a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg index 311bc20cd..031d8b231 100644 --- a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg @@ -21,18 +21,21 @@ graph: { title: "g29" label: "main" status:clustered color:white graph: { title: "n67" label: "Block 67" status:clustered color:yellow edge: {sourcename: "n67" targetname: "n68" label: "0" color: red} node: {title: "n66" label: "End 66" color: blue info1: "visited: 15 +irg: main "} } graph: { title: "n69" label: "Block 69" status:clustered color:yellow edge: {sourcename: "n69" targetname: "n70" label: "0" color: red} node: {title: "n68" label: "Return 68" info1: "visited: 15 +irg: main return in method of type main_tp res 0 type: int "} edge: {sourcename: "n68" targetname: "n90" label: "0" color: blue} edge: {sourcename: "n68" targetname: "n89" label: "1" } node: {title: "n89" label: "SubIs 89" info1: "visited: 15 +irg: main "} edge: {sourcename: "n89" targetname: "n79" label: "0" } edge: {sourcename: "n89" targetname: "n78" label: "1" } @@ -42,26 +45,33 @@ graph: { title: "n71" label: "Block 71" status:clustered color:yellow edge: {sourcename: "n71" targetname: "n88" label: "0" color: red} edge: {sourcename: "n71" targetname: "n72" label: "1" color: red} node: {title: "n70" label: "ProjX 0 70" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n70" targetname: "n75" label: "0" color: red} node: {title: "n74" label: "ProjX 1 74" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n74" targetname: "n75" label: "0" color: red} node: {title: "n75" label: "Cond 75" info1: "visited: 15 +irg: main "} edge: {sourcename: "n75" targetname: "n76" label: "0" } node: {title: "n76" label: "Projb Eq 76" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n76" targetname: "n77" label: "0" } node: {title: "n77" label: "CmpT 77" info1: "visited: 15 +irg: main "} edge: {sourcename: "n77" targetname: "n87" label: "0" } edge: {sourcename: "n77" targetname: "n78" label: "1" } node: {title: "n78" label: "PhiIs 78" color: green info1: "visited: 15 +irg: main "} edge: {sourcename: "n78" targetname: "n86" label: "0" } edge: {sourcename: "n78" targetname: "n79" label: "1" } node: {title: "n79" label: "PhiIs 79" color: green info1: "visited: 15 +irg: main "} edge: {sourcename: "n79" targetname: "n80" label: "0" } edge: {sourcename: "n79" targetname: "n78" label: "1" } @@ -70,14 +80,17 @@ edge: {sourcename: "n79" targetname: "n78" label: "1" } graph: { title: "n73" label: "Block 73" status:clustered color:yellow edge: {sourcename: "n73" targetname: "n74" label: "0" color: red} node: {title: "n72" label: "Jmp 72" info1: "visited: 15 +irg: main "} } graph: { title: "n81" label: "Block 81" status:clustered color:yellow edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} node: {title: "n88" label: "Jmp 88" info1: "visited: 15 +irg: main "} node: {title: "n80" label: "ProjIs 0 80" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n80" targetname: "n85" label: "0" } } @@ -85,21 +98,27 @@ edge: {sourcename: "n80" targetname: "n85" label: "0" } graph: { title: "n83" label: "Block 83" status:clustered color:yellow edge: {sourcename: "n83" targetname: "n82" label: "0" color: red} node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n90" targetname: "n84" label: "0" color: blue} node: {title: "n87" label: "0x0Is 87" color: yellow info1: "visited: 15 +irg: main Const of type type_unknown "} node: {title: "n86" label: "0x1Is 86" color: yellow info1: "visited: 15 +irg: main Const of type type_unknown "} node: {title: "n85" label: "ProjT 4 85" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n85" targetname: "n84" label: "0" } node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 15 +irg: main "} edge: {sourcename: "n82" targetname: "n84" label: "0" color: red} node: {title: "n84" label: "Start 84" color: blue info1: "visited: 15 +irg: main start of method of type main_tp param 0 type: int "} diff --git a/testprograms/ref-results/class_hierarchy.vcg b/testprograms/ref-results/class_hierarchy.vcg index 86b58613c..a5d48594d 100644 --- a/testprograms/ref-results/class_hierarchy.vcg +++ b/testprograms/ref-results/class_hierarchy.vcg @@ -1,5 +1,5 @@ graph: { title: "ir graph of class_hierarchy" -display_edge_labels: yes +display_edge_labels: no layoutalgorithm: mindepth manhattan_edges: yes port_sharing: no diff --git a/testprograms/ref-results/main.vcg b/testprograms/ref-results/main.vcg index f7c13c755..ce61e0c50 100644 --- a/testprograms/ref-results/main.vcg +++ b/testprograms/ref-results/main.vcg @@ -21,28 +21,34 @@ 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} node: {title: "n46" label: "End 46" color: blue info1: "visited: 8 +irg: main "} } graph: { title: "n49" label: "Block 49" status:clustered color:yellow edge: {sourcename: "n49" targetname: "n50" label: "0" color: red} node: {title: "n48" label: "Return 48" info1: "visited: 8 +irg: main return in method of type main res 0 type: int "} edge: {sourcename: "n48" targetname: "n60" label: "0" color: blue} edge: {sourcename: "n48" targetname: "n53" label: "1" } node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 8 +irg: main "} edge: {sourcename: "n60" targetname: "n54" label: "0" color: blue} node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 8 +irg: main "} edge: {sourcename: "n53" targetname: "n54" label: "0" } node: {title: "n54" label: "Load 54" info1: "visited: 8 +irg: main "} edge: {sourcename: "n54" targetname: "n59" label: "0" color: blue} edge: {sourcename: "n54" targetname: "n55" label: "1" } node: {title: "n55" label: "Sel a_tp_elem_ent 55" info1: "visited: 8 +irg: main Selecting entity of type int from entity of type a_tp "} @@ -50,6 +56,7 @@ edge: {sourcename: "n55" targetname: "n59" label: "0" 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 +irg: main Selecting entity of type a_tp from entity of type mainframe_tp "} @@ -60,18 +67,23 @@ 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} node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 8 +irg: main "} edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue} node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 8 +irg: main "} edge: {sourcename: "n58" targetname: "n52" label: "0" } node: {title: "n56" label: "0x3Iu 56" color: yellow info1: "visited: 8 +irg: main Const of type type_unknown "} node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 8 +irg: main "} edge: {sourcename: "n50" targetname: "n52" label: "0" color: red} node: {title: "n52" label: "Start 52" color: blue info1: "visited: 8 +irg: main start of method of type main "} } -- 2.20.1