From 73399aa4ce5c210095030773f6ec5eb26a43a3d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=B6tz=20Lindenmaier?= Date: Fri, 14 Nov 2003 14:21:26 +0000 Subject: [PATCH] *** empty log message *** [r2046] --- .../ARRAY-HEAP_EXAMPLE_main-type.vcg | 6 +- .../ref-results/ARRAY-HEAP_EXAMPLE_main.vcg | 53 ++-- .../ARRAY-STACK_EXAMPLE_main-all.vcg | 158 ------------ testprograms/ref-results/All_types.vcg | 4 +- .../ref-results/CALL_STR_EXAMPLE_main.vcg | 33 +-- .../ref-results/COND_EXAMPLE_main.vcg | 95 ++++---- .../ref-results/CONST_EVAL_EXAMPLE_main.vcg | 29 +-- testprograms/ref-results/DEAD_BLOCK_main.vcg | 29 +-- testprograms/ref-results/EMPTY_main.vcg | 23 +- .../ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg | 79 +++--- .../ref-results/FLOAT_EXAMPLE_main.vcg | 29 +-- .../ref-results/GLOBAL_CSE_EXAMPLE_main.vcg | 105 ++++---- .../ref-results/GLOBAL_VAR_main-all.vcg | 124 ---------- testprograms/ref-results/GLOBAL_VAR_main.vcg | 37 +-- .../ref-results/IF_ELSE_EXAMPLE_main.vcg | 31 +-- testprograms/ref-results/IF_EXAMPLE_main.vcg | 63 ++--- .../ref-results/IRREGULAR_CF_main.vcg | 103 ++++---- testprograms/ref-results/IRR_LOOP_main.vcg | 97 ++++---- .../ref-results/MEMORY_EXAMPLE_main.vcg | 119 ++++----- .../OO_INLINE_EXAMPLE_main-all.vcg | 225 ----------------- .../ref-results/OO_INLINE_EXAMPLE_main.vcg | 97 ++++---- .../OO_PROGRAM_EXAMPLE_main-all.vcg | 228 ------------------ .../ref-results/OO_PROGRAM_EXAMPLE_main.vcg | 55 ++--- .../ref-results/PRIMA_INLINE_c-all.vcg | 173 ------------- testprograms/ref-results/PRIMA_INLINE_c.vcg | 71 +++--- .../ref-results/PRIMA_INLINE_set_a-all.vcg | 157 ------------ .../ref-results/PRIMA_INLINE_set_a.vcg | 43 ++-- testprograms/ref-results/PRIMA_c-all.vcg | 165 ------------- testprograms/ref-results/PRIMA_c.vcg | 41 ++-- testprograms/ref-results/PRIMA_set_a-all.vcg | 157 ------------ testprograms/ref-results/PRIMA_set_a.vcg | 35 +-- .../ref-results/THREE_CFPRED_EXAMPLE_main.vcg | 101 ++++---- .../ref-results/WHILE_EXAMPLE_main.vcg | 69 +++--- testprograms/ref-results/main-type.vcg | 8 +- testprograms/ref-results/main.vcg | 45 ++-- 35 files changed, 759 insertions(+), 2128 deletions(-) delete mode 100644 testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg delete mode 100644 testprograms/ref-results/GLOBAL_VAR_main-all.vcg delete mode 100644 testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg delete mode 100644 testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg delete mode 100644 testprograms/ref-results/PRIMA_INLINE_c-all.vcg delete mode 100644 testprograms/ref-results/PRIMA_INLINE_set_a-all.vcg delete mode 100644 testprograms/ref-results/PRIMA_c-all.vcg delete mode 100644 testprograms/ref-results/PRIMA_set_a-all.vcg diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg index e91ee062b..abbbd0644 100644 --- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg @@ -26,7 +26,7 @@ variability: variability_uninitialized volatility: volatility_non_volatile peculiarity: peculiarity_existent name: a_elem_ent -ld_name: a_a_elem_ent +ld_name: no yet set offset: -1" } edge: { sourcename: "e17" targetname: "t12"class: 3 label: "type" color: red} @@ -40,8 +40,6 @@ edge: { sourcename: "n19" targetname: "t16"label: "lower 0"} node: {title: "n18" label: "0x9Iu 18" color: yellow info1: "visited: 1 Const of type type_unknown "} -node: {title: "n4" label: "Bad 4" info1: "visited: 1 -"} node: {title: "n19" label: "0x0Iu 19" color: yellow info1: "visited: 1 Const of type type_unknown "} @@ -58,7 +56,7 @@ variability: variability_constant volatility: volatility_non_volatile peculiarity: peculiarity_existent name: ARRAY-HEAP_EXAMPLE_main -ld_name: GlobalType_ARRAY-HEAP_EXAMPLE_main +ld_name: no yet set offset: -1 irg = g32" } diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg index 6cfa5d68d..2f3a27339 100644 --- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg +++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg @@ -17,69 +17,70 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n49" label: "49" status:clustered color:yellow +graph: { title: "0x80ae350" label: "ARRAY-HEAP_EXAMPLE_main" status:clustered color:white +graph: { title: "n49" label: "Block 49" status:clustered color:yellow edge: {sourcename: "n49" targetname: "n50" label: "0" color: red} node: {title: "n48" label: "End 48" color: blue info1: "visited: 8 "} } -graph: { title: "n51" label: "51" status:clustered color:yellow +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: 9 +node: {title: "n50" label: "Return 50" info1: "visited: 8 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: "n55" label: "ProjIs 2 55" color: yellow info1: "visited: 9 +node: {title: "n64" label: "ProjM 0 64" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n64" targetname: "n56" label: "0" color: blue} +node: {title: "n55" label: "ProjIs 2 55" color: yellow info1: "visited: 8 "} edge: {sourcename: "n55" targetname: "n56" label: "0" } -node: {title: "n56" label: "Load 56" info1: "visited: 9 +node: {title: "n56" label: "Load 56" info1: "visited: 8 "} 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: 9 +node: {title: "n57" label: "Sel a_elem_ent 57" info1: "visited: 8 Selecting entity of type int from entity of type a "} 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: "n59" label: "ProjP 2 59" color: yellow info1: "visited: 9 +node: {title: "n63" label: "ProjM 0 63" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n63" targetname: "n60" label: "0" color: blue} +node: {title: "n59" label: "ProjP 2 59" color: yellow info1: "visited: 8 "} edge: {sourcename: "n59" targetname: "n60" label: "0" } -node: {title: "n60" label: "Alloc 60" info1: "visited: 9 +node: {title: "n60" label: "Alloc 60" info1: "visited: 8 allocating entity of type a "} edge: {sourcename: "n60" targetname: "n62" label: "0" color: blue} edge: {sourcename: "n60" targetname: "n61" label: "1" } -node: {title: "n63" label: "ProjM 0 63" color: yellow info1: "visited: 9 -"} -edge: {sourcename: "n63" targetname: "n60" label: "0" color: blue} -node: {title: "n64" label: "ProjM 0 64" color: yellow info1: "visited: 9 -"} -edge: {sourcename: "n64" targetname: "n56" label: "0" color: blue} } -graph: { title: "n53" label: "53" status:clustered color:yellow +graph: { title: "n53" label: "Block 53" status:clustered color:yellow edge: {sourcename: "n53" targetname: "n52" label: "0" color: red} -node: {title: "n52" label: "ProjX 0 52" color: yellow info1: "visited: 10 +node: {title: "n62" label: "ProjM 1 62" color: yellow info1: "visited: 8 "} -edge: {sourcename: "n52" targetname: "n54" label: "0" color: red} -node: {title: "n54" label: "Start 54" color: blue info1: "visited: 10 -start of method of type ARRAY-HEAP_EXAMPLE_main -"} -node: {title: "n58" label: "0x3Iu 58" color: yellow info1: "visited: 10 +edge: {sourcename: "n62" targetname: "n54" label: "0" color: blue} +node: {title: "n61" label: "0x28Iu 61" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n61" label: "0x28Iu 61" color: yellow info1: "visited: 10 +node: {title: "n58" label: "0x3Iu 58" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n62" label: "ProjM 1 62" color: yellow info1: "visited: 10 +node: {title: "n52" label: "ProjX 0 52" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n52" targetname: "n54" label: "0" color: red} +node: {title: "n54" label: "Start 54" color: blue info1: "visited: 8 +start of method of type ARRAY-HEAP_EXAMPLE_main "} -edge: {sourcename: "n62" targetname: "n54" label: "0" color: blue} } -node: {title: "n68" label: "Bad 68" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg deleted file mode 100644 index f9d028fa6..000000000 --- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg +++ /dev/null @@ -1,158 +0,0 @@ -graph: { title: "ir graph of ARRAY-STACK_EXAMPLE_main" -display_edge_labels: yes -layoutalgorithm: mindepth -manhattan_edges: yes -port_sharing: no -orientation: bottom_to_top -classname 1: "Data" -classname 2: "Block" -classname 3: "Entity type" -classname 4: "Entity owner" -classname 5: "Method Param" -classname 6: "Method Res" -classname 7: "Super" -classname 8: "Union" -classname 9: "Points-to" -classname 10: "Array Element Type" -classname 11: "Overwrites" -classname 12: "Member" - -graph: { title: "n47" label: "47" status:clustered color:yellow -edge: {sourcename: "n47" targetname: "n48" label: "0" color: red} -node: {title: "n46" label: "End 46" color: blue info1: "visited: 13 -"} -} - -graph: { title: "n49" label: "49" status:clustered color:yellow -edge: {sourcename: "n49" targetname: "n50" label: "0" color: red} -node: {title: "n48" label: "Return 48" info1: "visited: 14 -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: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 14 -"} -edge: {sourcename: "n53" targetname: "n54" label: "0" } -node: {title: "n54" label: "Load 54" info1: "visited: 14 -"} -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: 14 -Selecting entity of type int - from entity of type a_tp -"} -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: 14 -Selecting entity of type a_tp - from entity of type mainframe_tp -"} -edge: {sourcename: "n57" targetname: "n59" label: "0" color: blue} -edge: {sourcename: "n57" targetname: "n58" label: "1" } -node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 14 -"} -edge: {sourcename: "n60" targetname: "n54" label: "0" color: blue} -} - -graph: { title: "n51" label: "51" status:clustered color:yellow -edge: {sourcename: "n51" targetname: "n50" label: "0" color: red} -node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 15 -"} -edge: {sourcename: "n50" targetname: "n52" label: "0" color: red} -node: {title: "n52" label: "Start 52" color: blue info1: "visited: 15 -start of method of type main -"} -node: {title: "n56" label: "0x3Iu 56" color: yellow info1: "visited: 15 -Const of type type_unknown -"} -node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 15 -"} -edge: {sourcename: "n58" targetname: "n52" label: "0" } -node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 15 -"} -edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue} -} - -node: {title: "n63" label: "Bad 63" info1: "visited: 0 -"} -node: {title: "e18" label: "ent a_tp_elem_ent" color: yellow - info1: " -id: e18 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: a_tp_elem_ent -ld_name: a_tp_a_tp_elem_ent -offset: -1" -} -edge: { sourcename: "e18" targetname: "t12"class: 3 label: "type" color: red} -node: {title: "t17" label: "array a_tp" info1: "state: layout_undefined -size: -1B, -"} -edge: { sourcename: "t17" targetname: "t12"class: 10 label: "arr elt tp" color:green} -edge: { sourcename: "t17" targetname: "e18"class: 10 label: "arr ent" color: green} -edge: { sourcename: "n19" targetname: "t17"label: "upper 0"} -edge: { sourcename: "n20" targetname: "t17"label: "lower 0"} -node: {title: "n19" label: "0x9Iu 19" color: yellow info1: "visited: 2 -Const of type type_unknown -"} -node: {title: "n4" label: "Bad 4" info1: "visited: 2 -"} -node: {title: "n20" label: "0x0Iu 20" color: yellow info1: "visited: 2 -Const of type type_unknown -"} -node: {title: "t12" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 4B, -"} -node: {title: "e35" label: "ent a" color: yellow - info1: " -id: e35 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: a -ld_name: mainframe_tp_a -offset: -1" -} -edge: { sourcename: "e35" targetname: "t17"class: 3 label: "type" color: red} -node: {title: "t21" label: "class mainframe_tp" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t21" targetname: "e35"class: 12 label: "member" color:blue} -node: {title: "e16" label: "ent main" color: yellow - info1: " -id: e16 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: main -ld_name: ARRAY-STACK_EXAMPLE_main -offset: -1 -irg = g33" -} -edge: { sourcename: "e16" targetname: "t14"class: 3 label: "type" color: red} -edge: { sourcename: "e16" targetname: "n15"label: "value 0"} -node: {title: "n15" label: "&(ARRAY-STACK_EXAMPLE_main)P 15" color: yellow info1: "visited: 2 -Const of type type_unknown -"} -node: {title: "t13" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t13" targetname: "e16"class: 12 label: "member" color:blue} -node: {title: "t14" label: "method main" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t14" targetname: "t12"class: 6 label: "res 0" color: green} -edge: { sourcename: "n55" targetname: "e18"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n57" targetname: "e35"class: 2 priority: 2 linestyle: dotted} -} diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg index d47eeac6e..400db8686 100644 --- a/testprograms/ref-results/All_types.vcg +++ b/testprograms/ref-results/All_types.vcg @@ -40,7 +40,7 @@ variability: variability_constant volatility: volatility_non_volatile peculiarity: peculiarity_existent name: main -ld_name: WHILE_EXAMPLE_main +ld_name: no yet set offset: -1 irg = g29" } @@ -49,8 +49,6 @@ edge: { sourcename: "e16" targetname: "n15"label: "value 0"} node: {title: "n15" label: "&(WHILE_EXAMPLE_main)P 15" color: yellow info1: "visited: 1 Const of type type_unknown "} -node: {title: "n4" label: "Bad 4" info1: "visited: 1 -"} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, " color: green} diff --git a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg index cf49f4b81..d2a55274d 100644 --- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg +++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg @@ -17,22 +17,23 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n56" label: "56" status:clustered color:yellow +graph: { title: "0x80af6e8" label: "CALL_STR_EXAMPLE_main" status:clustered color:white +graph: { title: "n56" label: "Block 56" status:clustered color:yellow edge: {sourcename: "n56" targetname: "n57" label: "0" color: red} node: {title: "n55" label: "End 55" color: blue info1: "visited: 6 "} } -graph: { title: "n58" label: "58" status:clustered color:yellow +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: 7 +node: {title: "n57" label: "Return 57" info1: "visited: 6 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: 7 +node: {title: "n62" label: "ProjM 0 62" color: yellow info1: "visited: 6 "} edge: {sourcename: "n62" targetname: "n63" label: "0" color: blue} -node: {title: "n63" label: "Call 63" info1: "visited: 7 +node: {title: "n63" label: "Call 63" info1: "visited: 6 calling method of type f param 0 type: ptr_to_string "} @@ -41,24 +42,24 @@ edge: {sourcename: "n63" targetname: "n65" label: "1" } edge: {sourcename: "n63" targetname: "n64" label: "2" } } -graph: { title: "n60" label: "60" status:clustered color:yellow +graph: { title: "n60" label: "Block 60" status:clustered color:yellow edge: {sourcename: "n60" targetname: "n59" label: "0" color: red} -node: {title: "n59" label: "ProjX 0 59" color: yellow info1: "visited: 8 +node: {title: "n66" label: "ProjM 1 66" color: yellow info1: "visited: 6 "} -edge: {sourcename: "n59" targetname: "n61" label: "0" color: red} -node: {title: "n61" label: "Start 61" color: blue info1: "visited: 8 -start of method of type CALL_STR_EXAMPLE_main +edge: {sourcename: "n66" targetname: "n61" label: "0" color: blue} +node: {title: "n65" label: "SymC f 65" info1: "visited: 6 "} -node: {title: "n64" label: "&(GlobalType_constStr)P 64" color: yellow info1: "visited: 8 +node: {title: "n64" label: "&(GlobalType_constStr)P 64" color: yellow info1: "visited: 6 Const of type ptr_to_string "} -node: {title: "n65" label: "SymC f 65" info1: "visited: 8 +node: {title: "n59" label: "ProjX 0 59" color: yellow info1: "visited: 6 "} -node: {title: "n66" label: "ProjM 1 66" color: yellow info1: "visited: 8 +edge: {sourcename: "n59" targetname: "n61" label: "0" color: red} +node: {title: "n61" label: "Start 61" color: blue info1: "visited: 6 +start of method of type CALL_STR_EXAMPLE_main "} -edge: {sourcename: "n66" targetname: "n61" label: "0" color: blue} } -node: {title: "n70" label: "Bad 70" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg index 6f8313d20..a998128d9 100644 --- a/testprograms/ref-results/COND_EXAMPLE_main.vcg +++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg @@ -17,109 +17,110 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n61" label: "61" status:clustered color:yellow +graph: { title: "0x80ae390" 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 "} } -graph: { title: "n63" label: "63" status:clustered color:yellow +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: 10 +node: {title: "n62" label: "Return 62" info1: "visited: 9 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: 10 +node: {title: "n87" label: "PhiIs 87" color: green info1: "visited: 9 "} edge: {sourcename: "n87" targetname: "n88" label: "0" } edge: {sourcename: "n87" targetname: "n78" label: "1" } } -graph: { title: "n65" label: "65" status:clustered color:yellow +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 +"} +} + +graph: { title: "n65" label: "Block 65" status:clustered color:yellow edge: {sourcename: "n65" targetname: "n66" label: "0" color: red} -node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 11 +node: {title: "n86" label: "ProjX 1 86" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n86" targetname: "n69" label: "0" color: red} +node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 9 "} edge: {sourcename: "n64" targetname: "n69" label: "0" color: red} -node: {title: "n69" label: "Cond 69" info1: "visited: 11 +node: {title: "n69" label: "Cond 69" info1: "visited: 9 "} edge: {sourcename: "n69" targetname: "n70" label: "0" } -node: {title: "n70" label: "Projb Ne 70" color: yellow info1: "visited: 11 +node: {title: "n70" label: "Projb Ne 70" color: yellow info1: "visited: 9 "} edge: {sourcename: "n70" targetname: "n71" label: "0" } -node: {title: "n71" label: "CmpT 71" info1: "visited: 11 +node: {title: "n71" label: "CmpT 71" info1: "visited: 9 "} edge: {sourcename: "n71" targetname: "n73" label: "0" } edge: {sourcename: "n71" targetname: "n72" label: "1" } -node: {title: "n73" label: "AndIs 73" info1: "visited: 11 +node: {title: "n73" label: "AndIs 73" info1: "visited: 9 "} edge: {sourcename: "n73" targetname: "n80" label: "0" } edge: {sourcename: "n73" targetname: "n74" label: "1" } -node: {title: "n74" label: "ConvIs 74" info1: "visited: 11 +node: {title: "n80" label: "ConvIs 80" info1: "visited: 9 +"} +edge: {sourcename: "n80" targetname: "n81" label: "0" } +node: {title: "n81" label: "Projb Gt 81" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n81" targetname: "n82" label: "0" } +node: {title: "n82" label: "CmpT 82" info1: "visited: 9 +"} +edge: {sourcename: "n82" targetname: "n78" label: "0" } +edge: {sourcename: "n82" targetname: "n83" label: "1" } +node: {title: "n74" label: "ConvIs 74" info1: "visited: 9 "} edge: {sourcename: "n74" targetname: "n75" label: "0" } -node: {title: "n75" label: "Projb Lt 75" color: yellow info1: "visited: 11 +node: {title: "n75" label: "Projb Lt 75" color: yellow info1: "visited: 9 "} edge: {sourcename: "n75" targetname: "n76" label: "0" } -node: {title: "n76" label: "CmpT 76" info1: "visited: 11 +node: {title: "n76" label: "CmpT 76" info1: "visited: 9 "} 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: 11 +node: {title: "n78" label: "ProjIs 0 78" color: yellow info1: "visited: 9 "} edge: {sourcename: "n78" targetname: "n79" label: "0" } -node: {title: "n80" label: "ConvIs 80" info1: "visited: 11 -"} -edge: {sourcename: "n80" targetname: "n81" label: "0" } -node: {title: "n81" label: "Projb Gt 81" color: yellow info1: "visited: 11 -"} -edge: {sourcename: "n81" targetname: "n82" label: "0" } -node: {title: "n82" label: "CmpT 82" info1: "visited: 11 -"} -edge: {sourcename: "n82" targetname: "n78" label: "0" } -edge: {sourcename: "n82" targetname: "n83" label: "1" } -node: {title: "n86" label: "ProjX 1 86" color: yellow info1: "visited: 11 -"} -edge: {sourcename: "n86" targetname: "n69" label: "0" color: red} } -graph: { title: "n67" label: "67" status:clustered color:yellow +graph: { title: "n67" label: "Block 67" status:clustered color:yellow edge: {sourcename: "n67" targetname: "n66" label: "0" color: red} -node: {title: "n66" label: "ProjX 0 66" color: yellow info1: "visited: 12 +node: {title: "n89" label: "ProjM 1 89" color: yellow info1: "visited: 9 "} -edge: {sourcename: "n66" targetname: "n68" label: "0" color: red} -node: {title: "n68" label: "Start 68" color: blue info1: "visited: 12 -start of method of type main - param 0 type: int -"} -node: {title: "n72" label: "0x0Is 72" color: yellow info1: "visited: 12 +edge: {sourcename: "n89" targetname: "n68" label: "0" color: blue} +node: {title: "n88" label: "0x1Is 88" color: yellow info1: "visited: 9 Const of type type_unknown "} -node: {title: "n77" label: "0xAIs 77" color: yellow info1: "visited: 12 +node: {title: "n83" label: "0x2Is 83" color: yellow info1: "visited: 9 Const of type type_unknown "} -node: {title: "n79" label: "ProjT 4 79" color: yellow info1: "visited: 12 +node: {title: "n79" label: "ProjT 4 79" color: yellow info1: "visited: 9 "} edge: {sourcename: "n79" targetname: "n68" label: "0" } -node: {title: "n83" label: "0x2Is 83" color: yellow info1: "visited: 12 +node: {title: "n77" label: "0xAIs 77" color: yellow info1: "visited: 9 Const of type type_unknown "} -node: {title: "n88" label: "0x1Is 88" color: yellow info1: "visited: 12 +node: {title: "n72" label: "0x0Is 72" color: yellow info1: "visited: 9 Const of type type_unknown "} -node: {title: "n89" label: "ProjM 1 89" color: yellow info1: "visited: 12 +node: {title: "n66" label: "ProjX 0 66" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n66" targetname: "n68" label: "0" color: red} +node: {title: "n68" label: "Start 68" color: blue info1: "visited: 9 +start of method of type main + param 0 type: int "} -edge: {sourcename: "n89" targetname: "n68" label: "0" color: blue} } -graph: { title: "n85" label: "85" status:clustered color:yellow -edge: {sourcename: "n85" targetname: "n86" label: "0" color: red} -node: {title: "n84" label: "Jmp 84" info1: "visited: 13 -"} } -node: {title: "n92" label: "Bad 92" info1: "visited: 0 -"} } diff --git a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg index 1f2f46868..a23c41691 100644 --- a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg +++ b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg @@ -17,15 +17,16 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n46" label: "46" status:clustered color:yellow +graph: { title: "0x80ae290" 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 "} } -graph: { title: "n48" label: "48" status:clustered color:yellow +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: 5 +node: {title: "n47" label: "Return 47" info1: "visited: 4 return in method of type main res 0 type: int res 1 type: int @@ -35,22 +36,22 @@ edge: {sourcename: "n47" targetname: "n52" label: "1" } edge: {sourcename: "n47" targetname: "n52" label: "2" } } -graph: { title: "n50" label: "50" status:clustered color:yellow +graph: { title: "n50" label: "Block 50" status:clustered color:yellow edge: {sourcename: "n50" targetname: "n49" label: "0" color: red} -node: {title: "n49" label: "ProjX 0 49" color: yellow info1: "visited: 6 +node: {title: "n53" label: "ProjM 1 53" color: yellow info1: "visited: 4 "} -edge: {sourcename: "n49" targetname: "n51" label: "0" color: red} -node: {title: "n51" label: "Start 51" color: blue info1: "visited: 6 -start of method of type main -"} -node: {title: "n52" label: "0xCIs 52" color: yellow info1: "visited: 6 +edge: {sourcename: "n53" targetname: "n51" label: "0" color: blue} +node: {title: "n52" label: "0xCIs 52" color: yellow info1: "visited: 4 Const of type type_unknown "} -node: {title: "n53" label: "ProjM 1 53" color: yellow info1: "visited: 6 +node: {title: "n49" label: "ProjX 0 49" color: yellow info1: "visited: 4 +"} +edge: {sourcename: "n49" targetname: "n51" label: "0" color: red} +node: {title: "n51" label: "Start 51" color: blue info1: "visited: 4 +start of method of type main "} -edge: {sourcename: "n53" targetname: "n51" label: "0" color: blue} } -node: {title: "n57" label: "Bad 57" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/DEAD_BLOCK_main.vcg b/testprograms/ref-results/DEAD_BLOCK_main.vcg index 96fdaaf48..6ca27709f 100644 --- a/testprograms/ref-results/DEAD_BLOCK_main.vcg +++ b/testprograms/ref-results/DEAD_BLOCK_main.vcg @@ -17,15 +17,16 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n59" label: "59" status:clustered color:yellow +graph: { title: "0x80ae2d0" 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 "} } -graph: { title: "n67" label: "67" status:clustered color:yellow +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: 10 +node: {title: "n60" label: "Return 60" info1: "visited: 9 return in method of type main res 0 type: int "} @@ -33,22 +34,22 @@ edge: {sourcename: "n60" targetname: "n69" label: "0" color: blue} edge: {sourcename: "n60" targetname: "n68" label: "1" } } -graph: { title: "n63" label: "63" status:clustered color:yellow +graph: { title: "n63" label: "Block 63" status:clustered color:yellow edge: {sourcename: "n63" targetname: "n64" label: "0" color: red} -node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 11 +node: {title: "n69" label: "ProjM 1 69" color: yellow info1: "visited: 9 "} -edge: {sourcename: "n64" targetname: "n65" label: "0" color: red} -node: {title: "n65" label: "Start 65" color: blue info1: "visited: 11 -start of method of type main -"} -node: {title: "n68" label: "0x2Is 68" color: yellow info1: "visited: 11 +edge: {sourcename: "n69" targetname: "n65" label: "0" color: blue} +node: {title: "n68" label: "0x2Is 68" color: yellow info1: "visited: 9 Const of type type_unknown "} -node: {title: "n69" label: "ProjM 1 69" color: yellow info1: "visited: 11 +node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n64" targetname: "n65" label: "0" color: red} +node: {title: "n65" label: "Start 65" color: blue info1: "visited: 9 +start of method of type main "} -edge: {sourcename: "n69" targetname: "n65" label: "0" color: blue} } -node: {title: "n62" label: "Bad 62" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/EMPTY_main.vcg b/testprograms/ref-results/EMPTY_main.vcg index 860b04c37..a8e0ad281 100644 --- a/testprograms/ref-results/EMPTY_main.vcg +++ b/testprograms/ref-results/EMPTY_main.vcg @@ -17,33 +17,34 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n16" label: "16" status:clustered color:yellow +graph: { title: "0x80ad0f8" 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 "} } -graph: { title: "n28" label: "28" status:clustered color:yellow +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: 5 +node: {title: "n30" label: "Return 30" info1: "visited: 4 return in method of type EMPTY_main "} edge: {sourcename: "n30" targetname: "n23" label: "0" color: blue} } -graph: { title: "n18" label: "18" status:clustered color:yellow +graph: { title: "n18" label: "Block 18" status:clustered color:yellow edge: {sourcename: "n18" targetname: "n22" label: "0" color: red} -node: {title: "n22" label: "ProjX 0 22" color: yellow info1: "visited: 6 +node: {title: "n23" label: "ProjM 1 23" color: yellow info1: "visited: 4 +"} +edge: {sourcename: "n23" targetname: "n19" label: "0" color: blue} +node: {title: "n22" label: "ProjX 0 22" color: yellow info1: "visited: 4 "} edge: {sourcename: "n22" targetname: "n19" label: "0" color: red} -node: {title: "n19" label: "Start 19" color: blue info1: "visited: 6 +node: {title: "n19" label: "Start 19" color: blue info1: "visited: 4 start of method of type EMPTY_main "} -node: {title: "n23" label: "ProjM 1 23" color: yellow info1: "visited: 6 -"} -edge: {sourcename: "n23" targetname: "n19" label: "0" color: blue} } -node: {title: "n20" label: "Bad 20" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg index 90385e5c0..9dc431687 100644 --- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg +++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg @@ -17,78 +17,79 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n75" label: "75" status:clustered color:yellow -node: {title: "n74" label: "End 74" color: blue info1: "visited: 19 -"} -edge: {sourcename: "n74" targetname: "n80" label: "0" color: red} -edge: {sourcename: "n74" targetname: "n86" label: "1" } -} - -graph: { title: "n80" label: "80" status:clustered color:yellow +graph: { title: "0x80ae450" label: "main" status:clustered color:white +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: 20 +node: {title: "n86" label: "PhiM 86" color: green info1: "visited: 19 "} edge: {sourcename: "n86" targetname: "n96" label: "0" color: blue} edge: {sourcename: "n86" targetname: "n87" label: "1" color: blue} -node: {title: "n81" label: "Jmp 81" info1: "visited: 20 -"} -node: {title: "n87" label: "ProjM 0 87" color: yellow info1: "visited: 20 +node: {title: "n87" label: "ProjM 0 87" color: yellow info1: "visited: 19 "} edge: {sourcename: "n87" targetname: "n88" label: "0" color: blue} -node: {title: "n88" label: "Store 88" info1: "visited: 20 +node: {title: "n88" label: "Store 88" info1: "visited: 19 "} 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: "n89" label: "PhiIs 89" color: green info1: "visited: 20 +node: {title: "n94" label: "Sel VAR_A 94" info1: "visited: 19 +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 "} edge: {sourcename: "n89" targetname: "n92" label: "0" } edge: {sourcename: "n89" targetname: "n90" label: "1" } -node: {title: "n90" label: "PhiIs 90" color: green info1: "visited: 20 +node: {title: "n90" label: "PhiIs 90" color: green info1: "visited: 19 "} edge: {sourcename: "n90" targetname: "n91" label: "0" } edge: {sourcename: "n90" targetname: "n89" label: "1" } -node: {title: "n94" label: "Sel VAR_A 94" info1: "visited: 20 -Selecting entity of type int - from entity of type GlobalType +node: {title: "n81" label: "Jmp 81" info1: "visited: 19 "} -edge: {sourcename: "n94" targetname: "n86" label: "0" color: blue} -edge: {sourcename: "n94" targetname: "n95" label: "1" } } -graph: { title: "n85" label: "85" status:clustered color:yellow +graph: { title: "n85" label: "Block 85" status:clustered color:yellow edge: {sourcename: "n85" targetname: "n78" label: "0" color: red} -node: {title: "n84" label: "Jmp 84" info1: "visited: 21 -"} -node: {title: "n92" label: "ProjIs 0 92" color: yellow info1: "visited: 21 +node: {title: "n92" label: "ProjIs 0 92" color: yellow info1: "visited: 19 "} edge: {sourcename: "n92" targetname: "n93" label: "0" } +node: {title: "n84" label: "Jmp 84" info1: "visited: 19 +"} } -graph: { title: "n77" label: "77" status:clustered color:yellow +graph: { title: "n77" label: "Block 77" status:clustered color:yellow edge: {sourcename: "n77" targetname: "n78" label: "0" color: red} -node: {title: "n78" label: "ProjX 0 78" color: yellow info1: "visited: 22 +node: {title: "n96" label: "ProjM 1 96" color: yellow info1: "visited: 19 "} -edge: {sourcename: "n78" targetname: "n79" label: "0" color: red} -node: {title: "n79" label: "Start 79" color: blue info1: "visited: 22 -start of method of type main_tp - param 0 type: int -"} -node: {title: "n91" label: "0x1Is 91" color: yellow info1: "visited: 22 -Const of type type_unknown +edge: {sourcename: "n96" targetname: "n79" label: "0" color: blue} +node: {title: "n95" label: "ProjP 3 95" color: yellow info1: "visited: 19 "} -node: {title: "n93" label: "ProjT 4 93" color: yellow info1: "visited: 22 +edge: {sourcename: "n95" targetname: "n79" label: "0" } +node: {title: "n93" label: "ProjT 4 93" color: yellow info1: "visited: 19 "} edge: {sourcename: "n93" targetname: "n79" label: "0" } -node: {title: "n95" label: "ProjP 3 95" color: yellow info1: "visited: 22 +node: {title: "n91" label: "0x1Is 91" color: yellow info1: "visited: 19 +Const of type type_unknown "} -edge: {sourcename: "n95" targetname: "n79" label: "0" } -node: {title: "n96" label: "ProjM 1 96" color: yellow info1: "visited: 22 +node: {title: "n78" label: "ProjX 0 78" color: yellow info1: "visited: 19 +"} +edge: {sourcename: "n78" targetname: "n79" label: "0" color: red} +node: {title: "n79" label: "Start 79" color: blue info1: "visited: 19 +start of method of type main_tp + param 0 type: int "} -edge: {sourcename: "n96" targetname: "n79" label: "0" color: blue} } -node: {title: "n76" label: "Bad 76" info1: "visited: 0 +graph: { title: "n75" label: "Block 75" status:clustered color:yellow +node: {title: "n74" label: "End 74" color: blue info1: "visited: 19 "} +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 1296acd1c..479e588fb 100644 --- a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg +++ b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg @@ -17,15 +17,16 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n17" label: "17" status:clustered color:yellow +graph: { title: "0x80ad150" 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 "} } -graph: { title: "n29" label: "29" status:clustered color:yellow +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: 5 +node: {title: "n32" label: "Return 32" info1: "visited: 4 return in method of type FLOAT_EXAMPLE_main res 0 type: dbl "} @@ -33,22 +34,22 @@ edge: {sourcename: "n32" targetname: "n24" label: "0" color: blue} edge: {sourcename: "n32" targetname: "n30" label: "1" } } -graph: { title: "n19" label: "19" status:clustered color:yellow +graph: { title: "n19" label: "Block 19" status:clustered color:yellow edge: {sourcename: "n19" targetname: "n23" label: "0" color: red} -node: {title: "n23" label: "ProjX 0 23" color: yellow info1: "visited: 6 +node: {title: "n24" label: "ProjM 1 24" color: yellow info1: "visited: 4 "} -edge: {sourcename: "n23" targetname: "n20" label: "0" color: red} -node: {title: "n20" label: "Start 20" color: blue info1: "visited: 6 -start of method of type FLOAT_EXAMPLE_main -"} -node: {title: "n30" label: "1.234567890123456716800000000000E+19D 30" color: yellow info1: "visited: 6 +edge: {sourcename: "n24" targetname: "n20" label: "0" color: blue} +node: {title: "n30" label: "1.234567890123456716800000000000E+19D 30" color: yellow info1: "visited: 4 Const of type type_unknown "} -node: {title: "n24" label: "ProjM 1 24" color: yellow info1: "visited: 6 +node: {title: "n23" label: "ProjX 0 23" color: yellow info1: "visited: 4 +"} +edge: {sourcename: "n23" targetname: "n20" label: "0" color: red} +node: {title: "n20" label: "Start 20" color: blue info1: "visited: 4 +start of method of type FLOAT_EXAMPLE_main "} -edge: {sourcename: "n24" targetname: "n20" label: "0" color: blue} } -node: {title: "n21" label: "Bad 21" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg index 2edcde9fe..d5aca8599 100644 --- a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg @@ -17,96 +17,97 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n64" label: "64" status:clustered color:yellow +graph: { title: "0x80ae348" label: "GLOBAL_CSE_EXAMPLE_main" status:clustered color:white +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 "} } -graph: { title: "n66" label: "66" status:clustered color:yellow +node: {title: "n88" label: "ProjM 1 88" color: yellow info1: "visited: 12 +"} +edge: {sourcename: "n88" targetname: "n73" label: "0" color: blue} +node: {title: "n86" label: "AddIs 86" info1: "visited: 12 +"} +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 +Const of type type_unknown +"} +node: {title: "n84" label: "SubIs 84" info1: "visited: 12 +"} +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 +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: 13 +node: {title: "n65" label: "Return 65" info1: "visited: 12 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: 13 +node: {title: "n83" label: "PhiIs 83" color: green info1: "visited: 12 "} edge: {sourcename: "n83" targetname: "n86" label: "0" } edge: {sourcename: "n83" targetname: "n84" label: "1" } } -graph: { title: "n68" label: "68" status:clustered color:yellow -edge: {sourcename: "n68" targetname: "n69" label: "0" color: red} -node: {title: "n67" label: "Jmp 67" info1: "visited: 14 -"} -} - -graph: { title: "n70" label: "70" status:clustered color:yellow -edge: {sourcename: "n70" targetname: "n71" label: "0" color: red} -node: {title: "n74" label: "Cond 74" info1: "visited: 15 +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 "} -edge: {sourcename: "n74" targetname: "n75" label: "0" } } -graph: { title: "n72" label: "72" status:clustered color:yellow -edge: {sourcename: "n72" targetname: "n71" label: "0" color: red} -node: {title: "n73" label: "Start 73" color: blue info1: "visited: 16 -start of method of type GLOBAL_CSE_EXAMPLE_main - param 0 type: int +node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 12 "} -} - -graph: { title: "n81" label: "81" status:clustered color:yellow -edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} -node: {title: "n80" label: "Jmp 80" info1: "visited: 17 +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 "} } -node: {title: "n69" label: "ProjX 1 69" color: yellow info1: "visited: 18 +node: {title: "n69" label: "ProjX 1 69" color: yellow info1: "visited: 12 "} edge: {sourcename: "n69" targetname: "n74" label: "0" color: red} -node: {title: "n71" label: "ProjX 0 71" color: yellow info1: "visited: 18 -"} -edge: {sourcename: "n71" targetname: "n73" label: "0" color: red} -node: {title: "n75" label: "Projb Eq 75" color: yellow info1: "visited: 18 +node: {title: "n75" label: "Projb Eq 75" color: yellow info1: "visited: 12 "} edge: {sourcename: "n75" targetname: "n76" label: "0" } -node: {title: "n76" label: "CmpT 76" info1: "visited: 18 +node: {title: "n76" label: "CmpT 76" info1: "visited: 12 "} edge: {sourcename: "n76" targetname: "n78" label: "0" } edge: {sourcename: "n76" targetname: "n77" label: "1" } -node: {title: "n77" label: "0x2Is 77" color: yellow info1: "visited: 18 -Const of type type_unknown -"} -node: {title: "n78" label: "ProjIs 0 78" color: yellow info1: "visited: 18 +node: {title: "n78" label: "ProjIs 0 78" color: yellow info1: "visited: 12 "} edge: {sourcename: "n78" targetname: "n79" label: "0" } -node: {title: "n79" label: "ProjT 4 79" color: yellow info1: "visited: 18 +node: {title: "n79" label: "ProjT 4 79" color: yellow info1: "visited: 12 "} edge: {sourcename: "n79" targetname: "n73" label: "0" } -node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 18 -"} -edge: {sourcename: "n82" targetname: "n74" label: "0" color: red} -node: {title: "n84" label: "SubIs 84" info1: "visited: 18 -"} -edge: {sourcename: "n84" targetname: "n78" label: "0" } -edge: {sourcename: "n84" targetname: "n85" label: "1" } -node: {title: "n85" label: "0x3Is 85" color: yellow info1: "visited: 18 +node: {title: "n77" label: "0x2Is 77" color: yellow info1: "visited: 12 Const of type type_unknown "} -node: {title: "n86" label: "AddIs 86" info1: "visited: 18 -"} -edge: {sourcename: "n86" targetname: "n84" label: "0" } -edge: {sourcename: "n86" targetname: "n87" label: "1" } -node: {title: "n87" label: "0x5Is 87" color: yellow info1: "visited: 18 -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 "} -node: {title: "n88" label: "ProjM 1 88" color: yellow info1: "visited: 18 +edge: {sourcename: "n74" targetname: "n75" label: "0" } +} + +node: {title: "n71" label: "ProjX 0 71" color: yellow info1: "visited: 12 "} -edge: {sourcename: "n88" targetname: "n73" label: "0" color: blue} -node: {title: "n91" label: "Bad 91" info1: "visited: 0 +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 +start of method of type GLOBAL_CSE_EXAMPLE_main + param 0 type: int "} } + +} + +} diff --git a/testprograms/ref-results/GLOBAL_VAR_main-all.vcg b/testprograms/ref-results/GLOBAL_VAR_main-all.vcg deleted file mode 100644 index b26a0eb07..000000000 --- a/testprograms/ref-results/GLOBAL_VAR_main-all.vcg +++ /dev/null @@ -1,124 +0,0 @@ -graph: { title: "ir graph of GLOBAL_VAR_main" -display_edge_labels: yes -layoutalgorithm: mindepth -manhattan_edges: yes -port_sharing: no -orientation: bottom_to_top -classname 1: "Data" -classname 2: "Block" -classname 3: "Entity type" -classname 4: "Entity owner" -classname 5: "Method Param" -classname 6: "Method Res" -classname 7: "Super" -classname 8: "Union" -classname 9: "Points-to" -classname 10: "Array Element Type" -classname 11: "Overwrites" -classname 12: "Member" - -node: {title: "n39" label: "End 39" color: blue info1: "visited: 11 -"} -edge: { sourcename: "n39" targetname: "n40" class: 2 priority: 2 linestyle: dotted} -node: {title: "n40" label: "Block 40" color: lightyellow info1: "visited: 11 -"} -edge: {sourcename: "n40" targetname: "n41" label: "0" color: red} -node: {title: "n41" label: "Return 41" info1: "visited: 11 -return in method of type GLOBAL_VAR_main -"} -edge: { sourcename: "n41" targetname: "n42" class: 2 priority: 2 linestyle: dotted} -edge: {sourcename: "n41" targetname: "n46" label: "0" color: blue} -node: {title: "n42" label: "Block 42" color: lightyellow info1: "visited: 11 -"} -edge: {sourcename: "n42" targetname: "n43" label: "0" color: red} -node: {title: "n43" label: "ProjX 0 43" color: yellow info1: "visited: 11 -"} -edge: { sourcename: "n43" targetname: "n44" class: 2 priority: 2 linestyle: dotted} -edge: {sourcename: "n43" targetname: "n45" label: "0" color: red} -node: {title: "n44" label: "Block 44" color: lightyellow info1: "visited: 11 -"} -edge: {sourcename: "n44" targetname: "n43" label: "0" color: red} -node: {title: "n45" label: "Start 45" color: blue info1: "visited: 11 -start of method of type GLOBAL_VAR_main -"} -edge: { sourcename: "n45" targetname: "n44" class: 2 priority: 2 linestyle: dotted} -node: {title: "n46" label: "ProjM 0 46" color: yellow info1: "visited: 11 -"} -edge: { sourcename: "n46" targetname: "n42" class: 2 priority: 2 linestyle: dotted} -edge: {sourcename: "n46" targetname: "n47" label: "0" color: blue} -node: {title: "n47" label: "Store 47" info1: "visited: 11 -"} -edge: { sourcename: "n47" targetname: "n42" class: 2 priority: 2 linestyle: dotted} -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: "n48" label: "0x2Is 48" color: yellow info1: "visited: 11 -Const of type type_unknown -"} -edge: { sourcename: "n48" targetname: "n44" class: 2 priority: 2 linestyle: dotted} -node: {title: "n49" label: "Sel i 49" info1: "visited: 11 -Selecting entity of type int - from entity of type GlobalType -"} -edge: { sourcename: "n49" targetname: "n42" class: 2 priority: 2 linestyle: dotted} -edge: {sourcename: "n49" targetname: "n51" label: "0" color: blue} -edge: {sourcename: "n49" targetname: "n50" label: "1" } -node: {title: "n50" label: "ProjP 3 50" color: yellow info1: "visited: 11 -"} -edge: { sourcename: "n50" targetname: "n44" class: 2 priority: 2 linestyle: dotted} -edge: {sourcename: "n50" targetname: "n45" label: "0" } -node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 11 -"} -edge: { sourcename: "n51" targetname: "n44" class: 2 priority: 2 linestyle: dotted} -edge: {sourcename: "n51" targetname: "n45" label: "0" color: blue} -node: {title: "e16" label: "ent i" color: yellow - info1: " -id: e16 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: i -ld_name: GlobalType_i -offset: -1" -} -edge: { sourcename: "e16" targetname: "t12"class: 3 label: "type" color: red} -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t0" targetname: "e15"class: 12 label: "member" color:blue} -edge: { sourcename: "t0" targetname: "e16"class: 12 label: "member" color:blue} -node: {title: "e15" label: "ent GLOBAL_VAR_main" color: yellow - info1: " -id: e15 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: GLOBAL_VAR_main -ld_name: GlobalType_GLOBAL_VAR_main -offset: -1 -irg = g29" -} -edge: { sourcename: "e15" targetname: "t13"class: 3 label: "type" color: red} -edge: { sourcename: "e15" targetname: "n14"label: "value 0"} -node: {title: "n14" label: "&(GlobalType_GLOBAL_VAR_main)P 14" color: yellow info1: "visited: 1 -Const of type type_unknown -"} -node: {title: "n4" label: "Bad 4" info1: "visited: 1 -"} -node: {title: "t13" label: "method GLOBAL_VAR_main" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -node: {title: "t12" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 4B, -"} -node: {title: "t17" label: "class GLOBAL_VAR_mainframe_tp" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "n49" targetname: "e16"class: 2 priority: 2 linestyle: dotted} -} diff --git a/testprograms/ref-results/GLOBAL_VAR_main.vcg b/testprograms/ref-results/GLOBAL_VAR_main.vcg index 3b0057b68..44e574cf9 100644 --- a/testprograms/ref-results/GLOBAL_VAR_main.vcg +++ b/testprograms/ref-results/GLOBAL_VAR_main.vcg @@ -17,27 +17,28 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n40" label: "40" status:clustered color:yellow +graph: { title: "0x80ae208" 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 "} } -graph: { title: "n42" label: "42" status:clustered color:yellow +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: 8 +node: {title: "n41" label: "Return 41" info1: "visited: 7 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: 8 +node: {title: "n46" label: "ProjM 0 46" color: yellow info1: "visited: 7 "} edge: {sourcename: "n46" targetname: "n47" label: "0" color: blue} -node: {title: "n47" label: "Store 47" info1: "visited: 8 +node: {title: "n47" label: "Store 47" info1: "visited: 7 "} 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: 8 +node: {title: "n49" label: "Sel i 49" info1: "visited: 7 Selecting entity of type int from entity of type GlobalType "} @@ -45,25 +46,25 @@ edge: {sourcename: "n49" targetname: "n51" label: "0" color: blue} edge: {sourcename: "n49" targetname: "n50" label: "1" } } -graph: { title: "n44" label: "44" status:clustered color:yellow +graph: { title: "n44" label: "Block 44" status:clustered color:yellow edge: {sourcename: "n44" targetname: "n43" label: "0" color: red} -node: {title: "n43" label: "ProjX 0 43" color: yellow info1: "visited: 9 +node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 7 "} -edge: {sourcename: "n43" targetname: "n45" label: "0" color: red} -node: {title: "n45" label: "Start 45" color: blue info1: "visited: 9 -start of method of type GLOBAL_VAR_main +edge: {sourcename: "n51" targetname: "n45" label: "0" color: blue} +node: {title: "n50" label: "ProjP 3 50" color: yellow info1: "visited: 7 "} -node: {title: "n48" label: "0x2Is 48" color: yellow info1: "visited: 9 +edge: {sourcename: "n50" targetname: "n45" label: "0" } +node: {title: "n48" label: "0x2Is 48" color: yellow info1: "visited: 7 Const of type type_unknown "} -node: {title: "n50" label: "ProjP 3 50" color: yellow info1: "visited: 9 +node: {title: "n43" label: "ProjX 0 43" color: yellow info1: "visited: 7 "} -edge: {sourcename: "n50" targetname: "n45" label: "0" } -node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 9 +edge: {sourcename: "n43" targetname: "n45" label: "0" color: red} +node: {title: "n45" label: "Start 45" color: blue info1: "visited: 7 +start of method of type GLOBAL_VAR_main "} -edge: {sourcename: "n51" targetname: "n45" label: "0" color: blue} } -node: {title: "n54" label: "Bad 54" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg index a95a8ffa5..f48e91ade 100644 --- a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg @@ -17,15 +17,16 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n62" label: "62" status:clustered color:yellow +graph: { title: "0x80ae2a8" 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 "} } -graph: { title: "n66" label: "66" status:clustered color:yellow +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: 14 +node: {title: "n63" label: "Return 63" info1: "visited: 13 return in method of type IF_ELSE_EXAMPLE_main res 0 type: int res 1 type: int @@ -35,25 +36,25 @@ edge: {sourcename: "n63" targetname: "n72" label: "1" } edge: {sourcename: "n63" targetname: "n71" label: "2" } } -graph: { title: "n68" label: "68" status:clustered color:yellow +graph: { title: "n68" label: "Block 68" status:clustered color:yellow edge: {sourcename: "n68" targetname: "n67" label: "0" color: red} -node: {title: "n67" label: "ProjX 0 67" color: yellow info1: "visited: 15 +node: {title: "n73" label: "ProjM 1 73" color: yellow info1: "visited: 13 "} -edge: {sourcename: "n67" targetname: "n69" label: "0" color: red} -node: {title: "n69" label: "Start 69" color: blue info1: "visited: 15 -start of method of type IF_ELSE_EXAMPLE_main -"} -node: {title: "n71" label: "0x2Is 71" color: yellow info1: "visited: 15 +edge: {sourcename: "n73" targetname: "n69" label: "0" color: blue} +node: {title: "n72" label: "0x0Is 72" color: yellow info1: "visited: 13 Const of type type_unknown "} -node: {title: "n72" label: "0x0Is 72" color: yellow info1: "visited: 15 +node: {title: "n71" label: "0x2Is 71" color: yellow info1: "visited: 13 Const of type type_unknown "} -node: {title: "n73" label: "ProjM 1 73" color: yellow info1: "visited: 15 +node: {title: "n67" label: "ProjX 0 67" color: yellow info1: "visited: 13 +"} +edge: {sourcename: "n67" targetname: "n69" label: "0" color: red} +node: {title: "n69" label: "Start 69" color: blue info1: "visited: 13 +start of method of type IF_ELSE_EXAMPLE_main "} -edge: {sourcename: "n73" targetname: "n69" label: "0" color: blue} } -node: {title: "n70" label: "Bad 70" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/IF_EXAMPLE_main.vcg b/testprograms/ref-results/IF_EXAMPLE_main.vcg index 68c250009..f7bd19175 100644 --- a/testprograms/ref-results/IF_EXAMPLE_main.vcg +++ b/testprograms/ref-results/IF_EXAMPLE_main.vcg @@ -17,83 +17,84 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n17" label: "17" status:clustered color:yellow +graph: { title: "0x80ae248" 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 "} } -graph: { title: "n43" label: "43" status:clustered color:yellow +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: 9 +node: {title: "n52" label: "Return 52" info1: "visited: 8 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: 9 +node: {title: "n45" label: "PhiIs 45" color: green info1: "visited: 8 "} edge: {sourcename: "n45" targetname: "n30" label: "0" } edge: {sourcename: "n45" targetname: "n40" label: "1" } } -graph: { title: "n37" label: "37" status:clustered color:yellow +graph: { title: "n37" label: "Block 37" status:clustered color:yellow edge: {sourcename: "n37" targetname: "n36" label: "0" color: red} -node: {title: "n42" label: "Jmp 42" info1: "visited: 10 -"} -node: {title: "n40" label: "SubIs 40" info1: "visited: 10 +node: {title: "n40" label: "SubIs 40" info1: "visited: 8 "} edge: {sourcename: "n40" targetname: "n30" label: "0" } edge: {sourcename: "n40" targetname: "n38" label: "1" } +node: {title: "n42" label: "Jmp 42" info1: "visited: 8 +"} } -graph: { title: "n29" label: "29" status:clustered color:yellow +graph: { title: "n29" label: "Block 29" status:clustered color:yellow edge: {sourcename: "n29" targetname: "n23" label: "0" color: red} -node: {title: "n36" label: "ProjX 1 36" color: yellow info1: "visited: 11 +node: {title: "n35" label: "ProjX 0 35" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n35" targetname: "n34" label: "0" color: red} +node: {title: "n36" label: "ProjX 1 36" color: yellow info1: "visited: 8 "} edge: {sourcename: "n36" targetname: "n34" label: "0" color: red} -node: {title: "n34" label: "Cond 34" info1: "visited: 11 +node: {title: "n34" label: "Cond 34" info1: "visited: 8 "} edge: {sourcename: "n34" targetname: "n33" label: "0" } -node: {title: "n33" label: "Projb Eq 33" color: yellow info1: "visited: 11 +node: {title: "n33" label: "Projb Eq 33" color: yellow info1: "visited: 8 "} edge: {sourcename: "n33" targetname: "n32" label: "0" } -node: {title: "n32" label: "CmpT 32" info1: "visited: 11 +node: {title: "n32" label: "CmpT 32" info1: "visited: 8 "} 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: 11 +node: {title: "n30" label: "ProjIs 0 30" color: yellow info1: "visited: 8 "} edge: {sourcename: "n30" targetname: "n27" label: "0" } -node: {title: "n35" label: "ProjX 0 35" color: yellow info1: "visited: 11 -"} -edge: {sourcename: "n35" targetname: "n34" label: "0" color: red} } -graph: { title: "n19" label: "19" status:clustered color:yellow +graph: { title: "n19" label: "Block 19" status:clustered color:yellow edge: {sourcename: "n19" targetname: "n23" label: "0" color: red} -node: {title: "n23" label: "ProjX 0 23" color: yellow info1: "visited: 12 -"} -edge: {sourcename: "n23" targetname: "n20" label: "0" color: red} -node: {title: "n20" label: "Start 20" color: blue info1: "visited: 12 -start of method of type IF_EXAMPLE_main - param 0 type: int +node: {title: "n24" label: "ProjM 1 24" color: yellow info1: "visited: 8 "} -node: {title: "n31" label: "0x2Is 31" color: yellow info1: "visited: 12 +edge: {sourcename: "n24" targetname: "n20" label: "0" color: blue} +node: {title: "n38" label: "0x3Is 38" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n27" label: "ProjT 4 27" color: yellow info1: "visited: 12 +node: {title: "n27" label: "ProjT 4 27" color: yellow info1: "visited: 8 "} edge: {sourcename: "n27" targetname: "n20" label: "0" } -node: {title: "n38" label: "0x3Is 38" color: yellow info1: "visited: 12 +node: {title: "n31" label: "0x2Is 31" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n24" label: "ProjM 1 24" color: yellow info1: "visited: 12 +node: {title: "n23" label: "ProjX 0 23" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n23" targetname: "n20" label: "0" color: red} +node: {title: "n20" label: "Start 20" color: blue info1: "visited: 8 +start of method of type IF_EXAMPLE_main + param 0 type: int "} -edge: {sourcename: "n24" targetname: "n20" label: "0" color: blue} } -node: {title: "n21" label: "Bad 21" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/IRREGULAR_CF_main.vcg b/testprograms/ref-results/IRREGULAR_CF_main.vcg index 8b287c05c..ddb720333 100644 --- a/testprograms/ref-results/IRREGULAR_CF_main.vcg +++ b/testprograms/ref-results/IRREGULAR_CF_main.vcg @@ -17,102 +17,103 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n65" label: "65" status:clustered color:yellow +graph: { title: "0x80ae340" 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 "} } -graph: { title: "n67" label: "67" status:clustered color:yellow +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: 6 +node: {title: "n66" label: "Return 66" info1: "visited: 5 return in method of type main "} edge: {sourcename: "n66" targetname: "n92" label: "0" color: blue} } -graph: { title: "n69" label: "69" status:clustered color:yellow +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 +"} +} + +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: 7 +node: {title: "n68" label: "Jmp 68" info1: "visited: 5 "} } -graph: { title: "n71" label: "71" status:clustered color:yellow +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 +"} +edge: {sourcename: "n91" targetname: "n85" label: "0" color: red} +node: {title: "n82" label: "ProjX 1 82" color: yellow info1: "visited: 5 +"} +edge: {sourcename: "n82" targetname: "n85" label: "0" color: red} +node: {title: "n85" label: "Cond 85" info1: "visited: 5 +"} +edge: {sourcename: "n85" targetname: "n86" label: "0" } +node: {title: "n86" label: "Projb Eq 86" color: yellow info1: "visited: 5 +"} +edge: {sourcename: "n86" targetname: "n87" label: "0" } +node: {title: "n87" label: "CmpT 87" info1: "visited: 5 +"} +edge: {sourcename: "n87" targetname: "n81" label: "0" } +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: 8 +node: {title: "n70" label: "Jmp 70" info1: "visited: 5 "} } -graph: { title: "n73" label: "73" status:clustered color:yellow +graph: { title: "n73" label: "Block 73" status:clustered color:yellow edge: {sourcename: "n73" targetname: "n74" label: "0" color: red} -node: {title: "n72" label: "ProjX 1 72" color: yellow info1: "visited: 9 +node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 5 +"} +edge: {sourcename: "n84" targetname: "n77" label: "0" color: red} +node: {title: "n72" label: "ProjX 1 72" color: yellow info1: "visited: 5 "} edge: {sourcename: "n72" targetname: "n77" label: "0" color: red} -node: {title: "n77" label: "Cond 77" info1: "visited: 9 +node: {title: "n77" label: "Cond 77" info1: "visited: 5 "} edge: {sourcename: "n77" targetname: "n78" label: "0" } -node: {title: "n78" label: "Projb Eq 78" color: yellow info1: "visited: 9 +node: {title: "n78" label: "Projb Eq 78" color: yellow info1: "visited: 5 "} edge: {sourcename: "n78" targetname: "n79" label: "0" } -node: {title: "n79" label: "CmpT 79" info1: "visited: 9 +node: {title: "n79" label: "CmpT 79" info1: "visited: 5 "} edge: {sourcename: "n79" targetname: "n81" label: "0" } edge: {sourcename: "n79" targetname: "n80" label: "1" } -node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 9 -"} -edge: {sourcename: "n84" targetname: "n77" label: "0" color: red} } -graph: { title: "n75" label: "75" status:clustered color:yellow +graph: { title: "n75" label: "Block 75" status:clustered color:yellow edge: {sourcename: "n75" targetname: "n74" label: "0" color: red} -node: {title: "n74" label: "ProjX 0 74" color: yellow info1: "visited: 10 +node: {title: "n92" label: "ProjM 1 92" color: yellow info1: "visited: 5 "} -edge: {sourcename: "n74" targetname: "n76" label: "0" color: red} -node: {title: "n76" label: "Start 76" color: blue info1: "visited: 10 -start of method of type main -"} -node: {title: "n80" label: "0x1Is 80" color: yellow info1: "visited: 10 +edge: {sourcename: "n92" targetname: "n76" label: "0" color: blue} +node: {title: "n88" label: "0x2Is 88" color: yellow info1: "visited: 5 Const of type type_unknown "} -node: {title: "n81" label: "0x0Is 81" color: yellow info1: "visited: 10 +node: {title: "n81" label: "0x0Is 81" color: yellow info1: "visited: 5 Const of type type_unknown "} -node: {title: "n88" label: "0x2Is 88" color: yellow info1: "visited: 10 +node: {title: "n80" label: "0x1Is 80" color: yellow info1: "visited: 5 Const of type type_unknown "} -node: {title: "n92" label: "ProjM 1 92" color: yellow info1: "visited: 10 -"} -edge: {sourcename: "n92" targetname: "n76" label: "0" color: blue} -} - -graph: { title: "n83" label: "83" status:clustered color:yellow -edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} -node: {title: "n82" label: "ProjX 1 82" color: yellow info1: "visited: 11 -"} -edge: {sourcename: "n82" targetname: "n85" label: "0" color: red} -node: {title: "n85" label: "Cond 85" info1: "visited: 11 -"} -edge: {sourcename: "n85" targetname: "n86" label: "0" } -node: {title: "n86" label: "Projb Eq 86" color: yellow info1: "visited: 11 -"} -edge: {sourcename: "n86" targetname: "n87" label: "0" } -node: {title: "n87" label: "CmpT 87" info1: "visited: 11 +node: {title: "n74" label: "ProjX 0 74" color: yellow info1: "visited: 5 "} -edge: {sourcename: "n87" targetname: "n81" label: "0" } -edge: {sourcename: "n87" targetname: "n88" label: "1" } -node: {title: "n91" label: "ProjX 0 91" color: yellow info1: "visited: 11 +edge: {sourcename: "n74" targetname: "n76" label: "0" color: red} +node: {title: "n76" label: "Start 76" color: blue info1: "visited: 5 +start of method of type main "} -edge: {sourcename: "n91" targetname: "n85" label: "0" color: red} } -graph: { title: "n90" label: "90" status:clustered color:yellow -edge: {sourcename: "n90" targetname: "n91" label: "0" color: red} -node: {title: "n89" label: "Jmp 89" info1: "visited: 12 -"} } -node: {title: "n96" label: "Bad 96" info1: "visited: 0 -"} } diff --git a/testprograms/ref-results/IRR_LOOP_main.vcg b/testprograms/ref-results/IRR_LOOP_main.vcg index c56588403..91f79d06c 100644 --- a/testprograms/ref-results/IRR_LOOP_main.vcg +++ b/testprograms/ref-results/IRR_LOOP_main.vcg @@ -17,117 +17,118 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n62" label: "62" status:clustered color:yellow +graph: { title: "0x80ae340" 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 "} } -graph: { title: "n64" label: "64" status:clustered color:yellow +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: 6 +node: {title: "n63" label: "Return 63" info1: "visited: 5 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: 6 +node: {title: "n89" label: "PhiM 89" color: green info1: "visited: 5 "} edge: {sourcename: "n89" targetname: "n91" label: "0" color: blue} edge: {sourcename: "n89" targetname: "n90" label: "1" color: blue} } -graph: { title: "n66" label: "66" status:clustered color:yellow +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: "n65" label: "ProjX 0 65" color: yellow info1: "visited: 7 +node: {title: "n90" label: "PhiM 90" color: green info1: "visited: 5 +"} +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 "} edge: {sourcename: "n65" targetname: "n70" label: "0" color: red} -node: {title: "n69" label: "ProjX 1 69" color: yellow info1: "visited: 7 +node: {title: "n69" label: "ProjX 1 69" color: yellow info1: "visited: 5 "} edge: {sourcename: "n69" targetname: "n70" label: "0" color: red} -node: {title: "n70" label: "Cond 70" info1: "visited: 7 +node: {title: "n70" label: "Cond 70" info1: "visited: 5 "} edge: {sourcename: "n70" targetname: "n71" label: "0" } -node: {title: "n71" label: "Projb Eq 71" color: yellow info1: "visited: 7 +node: {title: "n71" label: "Projb Eq 71" color: yellow info1: "visited: 5 "} edge: {sourcename: "n71" targetname: "n72" label: "0" } -node: {title: "n72" label: "CmpT 72" info1: "visited: 7 +node: {title: "n72" label: "CmpT 72" info1: "visited: 5 "} edge: {sourcename: "n72" targetname: "n77" label: "0" } edge: {sourcename: "n72" targetname: "n73" label: "1" } -node: {title: "n90" label: "PhiM 90" color: green info1: "visited: 7 -"} -edge: {sourcename: "n90" targetname: "n92" label: "0" color: blue} -edge: {sourcename: "n90" targetname: "n91" label: "1" color: blue} } -graph: { title: "n68" label: "68" status:clustered color:yellow +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: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 8 +node: {title: "n91" label: "PhiM 91" color: green info1: "visited: 5 +"} +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 +"} +edge: {sourcename: "n88" targetname: "n84" label: "0" color: red} +node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 5 "} edge: {sourcename: "n67" targetname: "n84" label: "0" color: red} -node: {title: "n84" label: "Cond 84" info1: "visited: 8 +node: {title: "n84" label: "Cond 84" info1: "visited: 5 "} edge: {sourcename: "n84" targetname: "n85" label: "0" } -node: {title: "n85" label: "Projb Eq 85" color: yellow info1: "visited: 8 +node: {title: "n85" label: "Projb Eq 85" color: yellow info1: "visited: 5 "} edge: {sourcename: "n85" targetname: "n86" label: "0" } -node: {title: "n86" label: "CmpT 86" info1: "visited: 8 +node: {title: "n86" label: "CmpT 86" info1: "visited: 5 "} edge: {sourcename: "n86" targetname: "n77" label: "0" } edge: {sourcename: "n86" targetname: "n73" label: "1" } -node: {title: "n88" label: "ProjX 0 88" color: yellow info1: "visited: 8 -"} -edge: {sourcename: "n88" targetname: "n84" label: "0" color: red} -node: {title: "n91" label: "PhiM 91" color: green info1: "visited: 8 -"} -edge: {sourcename: "n91" targetname: "n92" label: "0" color: blue} -edge: {sourcename: "n91" targetname: "n90" label: "1" color: blue} } -graph: { title: "n79" label: "79" status:clustered color:yellow +graph: { title: "n79" label: "Block 79" status:clustered color:yellow edge: {sourcename: "n79" targetname: "n75" label: "0" color: red} -node: {title: "n78" label: "ProjX 0 78" color: yellow info1: "visited: 9 +node: {title: "n87" label: "ProjX 1 87" color: yellow info1: "visited: 5 +"} +edge: {sourcename: "n87" targetname: "n80" label: "0" color: red} +node: {title: "n78" label: "ProjX 0 78" color: yellow info1: "visited: 5 "} edge: {sourcename: "n78" targetname: "n80" label: "0" color: red} -node: {title: "n80" label: "Cond 80" info1: "visited: 9 +node: {title: "n80" label: "Cond 80" info1: "visited: 5 "} edge: {sourcename: "n80" targetname: "n81" label: "0" } -node: {title: "n81" label: "Projb Eq 81" color: yellow info1: "visited: 9 +node: {title: "n81" label: "Projb Eq 81" color: yellow info1: "visited: 5 "} edge: {sourcename: "n81" targetname: "n82" label: "0" } -node: {title: "n82" label: "CmpT 82" info1: "visited: 9 +node: {title: "n82" label: "CmpT 82" info1: "visited: 5 "} edge: {sourcename: "n82" targetname: "n77" label: "0" } edge: {sourcename: "n82" targetname: "n83" label: "1" } -node: {title: "n87" label: "ProjX 1 87" color: yellow info1: "visited: 9 -"} -edge: {sourcename: "n87" targetname: "n80" label: "0" color: red} } -graph: { title: "n74" label: "74" status:clustered color:yellow +graph: { title: "n74" label: "Block 74" status:clustered color:yellow edge: {sourcename: "n74" targetname: "n75" label: "0" color: red} -node: {title: "n73" label: "0x2Is 73" color: yellow info1: "visited: 10 -Const of type type_unknown +node: {title: "n92" label: "ProjM 1 92" color: yellow info1: "visited: 5 "} -node: {title: "n75" label: "ProjX 0 75" color: yellow info1: "visited: 10 -"} -edge: {sourcename: "n75" targetname: "n76" label: "0" color: red} -node: {title: "n76" label: "Start 76" color: blue info1: "visited: 10 -start of method of type main +edge: {sourcename: "n92" targetname: "n76" label: "0" color: blue} +node: {title: "n83" label: "0x1Is 83" color: yellow info1: "visited: 5 +Const of type type_unknown "} -node: {title: "n77" label: "0x0Is 77" color: yellow info1: "visited: 10 +node: {title: "n77" label: "0x0Is 77" color: yellow info1: "visited: 5 Const of type type_unknown "} -node: {title: "n83" label: "0x1Is 83" color: yellow info1: "visited: 10 +node: {title: "n73" label: "0x2Is 73" color: yellow info1: "visited: 5 Const of type type_unknown "} -node: {title: "n92" label: "ProjM 1 92" color: yellow info1: "visited: 10 +node: {title: "n75" label: "ProjX 0 75" color: yellow info1: "visited: 5 +"} +edge: {sourcename: "n75" targetname: "n76" label: "0" color: red} +node: {title: "n76" label: "Start 76" color: blue info1: "visited: 5 +start of method of type main "} -edge: {sourcename: "n92" targetname: "n76" label: "0" color: blue} } -node: {title: "n96" label: "Bad 96" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg index 957fee36d..168d05cb1 100644 --- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg +++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg @@ -17,149 +17,150 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n78" label: "78" status:clustered color:yellow +graph: { title: "0x80ae490" 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 "} } -graph: { title: "n80" label: "80" status:clustered color:yellow +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: 16 +node: {title: "n79" label: "Return 79" info1: "visited: 15 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: "n113" label: "ProjIu 2 113" color: yellow info1: "visited: 16 +node: {title: "n115" label: "ProjM 0 115" color: yellow info1: "visited: 15 +"} +edge: {sourcename: "n115" targetname: "n114" label: "0" color: blue} +node: {title: "n113" label: "ProjIu 2 113" color: yellow info1: "visited: 15 "} edge: {sourcename: "n113" targetname: "n114" label: "0" } -node: {title: "n114" label: "Load 114" info1: "visited: 16 +node: {title: "n114" label: "Load 114" info1: "visited: 15 "} edge: {sourcename: "n114" targetname: "n97" label: "0" color: blue} edge: {sourcename: "n114" targetname: "n89" label: "1" } -node: {title: "n115" label: "ProjM 0 115" color: yellow info1: "visited: 16 -"} -edge: {sourcename: "n115" targetname: "n114" label: "0" color: blue} } -graph: { title: "n82" label: "82" status:clustered color:yellow +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: 17 +node: {title: "n81" label: "ProjX 1 81" color: yellow info1: "visited: 15 "} edge: {sourcename: "n81" targetname: "n84" label: "0" color: red} -node: {title: "n83" label: "ProjX 0 83" color: yellow info1: "visited: 17 +node: {title: "n83" label: "ProjX 0 83" color: yellow info1: "visited: 15 "} edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} -node: {title: "n84" label: "Cond 84" info1: "visited: 17 +node: {title: "n84" label: "Cond 84" info1: "visited: 15 "} edge: {sourcename: "n84" targetname: "n85" label: "0" } -node: {title: "n85" label: "Projb Gt 85" color: yellow info1: "visited: 17 +node: {title: "n85" label: "Projb Gt 85" color: yellow info1: "visited: 15 "} edge: {sourcename: "n85" targetname: "n86" label: "0" } -node: {title: "n86" label: "CmpT 86" info1: "visited: 17 +node: {title: "n86" label: "CmpT 86" info1: "visited: 15 "} 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: 17 +node: {title: "n87" label: "ProjIu 2 87" color: yellow info1: "visited: 15 "} edge: {sourcename: "n87" targetname: "n88" label: "0" } -node: {title: "n88" label: "Load 88" info1: "visited: 17 +node: {title: "n88" label: "Load 88" info1: "visited: 15 "} 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: 17 +node: {title: "n96" label: "PhiM 96" color: green info1: "visited: 15 "} 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: 17 +node: {title: "n97" label: "ProjM 0 97" color: yellow info1: "visited: 15 "} edge: {sourcename: "n97" targetname: "n98" label: "0" color: blue} -node: {title: "n98" label: "Store 98" info1: "visited: 17 +node: {title: "n98" label: "Store 98" info1: "visited: 15 "} 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: 17 +node: {title: "n100" label: "ProjM 0 100" color: yellow info1: "visited: 15 "} edge: {sourcename: "n100" targetname: "n101" label: "0" color: blue} -node: {title: "n101" label: "Store 101" info1: "visited: 17 +node: {title: "n101" label: "Store 101" info1: "visited: 15 "} 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: "n102" label: "ProjIu 2 102" color: yellow info1: "visited: 17 +node: {title: "n105" label: "ProjM 0 105" color: yellow info1: "visited: 15 +"} +edge: {sourcename: "n105" targetname: "n103" label: "0" color: blue} +node: {title: "n102" label: "ProjIu 2 102" color: yellow info1: "visited: 15 "} edge: {sourcename: "n102" targetname: "n103" label: "0" } -node: {title: "n103" label: "Load 103" info1: "visited: 17 +node: {title: "n103" label: "Load 103" info1: "visited: 15 "} 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: 17 +node: {title: "n104" label: "ProjM 0 104" color: yellow info1: "visited: 15 "} edge: {sourcename: "n104" targetname: "n88" label: "0" color: blue} -node: {title: "n105" label: "ProjM 0 105" color: yellow info1: "visited: 17 -"} -edge: {sourcename: "n105" targetname: "n103" label: "0" color: blue} } -graph: { title: "n90" label: "90" status:clustered color:yellow +graph: { title: "n90" label: "Block 90" status:clustered color:yellow edge: {sourcename: "n90" targetname: "n91" label: "0" color: red} -node: {title: "n89" label: "Sel VAR_A 89" info1: "visited: 18 -Selecting entity of type int - from entity of type GlobalType +node: {title: "n112" label: "Jmp 112" info1: "visited: 15 "} -edge: {sourcename: "n89" targetname: "n95" label: "0" color: blue} -edge: {sourcename: "n89" targetname: "n94" label: "1" } -node: {title: "n99" label: "Sel VAR_B 99" info1: "visited: 18 -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: "n106" label: "ProjM 0 106" color: yellow info1: "visited: 18 +node: {title: "n106" label: "ProjM 0 106" color: yellow info1: "visited: 15 "} edge: {sourcename: "n106" targetname: "n107" label: "0" color: blue} -node: {title: "n107" label: "Store 107" info1: "visited: 18 +node: {title: "n107" label: "Store 107" info1: "visited: 15 "} 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: 18 +node: {title: "n109" label: "ProjM 0 109" color: yellow info1: "visited: 15 "} edge: {sourcename: "n109" targetname: "n110" label: "0" color: blue} -node: {title: "n110" label: "Store 110" info1: "visited: 18 +node: {title: "n110" label: "Store 110" info1: "visited: 15 "} 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: "n112" label: "Jmp 112" info1: "visited: 18 +node: {title: "n99" label: "Sel VAR_B 99" info1: "visited: 15 +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 +Selecting entity of type int + from entity of type GlobalType +"} +edge: {sourcename: "n89" targetname: "n95" label: "0" color: blue} +edge: {sourcename: "n89" targetname: "n94" label: "1" } } -graph: { title: "n92" label: "92" status:clustered color:yellow +graph: { title: "n92" label: "Block 92" status:clustered color:yellow edge: {sourcename: "n92" targetname: "n91" label: "0" color: red} -node: {title: "n91" label: "ProjX 0 91" color: yellow info1: "visited: 19 -"} -edge: {sourcename: "n91" targetname: "n93" label: "0" color: red} -node: {title: "n93" label: "Start 93" color: blue info1: "visited: 19 -start of method of type main +node: {title: "n111" label: "0x0Iu 111" color: yellow info1: "visited: 15 +Const of type type_unknown "} -node: {title: "n94" label: "ProjP 3 94" color: yellow info1: "visited: 19 +node: {title: "n108" label: "0x1Iu 108" color: yellow info1: "visited: 15 +Const of type type_unknown "} -edge: {sourcename: "n94" targetname: "n93" label: "0" } -node: {title: "n95" label: "ProjM 1 95" color: yellow info1: "visited: 19 +node: {title: "n95" label: "ProjM 1 95" color: yellow info1: "visited: 15 "} edge: {sourcename: "n95" targetname: "n93" label: "0" color: blue} -node: {title: "n108" label: "0x1Iu 108" color: yellow info1: "visited: 19 -Const of type type_unknown +node: {title: "n94" label: "ProjP 3 94" color: yellow info1: "visited: 15 "} -node: {title: "n111" label: "0x0Iu 111" color: yellow info1: "visited: 19 -Const of type type_unknown +edge: {sourcename: "n94" targetname: "n93" label: "0" } +node: {title: "n91" label: "ProjX 0 91" color: yellow info1: "visited: 15 +"} +edge: {sourcename: "n91" targetname: "n93" label: "0" color: red} +node: {title: "n93" label: "Start 93" color: blue info1: "visited: 15 +start of method of type main "} } -node: {title: "n118" label: "Bad 118" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg deleted file mode 100644 index 71e427cb3..000000000 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg +++ /dev/null @@ -1,225 +0,0 @@ -graph: { title: "ir graph of OO_INLINE_EXAMPLE_main" -display_edge_labels: no -layoutalgorithm: mindepth -manhattan_edges: yes -port_sharing: no -orientation: bottom_to_top -classname 1: "Data" -classname 2: "Block" -classname 3: "Entity type" -classname 4: "Entity owner" -classname 5: "Method Param" -classname 6: "Method Res" -classname 7: "Super" -classname 8: "Union" -classname 9: "Points-to" -classname 10: "Array Element Type" -classname 11: "Overwrites" -classname 12: "Member" - -graph: { title: "n195" label: "195" status:clustered color:yellow -node: {title: "n194" label: "End 194" color: blue info1: "visited: 26 -"} -} - -graph: { title: "n200" label: "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: 27 -"} -edge: {sourcename: "n204" targetname: "n215" label: "0" color: blue} -edge: {sourcename: "n204" targetname: "n205" label: "1" color: blue} -node: {title: "n201" label: "Jmp 201" info1: "visited: 27 -"} -node: {title: "n205" label: "Store 205" info1: "visited: 27 -"} -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: "n206" label: "PhiIs 206" color: green info1: "visited: 27 -"} -edge: {sourcename: "n206" targetname: "n209" label: "0" } -edge: {sourcename: "n206" targetname: "n207" label: "1" } -node: {title: "n207" label: "PhiIs 207" color: green info1: "visited: 27 -"} -edge: {sourcename: "n207" targetname: "n208" label: "0" } -edge: {sourcename: "n207" targetname: "n206" label: "1" } -node: {title: "n210" label: "Sel a 210" info1: "visited: 27 -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" } -} - -graph: { title: "n203" label: "203" status:clustered color:yellow -edge: {sourcename: "n203" targetname: "n198" label: "0" color: red} -node: {title: "n202" label: "Jmp 202" info1: "visited: 28 -"} -node: {title: "n208" label: "0x0Is 208" color: yellow info1: "visited: 28 -Const of type type_unknown -"} -node: {title: "n211" label: "ProjP 2 211" color: yellow info1: "visited: 28 -"} -edge: {sourcename: "n211" targetname: "n212" label: "0" } -node: {title: "n212" label: "Alloc 212" info1: "visited: 28 -allocating entity of type PRIMA_INLINE -"} -edge: {sourcename: "n212" targetname: "n214" label: "0" color: blue} -edge: {sourcename: "n212" targetname: "n213" label: "1" } -node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 28 -"} -edge: {sourcename: "n215" targetname: "n216" label: "0" color: blue} -node: {title: "n216" label: "Store 216" info1: "visited: 28 -"} -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: 28 -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: 28 -"} -edge: {sourcename: "n219" targetname: "n212" label: "0" color: blue} -} - -graph: { title: "n197" label: "197" status:clustered color:yellow -edge: {sourcename: "n197" targetname: "n198" label: "0" color: red} -node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 29 -"} -edge: {sourcename: "n198" targetname: "n199" label: "0" color: red} -node: {title: "n199" label: "Start 199" color: blue info1: "visited: 29 -start of method of type OO_INLINE_EXAMPLE_main -"} -node: {title: "n209" label: "0x5Is 209" color: yellow info1: "visited: 29 -Const of type type_unknown -"} -node: {title: "n213" label: "SymC PRIMA_INLINE size 213" info1: "visited: 29 -"} -node: {title: "n214" label: "ProjM 1 214" color: yellow info1: "visited: 29 -"} -edge: {sourcename: "n214" targetname: "n199" label: "0" color: blue} -node: {title: "n217" label: "0x2Is 217" color: yellow info1: "visited: 29 -Const of type type_unknown -"} -} - -node: {title: "n196" label: "Bad 196" info1: "visited: 0 -"} -node: {title: "e15" label: "ent a" color: yellow - info1: " -id: e15 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: a -ld_name: PRIMA_INLINE_a -offset: -1" -} -edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red} -node: {title: "t13" label: "class PRIMA_INLINE" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue} -node: {title: "e18" label: "ent set_a" color: yellow - info1: " -id: e18 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: set_a -ld_name: PRIMA_INLINE_set_a -offset: -1 -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_INLINE_set_a)P 17" color: yellow info1: "visited: 1 -Const of type type_unknown -"} -node: {title: "n4" label: "Bad 4" info1: "visited: 1 -"} -node: {title: "t16" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green} -node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green} -node: {title: "t12" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 4B, -"} -node: {title: "e21" label: "ent c" color: yellow - info1: " -id: e21 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: c -ld_name: PRIMA_INLINE_c -offset: -1 -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_INLINE_c)P 20" color: yellow info1: "visited: 1 -Const of type type_unknown -"} -node: {title: "t19" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green} -node: {title: "e24" label: "ent OO_INLINE_EXAMPLE_main" color: yellow - info1: " -id: e24 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: OO_INLINE_EXAMPLE_main -ld_name: GlobalType_OO_INLINE_EXAMPLE_main -offset: -1 -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_INLINE_EXAMPLE_main)P 23" color: yellow info1: "visited: 1 -Const of type type_unknown -"} -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t0" targetname: "e24"class: 12 label: "member" color:blue} -node: {title: "t22" label: "method OO_INLINE_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t22" targetname: "t12"class: 6 label: "res 0" color: green} -node: {title: "t25" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "n210" targetname: "e15"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n212" targetname: "t13"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n213" targetname: "t13"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n218" targetname: "e15"class: 2 priority: 2 linestyle: dotted} -} diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg index 9ac50efea..2cc483631 100644 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg @@ -17,96 +17,97 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n195" label: "195" status:clustered color:yellow -node: {title: "n194" label: "End 194" color: blue info1: "visited: 21 -"} -} - -graph: { title: "n200" label: "200" status:clustered color:yellow +graph: { title: "0x80aec28" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white +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 +node: {title: "n204" label: "PhiM 204" color: green info1: "visited: 21 "} edge: {sourcename: "n204" targetname: "n215" label: "0" color: blue} edge: {sourcename: "n204" targetname: "n205" label: "1" color: blue} -node: {title: "n201" label: "Jmp 201" info1: "visited: 22 -"} -node: {title: "n205" label: "Store 205" info1: "visited: 22 +node: {title: "n205" label: "Store 205" info1: "visited: 21 "} 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: "n206" label: "PhiIs 206" color: green info1: "visited: 22 +node: {title: "n210" label: "Sel a 210" info1: "visited: 21 +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 "} 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 +node: {title: "n207" label: "PhiIs 207" color: green info1: "visited: 21 "} edge: {sourcename: "n207" targetname: "n208" label: "0" } edge: {sourcename: "n207" targetname: "n206" label: "1" } -node: {title: "n210" label: "Sel a 210" info1: "visited: 22 -Selecting entity of type int - from entity of type PRIMA_INLINE +node: {title: "n201" label: "Jmp 201" info1: "visited: 21 "} -edge: {sourcename: "n210" targetname: "n204" label: "0" color: blue} -edge: {sourcename: "n210" targetname: "n211" label: "1" } } -graph: { title: "n203" label: "203" status:clustered color:yellow +graph: { title: "n203" label: "Block 203" status:clustered color:yellow edge: {sourcename: "n203" targetname: "n198" label: "0" color: red} -node: {title: "n202" label: "Jmp 202" info1: "visited: 23 -"} -node: {title: "n208" label: "0x0Is 208" color: yellow info1: "visited: 23 -Const of type type_unknown -"} -node: {title: "n211" label: "ProjP 2 211" color: yellow info1: "visited: 23 -"} -edge: {sourcename: "n211" targetname: "n212" label: "0" } -node: {title: "n212" label: "Alloc 212" info1: "visited: 23 -allocating entity of type PRIMA_INLINE -"} -edge: {sourcename: "n212" targetname: "n214" label: "0" color: blue} -edge: {sourcename: "n212" targetname: "n213" label: "1" } -node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 23 +node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 21 "} edge: {sourcename: "n215" targetname: "n216" label: "0" color: blue} -node: {title: "n216" label: "Store 216" info1: "visited: 23 +node: {title: "n216" label: "Store 216" info1: "visited: 21 "} 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: 23 +node: {title: "n218" label: "Sel a 218" info1: "visited: 21 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: 23 +node: {title: "n219" label: "ProjM 0 219" color: yellow info1: "visited: 21 "} edge: {sourcename: "n219" targetname: "n212" label: "0" color: blue} -} - -graph: { title: "n197" label: "197" status:clustered color:yellow -edge: {sourcename: "n197" targetname: "n198" label: "0" color: red} -node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 24 +node: {title: "n211" label: "ProjP 2 211" color: yellow info1: "visited: 21 "} -edge: {sourcename: "n198" targetname: "n199" label: "0" color: red} -node: {title: "n199" label: "Start 199" color: blue info1: "visited: 24 -start of method of type OO_INLINE_EXAMPLE_main +edge: {sourcename: "n211" targetname: "n212" label: "0" } +node: {title: "n212" label: "Alloc 212" info1: "visited: 21 +allocating entity of type PRIMA_INLINE "} -node: {title: "n209" label: "0x5Is 209" color: yellow info1: "visited: 24 +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 Const of type type_unknown "} -node: {title: "n213" label: "SymC PRIMA_INLINE size 213" info1: "visited: 24 +node: {title: "n202" label: "Jmp 202" info1: "visited: 21 "} -node: {title: "n214" label: "ProjM 1 214" color: yellow info1: "visited: 24 +} + +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 +Const of type type_unknown +"} +node: {title: "n214" label: "ProjM 1 214" color: yellow info1: "visited: 21 "} edge: {sourcename: "n214" targetname: "n199" label: "0" color: blue} -node: {title: "n217" label: "0x2Is 217" color: yellow info1: "visited: 24 +node: {title: "n213" label: "SymC PRIMA_INLINE size 213" info1: "visited: 21 +"} +node: {title: "n209" label: "0x5Is 209" color: yellow info1: "visited: 21 Const of type type_unknown "} +node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 21 +"} +edge: {sourcename: "n198" targetname: "n199" label: "0" color: red} +node: {title: "n199" label: "Start 199" color: blue info1: "visited: 21 +start of method of type OO_INLINE_EXAMPLE_main +"} } -node: {title: "n196" label: "Bad 196" info1: "visited: 0 +graph: { title: "n195" label: "Block 195" status:clustered color:yellow +node: {title: "n194" label: "End 194" color: blue info1: "visited: 21 "} } + +} + +} diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg deleted file mode 100644 index 246f8481a..000000000 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg +++ /dev/null @@ -1,228 +0,0 @@ -graph: { title: "ir graph of OO_PROGRAM_EXAMPLE_main" -display_edge_labels: yes -layoutalgorithm: mindepth -manhattan_edges: yes -port_sharing: no -orientation: bottom_to_top -classname 1: "Data" -classname 2: "Block" -classname 3: "Entity type" -classname 4: "Entity owner" -classname 5: "Method Param" -classname 6: "Method Res" -classname 7: "Super" -classname 8: "Union" -classname 9: "Points-to" -classname 10: "Array Element Type" -classname 11: "Overwrites" -classname 12: "Member" - -graph: { title: "n108" label: "108" status:clustered color:yellow -edge: {sourcename: "n108" targetname: "n109" label: "0" color: red} -node: {title: "n107" label: "End 107" color: blue info1: "visited: 19 -"} -} - -graph: { title: "n110" label: "110" status:clustered color:yellow -edge: {sourcename: "n110" targetname: "n111" label: "0" color: red} -node: {title: "n109" label: "Return 109" info1: "visited: 20 -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: "n114" label: "ProjIs 0 114" color: yellow info1: "visited: 20 -"} -edge: {sourcename: "n114" targetname: "n115" label: "0" } -node: {title: "n115" label: "ProjT 2 115" color: yellow info1: "visited: 20 -"} -edge: {sourcename: "n115" targetname: "n116" label: "0" } -node: {title: "n116" label: "Call 116" info1: "visited: 20 -calling method of type c - param 0 type: class_prima_ptr - param 1 type: int - resul 0 type: int -"} -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" } -node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 20 -"} -edge: {sourcename: "n118" targetname: "n119" label: "0" } -node: {title: "n119" label: "Alloc 119" info1: "visited: 20 -allocating entity of type PRIMA -"} -edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } -node: {title: "n122" label: "Sel c 122" info1: "visited: 20 -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 -"} -edge: {sourcename: "n123" targetname: "n124" label: "0" color: blue} -node: {title: "n124" label: "Call 124" info1: "visited: 20 -calling method of type set_a - param 0 type: class_prima_ptr - param 1 type: int -"} -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" } -node: {title: "n126" label: "Sel set_a 126" info1: "visited: 20 -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 -"} -edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} -node: {title: "n128" label: "ProjM 0 128" color: yellow info1: "visited: 20 -"} -edge: {sourcename: "n128" targetname: "n116" label: "0" color: blue} -} - -graph: { title: "n112" label: "112" status:clustered color:yellow -edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} -node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 21 -"} -edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} -node: {title: "n113" label: "Start 113" color: blue info1: "visited: 21 -start of method of type OO_PROGRAM_EXAMPLE_main -"} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 21 -Const of type type_unknown -"} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 21 -"} -node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 21 -"} -edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 21 -Const of type type_unknown -"} -} - -node: {title: "n132" label: "Bad 132" info1: "visited: 0 -"} -node: {title: "t19" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green} -node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green} -node: {title: "t13" label: "class PRIMA" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue} -node: {title: "e15" label: "ent a" color: yellow - info1: " -id: e15 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: a -ld_name: PRIMA_a -offset: -1" -} -edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red} -node: {title: "t12" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 4B, -"} -node: {title: "e18" label: "ent set_a" color: yellow - info1: " -id: e18 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: set_a -ld_name: PRIMA_set_a -offset: -1 -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: 1 -Const of type type_unknown -"} -node: {title: "n4" label: "Bad 4" info1: "visited: 1 -"} -node: {title: "t16" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green} -node: {title: "e21" label: "ent c" color: yellow - info1: " -id: e21 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: c -ld_name: PRIMA_c -offset: -1 -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: 1 -Const of type type_unknown -"} -node: {title: "e24" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow - info1: " -id: e24 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: OO_PROGRAM_EXAMPLE_main -ld_name: GlobalType_OO_PROGRAM_EXAMPLE_main -offset: -1 -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: 1 -Const of type type_unknown -"} -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t0" targetname: "e24"class: 12 label: "member" color:blue} -node: {title: "t22" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t22" targetname: "t12"class: 6 label: "res 0" color: green} -node: {title: "t25" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "n116" targetname: "t19"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n119" targetname: "t13"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n120" targetname: "t13"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n122" targetname: "e21"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n124" targetname: "t16"class: 2 priority: 2 linestyle: dotted} -edge: { sourcename: "n126" targetname: "e18"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 d7bafeec9..076569b93 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg @@ -17,13 +17,14 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n108" label: "108" status:clustered color:yellow +graph: { title: "0x80aea48" 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: 15 +node: {title: "n107" label: "End 107" color: blue info1: "visited: 16 "} } -graph: { title: "n110" label: "110" status:clustered color:yellow +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 return in method of type OO_PROGRAM_EXAMPLE_main @@ -31,6 +32,9 @@ return in method of type OO_PROGRAM_EXAMPLE_main "} 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 +"} +edge: {sourcename: "n128" targetname: "n116" label: "0" color: blue} node: {title: "n114" label: "ProjIs 0 114" color: yellow info1: "visited: 16 "} edge: {sourcename: "n114" targetname: "n115" label: "0" } @@ -47,14 +51,6 @@ 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" } -node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 16 -"} -edge: {sourcename: "n118" targetname: "n119" label: "0" } -node: {title: "n119" label: "Alloc 119" info1: "visited: 16 -allocating entity of type PRIMA -"} -edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} -edge: {sourcename: "n119" targetname: "n120" label: "1" } node: {title: "n122" label: "Sel c 122" info1: "visited: 16 Selecting entity of type c from entity of type PRIMA @@ -82,32 +78,37 @@ edge: {sourcename: "n126" targetname: "n118" label: "1" } node: {title: "n127" label: "ProjM 0 127" color: yellow info1: "visited: 16 "} edge: {sourcename: "n127" targetname: "n119" label: "0" color: blue} -node: {title: "n128" label: "ProjM 0 128" color: yellow info1: "visited: 16 +node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 16 "} -edge: {sourcename: "n128" targetname: "n116" label: "0" color: blue} +edge: {sourcename: "n118" targetname: "n119" label: "0" } +node: {title: "n119" label: "Alloc 119" info1: "visited: 16 +allocating entity of type PRIMA +"} +edge: {sourcename: "n119" targetname: "n121" label: "0" color: blue} +edge: {sourcename: "n119" targetname: "n120" label: "1" } } -graph: { title: "n112" label: "112" status:clustered color:yellow +graph: { title: "n112" label: "Block 112" status:clustered color:yellow edge: {sourcename: "n112" targetname: "n111" label: "0" color: red} -node: {title: "n111" label: "ProjX 0 111" color: yellow info1: "visited: 17 -"} -edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} -node: {title: "n113" label: "Start 113" color: blue info1: "visited: 17 -start of method of type OO_PROGRAM_EXAMPLE_main -"} -node: {title: "n117" label: "0x5Is 117" color: yellow info1: "visited: 17 +node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 16 Const of type type_unknown "} -node: {title: "n120" label: "SymC PRIMA size 120" info1: "visited: 17 -"} -node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 17 +node: {title: "n121" label: "ProjM 1 121" color: yellow info1: "visited: 16 "} edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue} -node: {title: "n125" label: "0x2Is 125" color: yellow info1: "visited: 17 +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 +"} +edge: {sourcename: "n111" targetname: "n113" label: "0" color: red} +node: {title: "n113" label: "Start 113" color: blue info1: "visited: 16 +start of method of type OO_PROGRAM_EXAMPLE_main +"} +} + } -node: {title: "n132" label: "Bad 132" info1: "visited: 0 -"} } diff --git a/testprograms/ref-results/PRIMA_INLINE_c-all.vcg b/testprograms/ref-results/PRIMA_INLINE_c-all.vcg deleted file mode 100644 index 0accf4129..000000000 --- a/testprograms/ref-results/PRIMA_INLINE_c-all.vcg +++ /dev/null @@ -1,173 +0,0 @@ -graph: { title: "ir graph of PRIMA_INLINE_c" -display_edge_labels: no -layoutalgorithm: mindepth -manhattan_edges: yes -port_sharing: no -orientation: bottom_to_top -classname 1: "Data" -classname 2: "Block" -classname 3: "Entity type" -classname 4: "Entity owner" -classname 5: "Method Param" -classname 6: "Method Res" -classname 7: "Super" -classname 8: "Union" -classname 9: "Points-to" -classname 10: "Array Element Type" -classname 11: "Overwrites" -classname 12: "Member" - -graph: { title: "n243" label: "243" status:clustered color:yellow -node: {title: "n242" label: "End 242" color: blue info1: "visited: 26 -"} -} - -graph: { title: "n248" label: "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: 27 -"} -edge: {sourcename: "n252" targetname: "n261" label: "0" color: blue} -edge: {sourcename: "n252" targetname: "n253" label: "1" color: blue} -node: {title: "n249" label: "Jmp 249" info1: "visited: 27 -"} -node: {title: "n253" label: "Store 253" info1: "visited: 27 -"} -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: "n254" label: "PhiIs 254" color: green info1: "visited: 27 -"} -edge: {sourcename: "n254" targetname: "n257" label: "0" } -edge: {sourcename: "n254" targetname: "n255" label: "1" } -node: {title: "n255" label: "PhiIs 255" color: green info1: "visited: 27 -"} -edge: {sourcename: "n255" targetname: "n256" label: "0" } -edge: {sourcename: "n255" targetname: "n254" label: "1" } -node: {title: "n259" label: "Sel a 259" info1: "visited: 27 -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" } -} - -graph: { title: "n251" label: "251" status:clustered color:yellow -edge: {sourcename: "n251" targetname: "n246" label: "0" color: red} -node: {title: "n250" label: "Jmp 250" info1: "visited: 28 -"} -node: {title: "n257" label: "ProjIs 1 257" color: yellow info1: "visited: 28 -"} -edge: {sourcename: "n257" targetname: "n258" label: "0" } -node: {title: "n260" label: "ProjP 0 260" color: yellow info1: "visited: 28 -"} -edge: {sourcename: "n260" targetname: "n258" label: "0" } -} - -graph: { title: "n245" label: "245" status:clustered color:yellow -edge: {sourcename: "n245" targetname: "n246" label: "0" color: red} -node: {title: "n246" label: "ProjX 0 246" color: yellow info1: "visited: 29 -"} -edge: {sourcename: "n246" targetname: "n247" label: "0" color: red} -node: {title: "n247" label: "Start 247" color: blue info1: "visited: 29 -start of method of type c - param 0 type: class_prima_ptr - param 1 type: int -"} -node: {title: "n256" label: "0x0Is 256" color: yellow info1: "visited: 29 -Const of type type_unknown -"} -node: {title: "n258" label: "ProjT 4 258" color: yellow info1: "visited: 29 -"} -edge: {sourcename: "n258" targetname: "n247" label: "0" } -node: {title: "n261" label: "ProjM 1 261" color: yellow info1: "visited: 29 -"} -edge: {sourcename: "n261" targetname: "n247" label: "0" color: blue} -} - -node: {title: "n244" label: "Bad 244" info1: "visited: 0 -"} -node: {title: "e15" label: "ent a" color: yellow - info1: " -id: e15 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: a -ld_name: PRIMA_INLINE_a -offset: -1" -} -edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red} -node: {title: "t13" label: "class PRIMA_INLINE" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue} -node: {title: "e18" label: "ent set_a" color: yellow - info1: " -id: e18 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: set_a -ld_name: PRIMA_INLINE_set_a -offset: -1 -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_INLINE_set_a)P 17" color: yellow info1: "visited: 3 -Const of type type_unknown -"} -node: {title: "n4" label: "Bad 4" info1: "visited: 3 -"} -node: {title: "t16" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green} -node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green} -node: {title: "t12" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 4B, -"} -node: {title: "e21" label: "ent c" color: yellow - info1: " -id: e21 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: c -ld_name: PRIMA_INLINE_c -offset: -1 -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_INLINE_c)P 20" color: yellow info1: "visited: 3 -Const of type type_unknown -"} -node: {title: "t19" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green} -node: {title: "t82" label: "class cframe_tp" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "n259" targetname: "e15"class: 2 priority: 2 linestyle: dotted} -} diff --git a/testprograms/ref-results/PRIMA_INLINE_c.vcg b/testprograms/ref-results/PRIMA_INLINE_c.vcg index 6dca4174a..67f2dc5a7 100644 --- a/testprograms/ref-results/PRIMA_INLINE_c.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_c.vcg @@ -17,74 +17,75 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n243" label: "243" status:clustered color:yellow -node: {title: "n242" label: "End 242" color: blue info1: "visited: 21 -"} -} - -graph: { title: "n248" label: "248" status:clustered color:yellow +graph: { title: "0x80b3820" label: "c" status:clustered color:white +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 +node: {title: "n252" label: "PhiM 252" color: green info1: "visited: 21 "} edge: {sourcename: "n252" targetname: "n261" label: "0" color: blue} edge: {sourcename: "n252" targetname: "n253" label: "1" color: blue} -node: {title: "n249" label: "Jmp 249" info1: "visited: 22 -"} -node: {title: "n253" label: "Store 253" info1: "visited: 22 +node: {title: "n253" label: "Store 253" info1: "visited: 21 "} 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: "n254" label: "PhiIs 254" color: green info1: "visited: 22 +node: {title: "n259" label: "Sel a 259" info1: "visited: 21 +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 "} 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 +node: {title: "n255" label: "PhiIs 255" color: green info1: "visited: 21 "} edge: {sourcename: "n255" targetname: "n256" label: "0" } edge: {sourcename: "n255" targetname: "n254" label: "1" } -node: {title: "n259" label: "Sel a 259" info1: "visited: 22 -Selecting entity of type int - from entity of type PRIMA_INLINE +node: {title: "n249" label: "Jmp 249" info1: "visited: 21 "} -edge: {sourcename: "n259" targetname: "n252" label: "0" color: blue} -edge: {sourcename: "n259" targetname: "n260" label: "1" } } -graph: { title: "n251" label: "251" status:clustered color:yellow +graph: { title: "n251" label: "Block 251" status:clustered color:yellow edge: {sourcename: "n251" targetname: "n246" label: "0" color: red} -node: {title: "n250" label: "Jmp 250" info1: "visited: 23 +node: {title: "n260" label: "ProjP 0 260" color: yellow info1: "visited: 21 "} -node: {title: "n257" label: "ProjIs 1 257" color: yellow info1: "visited: 23 +edge: {sourcename: "n260" targetname: "n258" label: "0" } +node: {title: "n257" label: "ProjIs 1 257" color: yellow info1: "visited: 21 "} edge: {sourcename: "n257" targetname: "n258" label: "0" } -node: {title: "n260" label: "ProjP 0 260" color: yellow info1: "visited: 23 +node: {title: "n250" label: "Jmp 250" info1: "visited: 21 "} -edge: {sourcename: "n260" targetname: "n258" label: "0" } } -graph: { title: "n245" label: "245" status:clustered color:yellow +graph: { title: "n245" label: "Block 245" status:clustered color:yellow edge: {sourcename: "n245" targetname: "n246" label: "0" color: red} -node: {title: "n246" label: "ProjX 0 246" color: yellow info1: "visited: 24 +node: {title: "n261" label: "ProjM 1 261" color: yellow info1: "visited: 21 "} -edge: {sourcename: "n246" targetname: "n247" label: "0" color: red} -node: {title: "n247" label: "Start 247" color: blue info1: "visited: 24 -start of method of type c - param 0 type: class_prima_ptr - param 1 type: int +edge: {sourcename: "n261" targetname: "n247" label: "0" color: blue} +node: {title: "n258" label: "ProjT 4 258" color: yellow info1: "visited: 21 "} -node: {title: "n256" label: "0x0Is 256" color: yellow info1: "visited: 24 +edge: {sourcename: "n258" targetname: "n247" label: "0" } +node: {title: "n256" label: "0x0Is 256" color: yellow info1: "visited: 21 Const of type type_unknown "} -node: {title: "n258" label: "ProjT 4 258" color: yellow info1: "visited: 24 +node: {title: "n246" label: "ProjX 0 246" color: yellow info1: "visited: 21 "} -edge: {sourcename: "n258" targetname: "n247" label: "0" } -node: {title: "n261" label: "ProjM 1 261" color: yellow info1: "visited: 24 +edge: {sourcename: "n246" targetname: "n247" label: "0" color: red} +node: {title: "n247" label: "Start 247" color: blue info1: "visited: 21 +start of method of type c + param 0 type: class_prima_ptr + param 1 type: int "} -edge: {sourcename: "n261" targetname: "n247" label: "0" color: blue} } -node: {title: "n244" label: "Bad 244" info1: "visited: 0 +graph: { title: "n243" label: "Block 243" status:clustered color:yellow +node: {title: "n242" label: "End 242" color: blue info1: "visited: 21 "} } + +} + +} diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-all.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-all.vcg deleted file mode 100644 index 2ae827a97..000000000 --- a/testprograms/ref-results/PRIMA_INLINE_set_a-all.vcg +++ /dev/null @@ -1,157 +0,0 @@ -graph: { title: "ir graph of PRIMA_INLINE_set_a" -display_edge_labels: no -layoutalgorithm: mindepth -manhattan_edges: yes -port_sharing: no -orientation: bottom_to_top -classname 1: "Data" -classname 2: "Block" -classname 3: "Entity type" -classname 4: "Entity owner" -classname 5: "Method Param" -classname 6: "Method Res" -classname 7: "Super" -classname 8: "Union" -classname 9: "Points-to" -classname 10: "Array Element Type" -classname 11: "Overwrites" -classname 12: "Member" - -graph: { title: "n225" label: "225" status:clustered color:yellow -edge: {sourcename: "n225" targetname: "n226" label: "0" color: red} -node: {title: "n224" label: "End 224" color: blue info1: "visited: 20 -"} -} - -graph: { title: "n227" label: "227" status:clustered color:yellow -edge: {sourcename: "n227" targetname: "n228" label: "0" color: red} -node: {title: "n226" label: "Return 226" info1: "visited: 21 -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: 21 -"} -edge: {sourcename: "n231" targetname: "n232" label: "0" color: blue} -node: {title: "n232" label: "Store 232" info1: "visited: 21 -"} -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: "n233" label: "ProjIs 1 233" color: yellow info1: "visited: 21 -"} -edge: {sourcename: "n233" targetname: "n234" label: "0" } -node: {title: "n235" label: "Sel a 235" info1: "visited: 21 -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: 21 -"} -edge: {sourcename: "n236" targetname: "n234" label: "0" } -} - -graph: { title: "n229" label: "229" status:clustered color:yellow -edge: {sourcename: "n229" targetname: "n228" label: "0" color: red} -node: {title: "n228" label: "ProjX 0 228" color: yellow info1: "visited: 22 -"} -edge: {sourcename: "n228" targetname: "n230" label: "0" color: red} -node: {title: "n230" label: "Start 230" color: blue info1: "visited: 22 -start of method of type set_a - param 0 type: class_prima_ptr - param 1 type: int -"} -node: {title: "n234" label: "ProjT 4 234" color: yellow info1: "visited: 22 -"} -edge: {sourcename: "n234" targetname: "n230" label: "0" } -node: {title: "n237" label: "ProjM 1 237" color: yellow info1: "visited: 22 -"} -edge: {sourcename: "n237" targetname: "n230" label: "0" color: blue} -} - -node: {title: "n240" label: "Bad 240" info1: "visited: 0 -"} -node: {title: "e15" label: "ent a" color: yellow - info1: " -id: e15 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: a -ld_name: PRIMA_INLINE_a -offset: -1" -} -edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red} -node: {title: "t13" label: "class PRIMA_INLINE" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue} -node: {title: "e18" label: "ent set_a" color: yellow - info1: " -id: e18 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: set_a -ld_name: PRIMA_INLINE_set_a -offset: -1 -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_INLINE_set_a)P 17" color: yellow info1: "visited: 2 -Const of type type_unknown -"} -node: {title: "n4" label: "Bad 4" info1: "visited: 2 -"} -node: {title: "t16" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green} -node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green} -node: {title: "t12" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 4B, -"} -node: {title: "e21" label: "ent c" color: yellow - info1: " -id: e21 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: c -ld_name: PRIMA_INLINE_c -offset: -1 -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_INLINE_c)P 20" color: yellow info1: "visited: 2 -Const of type type_unknown -"} -node: {title: "t19" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green} -node: {title: "t59" label: "class set_aframe_tp" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "n235" targetname: "e15"class: 2 priority: 2 linestyle: dotted} -} diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg index ff5b4057e..46cf6c425 100644 --- a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg @@ -17,58 +17,59 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n225" label: "225" status:clustered color:yellow +graph: { title: "0x80b1208" 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 "} } -graph: { title: "n227" label: "227" status:clustered color:yellow +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 +node: {title: "n226" label: "Return 226" info1: "visited: 16 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 +node: {title: "n231" label: "ProjM 0 231" color: yellow info1: "visited: 16 "} edge: {sourcename: "n231" targetname: "n232" label: "0" color: blue} -node: {title: "n232" label: "Store 232" info1: "visited: 17 +node: {title: "n232" label: "Store 232" info1: "visited: 16 "} 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: "n233" label: "ProjIs 1 233" color: yellow info1: "visited: 17 -"} -edge: {sourcename: "n233" targetname: "n234" label: "0" } -node: {title: "n235" label: "Sel a 235" info1: "visited: 17 +node: {title: "n235" label: "Sel a 235" info1: "visited: 16 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 +node: {title: "n236" label: "ProjP 0 236" color: yellow info1: "visited: 16 "} edge: {sourcename: "n236" targetname: "n234" label: "0" } +node: {title: "n233" label: "ProjIs 1 233" color: yellow info1: "visited: 16 +"} +edge: {sourcename: "n233" targetname: "n234" label: "0" } } -graph: { title: "n229" label: "229" status:clustered color:yellow +graph: { title: "n229" label: "Block 229" status:clustered color:yellow edge: {sourcename: "n229" targetname: "n228" label: "0" color: red} -node: {title: "n228" label: "ProjX 0 228" color: yellow info1: "visited: 18 +node: {title: "n237" label: "ProjM 1 237" color: yellow info1: "visited: 16 +"} +edge: {sourcename: "n237" targetname: "n230" label: "0" color: blue} +node: {title: "n234" label: "ProjT 4 234" color: yellow info1: "visited: 16 +"} +edge: {sourcename: "n234" targetname: "n230" label: "0" } +node: {title: "n228" label: "ProjX 0 228" color: yellow info1: "visited: 16 "} edge: {sourcename: "n228" targetname: "n230" label: "0" color: red} -node: {title: "n230" label: "Start 230" color: blue info1: "visited: 18 +node: {title: "n230" label: "Start 230" color: blue info1: "visited: 16 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} -node: {title: "n234" label: "ProjT 4 234" color: yellow info1: "visited: 18 -"} -edge: {sourcename: "n234" targetname: "n230" label: "0" } -node: {title: "n237" label: "ProjM 1 237" color: yellow info1: "visited: 18 -"} -edge: {sourcename: "n237" targetname: "n230" label: "0" color: blue} } -node: {title: "n240" label: "Bad 240" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/PRIMA_c-all.vcg b/testprograms/ref-results/PRIMA_c-all.vcg deleted file mode 100644 index df7a682c3..000000000 --- a/testprograms/ref-results/PRIMA_c-all.vcg +++ /dev/null @@ -1,165 +0,0 @@ -graph: { title: "ir graph of PRIMA_c" -display_edge_labels: yes -layoutalgorithm: mindepth -manhattan_edges: yes -port_sharing: no -orientation: bottom_to_top -classname 1: "Data" -classname 2: "Block" -classname 3: "Entity type" -classname 4: "Entity owner" -classname 5: "Method Param" -classname 6: "Method Res" -classname 7: "Super" -classname 8: "Union" -classname 9: "Points-to" -classname 10: "Array Element Type" -classname 11: "Overwrites" -classname 12: "Member" - -graph: { title: "n153" label: "153" status:clustered color:yellow -edge: {sourcename: "n153" targetname: "n154" label: "0" color: red} -node: {title: "n152" label: "End 152" color: blue info1: "visited: 12 -"} -} - -graph: { title: "n155" label: "155" status:clustered color:yellow -edge: {sourcename: "n155" targetname: "n156" label: "0" color: red} -node: {title: "n154" label: "Return 154" info1: "visited: 13 -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: "n159" label: "AddIs 159" info1: "visited: 13 -"} -edge: {sourcename: "n159" targetname: "n166" label: "0" } -edge: {sourcename: "n159" targetname: "n160" label: "1" } -node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 13 -"} -edge: {sourcename: "n160" targetname: "n161" label: "0" } -node: {title: "n161" label: "Load 161" info1: "visited: 13 -"} -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 -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 -"} -edge: {sourcename: "n163" targetname: "n164" label: "0" } -node: {title: "n166" label: "ProjIs 1 166" color: yellow info1: "visited: 13 -"} -edge: {sourcename: "n166" targetname: "n164" label: "0" } -node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 13 -"} -edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} -} - -graph: { title: "n157" label: "157" status:clustered color:yellow -edge: {sourcename: "n157" targetname: "n156" label: "0" color: red} -node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 14 -"} -edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} -node: {title: "n158" label: "Start 158" color: blue info1: "visited: 14 -start of method of type c - param 0 type: class_prima_ptr - param 1 type: int -"} -node: {title: "n164" label: "ProjT 4 164" color: yellow info1: "visited: 14 -"} -edge: {sourcename: "n164" targetname: "n158" label: "0" } -node: {title: "n165" label: "ProjM 1 165" color: yellow info1: "visited: 14 -"} -edge: {sourcename: "n165" targetname: "n158" label: "0" color: blue} -} - -node: {title: "n170" label: "Bad 170" info1: "visited: 0 -"} -node: {title: "e15" label: "ent a" color: yellow - info1: " -id: e15 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: a -ld_name: PRIMA_a -offset: -1" -} -edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red} -node: {title: "t13" label: "class PRIMA" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue} -node: {title: "e18" label: "ent set_a" color: yellow - info1: " -id: e18 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: set_a -ld_name: PRIMA_set_a -offset: -1 -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: 3 -Const of type type_unknown -"} -node: {title: "n4" label: "Bad 4" info1: "visited: 3 -"} -node: {title: "t16" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green} -node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green} -node: {title: "t12" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 4B, -"} -node: {title: "e21" label: "ent c" color: yellow - info1: " -id: e21 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: c -ld_name: PRIMA_c -offset: -1 -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: 3 -Const of type type_unknown -"} -node: {title: "t19" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green} -node: {title: "t82" label: "class cframe_tp" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "n162" targetname: "e15"class: 2 priority: 2 linestyle: dotted} -} diff --git a/testprograms/ref-results/PRIMA_c.vcg b/testprograms/ref-results/PRIMA_c.vcg index 0f1363877..9858f9805 100644 --- a/testprograms/ref-results/PRIMA_c.vcg +++ b/testprograms/ref-results/PRIMA_c.vcg @@ -17,13 +17,14 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n153" label: "153" status:clustered color:yellow +graph: { title: "0x80b3640" 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: 8 +node: {title: "n152" label: "End 152" color: blue info1: "visited: 9 "} } -graph: { title: "n155" label: "155" status:clustered color:yellow +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 return in method of type c @@ -31,10 +32,16 @@ return in method of type c "} 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 +"} +edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} node: {title: "n159" label: "AddIs 159" info1: "visited: 9 "} 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 +"} +edge: {sourcename: "n166" targetname: "n164" label: "0" } node: {title: "n160" label: "ProjIs 2 160" color: yellow info1: "visited: 9 "} edge: {sourcename: "n160" targetname: "n161" label: "0" } @@ -51,32 +58,26 @@ edge: {sourcename: "n162" targetname: "n163" label: "1" } node: {title: "n163" label: "ProjP 0 163" color: yellow info1: "visited: 9 "} edge: {sourcename: "n163" targetname: "n164" label: "0" } -node: {title: "n166" label: "ProjIs 1 166" color: yellow info1: "visited: 9 -"} -edge: {sourcename: "n166" targetname: "n164" label: "0" } -node: {title: "n167" label: "ProjM 0 167" color: yellow info1: "visited: 9 -"} -edge: {sourcename: "n167" targetname: "n161" label: "0" color: blue} } -graph: { title: "n157" label: "157" status:clustered color:yellow +graph: { title: "n157" label: "Block 157" status:clustered color:yellow edge: {sourcename: "n157" targetname: "n156" label: "0" color: red} -node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 10 +node: {title: "n165" label: "ProjM 1 165" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n165" targetname: "n158" label: "0" color: blue} +node: {title: "n164" label: "ProjT 4 164" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n164" targetname: "n158" label: "0" } +node: {title: "n156" label: "ProjX 0 156" color: yellow info1: "visited: 9 "} edge: {sourcename: "n156" targetname: "n158" label: "0" color: red} -node: {title: "n158" label: "Start 158" color: blue info1: "visited: 10 +node: {title: "n158" label: "Start 158" color: blue info1: "visited: 9 start of method of type c param 0 type: class_prima_ptr param 1 type: int "} -node: {title: "n164" label: "ProjT 4 164" color: yellow info1: "visited: 10 -"} -edge: {sourcename: "n164" targetname: "n158" label: "0" } -node: {title: "n165" label: "ProjM 1 165" color: yellow info1: "visited: 10 -"} -edge: {sourcename: "n165" targetname: "n158" label: "0" color: blue} } -node: {title: "n170" label: "Bad 170" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/PRIMA_set_a-all.vcg b/testprograms/ref-results/PRIMA_set_a-all.vcg deleted file mode 100644 index 300fc24f2..000000000 --- a/testprograms/ref-results/PRIMA_set_a-all.vcg +++ /dev/null @@ -1,157 +0,0 @@ -graph: { title: "ir graph of PRIMA_set_a" -display_edge_labels: yes -layoutalgorithm: mindepth -manhattan_edges: yes -port_sharing: no -orientation: bottom_to_top -classname 1: "Data" -classname 2: "Block" -classname 3: "Entity type" -classname 4: "Entity owner" -classname 5: "Method Param" -classname 6: "Method Res" -classname 7: "Super" -classname 8: "Union" -classname 9: "Points-to" -classname 10: "Array Element Type" -classname 11: "Overwrites" -classname 12: "Member" - -graph: { title: "n135" label: "135" status:clustered color:yellow -edge: {sourcename: "n135" targetname: "n136" label: "0" color: red} -node: {title: "n134" label: "End 134" color: blue info1: "visited: 12 -"} -} - -graph: { title: "n137" label: "137" status:clustered color:yellow -edge: {sourcename: "n137" targetname: "n138" label: "0" color: red} -node: {title: "n136" label: "Return 136" info1: "visited: 13 -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 -"} -edge: {sourcename: "n141" targetname: "n142" label: "0" color: blue} -node: {title: "n142" label: "Store 142" info1: "visited: 13 -"} -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: "n143" label: "ProjIs 1 143" color: yellow info1: "visited: 13 -"} -edge: {sourcename: "n143" targetname: "n144" label: "0" } -node: {title: "n145" label: "Sel a 145" info1: "visited: 13 -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 -"} -edge: {sourcename: "n146" targetname: "n144" label: "0" } -} - -graph: { title: "n139" label: "139" status:clustered color:yellow -edge: {sourcename: "n139" targetname: "n138" label: "0" color: red} -node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 14 -"} -edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} -node: {title: "n140" label: "Start 140" color: blue info1: "visited: 14 -start of method of type set_a - param 0 type: class_prima_ptr - param 1 type: int -"} -node: {title: "n144" label: "ProjT 4 144" color: yellow info1: "visited: 14 -"} -edge: {sourcename: "n144" targetname: "n140" label: "0" } -node: {title: "n147" label: "ProjM 1 147" color: yellow info1: "visited: 14 -"} -edge: {sourcename: "n147" targetname: "n140" label: "0" color: blue} -} - -node: {title: "n150" label: "Bad 150" info1: "visited: 0 -"} -node: {title: "e15" label: "ent a" color: yellow - info1: " -id: e15 -allocation: allocation_automatic -visibility: visibility_local -variability: variability_uninitialized -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: a -ld_name: PRIMA_a -offset: -1" -} -edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red} -node: {title: "t13" label: "class PRIMA" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue} -edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue} -node: {title: "e18" label: "ent set_a" color: yellow - info1: " -id: e18 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: set_a -ld_name: PRIMA_set_a -offset: -1 -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: 2 -Const of type type_unknown -"} -node: {title: "n4" label: "Bad 4" info1: "visited: 2 -"} -node: {title: "t16" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green} -node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green} -node: {title: "t12" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 4B, -"} -node: {title: "e21" label: "ent c" color: yellow - info1: " -id: e21 -allocation: allocation_static -visibility: visibility_local -variability: variability_constant -volatility: volatility_non_volatile -peculiarity: peculiarity_existent -name: c -ld_name: PRIMA_c -offset: -1 -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: 2 -Const of type type_unknown -"} -node: {title: "t19" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 4B, -"} -edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green} -edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green} -node: {title: "t59" label: "class set_aframe_tp" info1: "state: layout_undefined -size: -1B, -" color: green} -edge: { sourcename: "n145" targetname: "e15"class: 2 priority: 2 linestyle: dotted} -} diff --git a/testprograms/ref-results/PRIMA_set_a.vcg b/testprograms/ref-results/PRIMA_set_a.vcg index d82956587..e22d96808 100644 --- a/testprograms/ref-results/PRIMA_set_a.vcg +++ b/testprograms/ref-results/PRIMA_set_a.vcg @@ -17,13 +17,14 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n135" label: "135" status:clustered color:yellow +graph: { title: "0x80b1028" 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: 8 +node: {title: "n134" label: "End 134" color: blue info1: "visited: 9 "} } -graph: { title: "n137" label: "137" status:clustered color:yellow +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 return in method of type set_a @@ -37,9 +38,6 @@ node: {title: "n142" label: "Store 142" info1: "visited: 9 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: "n143" label: "ProjIs 1 143" color: yellow info1: "visited: 9 -"} -edge: {sourcename: "n143" targetname: "n144" label: "0" } node: {title: "n145" label: "Sel a 145" info1: "visited: 9 Selecting entity of type int from entity of type PRIMA @@ -49,26 +47,29 @@ edge: {sourcename: "n145" targetname: "n146" label: "1" } node: {title: "n146" label: "ProjP 0 146" color: yellow info1: "visited: 9 "} edge: {sourcename: "n146" targetname: "n144" label: "0" } +node: {title: "n143" label: "ProjIs 1 143" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n143" targetname: "n144" label: "0" } } -graph: { title: "n139" label: "139" status:clustered color:yellow +graph: { title: "n139" label: "Block 139" status:clustered color:yellow edge: {sourcename: "n139" targetname: "n138" label: "0" color: red} -node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 10 +node: {title: "n147" label: "ProjM 1 147" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n147" targetname: "n140" label: "0" color: blue} +node: {title: "n144" label: "ProjT 4 144" color: yellow info1: "visited: 9 +"} +edge: {sourcename: "n144" targetname: "n140" label: "0" } +node: {title: "n138" label: "ProjX 0 138" color: yellow info1: "visited: 9 "} edge: {sourcename: "n138" targetname: "n140" label: "0" color: red} -node: {title: "n140" label: "Start 140" color: blue info1: "visited: 10 +node: {title: "n140" label: "Start 140" color: blue info1: "visited: 9 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int "} -node: {title: "n144" label: "ProjT 4 144" color: yellow info1: "visited: 10 -"} -edge: {sourcename: "n144" targetname: "n140" label: "0" } -node: {title: "n147" label: "ProjM 1 147" color: yellow info1: "visited: 10 -"} -edge: {sourcename: "n147" targetname: "n140" label: "0" color: blue} } -node: {title: "n150" label: "Bad 150" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg index c6d520388..fe76a3a59 100644 --- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg +++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg @@ -17,119 +17,120 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n77" label: "77" status:clustered color:yellow +graph: { title: "0x80ae348" label: "THREE_CFPRED_EXAMPLE_main" status:clustered color:white +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 "} } -graph: { title: "n79" label: "79" status:clustered color:yellow +graph: { title: "n79" label: "Block 79" status:clustered color:yellow 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: 9 +node: {title: "n78" label: "Return 78" info1: "visited: 8 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: 9 +node: {title: "n105" label: "PhiIs 105" color: green info1: "visited: 8 "} edge: {sourcename: "n105" targetname: "n107" label: "0" } edge: {sourcename: "n105" targetname: "n106" label: "1" } edge: {sourcename: "n105" targetname: "n106" label: "2" } } -graph: { title: "n81" label: "81" status:clustered color:yellow +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 +"} +} + +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 +"} +} + +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: 10 +node: {title: "n80" label: "Jmp 80" info1: "visited: 8 "} } -graph: { title: "n83" label: "83" status:clustered color:yellow +graph: { title: "n83" label: "Block 83" status:clustered color:yellow edge: {sourcename: "n83" targetname: "n84" label: "0" color: red} -node: {title: "n82" label: "ProjX 1 82" color: yellow info1: "visited: 11 +node: {title: "n101" label: "ProjX 0 101" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n101" targetname: "n95" label: "0" color: red} +node: {title: "n82" label: "ProjX 1 82" color: yellow info1: "visited: 8 "} edge: {sourcename: "n82" targetname: "n95" label: "0" color: red} -node: {title: "n95" label: "Cond 95" info1: "visited: 11 +node: {title: "n95" label: "Cond 95" info1: "visited: 8 "} edge: {sourcename: "n95" targetname: "n96" label: "0" } -node: {title: "n96" label: "Projb Eq 96" color: yellow info1: "visited: 11 +node: {title: "n96" label: "Projb Eq 96" color: yellow info1: "visited: 8 "} edge: {sourcename: "n96" targetname: "n97" label: "0" } -node: {title: "n97" label: "CmpT 97" info1: "visited: 11 +node: {title: "n97" label: "CmpT 97" info1: "visited: 8 "} edge: {sourcename: "n97" targetname: "n98" label: "0" } edge: {sourcename: "n97" targetname: "n92" label: "1" } -node: {title: "n101" label: "ProjX 0 101" color: yellow info1: "visited: 11 -"} -edge: {sourcename: "n101" targetname: "n95" label: "0" color: red} } -graph: { title: "n85" label: "85" status:clustered color:yellow +graph: { title: "n85" label: "Block 85" status:clustered color:yellow edge: {sourcename: "n85" targetname: "n86" label: "0" color: red} -node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 12 +node: {title: "n104" label: "ProjX 1 104" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n104" targetname: "n89" label: "0" color: red} +node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 8 "} edge: {sourcename: "n84" targetname: "n89" label: "0" color: red} -node: {title: "n89" label: "Cond 89" info1: "visited: 12 +node: {title: "n89" label: "Cond 89" info1: "visited: 8 "} edge: {sourcename: "n89" targetname: "n90" label: "0" } -node: {title: "n90" label: "Projb Eq 90" color: yellow info1: "visited: 12 +node: {title: "n90" label: "Projb Eq 90" color: yellow info1: "visited: 8 "} edge: {sourcename: "n90" targetname: "n91" label: "0" } -node: {title: "n91" label: "CmpT 91" info1: "visited: 12 +node: {title: "n91" label: "CmpT 91" info1: "visited: 8 "} 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: 12 +node: {title: "n92" label: "ProjIs 0 92" color: yellow info1: "visited: 8 "} edge: {sourcename: "n92" targetname: "n93" label: "0" } -node: {title: "n104" label: "ProjX 1 104" color: yellow info1: "visited: 12 -"} -edge: {sourcename: "n104" targetname: "n89" label: "0" color: red} } -graph: { title: "n87" label: "87" status:clustered color:yellow +graph: { title: "n87" label: "Block 87" status:clustered color:yellow edge: {sourcename: "n87" targetname: "n86" label: "0" color: red} -node: {title: "n86" label: "ProjX 0 86" color: yellow info1: "visited: 13 +node: {title: "n108" label: "ProjM 1 108" color: yellow info1: "visited: 8 "} -edge: {sourcename: "n86" targetname: "n88" label: "0" color: red} -node: {title: "n88" label: "Start 88" color: blue info1: "visited: 13 -start of method of type THREE_CFPRED_EXAMPLE_main - param 0 type: int -"} -node: {title: "n93" label: "ProjT 4 93" color: yellow info1: "visited: 13 -"} -edge: {sourcename: "n93" targetname: "n88" label: "0" } -node: {title: "n94" label: "0x1Is 94" color: yellow info1: "visited: 13 +edge: {sourcename: "n108" targetname: "n88" label: "0" color: blue} +node: {title: "n107" label: "0x5Is 107" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n98" label: "0x3Is 98" color: yellow info1: "visited: 13 +node: {title: "n106" label: "0x6Is 106" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n106" label: "0x6Is 106" color: yellow info1: "visited: 13 +node: {title: "n98" label: "0x3Is 98" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n107" label: "0x5Is 107" color: yellow info1: "visited: 13 +node: {title: "n94" label: "0x1Is 94" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n108" label: "ProjM 1 108" color: yellow info1: "visited: 13 +node: {title: "n93" label: "ProjT 4 93" color: yellow info1: "visited: 8 "} -edge: {sourcename: "n108" targetname: "n88" label: "0" color: blue} -} - -graph: { title: "n100" label: "100" status:clustered color:yellow -edge: {sourcename: "n100" targetname: "n101" label: "0" color: red} -node: {title: "n99" label: "Jmp 99" info1: "visited: 14 +edge: {sourcename: "n93" targetname: "n88" label: "0" } +node: {title: "n86" label: "ProjX 0 86" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n86" targetname: "n88" label: "0" color: red} +node: {title: "n88" label: "Start 88" color: blue info1: "visited: 8 +start of method of type THREE_CFPRED_EXAMPLE_main + param 0 type: int "} } -graph: { title: "n103" label: "103" status:clustered color:yellow -edge: {sourcename: "n103" targetname: "n104" label: "0" color: red} -node: {title: "n102" label: "Jmp 102" info1: "visited: 15 -"} } -node: {title: "n111" label: "Bad 111" info1: "visited: 0 -"} } diff --git a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg index bead973bb..d855e7582 100644 --- a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg @@ -17,93 +17,94 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n67" label: "67" status:clustered color:yellow +graph: { title: "0x80ae390" 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 "} } -graph: { title: "n69" label: "69" status:clustered color:yellow +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: 16 +node: {title: "n68" label: "Return 68" info1: "visited: 15 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: 16 +node: {title: "n89" label: "SubIs 89" info1: "visited: 15 "} edge: {sourcename: "n89" targetname: "n79" label: "0" } edge: {sourcename: "n89" targetname: "n78" label: "1" } } -graph: { title: "n71" label: "71" status:clustered color:yellow +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: 17 +node: {title: "n70" label: "ProjX 0 70" color: yellow info1: "visited: 15 "} edge: {sourcename: "n70" targetname: "n75" label: "0" color: red} -node: {title: "n74" label: "ProjX 1 74" color: yellow info1: "visited: 17 +node: {title: "n74" label: "ProjX 1 74" color: yellow info1: "visited: 15 "} edge: {sourcename: "n74" targetname: "n75" label: "0" color: red} -node: {title: "n75" label: "Cond 75" info1: "visited: 17 +node: {title: "n75" label: "Cond 75" info1: "visited: 15 "} edge: {sourcename: "n75" targetname: "n76" label: "0" } -node: {title: "n76" label: "Projb Eq 76" color: yellow info1: "visited: 17 +node: {title: "n76" label: "Projb Eq 76" color: yellow info1: "visited: 15 "} edge: {sourcename: "n76" targetname: "n77" label: "0" } -node: {title: "n77" label: "CmpT 77" info1: "visited: 17 +node: {title: "n77" label: "CmpT 77" info1: "visited: 15 "} edge: {sourcename: "n77" targetname: "n87" label: "0" } edge: {sourcename: "n77" targetname: "n78" label: "1" } -node: {title: "n78" label: "PhiIs 78" color: green info1: "visited: 17 +node: {title: "n78" label: "PhiIs 78" color: green info1: "visited: 15 "} edge: {sourcename: "n78" targetname: "n86" label: "0" } edge: {sourcename: "n78" targetname: "n79" label: "1" } -node: {title: "n79" label: "PhiIs 79" color: green info1: "visited: 17 +node: {title: "n79" label: "PhiIs 79" color: green info1: "visited: 15 "} edge: {sourcename: "n79" targetname: "n80" label: "0" } edge: {sourcename: "n79" targetname: "n78" label: "1" } } -graph: { title: "n73" label: "73" status:clustered color:yellow +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: 18 +node: {title: "n72" label: "Jmp 72" info1: "visited: 15 "} } -graph: { title: "n81" label: "81" status:clustered color:yellow +graph: { title: "n81" label: "Block 81" status:clustered color:yellow edge: {sourcename: "n81" targetname: "n82" label: "0" color: red} -node: {title: "n80" label: "ProjIs 0 80" color: yellow info1: "visited: 19 +node: {title: "n88" label: "Jmp 88" info1: "visited: 15 "} -edge: {sourcename: "n80" targetname: "n85" label: "0" } -node: {title: "n88" label: "Jmp 88" info1: "visited: 19 +node: {title: "n80" label: "ProjIs 0 80" color: yellow info1: "visited: 15 "} +edge: {sourcename: "n80" targetname: "n85" label: "0" } } -graph: { title: "n83" label: "83" status:clustered color:yellow +graph: { title: "n83" label: "Block 83" status:clustered color:yellow edge: {sourcename: "n83" targetname: "n82" label: "0" color: red} -node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 20 -"} -edge: {sourcename: "n82" targetname: "n84" label: "0" color: red} -node: {title: "n84" label: "Start 84" color: blue info1: "visited: 20 -start of method of type main_tp - param 0 type: int -"} -node: {title: "n85" label: "ProjT 4 85" color: yellow info1: "visited: 20 +node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 15 "} -edge: {sourcename: "n85" targetname: "n84" label: "0" } -node: {title: "n86" label: "0x1Is 86" color: yellow info1: "visited: 20 +edge: {sourcename: "n90" targetname: "n84" label: "0" color: blue} +node: {title: "n87" label: "0x0Is 87" color: yellow info1: "visited: 15 Const of type type_unknown "} -node: {title: "n87" label: "0x0Is 87" color: yellow info1: "visited: 20 +node: {title: "n86" label: "0x1Is 86" color: yellow info1: "visited: 15 Const of type type_unknown "} -node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 20 +node: {title: "n85" label: "ProjT 4 85" color: yellow info1: "visited: 15 +"} +edge: {sourcename: "n85" targetname: "n84" label: "0" } +node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 15 +"} +edge: {sourcename: "n82" targetname: "n84" label: "0" color: red} +node: {title: "n84" label: "Start 84" color: blue info1: "visited: 15 +start of method of type main_tp + param 0 type: int "} -edge: {sourcename: "n90" targetname: "n84" label: "0" color: blue} } -node: {title: "n93" label: "Bad 93" info1: "visited: 0 -"} +} + } diff --git a/testprograms/ref-results/main-type.vcg b/testprograms/ref-results/main-type.vcg index 52be909b0..2b4b85849 100644 --- a/testprograms/ref-results/main-type.vcg +++ b/testprograms/ref-results/main-type.vcg @@ -26,7 +26,7 @@ variability: variability_uninitialized volatility: volatility_non_volatile peculiarity: peculiarity_existent name: a_tp_elem_ent -ld_name: a_tp_a_tp_elem_ent +ld_name: no yet set offset: -1" } edge: { sourcename: "e18" targetname: "t12"class: 3 label: "type" color: red} @@ -40,8 +40,6 @@ edge: { sourcename: "n20" targetname: "t17"label: "lower 0"} node: {title: "n19" label: "0x9Iu 19" color: yellow info1: "visited: 1 Const of type type_unknown "} -node: {title: "n4" label: "Bad 4" info1: "visited: 1 -"} node: {title: "n20" label: "0x0Iu 20" color: yellow info1: "visited: 1 Const of type type_unknown "} @@ -58,7 +56,7 @@ variability: variability_uninitialized volatility: volatility_non_volatile peculiarity: peculiarity_existent name: a -ld_name: mainframe_tp_a +ld_name: no yet set offset: -1" } edge: { sourcename: "e35" targetname: "t17"class: 3 label: "type" color: red} @@ -75,7 +73,7 @@ variability: variability_constant volatility: volatility_non_volatile peculiarity: peculiarity_existent name: main -ld_name: ARRAY-STACK_EXAMPLE_main +ld_name: no yet set offset: -1 irg = g33" } diff --git a/testprograms/ref-results/main.vcg b/testprograms/ref-results/main.vcg index 38959aa36..ac4a8da0b 100644 --- a/testprograms/ref-results/main.vcg +++ b/testprograms/ref-results/main.vcg @@ -17,64 +17,65 @@ classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" -graph: { title: "n47" label: "47" status:clustered color:yellow +graph: { title: "0x80ae410" 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 "} } -graph: { title: "n49" label: "49" status:clustered color:yellow +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: 9 +node: {title: "n48" label: "Return 48" info1: "visited: 8 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: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 9 +node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 8 +"} +edge: {sourcename: "n60" targetname: "n54" label: "0" color: blue} +node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 8 "} edge: {sourcename: "n53" targetname: "n54" label: "0" } -node: {title: "n54" label: "Load 54" info1: "visited: 9 +node: {title: "n54" label: "Load 54" info1: "visited: 8 "} 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: 9 +node: {title: "n55" label: "Sel a_tp_elem_ent 55" info1: "visited: 8 Selecting entity of type int from entity of type a_tp "} 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: 9 +node: {title: "n57" label: "Sel a 57" info1: "visited: 8 Selecting entity of type a_tp from entity of type mainframe_tp "} edge: {sourcename: "n57" targetname: "n59" label: "0" color: blue} edge: {sourcename: "n57" targetname: "n58" label: "1" } -node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 9 -"} -edge: {sourcename: "n60" targetname: "n54" label: "0" color: blue} } -graph: { title: "n51" label: "51" status:clustered color:yellow +graph: { title: "n51" label: "Block 51" status:clustered color:yellow edge: {sourcename: "n51" targetname: "n50" label: "0" color: red} -node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 10 +node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 8 "} -edge: {sourcename: "n50" targetname: "n52" label: "0" color: red} -node: {title: "n52" label: "Start 52" color: blue info1: "visited: 10 -start of method of type main +edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue} +node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 8 "} -node: {title: "n56" label: "0x3Iu 56" color: yellow info1: "visited: 10 +edge: {sourcename: "n58" targetname: "n52" label: "0" } +node: {title: "n56" label: "0x3Iu 56" color: yellow info1: "visited: 8 Const of type type_unknown "} -node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 10 +node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 8 "} -edge: {sourcename: "n58" targetname: "n52" label: "0" } -node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 10 +edge: {sourcename: "n50" targetname: "n52" label: "0" color: red} +node: {title: "n52" label: "Start 52" color: blue info1: "visited: 8 +start of method of type main "} -edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue} } -node: {title: "n63" label: "Bad 63" info1: "visited: 0 -"} +} + } -- 2.20.1