From: Götz Lindenmaier Date: Wed, 31 Mar 2004 09:20:04 +0000 (+0000) Subject: changed palcement of color attribute` X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=234151cf2d9b0486777ed22e622040a0203a48fe;p=libfirm changed palcement of color attribute` [r2602] --- diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg index 0c77d986f..8b16f8c1d 100644 --- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "e18" label: "ent a_elem_ent" color: yellow info1: " @@ -40,14 +42,14 @@ edge: { sourcename: "t15" targetname: "t11"class: 10 label: "arr elt tp" color:g edge: { sourcename: "t15" targetname: "e18"class: 10 label: "arr ent" color: green} edge: { sourcename: "n19" targetname: "t15"label: "upper 0"} edge: { sourcename: "n20" targetname: "t15"label: "lower 0"} -node: {title: "n19" label: "0x9Iu 19" color: yellow info1: "visited: 1 +node: {title: "n19" label: "0x9Iu 19" info1: "visited: 1 arity: 0 Const of type type_unknown -"} -node: {title: "n20" label: "0x0Iu 20" color: yellow info1: "visited: 1 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n20" label: "0x0Iu 20" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t11" label: "primitive int" info1: "state: layout_fixed, mode: Is, size: 4B, @@ -67,10 +69,10 @@ irg = g32" } edge: { sourcename: "e14" targetname: "t12"class: 3 label: "type" color: red} edge: { sourcename: "e14" targetname: "n13"label: "value 0"} -node: {title: "n13" label: "&(GlobalType_ARRAY-HEAP_EXAMPLE_main)P 13" color: yellow info1: "visited: 1 +node: {title: "n13" label: "&(GlobalType_ARRAY-HEAP_EXAMPLE_main)P 13" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -79,6 +81,9 @@ edge: { sourcename: "t0" targetname: "e14"class: 12 label: "member" color:blue} node: {title: "t12" label: "method ARRAY-HEAP_EXAMPLE_main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t12" targetname: "t11"class: 6 label: "res 0" color: green} node: {title: "t21" label: "class ARRAY-HEAP_EXAMPLE_mainframe_tp" info1: "state: layout_undefined diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg index 78b223745..2c1db231d 100644 --- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg +++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g32" label: "ARRAY-HEAP_EXAMPLE_main" status:clustered color:white graph: { title: "n49" label: "Block 49" status:clustered color:yellow edge: {sourcename: "n49" targetname: "n50" label: "0" class:13 color:red} -node: {title: "n48" label: "End 48" color: blue info1: "visited: 8 +node: {title: "n48" label: "End 48" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n51" label: "Block 51" status:clustered color:yellow @@ -36,23 +38,23 @@ irg: ARRAY-HEAP_EXAMPLE_main arity: 2 return in method of type ARRAY-HEAP_EXAMPLE_main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n50" targetname: "n64" label: "0" class:14 color:blue} edge: {sourcename: "n50" targetname: "n55" label: "1" } -node: {title: "n64" label: "ProjM 0 64" color: yellow info1: "visited: 8 +node: {title: "n64" label: "ProjM 0 64" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n64" targetname: "n56" label: "0" class:14 color:blue} -node: {title: "n55" label: "ProjIs 2 55" color: yellow info1: "visited: 8 +node: {title: "n55" label: "ProjIs 2 55" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n55" targetname: "n56" label: "0" } node: {title: "n56" label: "Load 56" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n56" targetname: "n63" label: "0" class:14 color:blue} edge: {sourcename: "n56" targetname: "n57" label: "1" } node: {title: "n57" label: "Sel a_elem_ent 57" info1: "visited: 8 @@ -64,15 +66,15 @@ Selecting entity of type int edge: {sourcename: "n57" targetname: "n63" label: "0" class:14 color:blue} edge: {sourcename: "n57" targetname: "n59" label: "1" } edge: {sourcename: "n57" targetname: "n58" label: "2" } -node: {title: "n63" label: "ProjM 0 63" color: yellow info1: "visited: 8 +node: {title: "n63" label: "ProjM 0 63" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n63" targetname: "n60" label: "0" class:14 color:blue} -node: {title: "n59" label: "ProjP 2 59" color: yellow info1: "visited: 8 +node: {title: "n59" label: "ProjP 2 59" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n59" targetname: "n60" label: "0" } node: {title: "n60" label: "Alloc 60" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main @@ -85,31 +87,31 @@ edge: {sourcename: "n60" targetname: "n61" label: "1" } graph: { title: "n53" label: "Block 53" status:clustered color:yellow edge: {sourcename: "n53" targetname: "n52" label: "0" class:13 color:red} -node: {title: "n62" label: "ProjM 1 62" color: yellow info1: "visited: 8 +node: {title: "n62" label: "ProjM 1 62" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n62" targetname: "n54" label: "0" class:14 color:blue} -node: {title: "n61" label: "0x28Iu 61" color: yellow info1: "visited: 8 +node: {title: "n61" label: "0x28Iu 61" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n58" label: "0x3Iu 58" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n58" label: "0x3Iu 58" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n52" label: "ProjX 0 52" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n52" label: "ProjX 0 52" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n52" targetname: "n54" label: "0" class:13 color:red} -node: {title: "n54" label: "Start 54" color: blue info1: "visited: 8 +node: {title: "n54" label: "Start 54" info1: "visited: 8 irg: ARRAY-HEAP_EXAMPLE_main arity: 0 start of method of type ARRAY-HEAP_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg index a06d6dd77..674f23cb6 100644 --- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g33" label: "ARRAY-STACK_EXAMPLE_main" status:clustered color:white graph: { title: "n47" label: "Block 47" status:clustered color:yellow edge: {sourcename: "n47" targetname: "n48" label: "0" class:13 color:red} -node: {title: "n46" label: "End 46" color: blue info1: "visited: 10 +node: {title: "n46" label: "End 46" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n49" label: "Block 49" status:clustered color:yellow @@ -36,23 +38,23 @@ irg: ARRAY-STACK_EXAMPLE_main arity: 2 return in method of type main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n48" targetname: "n60" label: "0" class:14 color:blue} edge: {sourcename: "n48" targetname: "n53" label: "1" } -node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 10 +node: {title: "n60" label: "ProjM 0 60" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n60" targetname: "n54" label: "0" class:14 color:blue} -node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 10 +node: {title: "n53" label: "ProjIs 2 53" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n53" targetname: "n54" label: "0" } node: {title: "n54" label: "Load 54" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n54" targetname: "n59" label: "0" class:14 color:blue} edge: {sourcename: "n54" targetname: "n55" label: "1" } node: {title: "n55" label: "Sel a_tp_elem_ent 55" info1: "visited: 10 @@ -76,31 +78,31 @@ edge: {sourcename: "n57" targetname: "n58" label: "1" } graph: { title: "n51" label: "Block 51" status:clustered color:yellow edge: {sourcename: "n51" targetname: "n50" label: "0" class:13 color:red} -node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 10 +node: {title: "n59" label: "ProjM 1 59" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n59" targetname: "n52" label: "0" class:14 color:blue} -node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 10 +node: {title: "n58" label: "ProjP 2 58" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n58" targetname: "n52" label: "0" } -node: {title: "n56" label: "0x3Iu 56" color: yellow info1: "visited: 10 +node: {title: "n56" label: "0x3Iu 56" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 10 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n50" label: "ProjX 0 50" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n50" targetname: "n52" label: "0" class:13 color:red} -node: {title: "n52" label: "Start 52" color: blue info1: "visited: 10 +node: {title: "n52" label: "Start 52" info1: "visited: 10 irg: ARRAY-STACK_EXAMPLE_main arity: 0 start of method of type main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -125,14 +127,14 @@ edge: { sourcename: "t16" targetname: "t11"class: 10 label: "arr elt tp" color:g edge: { sourcename: "t16" targetname: "e19"class: 10 label: "arr ent" color: green} edge: { sourcename: "n20" targetname: "t16"label: "upper 0"} edge: { sourcename: "n21" targetname: "t16"label: "lower 0"} -node: {title: "n20" label: "0x9Iu 20" color: yellow info1: "visited: 2 +node: {title: "n20" label: "0x9Iu 20" info1: "visited: 2 arity: 0 Const of type type_unknown -"} -node: {title: "n21" label: "0x0Iu 21" color: yellow info1: "visited: 2 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n21" label: "0x0Iu 21" info1: "visited: 2 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t11" label: "primitive int" info1: "state: layout_fixed, mode: Is, size: 4B, @@ -170,10 +172,10 @@ irg = g33" } edge: { sourcename: "e15" targetname: "t13"class: 3 label: "type" color: red} edge: { sourcename: "e15" targetname: "n14"label: "value 0"} -node: {title: "n14" label: "&(ARRAY-STACK_EXAMPLE_main)P 14" color: yellow info1: "visited: 2 +node: {title: "n14" label: "&(ARRAY-STACK_EXAMPLE_main)P 14" info1: "visited: 2 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t12" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -182,6 +184,9 @@ edge: { sourcename: "t12" targetname: "e15"class: 12 label: "member" color:blue} node: {title: "t13" label: "method main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t13" targetname: "t11"class: 6 label: "res 0" color: green} edge: { sourcename: "n55" targetname: "e19"class:2 priority:2 linestyle:dotted} diff --git a/testprograms/ref-results/All_graphs.vcg b/testprograms/ref-results/All_graphs.vcg index 512b7301e..c2f52dee5 100644 --- a/testprograms/ref-results/All_graphs.vcg +++ b/testprograms/ref-results/All_graphs.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g35" label: "GlobalType_OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 48 +node: {title: "n103" label: "End 103" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n106" label: "Block 106" status:clustered color:yellow @@ -34,38 +36,38 @@ edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} node: {title: "n105" label: "Return 105" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } -node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 48 +node: {title: "n193" label: "FilterM 0 193" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 112 -"} +"color: yellow} edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} -node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 48 +node: {title: "n194" label: "FilterIs 0 194" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: ProjT 111 -"} +"color: yellow} edge: {sourcename: "n194" targetname: "n153" label: "0" } } graph: { title: "n188" label: "Block 188" status:clustered color:yellow edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} -node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 48 +node: {title: "n187" label: "FilterM 0 187" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 -"} +"color: yellow} edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} -node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 48 +node: {title: "n192" label: "ProjX 0 192" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -73,25 +75,25 @@ arity: 1 possible callees: 0: PRIMA_c "} -node: {title: "n190n165" label: "&(PRIMA_c)P 165" color: yellow info1: "visited: 48 +node: {title: "n190n165" label: "&(PRIMA_c)P 165" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n190" targetname: "n190n165" label: "0" } } graph: { title: "n182" label: "Block 182" status:clustered color:yellow edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 48 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 48 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } node: {title: "n115" label: "Alloc 115" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -104,10 +106,10 @@ arity: 0 "} edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } -node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 48 +node: {title: "n186" label: "ProjX 0 186" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -115,31 +117,31 @@ arity: 1 possible callees: 0: PRIMA_set_a "} -node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" color: yellow info1: "visited: 48 +node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n184" targetname: "n184n166" label: "0" } } graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 48 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 48 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} -node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 48 +node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -147,28 +149,28 @@ start of method of type OO_PROGRAM_EXAMPLE_main graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n179" label: "Block 179" status:clustered color:yellow edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} -node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 48 +node: {title: "n185" label: "ProjX 0 185" info1: "visited: 48 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} -node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 48 +node: {title: "n180" label: "EndReg 180" info1: "visited: 48 irg: PRIMA_set_a arity: 0 -"} +"color: blue} } graph: { title: "n132" label: "Block 132" status:clustered color:yellow edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 48 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 48 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 48 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } @@ -183,49 +185,49 @@ edge: {sourcename: "n140" targetname: "n176" label: "1" } node: {title: "n178" label: "Jmp 178" info1: "visited: 48 irg: PRIMA_set_a arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n134" label: "Block 134" status:clustered color:yellow edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} -node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 48 +node: {title: "n175" label: "FilterM 1 175" info1: "visited: 48 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 -"} +"color: yellow} edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} -node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 48 +node: {title: "n176" label: "FilterP 0 176" info1: "visited: 48 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} +"color: yellow} edge: {sourcename: "n176" targetname: "n114" label: "0" } -node: {title: "n177" label: "FilterIs 1 177" color: yellow info1: "visited: 48 +node: {title: "n177" label: "FilterIs 1 177" info1: "visited: 48 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} -node: {title: "n177n121" label: "0x2Is 121" color: yellow info1: "visited: 48 +"color: yellow} +node: {title: "n177n121" label: "0x2Is 121" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n177" targetname: "n177n121" label: "0" } -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 48 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 48 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} -node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 48 +node: {title: "n135" label: "Start PRIMA_set_a 135" info1: "visited: 48 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -233,23 +235,23 @@ start of method of type set_a graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n171" label: "Block 171" status:clustered color:yellow edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} -node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 48 +node: {title: "n191" label: "ProjX 0 191" info1: "visited: 48 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} -node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 48 +node: {title: "n172" label: "EndReg 172" info1: "visited: 48 irg: PRIMA_c arity: 0 -"} +"color: blue} } graph: { title: "n149" label: "Block 149" status:clustered color:yellow edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 48 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 48 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 48 irg: PRIMA_c @@ -257,15 +259,15 @@ arity: 2 "} edge: {sourcename: "n153" targetname: "n154" label: "0" } edge: {sourcename: "n153" targetname: "n167" label: "1" } -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 48 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 48 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } node: {title: "n155" label: "Load 155" info1: "visited: 48 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 48 @@ -279,49 +281,49 @@ edge: {sourcename: "n156" targetname: "n169" label: "1" } node: {title: "n170" label: "Jmp 170" info1: "visited: 48 irg: PRIMA_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n151" label: "Block 151" status:clustered color:yellow edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} -node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 48 +node: {title: "n168" label: "FilterM 1 168" info1: "visited: 48 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 -"} +"color: yellow} edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} -node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 48 +node: {title: "n169" label: "FilterP 0 169" info1: "visited: 48 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} +"color: yellow} edge: {sourcename: "n169" targetname: "n114" label: "0" } -node: {title: "n167" label: "FilterIs 1 167" color: yellow info1: "visited: 48 +node: {title: "n167" label: "FilterIs 1 167" info1: "visited: 48 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} -node: {title: "n167n113" label: "0x5Is 113" color: yellow info1: "visited: 48 +"color: yellow} +node: {title: "n167n113" label: "0x5Is 113" info1: "visited: 48 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n167" targetname: "n167n113" label: "0" } -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 48 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 48 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} -node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 48 +node: {title: "n152" label: "Start PRIMA_c 152" info1: "visited: 48 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg index 37b5275c4..88f487cf4 100644 --- a/testprograms/ref-results/All_types.vcg +++ b/testprograms/ref-results/All_types.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "t11" label: "primitive int" info1: "state: layout_fixed, mode: Is, @@ -27,6 +29,9 @@ size: 4B, node: {title: "t12" label: "method main_tp" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 1 +results: 1 "} edge: { sourcename: "t12" targetname: "t11"class: 5 label: "param 0" color: green} edge: { sourcename: "t12" targetname: "t11"class: 6 label: "res 0" color: green} @@ -50,10 +55,10 @@ irg = g27" } edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red} edge: { sourcename: "e15" targetname: "n14"label: "value 0"} -node: {title: "n14" label: "&(WHILE_EXAMPLE_main)P 14" color: yellow info1: "visited: 1 +node: {title: "n14" label: "&(WHILE_EXAMPLE_main)P 14" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent diff --git a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg index a6cb93a11..88292428e 100644 --- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg +++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g45" label: "CALL_STR_EXAMPLE_main" status:clustered color:white graph: { title: "n56" label: "Block 56" status:clustered color:yellow edge: {sourcename: "n56" targetname: "n57" label: "0" class:13 color:red} -node: {title: "n55" label: "End 55" color: blue info1: "visited: 6 +node: {title: "n55" label: "End 55" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n58" label: "Block 58" status:clustered color:yellow @@ -35,19 +37,19 @@ node: {title: "n57" label: "Return 57" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 1 return in method of type CALL_STR_EXAMPLE_main -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n57" targetname: "n62" label: "0" class:14 color:blue} -node: {title: "n62" label: "ProjM 0 62" color: yellow info1: "visited: 6 +node: {title: "n62" label: "ProjM 0 62" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n62" targetname: "n63" label: "0" class:14 color:blue} node: {title: "n63" label: "Call 63" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 3 calling method of type f param 0 type: ptr_to_string -"} +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} edge: {sourcename: "n63" targetname: "n66" label: "0" class:14 color:blue} edge: {sourcename: "n63" targetname: "n65" label: "1" } edge: {sourcename: "n63" targetname: "n64" label: "2" } @@ -55,30 +57,30 @@ edge: {sourcename: "n63" targetname: "n64" label: "2" } graph: { title: "n60" label: "Block 60" status:clustered color:yellow edge: {sourcename: "n60" targetname: "n59" label: "0" class:13 color:red} -node: {title: "n66" label: "ProjM 1 66" color: yellow info1: "visited: 6 +node: {title: "n66" label: "ProjM 1 66" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n66" targetname: "n61" label: "0" class:14 color:blue} node: {title: "n65" label: "SymC f 65" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 0 -"} -node: {title: "n64" label: "&(GlobalType_constStr)P 64" color: yellow info1: "visited: 6 +" info2: "(mode_is_int(mymode) || mode_is_reference(mymode)) && SymConst node"} +node: {title: "n64" label: "&(GlobalType_constStr)P 64" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 0 Const of type ptr_to_string -"} -node: {title: "n59" label: "ProjX 0 59" color: yellow info1: "visited: 6 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n59" label: "ProjX 0 59" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n59" targetname: "n61" label: "0" class:13 color:red} -node: {title: "n61" label: "Start 61" color: blue info1: "visited: 6 +node: {title: "n61" label: "Start 61" info1: "visited: 6 irg: CALL_STR_EXAMPLE_main arity: 0 start of method of type CALL_STR_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg index 077e227bd..9468f022c 100644 --- a/testprograms/ref-results/COND_EXAMPLE_main.vcg +++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g27" label: "COND_EXAMPLE_main" status:clustered color:white graph: { title: "n59" label: "Block 59" status:clustered color:yellow edge: {sourcename: "n59" targetname: "n60" label: "0" class:13 color:red} -node: {title: "n58" label: "End 58" color: blue info1: "visited: 9 +node: {title: "n58" label: "End 58" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n61" label: "Block 61" status:clustered color:yellow @@ -37,13 +39,13 @@ irg: COND_EXAMPLE_main arity: 2 return in method of type main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n60" targetname: "n87" label: "0" class:14 color:blue} edge: {sourcename: "n60" targetname: "n85" label: "1" } -node: {title: "n85" label: "PhiIs 85" color: green info1: "visited: 9 +node: {title: "n85" label: "PhiIs 85" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n85" targetname: "n86" label: "0" } edge: {sourcename: "n85" targetname: "n76" label: "1" } } @@ -53,30 +55,30 @@ edge: {sourcename: "n83" targetname: "n84" label: "0" class:13 color:red} node: {title: "n82" label: "Jmp 82" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n63" label: "Block 63" status:clustered color:yellow edge: {sourcename: "n63" targetname: "n64" label: "0" class:13 color:red} -node: {title: "n84" label: "ProjX 1 84" color: yellow info1: "visited: 9 +node: {title: "n84" label: "ProjX 1 84" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n84" targetname: "n67" label: "0" class:13 color:red} -node: {title: "n62" label: "ProjX 0 62" color: yellow info1: "visited: 9 +node: {title: "n62" label: "ProjX 0 62" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n62" targetname: "n67" label: "0" class:13 color:red} node: {title: "n67" label: "Cond 67" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n67" targetname: "n68" label: "0" } -node: {title: "n68" label: "Projb Ne 68" color: yellow info1: "visited: 9 +node: {title: "n68" label: "Projb Ne 68" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n68" targetname: "n69" label: "0" } node: {title: "n69" label: "CmpT 69" info1: "visited: 9 irg: COND_EXAMPLE_main @@ -95,10 +97,10 @@ irg: COND_EXAMPLE_main arity: 1 "} edge: {sourcename: "n78" targetname: "n79" label: "0" } -node: {title: "n79" label: "Projb Gt 79" color: yellow info1: "visited: 9 +node: {title: "n79" label: "Projb Gt 79" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n79" targetname: "n80" label: "0" } node: {title: "n80" label: "CmpT 80" info1: "visited: 9 irg: COND_EXAMPLE_main @@ -111,10 +113,10 @@ irg: COND_EXAMPLE_main arity: 1 "} edge: {sourcename: "n72" targetname: "n73" label: "0" } -node: {title: "n73" label: "Projb Lt 73" color: yellow info1: "visited: 9 +node: {title: "n73" label: "Projb Lt 73" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n73" targetname: "n74" label: "0" } node: {title: "n74" label: "CmpT 74" info1: "visited: 9 irg: COND_EXAMPLE_main @@ -122,56 +124,56 @@ arity: 2 "} edge: {sourcename: "n74" targetname: "n76" label: "0" } edge: {sourcename: "n74" targetname: "n75" label: "1" } -node: {title: "n76" label: "ProjIs 0 76" color: yellow info1: "visited: 9 +node: {title: "n76" label: "ProjIs 0 76" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n76" targetname: "n77" label: "0" } } graph: { title: "n65" label: "Block 65" status:clustered color:yellow edge: {sourcename: "n65" targetname: "n64" label: "0" class:13 color:red} -node: {title: "n87" label: "ProjM 1 87" color: yellow info1: "visited: 9 +node: {title: "n87" label: "ProjM 1 87" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n87" targetname: "n66" label: "0" class:14 color:blue} -node: {title: "n86" label: "0x1Is 86" color: yellow info1: "visited: 9 +node: {title: "n86" label: "0x1Is 86" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n81" label: "0x2Is 81" color: yellow info1: "visited: 9 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n81" label: "0x2Is 81" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n77" label: "ProjT 4 77" color: yellow info1: "visited: 9 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n77" label: "ProjT 4 77" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n77" targetname: "n66" label: "0" } -node: {title: "n75" label: "0xAIs 75" color: yellow info1: "visited: 9 +node: {title: "n75" label: "0xAIs 75" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n70" label: "0x0Is 70" color: yellow info1: "visited: 9 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n70" label: "0x0Is 70" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 9 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n64" label: "ProjX 0 64" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n64" targetname: "n66" label: "0" class:13 color:red} -node: {title: "n66" label: "Start 66" color: blue info1: "visited: 9 +node: {title: "n66" label: "Start 66" info1: "visited: 9 irg: COND_EXAMPLE_main arity: 0 start of method of type main param 0 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg index 6494e7b66..62fbb3e7e 100644 --- a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg +++ b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g27" label: "CONST_EVAL_EXAMPLE_main" status:clustered color:white graph: { title: "n44" label: "Block 44" status:clustered color:yellow edge: {sourcename: "n44" targetname: "n45" label: "0" class:13 color:red} -node: {title: "n43" label: "End 43" color: blue info1: "visited: 4 +node: {title: "n43" label: "End 43" info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n46" label: "Block 46" status:clustered color:yellow @@ -37,7 +39,7 @@ arity: 3 return in method of type main res 0 type: int res 1 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n45" targetname: "n51" label: "0" class:14 color:blue} edge: {sourcename: "n45" targetname: "n50" label: "1" } edge: {sourcename: "n45" targetname: "n50" label: "2" } @@ -45,26 +47,26 @@ edge: {sourcename: "n45" targetname: "n50" label: "2" } graph: { title: "n48" label: "Block 48" status:clustered color:yellow edge: {sourcename: "n48" targetname: "n47" label: "0" class:13 color:red} -node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 4 +node: {title: "n51" label: "ProjM 1 51" info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n51" targetname: "n49" label: "0" class:14 color:blue} -node: {title: "n50" label: "0xCIs 50" color: yellow info1: "visited: 4 +node: {title: "n50" label: "0xCIs 50" info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n47" label: "ProjX 0 47" color: yellow info1: "visited: 4 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n47" label: "ProjX 0 47" info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n47" targetname: "n49" label: "0" class:13 color:red} -node: {title: "n49" label: "Start 49" color: blue info1: "visited: 4 +node: {title: "n49" label: "Start 49" info1: "visited: 4 irg: CONST_EVAL_EXAMPLE_main arity: 0 start of method of type main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg index a5de53b02..b2d74f589 100644 --- a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg +++ b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "n57" label: "Block n57" } edge: { sourcename: "n57" targetname: "n65"} diff --git a/testprograms/ref-results/DEAD_BLOCK_main.vcg b/testprograms/ref-results/DEAD_BLOCK_main.vcg index 13de3fa7a..50457181f 100644 --- a/testprograms/ref-results/DEAD_BLOCK_main.vcg +++ b/testprograms/ref-results/DEAD_BLOCK_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g27" label: "DEAD_BLOCK_main" status:clustered color:white graph: { title: "n57" label: "Block 57" status:clustered color:yellow edge: {sourcename: "n57" targetname: "n58" label: "0" class:13 color:red} -node: {title: "n56" label: "End 56" color: blue info1: "visited: 9 +node: {title: "n56" label: "End 56" info1: "visited: 9 irg: DEAD_BLOCK_main arity: 0 -"} +"color: blue} } graph: { title: "n65" label: "Block 65" status:clustered color:yellow @@ -36,33 +38,33 @@ irg: DEAD_BLOCK_main arity: 2 return in method of type main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n58" targetname: "n67" label: "0" class:14 color:blue} edge: {sourcename: "n58" targetname: "n66" label: "1" } } graph: { title: "n61" label: "Block 61" status:clustered color:yellow edge: {sourcename: "n61" targetname: "n62" label: "0" class:13 color:red} -node: {title: "n67" label: "ProjM 1 67" color: yellow info1: "visited: 9 +node: {title: "n67" label: "ProjM 1 67" info1: "visited: 9 irg: DEAD_BLOCK_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n67" targetname: "n63" label: "0" class:14 color:blue} -node: {title: "n66" label: "0x2Is 66" color: yellow info1: "visited: 9 +node: {title: "n66" label: "0x2Is 66" info1: "visited: 9 irg: DEAD_BLOCK_main arity: 0 Const of type type_unknown -"} -node: {title: "n62" label: "ProjX 0 62" color: yellow info1: "visited: 9 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n62" label: "ProjX 0 62" info1: "visited: 9 irg: DEAD_BLOCK_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n62" targetname: "n63" label: "0" class:13 color:red} -node: {title: "n63" label: "Start 63" color: blue info1: "visited: 9 +node: {title: "n63" label: "Start 63" info1: "visited: 9 irg: DEAD_BLOCK_main arity: 0 start of method of type main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/EMPTY_main.vcg b/testprograms/ref-results/EMPTY_main.vcg index dce13563d..24308b4d0 100644 --- a/testprograms/ref-results/EMPTY_main.vcg +++ b/testprograms/ref-results/EMPTY_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g25" label: "EMPTY_main" status:clustered color:white graph: { title: "n15" label: "Block 15" status:clustered color:yellow edge: {sourcename: "n15" targetname: "n28" label: "0" class:13 color:red} -node: {title: "n16" label: "End 16" color: blue info1: "visited: 4 +node: {title: "n16" label: "End 16" info1: "visited: 4 irg: EMPTY_main arity: 0 -"} +"color: blue} } graph: { title: "n26" label: "Block 26" status:clustered color:yellow @@ -35,27 +37,27 @@ node: {title: "n28" label: "Return 28" info1: "visited: 4 irg: EMPTY_main arity: 1 return in method of type EMPTY_main -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n28" targetname: "n21" label: "0" class:14 color:blue} } graph: { title: "n17" label: "Block 17" status:clustered color:yellow edge: {sourcename: "n17" targetname: "n20" label: "0" class:13 color:red} -node: {title: "n21" label: "ProjM 1 21" color: yellow info1: "visited: 4 +node: {title: "n21" label: "ProjM 1 21" info1: "visited: 4 irg: EMPTY_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n21" targetname: "n18" label: "0" class:14 color:blue} -node: {title: "n20" label: "ProjX 0 20" color: yellow info1: "visited: 4 +node: {title: "n20" label: "ProjX 0 20" info1: "visited: 4 irg: EMPTY_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n20" targetname: "n18" label: "0" class:13 color:red} -node: {title: "n18" label: "Start 18" color: blue info1: "visited: 4 +node: {title: "n18" label: "Start 18" info1: "visited: 4 irg: EMPTY_main arity: 0 start of method of type EMPTY_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg index 0f54d72a3..0b1b36b02 100644 --- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg +++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg @@ -19,26 +19,28 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g27" label: "ENDLESS_LOOP_EXAMPLE_main" status:clustered color:white graph: { title: "n78" label: "Block 78" status:clustered color:yellow edge: {sourcename: "n78" targetname: "n82" label: "0" class:13 color:red} edge: {sourcename: "n78" targetname: "n79" label: "1" class:13 color:red} -node: {title: "n84" label: "PhiM 84" color: green info1: "visited: 19 +node: {title: "n84" label: "PhiM 84" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n84" targetname: "n94" label: "0" class:14 color:blue} edge: {sourcename: "n84" targetname: "n85" label: "1" class:14 color:blue} -node: {title: "n85" label: "ProjM 0 85" color: yellow info1: "visited: 19 +node: {title: "n85" label: "ProjM 0 85" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n85" targetname: "n86" label: "0" class:14 color:blue} node: {title: "n86" label: "Store 86" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n86" targetname: "n84" label: "0" class:14 color:blue} edge: {sourcename: "n86" targetname: "n92" label: "1" } edge: {sourcename: "n86" targetname: "n87" label: "2" } @@ -50,77 +52,77 @@ Selecting entity of type int "} edge: {sourcename: "n92" targetname: "n84" label: "0" class:14 color:blue} edge: {sourcename: "n92" targetname: "n93" label: "1" } -node: {title: "n87" label: "PhiIs 87" color: green info1: "visited: 19 +node: {title: "n87" label: "PhiIs 87" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n87" targetname: "n90" label: "0" } edge: {sourcename: "n87" targetname: "n88" label: "1" } -node: {title: "n88" label: "PhiIs 88" color: green info1: "visited: 19 +node: {title: "n88" label: "PhiIs 88" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n88" targetname: "n89" label: "0" } edge: {sourcename: "n88" targetname: "n87" label: "1" } node: {title: "n79" label: "Jmp 79" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n83" label: "Block 83" status:clustered color:yellow edge: {sourcename: "n83" targetname: "n76" label: "0" class:13 color:red} -node: {title: "n90" label: "ProjIs 0 90" color: yellow info1: "visited: 19 +node: {title: "n90" label: "ProjIs 0 90" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n90" targetname: "n91" label: "0" } node: {title: "n82" label: "Jmp 82" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n75" label: "Block 75" status:clustered color:yellow edge: {sourcename: "n75" targetname: "n76" label: "0" class:13 color:red} -node: {title: "n94" label: "ProjM 1 94" color: yellow info1: "visited: 19 +node: {title: "n94" label: "ProjM 1 94" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n94" targetname: "n77" label: "0" class:14 color:blue} -node: {title: "n93" label: "ProjP 3 93" color: yellow info1: "visited: 19 +node: {title: "n93" label: "ProjP 3 93" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n93" targetname: "n77" label: "0" } -node: {title: "n91" label: "ProjT 4 91" color: yellow info1: "visited: 19 +node: {title: "n91" label: "ProjT 4 91" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n91" targetname: "n77" label: "0" } -node: {title: "n89" label: "0x1Is 89" color: yellow info1: "visited: 19 +node: {title: "n89" label: "0x1Is 89" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n76" label: "ProjX 0 76" color: yellow info1: "visited: 19 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n76" label: "ProjX 0 76" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n76" targetname: "n77" label: "0" class:13 color:red} -node: {title: "n77" label: "Start 77" color: blue info1: "visited: 19 +node: {title: "n77" label: "Start 77" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 0 start of method of type main_tp param 0 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } graph: { title: "n73" label: "Block 73" status:clustered color:yellow -node: {title: "n72" label: "End 72" color: blue info1: "visited: 19 +node: {title: "n72" label: "End 72" info1: "visited: 19 irg: ENDLESS_LOOP_EXAMPLE_main arity: 2 -"} +"color: blue} edge: {sourcename: "n72" targetname: "n78" label: "0" class:13 color:red} edge: {sourcename: "n72" targetname: "n84" label: "1" } } diff --git a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg index d2f55564f..9cfc36336 100644 --- a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg +++ b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g26" label: "FLOAT_EXAMPLE_main" status:clustered color:white graph: { title: "n16" label: "Block 16" status:clustered color:yellow edge: {sourcename: "n16" targetname: "n30" label: "0" class:13 color:red} -node: {title: "n17" label: "End 17" color: blue info1: "visited: 4 +node: {title: "n17" label: "End 17" info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n27" label: "Block 27" status:clustered color:yellow @@ -36,33 +38,33 @@ irg: FLOAT_EXAMPLE_main arity: 2 return in method of type FLOAT_EXAMPLE_main res 0 type: dbl -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n30" targetname: "n22" label: "0" class:14 color:blue} edge: {sourcename: "n30" targetname: "n28" label: "1" } } graph: { title: "n18" label: "Block 18" status:clustered color:yellow edge: {sourcename: "n18" targetname: "n21" label: "0" class:13 color:red} -node: {title: "n22" label: "ProjM 1 22" color: yellow info1: "visited: 4 +node: {title: "n22" label: "ProjM 1 22" info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n22" targetname: "n19" label: "0" class:14 color:blue} -node: {title: "n28" label: "1.234567890123456716800000000000E+19D 28" color: yellow info1: "visited: 4 +node: {title: "n28" label: "1.234567890123456716800000000000E+19D 28" info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n21" label: "ProjX 0 21" color: yellow info1: "visited: 4 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n21" label: "ProjX 0 21" info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n21" targetname: "n19" label: "0" class:13 color:red} -node: {title: "n19" label: "Start 19" color: blue info1: "visited: 4 +node: {title: "n19" label: "Start 19" info1: "visited: 4 irg: FLOAT_EXAMPLE_main arity: 0 start of method of type FLOAT_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg index 9ec7c1bbf..b638fcb87 100644 --- a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg @@ -19,20 +19,22 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g26" label: "GLOBAL_CSE_EXAMPLE_main" status:clustered color:white graph: { title: "n62" label: "Block 62" status:clustered color:yellow edge: {sourcename: "n62" targetname: "n63" label: "0" class:13 color:red} -node: {title: "n61" label: "End 61" color: blue info1: "visited: 12 +node: {title: "n61" label: "End 61" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 -"} +"color: blue} } -node: {title: "n86" label: "ProjM 1 86" color: yellow info1: "visited: 12 +node: {title: "n86" label: "ProjM 1 86" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n86" targetname: "n71" label: "0" class:14 color:blue} node: {title: "n84" label: "AddIs 84" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main @@ -40,22 +42,22 @@ arity: 2 "} edge: {sourcename: "n84" targetname: "n82" label: "0" } edge: {sourcename: "n84" targetname: "n85" label: "1" } -node: {title: "n85" label: "0x5Is 85" color: yellow info1: "visited: 12 +node: {title: "n85" label: "0x5Is 85" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "n82" label: "SubIs 82" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 2 "} edge: {sourcename: "n82" targetname: "n76" label: "0" } edge: {sourcename: "n82" targetname: "n83" label: "1" } -node: {title: "n83" label: "0x3Is 83" color: yellow info1: "visited: 12 +node: {title: "n83" label: "0x3Is 83" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} graph: { title: "n64" label: "Block 64" status:clustered color:yellow edge: {sourcename: "n64" targetname: "n78" label: "0" class:13 color:red} edge: {sourcename: "n64" targetname: "n65" label: "1" class:13 color:red} @@ -64,13 +66,13 @@ irg: GLOBAL_CSE_EXAMPLE_main arity: 2 return in method of type GLOBAL_CSE_EXAMPLE_main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n63" targetname: "n86" label: "0" class:14 color:blue} edge: {sourcename: "n63" targetname: "n81" label: "1" } -node: {title: "n81" label: "PhiIs 81" color: green info1: "visited: 12 +node: {title: "n81" label: "PhiIs 81" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n81" targetname: "n84" label: "0" } edge: {sourcename: "n81" targetname: "n82" label: "1" } } @@ -80,31 +82,31 @@ edge: {sourcename: "n79" targetname: "n80" label: "0" class:13 color:red} node: {title: "n78" label: "Jmp 78" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } -node: {title: "n80" label: "ProjX 0 80" color: yellow info1: "visited: 12 +node: {title: "n80" label: "ProjX 0 80" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n80" targetname: "n72" label: "0" class:13 color:red} graph: { title: "n66" label: "Block 66" status:clustered color:yellow edge: {sourcename: "n66" targetname: "n67" label: "0" class:13 color:red} node: {title: "n65" label: "Jmp 65" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } -node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 12 +node: {title: "n67" label: "ProjX 1 67" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n67" targetname: "n72" label: "0" class:13 color:red} -node: {title: "n73" label: "Projb Eq 73" color: yellow info1: "visited: 12 +node: {title: "n73" label: "Projb Eq 73" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n73" targetname: "n74" label: "0" } node: {title: "n74" label: "CmpT 74" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main @@ -112,43 +114,43 @@ arity: 2 "} edge: {sourcename: "n74" targetname: "n76" label: "0" } edge: {sourcename: "n74" targetname: "n75" label: "1" } -node: {title: "n76" label: "ProjIs 0 76" color: yellow info1: "visited: 12 +node: {title: "n76" label: "ProjIs 0 76" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n76" targetname: "n77" label: "0" } -node: {title: "n77" label: "ProjT 4 77" color: yellow info1: "visited: 12 +node: {title: "n77" label: "ProjT 4 77" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n77" targetname: "n71" label: "0" } -node: {title: "n75" label: "0x2Is 75" color: yellow info1: "visited: 12 +node: {title: "n75" label: "0x2Is 75" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} graph: { title: "n68" label: "Block 68" status:clustered color:yellow edge: {sourcename: "n68" targetname: "n69" label: "0" class:13 color:red} node: {title: "n72" label: "Cond 72" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n72" targetname: "n73" label: "0" } } -node: {title: "n69" label: "ProjX 0 69" color: yellow info1: "visited: 12 +node: {title: "n69" label: "ProjX 0 69" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n69" targetname: "n71" label: "0" class:13 color:red} graph: { title: "n70" label: "Block 70" status:clustered color:yellow edge: {sourcename: "n70" targetname: "n69" label: "0" class:13 color:red} -node: {title: "n71" label: "Start 71" color: blue info1: "visited: 12 +node: {title: "n71" label: "Start 71" info1: "visited: 12 irg: GLOBAL_CSE_EXAMPLE_main arity: 0 start of method of type GLOBAL_CSE_EXAMPLE_main param 0 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg index 969444bb4..e276487c9 100644 --- a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg +++ b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg @@ -19,45 +19,47 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n42" label: "Block 42" color: lightyellow info1: "visited: 8 +node: {title: "n42" label: "Block 42" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n42" targetname: "n41" label: "0" class:13 color:red} -node: {title: "n43" label: "Start 43" color: blue info1: "visited: 8 +node: {title: "n43" label: "Start 43" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 0 start of method of type GLOBAL_VAR_main -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n43" targetname: "n42" class:2 priority:2 linestyle:dotted} -node: {title: "n41" label: "ProjX 0 41" color: yellow info1: "visited: 8 +node: {title: "n41" label: "ProjX 0 41" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n41" targetname: "n43" label: "0" class:13 color:red} edge: { sourcename: "n41" targetname: "n42" class:2 priority:2 linestyle:dotted} -node: {title: "n40" label: "Block 40" color: lightyellow info1: "visited: 8 +node: {title: "n40" label: "Block 40" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n40" targetname: "n41" label: "0" class:13 color:red} -node: {title: "n46" label: "0x2Is 46" color: yellow info1: "visited: 8 +node: {title: "n46" label: "0x2Is 46" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} edge: { sourcename: "n46" targetname: "n42" class:2 priority:2 linestyle:dotted} -node: {title: "n48" label: "ProjP 3 48" color: yellow info1: "visited: 8 +node: {title: "n48" label: "ProjP 3 48" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n48" targetname: "n43" label: "0" } edge: { sourcename: "n48" targetname: "n42" class:2 priority:2 linestyle:dotted} -node: {title: "n49" label: "ProjM 1 49" color: yellow info1: "visited: 8 +node: {title: "n49" label: "ProjM 1 49" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n49" targetname: "n43" label: "0" class:14 color:blue} edge: { sourcename: "n49" targetname: "n42" class:2 priority:2 linestyle:dotted} node: {title: "n47" label: "Sel i 47" info1: "visited: 8 @@ -72,33 +74,33 @@ edge: { sourcename: "n47" targetname: "n40" class:2 priority:2 linestyle:dotted} node: {title: "n45" label: "Store 45" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n45" targetname: "n49" label: "0" class:14 color:blue} edge: {sourcename: "n45" targetname: "n47" label: "1" } edge: {sourcename: "n45" targetname: "n46" label: "2" } edge: { sourcename: "n45" targetname: "n40" class:2 priority:2 linestyle:dotted} -node: {title: "n44" label: "ProjM 0 44" color: yellow info1: "visited: 8 +node: {title: "n44" label: "ProjM 0 44" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n44" targetname: "n45" label: "0" class:14 color:blue} edge: { sourcename: "n44" targetname: "n40" class:2 priority:2 linestyle:dotted} node: {title: "n39" label: "Return 39" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 return in method of type GLOBAL_VAR_main -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n39" targetname: "n44" label: "0" class:14 color:blue} edge: { sourcename: "n39" targetname: "n40" class:2 priority:2 linestyle:dotted} -node: {title: "n38" label: "Block 38" color: lightyellow info1: "visited: 8 +node: {title: "n38" label: "Block 38" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n38" targetname: "n39" label: "0" class:13 color:red} -node: {title: "n37" label: "End 37" color: blue info1: "visited: 8 +node: {title: "n37" label: "End 37" info1: "visited: 8 irg: GLOBAL_VAR_main arity: 0 -"} +"color: blue} edge: { sourcename: "n37" targetname: "n38" class:2 priority:2 linestyle:dotted} node: {title: "e15" label: "ent i" color: yellow info1: " @@ -134,13 +136,16 @@ irg = g27" } edge: { sourcename: "e14" targetname: "t12"class: 3 label: "type" color: red} edge: { sourcename: "e14" targetname: "n13"label: "value 0"} -node: {title: "n13" label: "&(GlobalType_GLOBAL_VAR_main)P 13" color: yellow info1: "visited: 1 +node: {title: "n13" label: "&(GlobalType_GLOBAL_VAR_main)P 13" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t12" label: "method GLOBAL_VAR_main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 0 "} node: {title: "t11" label: "primitive int" info1: "state: layout_fixed, mode: Is, diff --git a/testprograms/ref-results/GLOBAL_VAR_main.vcg b/testprograms/ref-results/GLOBAL_VAR_main.vcg index 547e671f9..6f14749b9 100644 --- a/testprograms/ref-results/GLOBAL_VAR_main.vcg +++ b/testprograms/ref-results/GLOBAL_VAR_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g27" label: "GLOBAL_VAR_main" status:clustered color:white graph: { title: "n38" label: "Block 38" status:clustered color:yellow edge: {sourcename: "n38" targetname: "n39" label: "0" class:13 color:red} -node: {title: "n37" label: "End 37" color: blue info1: "visited: 7 +node: {title: "n37" label: "End 37" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 0 -"} +"color: blue} } graph: { title: "n40" label: "Block 40" status:clustered color:yellow @@ -35,17 +37,17 @@ node: {title: "n39" label: "Return 39" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 return in method of type GLOBAL_VAR_main -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n39" targetname: "n44" label: "0" class:14 color:blue} -node: {title: "n44" label: "ProjM 0 44" color: yellow info1: "visited: 7 +node: {title: "n44" label: "ProjM 0 44" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n44" targetname: "n45" label: "0" class:14 color:blue} node: {title: "n45" label: "Store 45" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n45" targetname: "n49" label: "0" class:14 color:blue} edge: {sourcename: "n45" targetname: "n47" label: "1" } edge: {sourcename: "n45" targetname: "n46" label: "2" } @@ -61,31 +63,31 @@ edge: {sourcename: "n47" targetname: "n48" label: "1" } graph: { title: "n42" label: "Block 42" status:clustered color:yellow edge: {sourcename: "n42" targetname: "n41" label: "0" class:13 color:red} -node: {title: "n49" label: "ProjM 1 49" color: yellow info1: "visited: 7 +node: {title: "n49" label: "ProjM 1 49" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n49" targetname: "n43" label: "0" class:14 color:blue} -node: {title: "n48" label: "ProjP 3 48" color: yellow info1: "visited: 7 +node: {title: "n48" label: "ProjP 3 48" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n48" targetname: "n43" label: "0" } -node: {title: "n46" label: "0x2Is 46" color: yellow info1: "visited: 7 +node: {title: "n46" label: "0x2Is 46" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 0 Const of type type_unknown -"} -node: {title: "n41" label: "ProjX 0 41" color: yellow info1: "visited: 7 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n41" label: "ProjX 0 41" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n41" targetname: "n43" label: "0" class:13 color:red} -node: {title: "n43" label: "Start 43" color: blue info1: "visited: 7 +node: {title: "n43" label: "Start 43" info1: "visited: 7 irg: GLOBAL_VAR_main arity: 0 start of method of type GLOBAL_VAR_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg index 2c2f00cbf..5e992c7bc 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g35" label: "GlobalType_OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 31 +node: {title: "n103" label: "End 103" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n106" label: "Block 106" status:clustered color:yellow @@ -34,38 +36,38 @@ edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} node: {title: "n105" label: "Return 105" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } -node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 31 +node: {title: "n193" label: "FilterM 0 193" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 112 -"} +"color: yellow} edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} -node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 31 +node: {title: "n194" label: "FilterIs 0 194" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: ProjT 111 -"} +"color: yellow} edge: {sourcename: "n194" targetname: "n153" label: "0" } } graph: { title: "n188" label: "Block 188" status:clustered color:yellow edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} -node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 31 +node: {title: "n187" label: "FilterM 0 187" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 -"} +"color: yellow} edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} -node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 31 +node: {title: "n192" label: "ProjX 0 192" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -73,25 +75,25 @@ arity: 1 possible callees: 0: PRIMA_c "} -node: {title: "n190n165" label: "&(PRIMA_c)P 165" color: yellow info1: "visited: 31 +node: {title: "n190n165" label: "&(PRIMA_c)P 165" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n190" targetname: "n190n165" label: "0" } } graph: { title: "n182" label: "Block 182" status:clustered color:yellow edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 31 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 31 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } node: {title: "n115" label: "Alloc 115" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -104,10 +106,10 @@ arity: 0 "} edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } -node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 31 +node: {title: "n186" label: "ProjX 0 186" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -115,31 +117,31 @@ arity: 1 possible callees: 0: PRIMA_set_a "} -node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" color: yellow info1: "visited: 31 +node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n184" targetname: "n184n166" label: "0" } } graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 31 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 31 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} -node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 31 +node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -147,28 +149,28 @@ start of method of type OO_PROGRAM_EXAMPLE_main graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n179" label: "Block 179" status:clustered color:yellow edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} -node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 31 +node: {title: "n185" label: "ProjX 0 185" info1: "visited: 31 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} -node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 31 +node: {title: "n180" label: "EndReg 180" info1: "visited: 31 irg: PRIMA_set_a arity: 0 -"} +"color: blue} } graph: { title: "n132" label: "Block 132" status:clustered color:yellow edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 31 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 31 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 31 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } @@ -183,49 +185,49 @@ edge: {sourcename: "n140" targetname: "n176" label: "1" } node: {title: "n178" label: "Jmp 178" info1: "visited: 31 irg: PRIMA_set_a arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n134" label: "Block 134" status:clustered color:yellow edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} -node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 31 +node: {title: "n175" label: "FilterM 1 175" info1: "visited: 31 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 -"} +"color: yellow} edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} -node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 31 +node: {title: "n176" label: "FilterP 0 176" info1: "visited: 31 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} +"color: yellow} edge: {sourcename: "n176" targetname: "n114" label: "0" } -node: {title: "n177" label: "FilterIs 1 177" color: yellow info1: "visited: 31 +node: {title: "n177" label: "FilterIs 1 177" info1: "visited: 31 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} -node: {title: "n177n121" label: "0x2Is 121" color: yellow info1: "visited: 31 +"color: yellow} +node: {title: "n177n121" label: "0x2Is 121" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n177" targetname: "n177n121" label: "0" } -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 31 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 31 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} -node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 31 +node: {title: "n135" label: "Start PRIMA_set_a 135" info1: "visited: 31 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -233,23 +235,23 @@ start of method of type set_a graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n171" label: "Block 171" status:clustered color:yellow edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} -node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 31 +node: {title: "n191" label: "ProjX 0 191" info1: "visited: 31 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} -node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 31 +node: {title: "n172" label: "EndReg 172" info1: "visited: 31 irg: PRIMA_c arity: 0 -"} +"color: blue} } graph: { title: "n149" label: "Block 149" status:clustered color:yellow edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 31 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 31 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 31 irg: PRIMA_c @@ -257,15 +259,15 @@ arity: 2 "} edge: {sourcename: "n153" targetname: "n154" label: "0" } edge: {sourcename: "n153" targetname: "n167" label: "1" } -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 31 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 31 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } node: {title: "n155" label: "Load 155" info1: "visited: 31 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 31 @@ -279,49 +281,49 @@ edge: {sourcename: "n156" targetname: "n169" label: "1" } node: {title: "n170" label: "Jmp 170" info1: "visited: 31 irg: PRIMA_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n151" label: "Block 151" status:clustered color:yellow edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} -node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 31 +node: {title: "n168" label: "FilterM 1 168" info1: "visited: 31 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 -"} +"color: yellow} edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} -node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 31 +node: {title: "n169" label: "FilterP 0 169" info1: "visited: 31 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} +"color: yellow} edge: {sourcename: "n169" targetname: "n114" label: "0" } -node: {title: "n167" label: "FilterIs 1 167" color: yellow info1: "visited: 31 +node: {title: "n167" label: "FilterIs 1 167" info1: "visited: 31 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} -node: {title: "n167n113" label: "0x5Is 113" color: yellow info1: "visited: 31 +"color: yellow} +node: {title: "n167n113" label: "0x5Is 113" info1: "visited: 31 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n167" targetname: "n167n113" label: "0" } -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 31 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 31 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} -node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 31 +node: {title: "n152" label: "Start PRIMA_c 152" info1: "visited: 31 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg index 257c86ead..19cc7898f 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-ip.vcg @@ -19,28 +19,30 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 29 +node: {title: "n108" label: "Block 108" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 29 +node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n109" targetname: "n108" class:2 priority:2 linestyle:dotted} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 29 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} edge: { sourcename: "n107" targetname: "n108" class:2 priority:2 linestyle:dotted} -node: {title: "n182" label: "Block 182" color: lightyellow info1: "visited: 29 +node: {title: "n182" label: "Block 182" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -48,68 +50,68 @@ arity: 1 possible callees: 0: PRIMA_set_a "} -node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" color: yellow info1: "visited: 29 +node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n184" targetname: "n184n166" label: "0" } edge: { sourcename: "n184" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 29 +node: {title: "n186" label: "ProjX 0 186" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} edge: { sourcename: "n186" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n134" label: "Block 134" color: lightyellow info1: "visited: 29 +node: {title: "n134" label: "Block 134" info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} -node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 29 +node: {title: "n135" label: "Start PRIMA_set_a 135" info1: "visited: 29 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n135" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 29 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 29 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} edge: { sourcename: "n133" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n132" label: "Block 132" color: lightyellow info1: "visited: 29 +node: {title: "n132" label: "Block 132" info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n178" label: "Jmp 178" info1: "visited: 29 irg: PRIMA_set_a arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} edge: { sourcename: "n178" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n179" label: "Block 179" color: lightyellow info1: "visited: 29 +node: {title: "n179" label: "Block 179" info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} -node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 29 +node: {title: "n180" label: "EndReg 180" info1: "visited: 29 irg: PRIMA_set_a arity: 0 -"} +"color: blue} edge: { sourcename: "n180" targetname: "n179" class:2 priority:2 linestyle:dotted} -node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 29 +node: {title: "n185" label: "ProjX 0 185" info1: "visited: 29 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} edge: { sourcename: "n185" targetname: "n179" class:2 priority:2 linestyle:dotted} -node: {title: "n188" label: "Block 188" color: lightyellow info1: "visited: 29 +node: {title: "n188" label: "Block 188" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -117,86 +119,86 @@ arity: 1 possible callees: 0: PRIMA_c "} -node: {title: "n190n165" label: "&(PRIMA_c)P 165" color: yellow info1: "visited: 29 +node: {title: "n190n165" label: "&(PRIMA_c)P 165" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n190" targetname: "n190n165" label: "0" } edge: { sourcename: "n190" targetname: "n188" class:2 priority:2 linestyle:dotted} -node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 29 +node: {title: "n192" label: "ProjX 0 192" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} edge: { sourcename: "n192" targetname: "n188" class:2 priority:2 linestyle:dotted} -node: {title: "n151" label: "Block 151" color: lightyellow info1: "visited: 29 +node: {title: "n151" label: "Block 151" info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} -node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 29 +node: {title: "n152" label: "Start PRIMA_c 152" info1: "visited: 29 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n152" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 29 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 29 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} edge: { sourcename: "n150" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n149" label: "Block 149" color: lightyellow info1: "visited: 29 +node: {title: "n149" label: "Block 149" info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n170" label: "Jmp 170" info1: "visited: 29 irg: PRIMA_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} edge: { sourcename: "n170" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n171" label: "Block 171" color: lightyellow info1: "visited: 29 +node: {title: "n171" label: "Block 171" info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} -node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 29 +node: {title: "n172" label: "EndReg 172" info1: "visited: 29 irg: PRIMA_c arity: 0 -"} +"color: blue} edge: { sourcename: "n172" targetname: "n171" class:2 priority:2 linestyle:dotted} -node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 29 +node: {title: "n191" label: "ProjX 0 191" info1: "visited: 29 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} edge: { sourcename: "n191" targetname: "n171" class:2 priority:2 linestyle:dotted} -node: {title: "n106" label: "Block 106" color: lightyellow info1: "visited: 29 +node: {title: "n106" label: "Block 106" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} -node: {title: "n167" label: "FilterIs 1 167" color: yellow info1: "visited: 29 +node: {title: "n167" label: "FilterIs 1 167" info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} -node: {title: "n167n113" label: "0x5Is 113" color: yellow info1: "visited: 29 +"color: yellow} +node: {title: "n167n113" label: "0x5Is 113" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n167" targetname: "n167n113" label: "0" } edge: { sourcename: "n167" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 29 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} edge: { sourcename: "n117" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n115" label: "Alloc 115" info1: "visited: 29 @@ -211,53 +213,53 @@ arity: 0 edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } edge: { sourcename: "n115" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 29 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } edge: { sourcename: "n114" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 29 +node: {title: "n169" label: "FilterP 0 169" info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} +"color: yellow} edge: {sourcename: "n169" targetname: "n114" label: "0" } edge: { sourcename: "n169" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n177" label: "FilterIs 1 177" color: yellow info1: "visited: 29 +node: {title: "n177" label: "FilterIs 1 177" info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} -node: {title: "n177n121" label: "0x2Is 121" color: yellow info1: "visited: 29 +"color: yellow} +node: {title: "n177n121" label: "0x2Is 121" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n177" targetname: "n177n121" label: "0" } edge: { sourcename: "n177" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 29 +node: {title: "n176" label: "FilterP 0 176" info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} +"color: yellow} edge: {sourcename: "n176" targetname: "n114" label: "0" } edge: { sourcename: "n176" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 29 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} edge: { sourcename: "n123" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 29 +node: {title: "n175" label: "FilterM 1 175" info1: "visited: 29 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 -"} +"color: yellow} edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} edge: { sourcename: "n175" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n140" label: "Sel a 140" info1: "visited: 29 @@ -272,31 +274,31 @@ edge: { sourcename: "n140" targetname: "n132" class:2 priority:2 linestyle:dotte node: {title: "n137" label: "Store 137" info1: "visited: 29 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } edge: { sourcename: "n137" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 29 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 29 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} edge: { sourcename: "n136" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 29 +node: {title: "n187" label: "FilterM 0 187" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 -"} +"color: yellow} edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} edge: { sourcename: "n187" targetname: "n188" class:2 priority:2 linestyle:dotted} -node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 29 +node: {title: "n168" label: "FilterM 1 168" info1: "visited: 29 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 -"} +"color: yellow} edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} edge: { sourcename: "n168" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n156" label: "Sel a 156" info1: "visited: 29 @@ -311,14 +313,14 @@ edge: { sourcename: "n156" targetname: "n149" class:2 priority:2 linestyle:dotte node: {title: "n155" label: "Load 155" info1: "visited: 29 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } edge: { sourcename: "n155" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 29 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 29 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } edge: { sourcename: "n154" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n153" label: "AddIs 153" info1: "visited: 29 @@ -328,43 +330,43 @@ arity: 2 edge: {sourcename: "n153" targetname: "n154" label: "0" } edge: {sourcename: "n153" targetname: "n167" label: "1" } edge: { sourcename: "n153" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 29 +node: {title: "n194" label: "FilterIs 0 194" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: ProjT 111 -"} +"color: yellow} edge: {sourcename: "n194" targetname: "n153" label: "0" } edge: { sourcename: "n194" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 29 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 29 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} edge: { sourcename: "n161" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 29 +node: {title: "n193" label: "FilterM 0 193" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 112 -"} +"color: yellow} edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} edge: { sourcename: "n193" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n105" label: "Return 105" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } edge: { sourcename: "n105" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n104" label: "Block 104" color: lightyellow info1: "visited: 29 +node: {title: "n104" label: "Block 104" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_op(pred) == op_Return) || is_Bad(pred) || (get_irn_op(pred) == op_Raise) || is_fragile_op(pred) ) && End Block node"color: lightyellow} edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 29 +node: {title: "n103" label: "End 103" info1: "visited: 29 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} edge: { sourcename: "n103" targetname: "n104" class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg index 13e7ed83a..75c2d6ae7 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg @@ -19,28 +19,30 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 33 +node: {title: "n108" label: "Block 108" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 33 +node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n109" targetname: "n108" class:2 priority:2 linestyle:dotted} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 33 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} edge: { sourcename: "n107" targetname: "n108" class:2 priority:2 linestyle:dotted} -node: {title: "n182" label: "Block 182" color: lightyellow info1: "visited: 33 +node: {title: "n182" label: "Block 182" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -48,68 +50,68 @@ arity: 1 possible callees: 0: PRIMA_set_a "} -node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" color: yellow info1: "visited: 33 +node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n184" targetname: "n184n166" label: "0" } edge: { sourcename: "n184" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 33 +node: {title: "n186" label: "ProjX 0 186" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} edge: { sourcename: "n186" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n134" label: "Block 134" color: lightyellow info1: "visited: 33 +node: {title: "n134" label: "Block 134" info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} -node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 33 +node: {title: "n135" label: "Start PRIMA_set_a 135" info1: "visited: 33 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n135" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 33 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 33 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} edge: { sourcename: "n133" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n132" label: "Block 132" color: lightyellow info1: "visited: 33 +node: {title: "n132" label: "Block 132" info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} node: {title: "n178" label: "Jmp 178" info1: "visited: 33 irg: PRIMA_set_a arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} edge: { sourcename: "n178" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n179" label: "Block 179" color: lightyellow info1: "visited: 33 +node: {title: "n179" label: "Block 179" info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} -node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 33 +node: {title: "n180" label: "EndReg 180" info1: "visited: 33 irg: PRIMA_set_a arity: 0 -"} +"color: blue} edge: { sourcename: "n180" targetname: "n179" class:2 priority:2 linestyle:dotted} -node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 33 +node: {title: "n185" label: "ProjX 0 185" info1: "visited: 33 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} edge: { sourcename: "n185" targetname: "n179" class:2 priority:2 linestyle:dotted} -node: {title: "n188" label: "Block 188" color: lightyellow info1: "visited: 33 +node: {title: "n188" label: "Block 188" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -117,86 +119,86 @@ arity: 1 possible callees: 0: PRIMA_c "} -node: {title: "n190n165" label: "&(PRIMA_c)P 165" color: yellow info1: "visited: 33 +node: {title: "n190n165" label: "&(PRIMA_c)P 165" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n190" targetname: "n190n165" label: "0" } edge: { sourcename: "n190" targetname: "n188" class:2 priority:2 linestyle:dotted} -node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 33 +node: {title: "n192" label: "ProjX 0 192" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} edge: { sourcename: "n192" targetname: "n188" class:2 priority:2 linestyle:dotted} -node: {title: "n151" label: "Block 151" color: lightyellow info1: "visited: 33 +node: {title: "n151" label: "Block 151" info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} -node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 33 +node: {title: "n152" label: "Start PRIMA_c 152" info1: "visited: 33 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n152" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 33 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 33 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} edge: { sourcename: "n150" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n149" label: "Block 149" color: lightyellow info1: "visited: 33 +node: {title: "n149" label: "Block 149" info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} node: {title: "n170" label: "Jmp 170" info1: "visited: 33 irg: PRIMA_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} edge: { sourcename: "n170" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n171" label: "Block 171" color: lightyellow info1: "visited: 33 +node: {title: "n171" label: "Block 171" info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} -node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 33 +node: {title: "n172" label: "EndReg 172" info1: "visited: 33 irg: PRIMA_c arity: 0 -"} +"color: blue} edge: { sourcename: "n172" targetname: "n171" class:2 priority:2 linestyle:dotted} -node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 33 +node: {title: "n191" label: "ProjX 0 191" info1: "visited: 33 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} edge: { sourcename: "n191" targetname: "n171" class:2 priority:2 linestyle:dotted} -node: {title: "n106" label: "Block 106" color: lightyellow info1: "visited: 33 +node: {title: "n106" label: "Block 106" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "(is_Bad(pred) || is_Unknown(pred) || (get_irn_mode(pred) == mode_X) ) && Block node"color: lightyellow} edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} -node: {title: "n167" label: "FilterIs 1 167" color: yellow info1: "visited: 33 +node: {title: "n167" label: "FilterIs 1 167" info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} -node: {title: "n167n113" label: "0x5Is 113" color: yellow info1: "visited: 33 +"color: yellow} +node: {title: "n167n113" label: "0x5Is 113" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n167" targetname: "n167n113" label: "0" } edge: { sourcename: "n167" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 33 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} edge: { sourcename: "n117" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n115" label: "Alloc 115" info1: "visited: 33 @@ -211,53 +213,53 @@ arity: 0 edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } edge: { sourcename: "n115" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 33 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } edge: { sourcename: "n114" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 33 +node: {title: "n169" label: "FilterP 0 169" info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} +"color: yellow} edge: {sourcename: "n169" targetname: "n114" label: "0" } edge: { sourcename: "n169" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n177" label: "FilterIs 1 177" color: yellow info1: "visited: 33 +node: {title: "n177" label: "FilterIs 1 177" info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} -node: {title: "n177n121" label: "0x2Is 121" color: yellow info1: "visited: 33 +"color: yellow} +node: {title: "n177n121" label: "0x2Is 121" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n177" targetname: "n177n121" label: "0" } edge: { sourcename: "n177" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 33 +node: {title: "n176" label: "FilterP 0 176" info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} +"color: yellow} edge: {sourcename: "n176" targetname: "n114" label: "0" } edge: { sourcename: "n176" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 33 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} edge: { sourcename: "n123" targetname: "n182" class:2 priority:2 linestyle:dotted} -node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 33 +node: {title: "n175" label: "FilterM 1 175" info1: "visited: 33 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 -"} +"color: yellow} edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} edge: { sourcename: "n175" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n140" label: "Sel a 140" info1: "visited: 33 @@ -272,31 +274,31 @@ edge: { sourcename: "n140" targetname: "n132" class:2 priority:2 linestyle:dotte node: {title: "n137" label: "Store 137" info1: "visited: 33 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } edge: { sourcename: "n137" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 33 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 33 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} edge: { sourcename: "n136" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 33 +node: {title: "n187" label: "FilterM 0 187" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 -"} +"color: yellow} edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} edge: { sourcename: "n187" targetname: "n188" class:2 priority:2 linestyle:dotted} -node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 33 +node: {title: "n168" label: "FilterM 1 168" info1: "visited: 33 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 -"} +"color: yellow} edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} edge: { sourcename: "n168" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n156" label: "Sel a 156" info1: "visited: 33 @@ -311,14 +313,14 @@ edge: { sourcename: "n156" targetname: "n149" class:2 priority:2 linestyle:dotte node: {title: "n155" label: "Load 155" info1: "visited: 33 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } edge: { sourcename: "n155" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 33 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 33 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } edge: { sourcename: "n154" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n153" label: "AddIs 153" info1: "visited: 33 @@ -328,44 +330,44 @@ arity: 2 edge: {sourcename: "n153" targetname: "n154" label: "0" } edge: {sourcename: "n153" targetname: "n167" label: "1" } edge: { sourcename: "n153" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 33 +node: {title: "n194" label: "FilterIs 0 194" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: ProjT 111 -"} +"color: yellow} edge: {sourcename: "n194" targetname: "n153" label: "0" } edge: { sourcename: "n194" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 33 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 33 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} edge: { sourcename: "n161" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 33 +node: {title: "n193" label: "FilterM 0 193" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 112 -"} +"color: yellow} edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} edge: { sourcename: "n193" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n105" label: "Return 105" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } edge: { sourcename: "n105" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n104" label: "Block 104" color: lightyellow info1: "visited: 33 +node: {title: "n104" label: "Block 104" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_op(pred) == op_Return) || is_Bad(pred) || (get_irn_op(pred) == op_Raise) || is_fragile_op(pred) ) && End Block node"color: lightyellow} edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 33 +node: {title: "n103" label: "End 103" info1: "visited: 33 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} edge: { sourcename: "n103" targetname: "n104" class:2 priority:2 linestyle:dotted} node: {title: "e14" label: "ent a" color: yellow info1: " @@ -402,13 +404,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 36 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 36 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -436,13 +441,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 37 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 37 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} @@ -462,10 +470,10 @@ irg = g35" } edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red} edge: { sourcename: "e23" targetname: "n22"label: "value 0"} -node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" color: yellow info1: "visited: 38 +node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" info1: "visited: 38 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -474,6 +482,9 @@ edge: { sourcename: "t0" targetname: "e23"class: 12 label: "member" color:blue} node: {title: "t21" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t21" targetname: "t11"class: 6 label: "res 0" color: green} node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg index 442bbe567..c303701a0 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg @@ -19,10 +19,15 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} @@ -71,13 +76,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 7 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 7 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -96,10 +104,10 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 7 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 7 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "e23" label: "ent GlobalType_OO_PROGRAM_EXAMPLE_main" color: yellow info1: " id: e23 @@ -115,10 +123,10 @@ irg = g35" } edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red} edge: { sourcename: "e23" targetname: "n22"label: "value 0"} -node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" color: yellow info1: "visited: 7 +node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" info1: "visited: 7 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -127,6 +135,9 @@ edge: { sourcename: "t0" targetname: "e23"class: 12 label: "member" color:blue} node: {title: "t21" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t21" targetname: "t11"class: 6 label: "res 0" color: green} node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg index 513a7e71c..e0f15d61d 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g35" label: "GlobalType_OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 41 +node: {title: "n103" label: "End 103" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n106" label: "Block 106" status:clustered color:yellow @@ -34,38 +36,38 @@ edge: {sourcename: "n106" targetname: "n191" label: "0" class:13 color:red} node: {title: "n105" label: "Return 105" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n193" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n194" label: "1" } -node: {title: "n193" label: "FilterM 0 193" color: yellow info1: "visited: 41 +node: {title: "n193" label: "FilterM 0 193" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 112 -"} +"color: yellow} edge: {sourcename: "n193" targetname: "n161" label: "0" class:14 color:blue} -node: {title: "n194" label: "FilterIs 0 194" color: yellow info1: "visited: 41 +node: {title: "n194" label: "FilterIs 0 194" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: ProjT 111 -"} +"color: yellow} edge: {sourcename: "n194" targetname: "n153" label: "0" } } graph: { title: "n188" label: "Block 188" status:clustered color:yellow edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 color:red} -node: {title: "n187" label: "FilterM 0 187" color: yellow info1: "visited: 41 +node: {title: "n187" label: "FilterM 0 187" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 backedges: intra predecessor nodes: CallT 120 -"} +"color: yellow} edge: {sourcename: "n187" targetname: "n136" label: "0" class:14 color:blue} -node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 41 +node: {title: "n192" label: "ProjX 0 192" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 color:red} node: {title: "n190" label: "CallBegin 190" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -73,25 +75,25 @@ arity: 1 possible callees: 0: PRIMA_c "} -node: {title: "n190n165" label: "&(PRIMA_c)P 165" color: yellow info1: "visited: 41 +node: {title: "n190n165" label: "&(PRIMA_c)P 165" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n190" targetname: "n190n165" label: "0" } } graph: { title: "n182" label: "Block 182" status:clustered color:yellow edge: {sourcename: "n182" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 41 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 41 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } node: {title: "n115" label: "Alloc 115" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -104,10 +106,10 @@ arity: 0 "} edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } -node: {title: "n186" label: "ProjX 0 186" color: yellow info1: "visited: 41 +node: {title: "n186" label: "ProjX 0 186" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 color:red} node: {title: "n184" label: "CallBegin 184" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -115,31 +117,31 @@ arity: 1 possible callees: 0: PRIMA_set_a "} -node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" color: yellow info1: "visited: 41 +node: {title: "n184n166" label: "&(PRIMA_set_a)P 166" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n184" targetname: "n184n166" label: "0" } } graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 41 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 41 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} -node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" color: blue info1: "visited: 41 +node: {title: "n109" label: "Start GlobalType_OO_PROGRAM_EXAMPLE_main 109" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -147,28 +149,28 @@ start of method of type OO_PROGRAM_EXAMPLE_main graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n179" label: "Block 179" status:clustered color:yellow edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 color:red} -node: {title: "n185" label: "ProjX 0 185" color: yellow info1: "visited: 41 +node: {title: "n185" label: "ProjX 0 185" info1: "visited: 41 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 color:red} -node: {title: "n180" label: "EndReg 180" color: blue info1: "visited: 41 +node: {title: "n180" label: "EndReg 180" info1: "visited: 41 irg: PRIMA_set_a arity: 0 -"} +"color: blue} } graph: { title: "n132" label: "Block 132" status:clustered color:yellow edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 41 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 41 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 41 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n175" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n177" label: "2" } @@ -183,49 +185,49 @@ edge: {sourcename: "n140" targetname: "n176" label: "1" } node: {title: "n178" label: "Jmp 178" info1: "visited: 41 irg: PRIMA_set_a arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n134" label: "Block 134" status:clustered color:yellow edge: {sourcename: "n134" targetname: "n186" label: "0" class:13 color:red} -node: {title: "n175" label: "FilterM 1 175" color: yellow info1: "visited: 41 +node: {title: "n175" label: "FilterM 1 175" info1: "visited: 41 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: StartT 135 -"} +"color: yellow} edge: {sourcename: "n175" targetname: "n123" label: "0" class:14 color:blue} -node: {title: "n176" label: "FilterP 0 176" color: yellow info1: "visited: 41 +node: {title: "n176" label: "FilterP 0 176" info1: "visited: 41 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} +"color: yellow} edge: {sourcename: "n176" targetname: "n114" label: "0" } -node: {title: "n177" label: "FilterIs 1 177" color: yellow info1: "visited: 41 +node: {title: "n177" label: "FilterIs 1 177" info1: "visited: 41 irg: PRIMA_set_a arity: 1 backedges: intra predecessor nodes: ProjT 139 -"} -node: {title: "n177n121" label: "0x2Is 121" color: yellow info1: "visited: 41 +"color: yellow} +node: {title: "n177n121" label: "0x2Is 121" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n177" targetname: "n177n121" label: "0" } -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 41 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 41 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} -node: {title: "n135" label: "Start PRIMA_set_a 135" color: blue info1: "visited: 41 +node: {title: "n135" label: "Start PRIMA_set_a 135" info1: "visited: 41 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -233,23 +235,23 @@ start of method of type set_a graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n171" label: "Block 171" status:clustered color:yellow edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 color:red} -node: {title: "n191" label: "ProjX 0 191" color: yellow info1: "visited: 41 +node: {title: "n191" label: "ProjX 0 191" info1: "visited: 41 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 color:red} -node: {title: "n172" label: "EndReg 172" color: blue info1: "visited: 41 +node: {title: "n172" label: "EndReg 172" info1: "visited: 41 irg: PRIMA_c arity: 0 -"} +"color: blue} } graph: { title: "n149" label: "Block 149" status:clustered color:yellow edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 41 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 41 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 41 irg: PRIMA_c @@ -257,15 +259,15 @@ arity: 2 "} edge: {sourcename: "n153" targetname: "n154" label: "0" } edge: {sourcename: "n153" targetname: "n167" label: "1" } -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 41 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 41 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } node: {title: "n155" label: "Load 155" info1: "visited: 41 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n168" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 41 @@ -279,49 +281,49 @@ edge: {sourcename: "n156" targetname: "n169" label: "1" } node: {title: "n170" label: "Jmp 170" info1: "visited: 41 irg: PRIMA_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n151" label: "Block 151" status:clustered color:yellow edge: {sourcename: "n151" targetname: "n192" label: "0" class:13 color:red} -node: {title: "n168" label: "FilterM 1 168" color: yellow info1: "visited: 41 +node: {title: "n168" label: "FilterM 1 168" info1: "visited: 41 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: StartT 152 -"} +"color: yellow} edge: {sourcename: "n168" targetname: "n187" label: "0" class:14 color:blue} -node: {title: "n169" label: "FilterP 0 169" color: yellow info1: "visited: 41 +node: {title: "n169" label: "FilterP 0 169" info1: "visited: 41 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} +"color: yellow} edge: {sourcename: "n169" targetname: "n114" label: "0" } -node: {title: "n167" label: "FilterIs 1 167" color: yellow info1: "visited: 41 +node: {title: "n167" label: "FilterIs 1 167" info1: "visited: 41 irg: PRIMA_c arity: 1 backedges: intra predecessor nodes: ProjT 158 -"} -node: {title: "n167n113" label: "0x5Is 113" color: yellow info1: "visited: 41 +"color: yellow} +node: {title: "n167n113" label: "0x5Is 113" info1: "visited: 41 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n167" targetname: "n167n113" label: "0" } -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 41 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 41 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} -node: {title: "n152" label: "Start PRIMA_c 152" color: blue info1: "visited: 41 +node: {title: "n152" label: "Start PRIMA_c 152" info1: "visited: 41 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -361,13 +363,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 44 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 44 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -395,13 +400,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 45 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 45 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} @@ -421,10 +429,10 @@ irg = g35" } edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red} edge: { sourcename: "e23" targetname: "n22"label: "value 0"} -node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" color: yellow info1: "visited: 46 +node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" info1: "visited: 46 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -433,6 +441,9 @@ edge: { sourcename: "t0" targetname: "e23"class: 12 label: "member" color:blue} node: {title: "t21" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t21" targetname: "t11"class: 6 label: "res 0" color: green} node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg index 734a3c724..cb1cac6cb 100644 --- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g35" label: "GlobalType_OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 20 +node: {title: "n103" label: "End 103" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n106" label: "Block 106" status:clustered color:yellow @@ -36,23 +38,23 @@ irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 2 return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n124" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n110" label: "1" } -node: {title: "n124" label: "ProjM 0 124" color: yellow info1: "visited: 20 +node: {title: "n124" label: "ProjM 0 124" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n124" targetname: "n112" label: "0" class:14 color:blue} -node: {title: "n110" label: "ProjIs 0 110" color: yellow info1: "visited: 20 +node: {title: "n110" label: "ProjIs 0 110" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_res_type(mt, proj))) && Mode of Proj from Call doesn't match mode of result type."color: yellow} edge: {sourcename: "n110" targetname: "n111" label: "0" } -node: {title: "n111" label: "ProjT 2 111" color: yellow info1: "visited: 20 +node: {title: "n111" label: "ProjT 2 111" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n111" targetname: "n112" label: "0" } node: {title: "n112" label: "Call 112" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -61,12 +63,12 @@ calling method of type c param 0 type: class_prima_ptr param 1 type: int resul 0 type: int -"} -node: {title: "n112n113" label: "0x5Is 113" color: yellow info1: "visited: 20 +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} +node: {title: "n112n113" label: "0x5Is 113" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n112" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n118" label: "1" } edge: {sourcename: "n112" targetname: "n114" label: "2" } @@ -79,10 +81,10 @@ Selecting entity of type c "} edge: {sourcename: "n118" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n118" targetname: "n114" label: "1" } -node: {title: "n119" label: "ProjM 0 119" color: yellow info1: "visited: 20 +node: {title: "n119" label: "ProjM 0 119" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n119" targetname: "n120" label: "0" class:14 color:blue} node: {title: "n120" label: "Call 120" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -90,12 +92,12 @@ arity: 4 calling method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} -node: {title: "n120n121" label: "0x2Is 121" color: yellow info1: "visited: 20 +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} +node: {title: "n120n121" label: "0x2Is 121" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n120" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n120" targetname: "n122" label: "1" } edge: {sourcename: "n120" targetname: "n114" label: "2" } @@ -108,15 +110,15 @@ Selecting entity of type set_a "} edge: {sourcename: "n122" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n122" targetname: "n114" label: "1" } -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 20 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 20 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } node: {title: "n115" label: "Alloc 115" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main @@ -133,21 +135,21 @@ edge: {sourcename: "n115" targetname: "n115n116" label: "1" } graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 20 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 20 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} -node: {title: "n109" label: "Start 109" color: blue info1: "visited: 20 +node: {title: "n109" label: "Start 109" info1: "visited: 20 irg: GlobalType_OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -155,6 +157,9 @@ start of method of type OO_PROGRAM_EXAMPLE_main node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} @@ -203,13 +208,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 4 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 4 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -228,10 +236,10 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 4 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 4 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "e23" label: "ent GlobalType_OO_PROGRAM_EXAMPLE_main" color: yellow info1: " id: e23 @@ -247,10 +255,10 @@ irg = g35" } edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red} edge: { sourcename: "e23" targetname: "n22"label: "value 0"} -node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" color: yellow info1: "visited: 4 +node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" info1: "visited: 4 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -259,6 +267,9 @@ edge: { sourcename: "t0" targetname: "e23"class: 12 label: "member" color:blue} node: {title: "t21" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t21" targetname: "t11"class: 6 label: "res 0" color: green} node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined diff --git a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg index e29b39878..b4a0be54d 100644 --- a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g26" label: "IF_ELSE_EXAMPLE_main" status:clustered color:white graph: { title: "n60" label: "Block 60" status:clustered color:yellow edge: {sourcename: "n60" targetname: "n61" label: "0" class:13 color:red} -node: {title: "n59" label: "End 59" color: blue info1: "visited: 13 +node: {title: "n59" label: "End 59" info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n64" label: "Block 64" status:clustered color:yellow @@ -37,7 +39,7 @@ arity: 3 return in method of type IF_ELSE_EXAMPLE_main res 0 type: int res 1 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n61" targetname: "n71" label: "0" class:14 color:blue} edge: {sourcename: "n61" targetname: "n70" label: "1" } edge: {sourcename: "n61" targetname: "n69" label: "2" } @@ -45,31 +47,31 @@ edge: {sourcename: "n61" targetname: "n69" label: "2" } graph: { title: "n66" label: "Block 66" status:clustered color:yellow edge: {sourcename: "n66" targetname: "n65" label: "0" class:13 color:red} -node: {title: "n71" label: "ProjM 1 71" color: yellow info1: "visited: 13 +node: {title: "n71" label: "ProjM 1 71" info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n71" targetname: "n67" label: "0" class:14 color:blue} -node: {title: "n70" label: "0x0Is 70" color: yellow info1: "visited: 13 +node: {title: "n70" label: "0x0Is 70" info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n69" label: "0x2Is 69" color: yellow info1: "visited: 13 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n69" label: "0x2Is 69" info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n65" label: "ProjX 0 65" color: yellow info1: "visited: 13 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n65" label: "ProjX 0 65" info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n65" targetname: "n67" label: "0" class:13 color:red} -node: {title: "n67" label: "Start 67" color: blue info1: "visited: 13 +node: {title: "n67" label: "Start 67" info1: "visited: 13 irg: IF_ELSE_EXAMPLE_main arity: 0 start of method of type IF_ELSE_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/IF_EXAMPLE_main.vcg b/testprograms/ref-results/IF_EXAMPLE_main.vcg index 8c6e695c7..34f23d8f2 100644 --- a/testprograms/ref-results/IF_EXAMPLE_main.vcg +++ b/testprograms/ref-results/IF_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g26" label: "IF_EXAMPLE_main" status:clustered color:white graph: { title: "n16" label: "Block 16" status:clustered color:yellow edge: {sourcename: "n16" targetname: "n50" label: "0" class:13 color:red} -node: {title: "n17" label: "End 17" color: blue info1: "visited: 8 +node: {title: "n17" label: "End 17" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n41" label: "Block 41" status:clustered color:yellow @@ -37,13 +39,13 @@ irg: IF_EXAMPLE_main arity: 2 return in method of type IF_EXAMPLE_main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n50" targetname: "n22" label: "0" class:14 color:blue} edge: {sourcename: "n50" targetname: "n43" label: "1" } -node: {title: "n43" label: "PhiIs 43" color: green info1: "visited: 8 +node: {title: "n43" label: "PhiIs 43" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n43" targetname: "n28" label: "0" } edge: {sourcename: "n43" targetname: "n38" label: "1" } } @@ -59,30 +61,30 @@ edge: {sourcename: "n38" targetname: "n36" label: "1" } node: {title: "n40" label: "Jmp 40" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n27" label: "Block 27" status:clustered color:yellow edge: {sourcename: "n27" targetname: "n21" label: "0" class:13 color:red} -node: {title: "n33" label: "ProjX 0 33" color: yellow info1: "visited: 8 +node: {title: "n33" label: "ProjX 0 33" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n33" targetname: "n32" label: "0" class:13 color:red} -node: {title: "n34" label: "ProjX 1 34" color: yellow info1: "visited: 8 +node: {title: "n34" label: "ProjX 1 34" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n34" targetname: "n32" label: "0" class:13 color:red} node: {title: "n32" label: "Cond 32" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n32" targetname: "n31" label: "0" } -node: {title: "n31" label: "Projb Eq 31" color: yellow info1: "visited: 8 +node: {title: "n31" label: "Projb Eq 31" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n31" targetname: "n30" label: "0" } node: {title: "n30" label: "CmpT 30" info1: "visited: 8 irg: IF_EXAMPLE_main @@ -90,46 +92,46 @@ arity: 2 "} edge: {sourcename: "n30" targetname: "n28" label: "0" } edge: {sourcename: "n30" targetname: "n29" label: "1" } -node: {title: "n28" label: "ProjIs 0 28" color: yellow info1: "visited: 8 +node: {title: "n28" label: "ProjIs 0 28" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n28" targetname: "n25" label: "0" } } graph: { title: "n18" label: "Block 18" status:clustered color:yellow edge: {sourcename: "n18" targetname: "n21" label: "0" class:13 color:red} -node: {title: "n22" label: "ProjM 1 22" color: yellow info1: "visited: 8 +node: {title: "n22" label: "ProjM 1 22" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n22" targetname: "n19" label: "0" class:14 color:blue} -node: {title: "n36" label: "0x3Is 36" color: yellow info1: "visited: 8 +node: {title: "n36" label: "0x3Is 36" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n25" label: "ProjT 4 25" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n25" label: "ProjT 4 25" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n25" targetname: "n19" label: "0" } -node: {title: "n29" label: "0x2Is 29" color: yellow info1: "visited: 8 +node: {title: "n29" label: "0x2Is 29" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n21" label: "ProjX 0 21" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n21" label: "ProjX 0 21" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n21" targetname: "n19" label: "0" class:13 color:red} -node: {title: "n19" label: "Start 19" color: blue info1: "visited: 8 +node: {title: "n19" label: "Start 19" info1: "visited: 8 irg: IF_EXAMPLE_main arity: 0 start of method of type IF_EXAMPLE_main param 0 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg index db8c868b3..0dbf15b96 100644 --- a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg +++ b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg @@ -19,29 +19,31 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n88" label: "Start 88" color: blue info1: "visited: 14 +node: {title: "n88" label: "Start 88" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 start of method of type main -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n88" targetname: "n86" class:2 priority:2 linestyle:dotted} -node: {title: "n87" label: "ProjX 0 87" color: yellow info1: "visited: 14 +node: {title: "n87" label: "ProjX 0 87" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n87" targetname: "n88" label: "0" class:13 color:red} edge: { sourcename: "n87" targetname: "n86" class:2 priority:2 linestyle:dotted} -node: {title: "n86" label: "Block 86" color: lightyellow info1: "visited: 14 +node: {title: "n86" label: "Block 86" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n86" targetname: "n87" label: "0" class:13 color:red} -node: {title: "n85" label: "0x0Iu 85" color: yellow info1: "visited: 14 +node: {title: "n85" label: "0x0Iu 85" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} edge: { sourcename: "n85" targetname: "n86" class:2 priority:2 linestyle:dotted} node: {title: "n84" label: "CmpT 84" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main @@ -50,84 +52,84 @@ arity: 2 edge: {sourcename: "n84" targetname: "n85" label: "0" } edge: {sourcename: "n84" targetname: "n85" label: "1" } edge: { sourcename: "n84" targetname: "n78" class:2 priority:2 linestyle:dotted} -node: {title: "n83" label: "Projb Eq 83" color: yellow info1: "visited: 14 +node: {title: "n83" label: "Projb Eq 83" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n83" targetname: "n84" label: "0" } edge: { sourcename: "n83" targetname: "n78" class:2 priority:2 linestyle:dotted} node: {title: "n82" label: "Cond 82" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n82" targetname: "n83" label: "0" } edge: { sourcename: "n82" targetname: "n78" class:2 priority:2 linestyle:dotted} -node: {title: "n81" label: "ProjX 1 81" color: yellow info1: "visited: 14 +node: {title: "n81" label: "ProjX 1 81" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n81" targetname: "n82" label: "0" class:13 color:red} edge: { sourcename: "n81" targetname: "n78" class:2 priority:2 linestyle:dotted} -node: {title: "n80" label: "Block 80" color: lightyellow info1: "visited: 14 +node: {title: "n80" label: "Block 80" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n80" targetname: "n81" label: "0" class:13 color:red} node: {title: "n79" label: "Jmp 79" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} edge: { sourcename: "n79" targetname: "n80" class:2 priority:2 linestyle:dotted} -node: {title: "n90" label: "Block 90" color: lightyellow info1: "visited: 14 +node: {title: "n90" label: "Block 90" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n90" targetname: "n87" label: "0" class:13 color:red} node: {title: "n89" label: "Jmp 89" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} edge: { sourcename: "n89" targetname: "n90" class:2 priority:2 linestyle:dotted} -node: {title: "n78" label: "Block 78" color: lightyellow info1: "visited: 14 +node: {title: "n78" label: "Block 78" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n78" targetname: "n89" label: "0" class:13 color:red} edge: {sourcename: "n78" targetname: "n79" label: "1" class:13 color:red} -node: {title: "n77" label: "ProjX 0 77" color: yellow info1: "visited: 14 +node: {title: "n77" label: "ProjX 0 77" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n77" targetname: "n82" label: "0" class:13 color:red} edge: { sourcename: "n77" targetname: "n78" class:2 priority:2 linestyle:dotted} -node: {title: "n76" label: "Block 76" color: lightyellow info1: "visited: 14 +node: {title: "n76" label: "Block 76" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n76" targetname: "n77" label: "0" class:13 color:red} -node: {title: "n94" label: "0x0Iu 94" color: yellow info1: "visited: 14 +node: {title: "n94" label: "0x0Iu 94" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} edge: { sourcename: "n94" targetname: "n86" class:2 priority:2 linestyle:dotted} -node: {title: "n93" label: "PhiIu 93" color: green info1: "visited: 14 +node: {title: "n93" label: "PhiIu 93" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n93" targetname: "n94" label: "0" } edge: {sourcename: "n93" targetname: "n92" label: "1" } edge: { sourcename: "n93" targetname: "n78" class:2 priority:2 linestyle:dotted} -node: {title: "n95" label: "0x1Iu 95" color: yellow info1: "visited: 14 +node: {title: "n95" label: "0x1Iu 95" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} edge: { sourcename: "n95" targetname: "n86" class:2 priority:2 linestyle:dotted} -node: {title: "n92" label: "PhiIu 92" color: green info1: "visited: 14 +node: {title: "n92" label: "PhiIu 92" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n92" targetname: "n95" label: "0" } edge: {sourcename: "n92" targetname: "n93" label: "1" } edge: { sourcename: "n92" targetname: "n78" class:2 priority:2 linestyle:dotted} @@ -138,10 +140,10 @@ arity: 2 edge: {sourcename: "n91" targetname: "n93" label: "0" } edge: {sourcename: "n91" targetname: "n92" label: "1" } edge: { sourcename: "n91" targetname: "n76" class:2 priority:2 linestyle:dotted} -node: {title: "n96" label: "ProjM 1 96" color: yellow info1: "visited: 14 +node: {title: "n96" label: "ProjM 1 96" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n96" targetname: "n88" label: "0" class:14 color:blue} edge: { sourcename: "n96" targetname: "n86" class:2 priority:2 linestyle:dotted} node: {title: "n75" label: "Return 75" info1: "visited: 14 @@ -149,19 +151,19 @@ irg: IF_WHILE_EXAMPLE_main arity: 2 return in method of type main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n75" targetname: "n96" label: "0" class:14 color:blue} edge: {sourcename: "n75" targetname: "n91" label: "1" } edge: { sourcename: "n75" targetname: "n76" class:2 priority:2 linestyle:dotted} -node: {title: "n74" label: "Block 74" color: lightyellow info1: "visited: 14 +node: {title: "n74" label: "Block 74" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n74" targetname: "n75" label: "0" class:13 color:red} -node: {title: "n73" label: "End 73" color: blue info1: "visited: 14 +node: {title: "n73" label: "End 73" info1: "visited: 14 irg: IF_WHILE_EXAMPLE_main arity: 0 -"} +"color: blue} edge: { sourcename: "n73" targetname: "n74" class:2 priority:2 linestyle:dotted} edge: {sourcename: "n88" targetname: "n87" color: red linestyle: dashed} edge: {sourcename: "n88" targetname: "n96" color: red linestyle: dashed} diff --git a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg index 1caf415d7..b89c7894b 100644 --- a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg +++ b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "n63" label: "Block n63" } edge: { sourcename: "n63" targetname: "n65"} diff --git a/testprograms/ref-results/IRREGULAR_CF_main.vcg b/testprograms/ref-results/IRREGULAR_CF_main.vcg index 1e948ae15..2159c850f 100644 --- a/testprograms/ref-results/IRREGULAR_CF_main.vcg +++ b/testprograms/ref-results/IRREGULAR_CF_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g26" label: "IRREGULAR_CF_main" status:clustered color:white graph: { title: "n63" label: "Block 63" status:clustered color:yellow edge: {sourcename: "n63" targetname: "n64" label: "0" class:13 color:red} -node: {title: "n62" label: "End 62" color: blue info1: "visited: 5 +node: {title: "n62" label: "End 62" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 -"} +"color: blue} } graph: { title: "n65" label: "Block 65" status:clustered color:yellow @@ -36,7 +38,7 @@ node: {title: "n64" label: "Return 64" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 return in method of type main -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n64" targetname: "n90" label: "0" class:14 color:blue} } @@ -45,7 +47,7 @@ edge: {sourcename: "n88" targetname: "n89" label: "0" class:13 color:red} node: {title: "n87" label: "Jmp 87" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n67" label: "Block 67" status:clustered color:yellow @@ -54,30 +56,30 @@ edge: {sourcename: "n67" targetname: "n68" label: "1" class:13 color:red} node: {title: "n66" label: "Jmp 66" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n81" label: "Block 81" status:clustered color:yellow edge: {sourcename: "n81" targetname: "n82" label: "0" class:13 color:red} -node: {title: "n89" label: "ProjX 0 89" color: yellow info1: "visited: 5 +node: {title: "n89" label: "ProjX 0 89" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n89" targetname: "n83" label: "0" class:13 color:red} -node: {title: "n80" label: "ProjX 1 80" color: yellow info1: "visited: 5 +node: {title: "n80" label: "ProjX 1 80" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n80" targetname: "n83" label: "0" class:13 color:red} node: {title: "n83" label: "Cond 83" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n83" targetname: "n84" label: "0" } -node: {title: "n84" label: "Projb Eq 84" color: yellow info1: "visited: 5 +node: {title: "n84" label: "Projb Eq 84" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n84" targetname: "n85" label: "0" } node: {title: "n85" label: "CmpT 85" info1: "visited: 5 irg: IRREGULAR_CF_main @@ -92,30 +94,30 @@ edge: {sourcename: "n69" targetname: "n70" label: "0" class:13 color:red} node: {title: "n68" label: "Jmp 68" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n71" label: "Block 71" status:clustered color:yellow edge: {sourcename: "n71" targetname: "n72" label: "0" class:13 color:red} -node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 5 +node: {title: "n82" label: "ProjX 0 82" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n82" targetname: "n75" label: "0" class:13 color:red} -node: {title: "n70" label: "ProjX 1 70" color: yellow info1: "visited: 5 +node: {title: "n70" label: "ProjX 1 70" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n70" targetname: "n75" label: "0" class:13 color:red} node: {title: "n75" label: "Cond 75" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n75" targetname: "n76" label: "0" } -node: {title: "n76" label: "Projb Eq 76" color: yellow info1: "visited: 5 +node: {title: "n76" label: "Projb Eq 76" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n76" targetname: "n77" label: "0" } node: {title: "n77" label: "CmpT 77" info1: "visited: 5 irg: IRREGULAR_CF_main @@ -127,36 +129,36 @@ edge: {sourcename: "n77" targetname: "n78" label: "1" } graph: { title: "n73" label: "Block 73" status:clustered color:yellow edge: {sourcename: "n73" targetname: "n72" label: "0" class:13 color:red} -node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 5 +node: {title: "n90" label: "ProjM 1 90" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n90" targetname: "n74" label: "0" class:14 color:blue} -node: {title: "n86" label: "0x2Is 86" color: yellow info1: "visited: 5 +node: {title: "n86" label: "0x2Is 86" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 Const of type type_unknown -"} -node: {title: "n79" label: "0x0Is 79" color: yellow info1: "visited: 5 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n79" label: "0x0Is 79" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 Const of type type_unknown -"} -node: {title: "n78" label: "0x1Is 78" color: yellow info1: "visited: 5 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n78" label: "0x1Is 78" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 Const of type type_unknown -"} -node: {title: "n72" label: "ProjX 0 72" color: yellow info1: "visited: 5 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n72" label: "ProjX 0 72" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n72" targetname: "n74" label: "0" class:13 color:red} -node: {title: "n74" label: "Start 74" color: blue info1: "visited: 5 +node: {title: "n74" label: "Start 74" info1: "visited: 5 irg: IRREGULAR_CF_main arity: 0 start of method of type main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg index 20932e404..5b8ef22e1 100644 --- a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg +++ b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "n60" label: "Block n60" } edge: { sourcename: "n60" targetname: "n62"} diff --git a/testprograms/ref-results/IRR_LOOP_main.vcg b/testprograms/ref-results/IRR_LOOP_main.vcg index 8f63c7359..e0d175ff4 100644 --- a/testprograms/ref-results/IRR_LOOP_main.vcg +++ b/testprograms/ref-results/IRR_LOOP_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g26" label: "IRR_LOOP_main" status:clustered color:white graph: { title: "n60" label: "Block 60" status:clustered color:yellow edge: {sourcename: "n60" targetname: "n61" label: "0" class:13 color:red} -node: {title: "n59" label: "End 59" color: blue info1: "visited: 5 +node: {title: "n59" label: "End 59" info1: "visited: 5 irg: IRR_LOOP_main arity: 3 -"} +"color: blue} } graph: { title: "n62" label: "Block 62" status:clustered color:yellow @@ -36,12 +38,12 @@ node: {title: "n61" label: "Return 61" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 return in method of type main -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n61" targetname: "n87" label: "0" class:14 color:blue} -node: {title: "n87" label: "PhiM 87" color: green info1: "visited: 5 +node: {title: "n87" label: "PhiM 87" info1: "visited: 5 irg: IRR_LOOP_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n87" targetname: "n89" label: "0" class:14 color:blue} edge: {sourcename: "n87" targetname: "n88" label: "1" class:14 color:blue} } @@ -49,31 +51,31 @@ edge: {sourcename: "n87" targetname: "n88" label: "1" class:14 color:blue} graph: { title: "n64" label: "Block 64" status:clustered color:yellow edge: {sourcename: "n64" targetname: "n85" label: "0" class:13 color:red} edge: {sourcename: "n64" targetname: "n65" label: "1" class:13 color:red} -node: {title: "n88" label: "PhiM 88" color: green info1: "visited: 5 +node: {title: "n88" label: "PhiM 88" info1: "visited: 5 irg: IRR_LOOP_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n88" targetname: "n90" label: "0" class:14 color:blue} edge: {sourcename: "n88" targetname: "n89" label: "1" class:14 color:blue} -node: {title: "n63" label: "ProjX 0 63" color: yellow info1: "visited: 5 +node: {title: "n63" label: "ProjX 0 63" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n63" targetname: "n68" label: "0" class:13 color:red} -node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 5 +node: {title: "n67" label: "ProjX 1 67" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n67" targetname: "n68" label: "0" class:13 color:red} node: {title: "n68" label: "Cond 68" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n68" targetname: "n69" label: "0" } -node: {title: "n69" label: "Projb Eq 69" color: yellow info1: "visited: 5 +node: {title: "n69" label: "Projb Eq 69" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n69" targetname: "n70" label: "0" } node: {title: "n70" label: "CmpT 70" info1: "visited: 5 irg: IRR_LOOP_main @@ -86,31 +88,31 @@ edge: {sourcename: "n70" targetname: "n71" label: "1" } graph: { title: "n66" label: "Block 66" status:clustered color:yellow edge: {sourcename: "n66" targetname: "n76" label: "0" class:13 color:red} edge: {sourcename: "n66" targetname: "n67" label: "1" class:13 color:red} -node: {title: "n89" label: "PhiM 89" color: green info1: "visited: 5 +node: {title: "n89" label: "PhiM 89" info1: "visited: 5 irg: IRR_LOOP_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n89" targetname: "n90" label: "0" class:14 color:blue} edge: {sourcename: "n89" targetname: "n88" label: "1" class:14 color:blue} -node: {title: "n86" label: "ProjX 0 86" color: yellow info1: "visited: 5 +node: {title: "n86" label: "ProjX 0 86" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n86" targetname: "n82" label: "0" class:13 color:red} -node: {title: "n65" label: "ProjX 1 65" color: yellow info1: "visited: 5 +node: {title: "n65" label: "ProjX 1 65" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n65" targetname: "n82" label: "0" class:13 color:red} node: {title: "n82" label: "Cond 82" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n82" targetname: "n83" label: "0" } -node: {title: "n83" label: "Projb Eq 83" color: yellow info1: "visited: 5 +node: {title: "n83" label: "Projb Eq 83" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n83" targetname: "n84" label: "0" } node: {title: "n84" label: "CmpT 84" info1: "visited: 5 irg: IRR_LOOP_main @@ -122,25 +124,25 @@ edge: {sourcename: "n84" targetname: "n71" label: "1" } graph: { title: "n77" label: "Block 77" status:clustered color:yellow edge: {sourcename: "n77" targetname: "n73" label: "0" class:13 color:red} -node: {title: "n85" label: "ProjX 1 85" color: yellow info1: "visited: 5 +node: {title: "n85" label: "ProjX 1 85" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n85" targetname: "n78" label: "0" class:13 color:red} -node: {title: "n76" label: "ProjX 0 76" color: yellow info1: "visited: 5 +node: {title: "n76" label: "ProjX 0 76" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n76" targetname: "n78" label: "0" class:13 color:red} node: {title: "n78" label: "Cond 78" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n78" targetname: "n79" label: "0" } -node: {title: "n79" label: "Projb Eq 79" color: yellow info1: "visited: 5 +node: {title: "n79" label: "Projb Eq 79" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n79" targetname: "n80" label: "0" } node: {title: "n80" label: "CmpT 80" info1: "visited: 5 irg: IRR_LOOP_main @@ -152,36 +154,36 @@ edge: {sourcename: "n80" targetname: "n81" label: "1" } graph: { title: "n72" label: "Block 72" status:clustered color:yellow edge: {sourcename: "n72" targetname: "n73" label: "0" class:13 color:red} -node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 5 +node: {title: "n90" label: "ProjM 1 90" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n90" targetname: "n74" label: "0" class:14 color:blue} -node: {title: "n81" label: "0x1Is 81" color: yellow info1: "visited: 5 +node: {title: "n81" label: "0x1Is 81" info1: "visited: 5 irg: IRR_LOOP_main arity: 0 Const of type type_unknown -"} -node: {title: "n75" label: "0x0Is 75" color: yellow info1: "visited: 5 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n75" label: "0x0Is 75" info1: "visited: 5 irg: IRR_LOOP_main arity: 0 Const of type type_unknown -"} -node: {title: "n71" label: "0x2Is 71" color: yellow info1: "visited: 5 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n71" label: "0x2Is 71" info1: "visited: 5 irg: IRR_LOOP_main arity: 0 Const of type type_unknown -"} -node: {title: "n73" label: "ProjX 0 73" color: yellow info1: "visited: 5 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n73" label: "ProjX 0 73" info1: "visited: 5 irg: IRR_LOOP_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n73" targetname: "n74" label: "0" class:13 color:red} -node: {title: "n74" label: "Start 74" color: blue info1: "visited: 5 +node: {title: "n74" label: "Start 74" info1: "visited: 5 irg: IRR_LOOP_main arity: 0 start of method of type main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg index 252345ebe..ac3cb8b05 100644 --- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg +++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g27" label: "MEMORY_EXAMPLE_main" status:clustered color:white graph: { title: "n76" label: "Block 76" status:clustered color:yellow edge: {sourcename: "n76" targetname: "n77" label: "0" class:13 color:red} -node: {title: "n75" label: "End 75" color: blue info1: "visited: 15 +node: {title: "n75" label: "End 75" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: blue} } graph: { title: "n78" label: "Block 78" status:clustered color:yellow @@ -36,23 +38,23 @@ irg: MEMORY_EXAMPLE_main arity: 2 return in method of type main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n77" targetname: "n113" label: "0" class:14 color:blue} edge: {sourcename: "n77" targetname: "n111" label: "1" } -node: {title: "n113" label: "ProjM 0 113" color: yellow info1: "visited: 15 +node: {title: "n113" label: "ProjM 0 113" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n113" targetname: "n112" label: "0" class:14 color:blue} -node: {title: "n111" label: "ProjIu 2 111" color: yellow info1: "visited: 15 +node: {title: "n111" label: "ProjIu 2 111" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n111" targetname: "n112" label: "0" } node: {title: "n112" label: "Load 112" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n112" targetname: "n95" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n87" label: "1" } } @@ -60,25 +62,25 @@ edge: {sourcename: "n112" targetname: "n87" label: "1" } graph: { title: "n80" label: "Block 80" status:clustered color:yellow edge: {sourcename: "n80" targetname: "n110" label: "0" class:13 color:red} edge: {sourcename: "n80" targetname: "n81" label: "1" class:13 color:red} -node: {title: "n79" label: "ProjX 1 79" color: yellow info1: "visited: 15 +node: {title: "n79" label: "ProjX 1 79" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n79" targetname: "n82" label: "0" class:13 color:red} -node: {title: "n81" label: "ProjX 0 81" color: yellow info1: "visited: 15 +node: {title: "n81" label: "ProjX 0 81" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n81" targetname: "n82" label: "0" class:13 color:red} node: {title: "n82" label: "Cond 82" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n82" targetname: "n83" label: "0" } -node: {title: "n83" label: "Projb Gt 83" color: yellow info1: "visited: 15 +node: {title: "n83" label: "Projb Gt 83" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n83" targetname: "n84" label: "0" } node: {title: "n84" label: "CmpT 84" info1: "visited: 15 irg: MEMORY_EXAMPLE_main @@ -86,67 +88,67 @@ arity: 2 "} edge: {sourcename: "n84" targetname: "n109" label: "0" } edge: {sourcename: "n84" targetname: "n85" label: "1" } -node: {title: "n85" label: "ProjIu 2 85" color: yellow info1: "visited: 15 +node: {title: "n85" label: "ProjIu 2 85" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n85" targetname: "n86" label: "0" } node: {title: "n86" label: "Load 86" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n86" targetname: "n94" label: "0" class:14 color:blue} edge: {sourcename: "n86" targetname: "n87" label: "1" } -node: {title: "n94" label: "PhiM 94" color: green info1: "visited: 15 +node: {title: "n94" label: "PhiM 94" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n94" targetname: "n104" label: "0" class:14 color:blue} edge: {sourcename: "n94" targetname: "n95" label: "1" class:14 color:blue} -node: {title: "n95" label: "ProjM 0 95" color: yellow info1: "visited: 15 +node: {title: "n95" label: "ProjM 0 95" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n95" targetname: "n96" label: "0" class:14 color:blue} node: {title: "n96" label: "Store 96" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n96" targetname: "n98" label: "0" class:14 color:blue} edge: {sourcename: "n96" targetname: "n97" label: "1" } edge: {sourcename: "n96" targetname: "n85" label: "2" } -node: {title: "n98" label: "ProjM 0 98" color: yellow info1: "visited: 15 +node: {title: "n98" label: "ProjM 0 98" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n98" targetname: "n99" label: "0" class:14 color:blue} node: {title: "n99" label: "Store 99" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n99" targetname: "n103" label: "0" class:14 color:blue} edge: {sourcename: "n99" targetname: "n87" label: "1" } edge: {sourcename: "n99" targetname: "n100" label: "2" } -node: {title: "n103" label: "ProjM 0 103" color: yellow info1: "visited: 15 +node: {title: "n103" label: "ProjM 0 103" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n103" targetname: "n101" label: "0" class:14 color:blue} -node: {title: "n100" label: "ProjIu 2 100" color: yellow info1: "visited: 15 +node: {title: "n100" label: "ProjIu 2 100" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n100" targetname: "n101" label: "0" } node: {title: "n101" label: "Load 101" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n101" targetname: "n102" label: "0" class:14 color:blue} edge: {sourcename: "n101" targetname: "n97" label: "1" } -node: {title: "n102" label: "ProjM 0 102" color: yellow info1: "visited: 15 +node: {title: "n102" label: "ProjM 0 102" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n102" targetname: "n86" label: "0" class:14 color:blue} } @@ -155,28 +157,28 @@ edge: {sourcename: "n88" targetname: "n89" label: "0" class:13 color:red} node: {title: "n110" label: "Jmp 110" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 0 -"} -node: {title: "n104" label: "ProjM 0 104" color: yellow info1: "visited: 15 +" info2: "mymode == mode_X && Jmp node"} +node: {title: "n104" label: "ProjM 0 104" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n104" targetname: "n105" label: "0" class:14 color:blue} node: {title: "n105" label: "Store 105" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n105" targetname: "n107" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n97" label: "1" } edge: {sourcename: "n105" targetname: "n106" label: "2" } -node: {title: "n107" label: "ProjM 0 107" color: yellow info1: "visited: 15 +node: {title: "n107" label: "ProjM 0 107" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n108" label: "0" class:14 color:blue} node: {title: "n108" label: "Store 108" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n108" targetname: "n93" label: "0" class:14 color:blue} edge: {sourcename: "n108" targetname: "n87" label: "1" } edge: {sourcename: "n108" targetname: "n109" label: "2" } @@ -200,36 +202,36 @@ edge: {sourcename: "n87" targetname: "n92" label: "1" } graph: { title: "n90" label: "Block 90" status:clustered color:yellow edge: {sourcename: "n90" targetname: "n89" label: "0" class:13 color:red} -node: {title: "n109" label: "0x0Iu 109" color: yellow info1: "visited: 15 +node: {title: "n109" label: "0x0Iu 109" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n106" label: "0x1Iu 106" color: yellow info1: "visited: 15 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n106" label: "0x1Iu 106" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n93" label: "ProjM 1 93" color: yellow info1: "visited: 15 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n93" label: "ProjM 1 93" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n93" targetname: "n91" label: "0" class:14 color:blue} -node: {title: "n92" label: "ProjP 3 92" color: yellow info1: "visited: 15 +node: {title: "n92" label: "ProjP 3 92" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n92" targetname: "n91" label: "0" } -node: {title: "n89" label: "ProjX 0 89" color: yellow info1: "visited: 15 +node: {title: "n89" label: "ProjX 0 89" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n89" targetname: "n91" label: "0" class:13 color:red} -node: {title: "n91" label: "Start 91" color: blue info1: "visited: 15 +node: {title: "n91" label: "Start 91" info1: "visited: 15 irg: MEMORY_EXAMPLE_main arity: 0 start of method of type main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg index 92e569c43..a5f7b3f88 100644 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg @@ -19,21 +19,23 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g35" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white graph: { title: "n196" label: "Block 196" status:clustered color:yellow edge: {sourcename: "n196" targetname: "n198" label: "0" class:13 color:red} edge: {sourcename: "n196" targetname: "n197" label: "1" class:13 color:red} -node: {title: "n200" label: "PhiM 200" color: green info1: "visited: 22 +node: {title: "n200" label: "PhiM 200" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n200" targetname: "n211" label: "0" class:14 color:blue} edge: {sourcename: "n200" targetname: "n201" label: "1" class:14 color:blue} node: {title: "n201" label: "Store 201" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n201" targetname: "n200" label: "0" class:14 color:blue} edge: {sourcename: "n201" targetname: "n206" label: "1" } edge: {sourcename: "n201" targetname: "n202" label: "2" } @@ -45,35 +47,35 @@ Selecting entity of type int "} edge: {sourcename: "n206" targetname: "n200" label: "0" class:14 color:blue} edge: {sourcename: "n206" targetname: "n207" label: "1" } -node: {title: "n202" label: "PhiIs 202" color: green info1: "visited: 22 +node: {title: "n202" label: "PhiIs 202" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n202" targetname: "n205" label: "0" } edge: {sourcename: "n202" targetname: "n203" label: "1" } -node: {title: "n203" label: "PhiIs 203" color: green info1: "visited: 22 +node: {title: "n203" label: "PhiIs 203" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n203" targetname: "n204" label: "0" } edge: {sourcename: "n203" targetname: "n202" label: "1" } node: {title: "n197" label: "Jmp 197" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n199" label: "Block 199" status:clustered color:yellow edge: {sourcename: "n199" targetname: "n194" label: "0" class:13 color:red} -node: {title: "n211" label: "ProjM 0 211" color: yellow info1: "visited: 22 +node: {title: "n211" label: "ProjM 0 211" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n211" targetname: "n212" label: "0" class:14 color:blue} node: {title: "n212" label: "Store 212" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n212" targetname: "n215" label: "0" class:14 color:blue} edge: {sourcename: "n212" targetname: "n214" label: "1" } edge: {sourcename: "n212" targetname: "n213" label: "2" } @@ -85,15 +87,15 @@ Selecting entity of type int "} edge: {sourcename: "n214" targetname: "n215" label: "0" class:14 color:blue} edge: {sourcename: "n214" targetname: "n207" label: "1" } -node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 22 +node: {title: "n215" label: "ProjM 0 215" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n215" targetname: "n208" label: "0" class:14 color:blue} -node: {title: "n207" label: "ProjP 2 207" color: yellow info1: "visited: 22 +node: {title: "n207" label: "ProjP 2 207" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n207" targetname: "n208" label: "0" } node: {title: "n208" label: "Alloc 208" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main @@ -102,55 +104,55 @@ allocating entity of type PRIMA_INLINE "} edge: {sourcename: "n208" targetname: "n210" label: "0" class:14 color:blue} edge: {sourcename: "n208" targetname: "n209" label: "1" } -node: {title: "n204" label: "0x0Is 204" color: yellow info1: "visited: 22 +node: {title: "n204" label: "0x0Is 204" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "n198" label: "Jmp 198" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n193" label: "Block 193" status:clustered color:yellow edge: {sourcename: "n193" targetname: "n194" label: "0" class:13 color:red} -node: {title: "n213" label: "0x2Is 213" color: yellow info1: "visited: 22 +node: {title: "n213" label: "0x2Is 213" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n210" label: "ProjM 1 210" color: yellow info1: "visited: 22 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n210" label: "ProjM 1 210" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n210" targetname: "n195" label: "0" class:14 color:blue} node: {title: "n209" label: "SymC PRIMA_INLINE size 209" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 -"} -node: {title: "n205" label: "0x5Is 205" color: yellow info1: "visited: 22 +" info2: "(mode_is_int(mymode) || mode_is_reference(mymode)) && SymConst node"} +node: {title: "n205" label: "0x5Is 205" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n194" label: "ProjX 0 194" color: yellow info1: "visited: 22 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n194" label: "ProjX 0 194" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n194" targetname: "n195" label: "0" class:13 color:red} -node: {title: "n195" label: "Start 195" color: blue info1: "visited: 22 +node: {title: "n195" label: "Start 195" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 0 start of method of type OO_INLINE_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } graph: { title: "n191" label: "Block 191" status:clustered color:yellow -node: {title: "n190" label: "End 190" color: blue info1: "visited: 22 +node: {title: "n190" label: "End 190" info1: "visited: 22 irg: OO_INLINE_EXAMPLE_main arity: 2 -"} +"color: blue} } } @@ -190,13 +192,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_INLINE_set_a)P 16" color: yellow info1: "visited: 1 +node: {title: "n16" label: "&(PRIMA_INLINE_set_a)P 16" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -224,13 +229,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_INLINE_c)P 19" color: yellow info1: "visited: 1 +node: {title: "n19" label: "&(PRIMA_INLINE_c)P 19" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} @@ -250,10 +258,10 @@ irg = g35" } edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red} edge: { sourcename: "e23" targetname: "n22"label: "value 0"} -node: {title: "n22" label: "&(GlobalType_OO_INLINE_EXAMPLE_main)P 22" color: yellow info1: "visited: 1 +node: {title: "n22" label: "&(GlobalType_OO_INLINE_EXAMPLE_main)P 22" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -262,6 +270,9 @@ edge: { sourcename: "t0" targetname: "e23"class: 12 label: "member" color:blue} node: {title: "t21" label: "method OO_INLINE_EXAMPLE_main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t21" targetname: "t11"class: 6 label: "res 0" color: green} node: {title: "t24" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "state: layout_undefined diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg index 0ca53481e..9f5aa9534 100644 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg @@ -19,21 +19,23 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g35" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white graph: { title: "n196" label: "Block 196" status:clustered color:yellow edge: {sourcename: "n196" targetname: "n198" label: "0" class:13 color:red} edge: {sourcename: "n196" targetname: "n197" label: "1" class:13 color:red} -node: {title: "n200" label: "PhiM 200" color: green info1: "visited: 21 +node: {title: "n200" label: "PhiM 200" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n200" targetname: "n211" label: "0" class:14 color:blue} edge: {sourcename: "n200" targetname: "n201" label: "1" class:14 color:blue} node: {title: "n201" label: "Store 201" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n201" targetname: "n200" label: "0" class:14 color:blue} edge: {sourcename: "n201" targetname: "n206" label: "1" } edge: {sourcename: "n201" targetname: "n202" label: "2" } @@ -45,35 +47,35 @@ Selecting entity of type int "} edge: {sourcename: "n206" targetname: "n200" label: "0" class:14 color:blue} edge: {sourcename: "n206" targetname: "n207" label: "1" } -node: {title: "n202" label: "PhiIs 202" color: green info1: "visited: 21 +node: {title: "n202" label: "PhiIs 202" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n202" targetname: "n205" label: "0" } edge: {sourcename: "n202" targetname: "n203" label: "1" } -node: {title: "n203" label: "PhiIs 203" color: green info1: "visited: 21 +node: {title: "n203" label: "PhiIs 203" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n203" targetname: "n204" label: "0" } edge: {sourcename: "n203" targetname: "n202" label: "1" } node: {title: "n197" label: "Jmp 197" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n199" label: "Block 199" status:clustered color:yellow edge: {sourcename: "n199" targetname: "n194" label: "0" class:13 color:red} -node: {title: "n211" label: "ProjM 0 211" color: yellow info1: "visited: 21 +node: {title: "n211" label: "ProjM 0 211" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n211" targetname: "n212" label: "0" class:14 color:blue} node: {title: "n212" label: "Store 212" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n212" targetname: "n215" label: "0" class:14 color:blue} edge: {sourcename: "n212" targetname: "n214" label: "1" } edge: {sourcename: "n212" targetname: "n213" label: "2" } @@ -85,15 +87,15 @@ Selecting entity of type int "} edge: {sourcename: "n214" targetname: "n215" label: "0" class:14 color:blue} edge: {sourcename: "n214" targetname: "n207" label: "1" } -node: {title: "n215" label: "ProjM 0 215" color: yellow info1: "visited: 21 +node: {title: "n215" label: "ProjM 0 215" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n215" targetname: "n208" label: "0" class:14 color:blue} -node: {title: "n207" label: "ProjP 2 207" color: yellow info1: "visited: 21 +node: {title: "n207" label: "ProjP 2 207" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n207" targetname: "n208" label: "0" } node: {title: "n208" label: "Alloc 208" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main @@ -102,55 +104,55 @@ allocating entity of type PRIMA_INLINE "} edge: {sourcename: "n208" targetname: "n210" label: "0" class:14 color:blue} edge: {sourcename: "n208" targetname: "n209" label: "1" } -node: {title: "n204" label: "0x0Is 204" color: yellow info1: "visited: 21 +node: {title: "n204" label: "0x0Is 204" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "n198" label: "Jmp 198" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n193" label: "Block 193" status:clustered color:yellow edge: {sourcename: "n193" targetname: "n194" label: "0" class:13 color:red} -node: {title: "n213" label: "0x2Is 213" color: yellow info1: "visited: 21 +node: {title: "n213" label: "0x2Is 213" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n210" label: "ProjM 1 210" color: yellow info1: "visited: 21 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n210" label: "ProjM 1 210" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n210" targetname: "n195" label: "0" class:14 color:blue} node: {title: "n209" label: "SymC PRIMA_INLINE size 209" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 -"} -node: {title: "n205" label: "0x5Is 205" color: yellow info1: "visited: 21 +" info2: "(mode_is_int(mymode) || mode_is_reference(mymode)) && SymConst node"} +node: {title: "n205" label: "0x5Is 205" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n194" label: "ProjX 0 194" color: yellow info1: "visited: 21 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n194" label: "ProjX 0 194" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n194" targetname: "n195" label: "0" class:13 color:red} -node: {title: "n195" label: "Start 195" color: blue info1: "visited: 21 +node: {title: "n195" label: "Start 195" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 0 start of method of type OO_INLINE_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } graph: { title: "n191" label: "Block 191" status:clustered color:yellow -node: {title: "n190" label: "End 190" color: blue info1: "visited: 21 +node: {title: "n190" label: "End 190" info1: "visited: 21 irg: OO_INLINE_EXAMPLE_main arity: 2 -"} +"color: blue} } } diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg index 866659c87..6eff40ed3 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg @@ -19,33 +19,35 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 17 +node: {title: "n108" label: "Block 108" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n109" label: "Start 109" color: blue info1: "visited: 17 +node: {title: "n109" label: "Start 109" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n109" targetname: "n108" class:2 priority:2 linestyle:dotted} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 17 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} edge: { sourcename: "n107" targetname: "n108" class:2 priority:2 linestyle:dotted} -node: {title: "n106" label: "Block 106" color: lightyellow info1: "visited: 17 +node: {title: "n106" label: "Block 106" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n106" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 17 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} edge: { sourcename: "n117" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n115" label: "Alloc 115" info1: "visited: 17 @@ -60,16 +62,16 @@ arity: 0 edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } edge: { sourcename: "n115" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 17 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } edge: { sourcename: "n114" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 17 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} edge: { sourcename: "n123" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n122" label: "Sel PRIMA_set_a 122" info1: "visited: 17 @@ -87,21 +89,21 @@ arity: 4 calling method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} -node: {title: "n120n121" label: "0x2Is 121" color: yellow info1: "visited: 17 +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} +node: {title: "n120n121" label: "0x2Is 121" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n120" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n120" targetname: "n122" label: "1" } edge: {sourcename: "n120" targetname: "n114" label: "2" } edge: {sourcename: "n120" targetname: "n120n121" label: "3" } edge: { sourcename: "n120" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n119" label: "ProjM 0 119" color: yellow info1: "visited: 17 +node: {title: "n119" label: "ProjM 0 119" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n119" targetname: "n120" label: "0" class:14 color:blue} edge: { sourcename: "n119" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n118" label: "Sel PRIMA_c 118" info1: "visited: 17 @@ -120,33 +122,33 @@ calling method of type c param 0 type: class_prima_ptr param 1 type: int resul 0 type: int -"} -node: {title: "n112n113" label: "0x5Is 113" color: yellow info1: "visited: 17 +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} +node: {title: "n112n113" label: "0x5Is 113" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n112" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n118" label: "1" } edge: {sourcename: "n112" targetname: "n114" label: "2" } edge: {sourcename: "n112" targetname: "n112n113" label: "3" } edge: { sourcename: "n112" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n111" label: "ProjT 2 111" color: yellow info1: "visited: 17 +node: {title: "n111" label: "ProjT 2 111" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n111" targetname: "n112" label: "0" } edge: { sourcename: "n111" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n110" label: "ProjIs 0 110" color: yellow info1: "visited: 17 +node: {title: "n110" label: "ProjIs 0 110" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_res_type(mt, proj))) && Mode of Proj from Call doesn't match mode of result type."color: yellow} edge: {sourcename: "n110" targetname: "n111" label: "0" } edge: { sourcename: "n110" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n124" label: "ProjM 0 124" color: yellow info1: "visited: 17 +node: {title: "n124" label: "ProjM 0 124" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n124" targetname: "n112" label: "0" class:14 color:blue} edge: { sourcename: "n124" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n105" label: "Return 105" info1: "visited: 17 @@ -154,23 +156,26 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 2 return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n124" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n110" label: "1" } edge: { sourcename: "n105" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n104" label: "Block 104" color: lightyellow info1: "visited: 17 +node: {title: "n104" label: "Block 104" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 17 +node: {title: "n103" label: "End 103" info1: "visited: 17 irg: OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} edge: { sourcename: "n103" targetname: "n104" class:2 priority:2 linestyle:dotted} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} @@ -219,13 +224,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 1 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -244,10 +252,10 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 1 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "e23" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow info1: " id: e23 @@ -263,10 +271,10 @@ irg = g35" } edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red} edge: { sourcename: "e23" targetname: "n22"label: "value 0"} -node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" color: yellow info1: "visited: 1 +node: {title: "n22" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P 22" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -275,6 +283,9 @@ edge: { sourcename: "t0" targetname: "e23"class: 12 label: "member" color:blue} node: {title: "t21" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t21" targetname: "t11"class: 6 label: "res 0" color: green} node: {title: "t24" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg index 2152d96ce..4d53649b8 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg @@ -19,33 +19,35 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n108" label: "Block 108" color: lightyellow info1: "visited: 15 +node: {title: "n108" label: "Block 108" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n109" label: "Start 109" color: blue info1: "visited: 15 +node: {title: "n109" label: "Start 109" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n109" targetname: "n108" class:2 priority:2 linestyle:dotted} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 15 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} edge: { sourcename: "n107" targetname: "n108" class:2 priority:2 linestyle:dotted} -node: {title: "n106" label: "Block 106" color: lightyellow info1: "visited: 15 +node: {title: "n106" label: "Block 106" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n106" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 15 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} edge: { sourcename: "n117" targetname: "n108" class:2 priority:2 linestyle:dotted} node: {title: "n115" label: "Alloc 115" info1: "visited: 15 @@ -60,16 +62,16 @@ arity: 0 edge: {sourcename: "n115" targetname: "n117" label: "0" class:14 color:blue} edge: {sourcename: "n115" targetname: "n115n116" label: "1" } edge: { sourcename: "n115" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 15 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } edge: { sourcename: "n114" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 15 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} edge: { sourcename: "n123" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n122" label: "Sel PRIMA_set_a 122" info1: "visited: 15 @@ -87,21 +89,21 @@ arity: 4 calling method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} -node: {title: "n120n121" label: "0x2Is 121" color: yellow info1: "visited: 15 +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} +node: {title: "n120n121" label: "0x2Is 121" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n120" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n120" targetname: "n122" label: "1" } edge: {sourcename: "n120" targetname: "n114" label: "2" } edge: {sourcename: "n120" targetname: "n120n121" label: "3" } edge: { sourcename: "n120" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n119" label: "ProjM 0 119" color: yellow info1: "visited: 15 +node: {title: "n119" label: "ProjM 0 119" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n119" targetname: "n120" label: "0" class:14 color:blue} edge: { sourcename: "n119" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n118" label: "Sel PRIMA_c 118" info1: "visited: 15 @@ -120,33 +122,33 @@ calling method of type c param 0 type: class_prima_ptr param 1 type: int resul 0 type: int -"} -node: {title: "n112n113" label: "0x5Is 113" color: yellow info1: "visited: 15 +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} +node: {title: "n112n113" label: "0x5Is 113" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n112" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n118" label: "1" } edge: {sourcename: "n112" targetname: "n114" label: "2" } edge: {sourcename: "n112" targetname: "n112n113" label: "3" } edge: { sourcename: "n112" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n111" label: "ProjT 2 111" color: yellow info1: "visited: 15 +node: {title: "n111" label: "ProjT 2 111" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n111" targetname: "n112" label: "0" } edge: { sourcename: "n111" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n110" label: "ProjIs 0 110" color: yellow info1: "visited: 15 +node: {title: "n110" label: "ProjIs 0 110" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_res_type(mt, proj))) && Mode of Proj from Call doesn't match mode of result type."color: yellow} edge: {sourcename: "n110" targetname: "n111" label: "0" } edge: { sourcename: "n110" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n124" label: "ProjM 0 124" color: yellow info1: "visited: 15 +node: {title: "n124" label: "ProjM 0 124" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n124" targetname: "n112" label: "0" class:14 color:blue} edge: { sourcename: "n124" targetname: "n106" class:2 priority:2 linestyle:dotted} node: {title: "n105" label: "Return 105" info1: "visited: 15 @@ -154,18 +156,18 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 2 return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n124" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n110" label: "1" } edge: { sourcename: "n105" targetname: "n106" class:2 priority:2 linestyle:dotted} -node: {title: "n104" label: "Block 104" color: lightyellow info1: "visited: 15 +node: {title: "n104" label: "Block 104" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 15 +node: {title: "n103" label: "End 103" info1: "visited: 15 irg: OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} edge: { sourcename: "n103" targetname: "n104" class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg index c6b18bac0..9a1c284a4 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g35" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white graph: { title: "n104" label: "Block 104" status:clustered color:yellow edge: {sourcename: "n104" targetname: "n105" label: "0" class:13 color:red} -node: {title: "n103" label: "End 103" color: blue info1: "visited: 16 +node: {title: "n103" label: "End 103" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n106" label: "Block 106" status:clustered color:yellow @@ -36,23 +38,23 @@ irg: OO_PROGRAM_EXAMPLE_main arity: 2 return in method of type OO_PROGRAM_EXAMPLE_main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n105" targetname: "n124" label: "0" class:14 color:blue} edge: {sourcename: "n105" targetname: "n110" label: "1" } -node: {title: "n124" label: "ProjM 0 124" color: yellow info1: "visited: 16 +node: {title: "n124" label: "ProjM 0 124" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n124" targetname: "n112" label: "0" class:14 color:blue} -node: {title: "n110" label: "ProjIs 0 110" color: yellow info1: "visited: 16 +node: {title: "n110" label: "ProjIs 0 110" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_res_type(mt, proj))) && Mode of Proj from Call doesn't match mode of result type."color: yellow} edge: {sourcename: "n110" targetname: "n111" label: "0" } -node: {title: "n111" label: "ProjT 2 111" color: yellow info1: "visited: 16 +node: {title: "n111" label: "ProjT 2 111" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n111" targetname: "n112" label: "0" } node: {title: "n112" label: "Call 112" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main @@ -61,12 +63,12 @@ calling method of type c param 0 type: class_prima_ptr param 1 type: int resul 0 type: int -"} -node: {title: "n112n113" label: "0x5Is 113" color: yellow info1: "visited: 16 +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} +node: {title: "n112n113" label: "0x5Is 113" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n112" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n112" targetname: "n118" label: "1" } edge: {sourcename: "n112" targetname: "n114" label: "2" } @@ -79,10 +81,10 @@ Selecting entity of type c "} edge: {sourcename: "n118" targetname: "n119" label: "0" class:14 color:blue} edge: {sourcename: "n118" targetname: "n114" label: "1" } -node: {title: "n119" label: "ProjM 0 119" color: yellow info1: "visited: 16 +node: {title: "n119" label: "ProjM 0 119" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n119" targetname: "n120" label: "0" class:14 color:blue} node: {title: "n120" label: "Call 120" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main @@ -90,12 +92,12 @@ arity: 4 calling method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} -node: {title: "n120n121" label: "0x2Is 121" color: yellow info1: "visited: 16 +" info2: "get_Call_n_params(n) == get_method_n_params(mt) && Number of args for Call doesn't match number of args in non variadic type."} +node: {title: "n120n121" label: "0x2Is 121" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 0 Const of type type_unknown -"} +"color: yellow} edge: {sourcename: "n120" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n120" targetname: "n122" label: "1" } edge: {sourcename: "n120" targetname: "n114" label: "2" } @@ -108,15 +110,15 @@ Selecting entity of type set_a "} edge: {sourcename: "n122" targetname: "n123" label: "0" class:14 color:blue} edge: {sourcename: "n122" targetname: "n114" label: "1" } -node: {title: "n123" label: "ProjM 0 123" color: yellow info1: "visited: 16 +node: {title: "n123" label: "ProjM 0 123" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n123" targetname: "n115" label: "0" class:14 color:blue} -node: {title: "n114" label: "ProjP 2 114" color: yellow info1: "visited: 16 +node: {title: "n114" label: "ProjP 2 114" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n114" targetname: "n115" label: "0" } node: {title: "n115" label: "Alloc 115" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main @@ -133,21 +135,21 @@ edge: {sourcename: "n115" targetname: "n115n116" label: "1" } graph: { title: "n108" label: "Block 108" status:clustered color:yellow edge: {sourcename: "n108" targetname: "n107" label: "0" class:13 color:red} -node: {title: "n117" label: "ProjM 1 117" color: yellow info1: "visited: 16 +node: {title: "n117" label: "ProjM 1 117" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n117" targetname: "n109" label: "0" class:14 color:blue} -node: {title: "n107" label: "ProjX 0 107" color: yellow info1: "visited: 16 +node: {title: "n107" label: "ProjX 0 107" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n107" targetname: "n109" label: "0" class:13 color:red} -node: {title: "n109" label: "Start 109" color: blue info1: "visited: 16 +node: {title: "n109" label: "Start 109" info1: "visited: 16 irg: OO_PROGRAM_EXAMPLE_main arity: 0 start of method of type OO_PROGRAM_EXAMPLE_main -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg index 5dd5c9a75..ad33b2ef8 100644 --- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg @@ -19,21 +19,23 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g90" label: "PRIMA_INLINE_c" status:clustered color:white graph: { title: "n242" label: "Block 242" status:clustered color:yellow edge: {sourcename: "n242" targetname: "n244" label: "0" class:13 color:red} edge: {sourcename: "n242" targetname: "n243" label: "1" class:13 color:red} -node: {title: "n246" label: "PhiM 246" color: green info1: "visited: 22 +node: {title: "n246" label: "PhiM 246" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n246" targetname: "n255" label: "0" class:14 color:blue} edge: {sourcename: "n246" targetname: "n247" label: "1" class:14 color:blue} node: {title: "n247" label: "Store 247" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n247" targetname: "n246" label: "0" class:14 color:blue} edge: {sourcename: "n247" targetname: "n253" label: "1" } edge: {sourcename: "n247" targetname: "n248" label: "2" } @@ -45,78 +47,78 @@ Selecting entity of type int "} edge: {sourcename: "n253" targetname: "n246" label: "0" class:14 color:blue} edge: {sourcename: "n253" targetname: "n254" label: "1" } -node: {title: "n248" label: "PhiIs 248" color: green info1: "visited: 22 +node: {title: "n248" label: "PhiIs 248" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n248" targetname: "n251" label: "0" } edge: {sourcename: "n248" targetname: "n249" label: "1" } -node: {title: "n249" label: "PhiIs 249" color: green info1: "visited: 22 +node: {title: "n249" label: "PhiIs 249" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n249" targetname: "n250" label: "0" } edge: {sourcename: "n249" targetname: "n248" label: "1" } node: {title: "n243" label: "Jmp 243" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n245" label: "Block 245" status:clustered color:yellow edge: {sourcename: "n245" targetname: "n240" label: "0" class:13 color:red} -node: {title: "n254" label: "ProjP 0 254" color: yellow info1: "visited: 22 +node: {title: "n254" label: "ProjP 0 254" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n254" targetname: "n252" label: "0" } -node: {title: "n251" label: "ProjIs 1 251" color: yellow info1: "visited: 22 +node: {title: "n251" label: "ProjIs 1 251" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n251" targetname: "n252" label: "0" } node: {title: "n244" label: "Jmp 244" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n239" label: "Block 239" status:clustered color:yellow edge: {sourcename: "n239" targetname: "n240" label: "0" class:13 color:red} -node: {title: "n255" label: "ProjM 1 255" color: yellow info1: "visited: 22 +node: {title: "n255" label: "ProjM 1 255" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n255" targetname: "n241" label: "0" class:14 color:blue} -node: {title: "n252" label: "ProjT 4 252" color: yellow info1: "visited: 22 +node: {title: "n252" label: "ProjT 4 252" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n252" targetname: "n241" label: "0" } -node: {title: "n250" label: "0x0Is 250" color: yellow info1: "visited: 22 +node: {title: "n250" label: "0x0Is 250" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 0 Const of type type_unknown -"} -node: {title: "n240" label: "ProjX 0 240" color: yellow info1: "visited: 22 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n240" label: "ProjX 0 240" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n240" targetname: "n241" label: "0" class:13 color:red} -node: {title: "n241" label: "Start 241" color: blue info1: "visited: 22 +node: {title: "n241" label: "Start 241" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } graph: { title: "n237" label: "Block 237" status:clustered color:yellow -node: {title: "n236" label: "End 236" color: blue info1: "visited: 22 +node: {title: "n236" label: "End 236" info1: "visited: 22 irg: PRIMA_INLINE_c arity: 2 -"} +"color: blue} } } @@ -156,13 +158,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_INLINE_set_a)P 16" color: yellow info1: "visited: 3 +node: {title: "n16" label: "&(PRIMA_INLINE_set_a)P 16" info1: "visited: 3 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -190,13 +195,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_INLINE_c)P 19" color: yellow info1: "visited: 3 +node: {title: "n19" label: "&(PRIMA_INLINE_c)P 19" info1: "visited: 3 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} diff --git a/testprograms/ref-results/PRIMA_INLINE_c.vcg b/testprograms/ref-results/PRIMA_INLINE_c.vcg index 91c544489..0298a32b1 100644 --- a/testprograms/ref-results/PRIMA_INLINE_c.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_c.vcg @@ -19,21 +19,23 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g90" label: "PRIMA_INLINE_c" status:clustered color:white graph: { title: "n242" label: "Block 242" status:clustered color:yellow edge: {sourcename: "n242" targetname: "n244" label: "0" class:13 color:red} edge: {sourcename: "n242" targetname: "n243" label: "1" class:13 color:red} -node: {title: "n246" label: "PhiM 246" color: green info1: "visited: 21 +node: {title: "n246" label: "PhiM 246" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n246" targetname: "n255" label: "0" class:14 color:blue} edge: {sourcename: "n246" targetname: "n247" label: "1" class:14 color:blue} node: {title: "n247" label: "Store 247" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n247" targetname: "n246" label: "0" class:14 color:blue} edge: {sourcename: "n247" targetname: "n253" label: "1" } edge: {sourcename: "n247" targetname: "n248" label: "2" } @@ -45,78 +47,78 @@ Selecting entity of type int "} edge: {sourcename: "n253" targetname: "n246" label: "0" class:14 color:blue} edge: {sourcename: "n253" targetname: "n254" label: "1" } -node: {title: "n248" label: "PhiIs 248" color: green info1: "visited: 21 +node: {title: "n248" label: "PhiIs 248" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n248" targetname: "n251" label: "0" } edge: {sourcename: "n248" targetname: "n249" label: "1" } -node: {title: "n249" label: "PhiIs 249" color: green info1: "visited: 21 +node: {title: "n249" label: "PhiIs 249" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n249" targetname: "n250" label: "0" } edge: {sourcename: "n249" targetname: "n248" label: "1" } node: {title: "n243" label: "Jmp 243" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n245" label: "Block 245" status:clustered color:yellow edge: {sourcename: "n245" targetname: "n240" label: "0" class:13 color:red} -node: {title: "n254" label: "ProjP 0 254" color: yellow info1: "visited: 21 +node: {title: "n254" label: "ProjP 0 254" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n254" targetname: "n252" label: "0" } -node: {title: "n251" label: "ProjIs 1 251" color: yellow info1: "visited: 21 +node: {title: "n251" label: "ProjIs 1 251" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n251" targetname: "n252" label: "0" } node: {title: "n244" label: "Jmp 244" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n239" label: "Block 239" status:clustered color:yellow edge: {sourcename: "n239" targetname: "n240" label: "0" class:13 color:red} -node: {title: "n255" label: "ProjM 1 255" color: yellow info1: "visited: 21 +node: {title: "n255" label: "ProjM 1 255" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n255" targetname: "n241" label: "0" class:14 color:blue} -node: {title: "n252" label: "ProjT 4 252" color: yellow info1: "visited: 21 +node: {title: "n252" label: "ProjT 4 252" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n252" targetname: "n241" label: "0" } -node: {title: "n250" label: "0x0Is 250" color: yellow info1: "visited: 21 +node: {title: "n250" label: "0x0Is 250" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 0 Const of type type_unknown -"} -node: {title: "n240" label: "ProjX 0 240" color: yellow info1: "visited: 21 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n240" label: "ProjX 0 240" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n240" targetname: "n241" label: "0" class:13 color:red} -node: {title: "n241" label: "Start 241" color: blue info1: "visited: 21 +node: {title: "n241" label: "Start 241" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } graph: { title: "n237" label: "Block 237" status:clustered color:yellow -node: {title: "n236" label: "End 236" color: blue info1: "visited: 21 +node: {title: "n236" label: "End 236" info1: "visited: 21 irg: PRIMA_INLINE_c arity: 2 -"} +"color: blue} } } diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg index d98ce4395..4057a6c56 100644 --- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g68" label: "PRIMA_INLINE_set_a" status:clustered color:white graph: { title: "n220" label: "Block 220" status:clustered color:yellow edge: {sourcename: "n220" targetname: "n221" label: "0" class:13 color:red} -node: {title: "n219" label: "End 219" color: blue info1: "visited: 17 +node: {title: "n219" label: "End 219" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 0 -"} +"color: blue} } graph: { title: "n222" label: "Block 222" status:clustered color:yellow @@ -35,17 +37,17 @@ node: {title: "n221" label: "Return 221" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 return in method of type set_a -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n221" targetname: "n226" label: "0" class:14 color:blue} -node: {title: "n226" label: "ProjM 0 226" color: yellow info1: "visited: 17 +node: {title: "n226" label: "ProjM 0 226" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n226" targetname: "n227" label: "0" class:14 color:blue} node: {title: "n227" label: "Store 227" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n227" targetname: "n232" label: "0" class:14 color:blue} edge: {sourcename: "n227" targetname: "n230" label: "1" } edge: {sourcename: "n227" targetname: "n228" label: "2" } @@ -57,42 +59,42 @@ Selecting entity of type int "} edge: {sourcename: "n230" targetname: "n232" label: "0" class:14 color:blue} edge: {sourcename: "n230" targetname: "n231" label: "1" } -node: {title: "n231" label: "ProjP 0 231" color: yellow info1: "visited: 17 +node: {title: "n231" label: "ProjP 0 231" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n231" targetname: "n229" label: "0" } -node: {title: "n228" label: "ProjIs 1 228" color: yellow info1: "visited: 17 +node: {title: "n228" label: "ProjIs 1 228" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n228" targetname: "n229" label: "0" } } graph: { title: "n224" label: "Block 224" status:clustered color:yellow edge: {sourcename: "n224" targetname: "n223" label: "0" class:13 color:red} -node: {title: "n232" label: "ProjM 1 232" color: yellow info1: "visited: 17 +node: {title: "n232" label: "ProjM 1 232" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n232" targetname: "n225" label: "0" class:14 color:blue} -node: {title: "n229" label: "ProjT 4 229" color: yellow info1: "visited: 17 +node: {title: "n229" label: "ProjT 4 229" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n229" targetname: "n225" label: "0" } -node: {title: "n223" label: "ProjX 0 223" color: yellow info1: "visited: 17 +node: {title: "n223" label: "ProjX 0 223" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n223" targetname: "n225" label: "0" class:13 color:red} -node: {title: "n225" label: "Start 225" color: blue info1: "visited: 17 +node: {title: "n225" label: "Start 225" info1: "visited: 17 irg: PRIMA_INLINE_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -132,13 +134,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_INLINE_set_a)P 16" color: yellow info1: "visited: 2 +node: {title: "n16" label: "&(PRIMA_INLINE_set_a)P 16" info1: "visited: 2 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -166,13 +171,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_INLINE_c)P 19" color: yellow info1: "visited: 2 +node: {title: "n19" label: "&(PRIMA_INLINE_c)P 19" info1: "visited: 2 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg index 1b86bd9c2..2f9c982b4 100644 --- a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g68" label: "PRIMA_INLINE_set_a" status:clustered color:white graph: { title: "n220" label: "Block 220" status:clustered color:yellow edge: {sourcename: "n220" targetname: "n221" label: "0" class:13 color:red} -node: {title: "n219" label: "End 219" color: blue info1: "visited: 16 +node: {title: "n219" label: "End 219" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 0 -"} +"color: blue} } graph: { title: "n222" label: "Block 222" status:clustered color:yellow @@ -35,17 +37,17 @@ node: {title: "n221" label: "Return 221" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 return in method of type set_a -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n221" targetname: "n226" label: "0" class:14 color:blue} -node: {title: "n226" label: "ProjM 0 226" color: yellow info1: "visited: 16 +node: {title: "n226" label: "ProjM 0 226" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n226" targetname: "n227" label: "0" class:14 color:blue} node: {title: "n227" label: "Store 227" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n227" targetname: "n232" label: "0" class:14 color:blue} edge: {sourcename: "n227" targetname: "n230" label: "1" } edge: {sourcename: "n227" targetname: "n228" label: "2" } @@ -57,42 +59,42 @@ Selecting entity of type int "} edge: {sourcename: "n230" targetname: "n232" label: "0" class:14 color:blue} edge: {sourcename: "n230" targetname: "n231" label: "1" } -node: {title: "n231" label: "ProjP 0 231" color: yellow info1: "visited: 16 +node: {title: "n231" label: "ProjP 0 231" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n231" targetname: "n229" label: "0" } -node: {title: "n228" label: "ProjIs 1 228" color: yellow info1: "visited: 16 +node: {title: "n228" label: "ProjIs 1 228" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n228" targetname: "n229" label: "0" } } graph: { title: "n224" label: "Block 224" status:clustered color:yellow edge: {sourcename: "n224" targetname: "n223" label: "0" class:13 color:red} -node: {title: "n232" label: "ProjM 1 232" color: yellow info1: "visited: 16 +node: {title: "n232" label: "ProjM 1 232" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n232" targetname: "n225" label: "0" class:14 color:blue} -node: {title: "n229" label: "ProjT 4 229" color: yellow info1: "visited: 16 +node: {title: "n229" label: "ProjT 4 229" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n229" targetname: "n225" label: "0" } -node: {title: "n223" label: "ProjX 0 223" color: yellow info1: "visited: 16 +node: {title: "n223" label: "ProjX 0 223" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n223" targetname: "n225" label: "0" class:13 color:red} -node: {title: "n225" label: "Start 225" color: blue info1: "visited: 16 +node: {title: "n225" label: "Start 225" info1: "visited: 16 irg: PRIMA_INLINE_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg index 05320eb6d..d6209de08 100644 --- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg @@ -19,47 +19,49 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n151" label: "Block 151" color: lightyellow info1: "visited: 10 +node: {title: "n151" label: "Block 151" info1: "visited: 10 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n151" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n152" label: "Start 152" color: blue info1: "visited: 10 +node: {title: "n152" label: "Start 152" info1: "visited: 10 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n152" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 10 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 10 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} edge: { sourcename: "n150" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n149" label: "Block 149" color: lightyellow info1: "visited: 10 +node: {title: "n149" label: "Block 149" info1: "visited: 10 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n158" label: "ProjT 4 158" color: yellow info1: "visited: 10 +node: {title: "n158" label: "ProjT 4 158" info1: "visited: 10 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n158" targetname: "n152" label: "0" } edge: { sourcename: "n158" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n157" label: "ProjP 0 157" color: yellow info1: "visited: 10 +node: {title: "n157" label: "ProjP 0 157" info1: "visited: 10 irg: PRIMA_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n157" targetname: "n158" label: "0" } edge: { sourcename: "n157" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n159" label: "ProjM 1 159" color: yellow info1: "visited: 10 +node: {title: "n159" label: "ProjM 1 159" info1: "visited: 10 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n159" targetname: "n152" label: "0" class:14 color:blue} edge: { sourcename: "n159" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n156" label: "Sel a 156" info1: "visited: 10 @@ -74,20 +76,20 @@ edge: { sourcename: "n156" targetname: "n149" class:2 priority:2 linestyle:dotte node: {title: "n155" label: "Load 155" info1: "visited: 10 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } edge: { sourcename: "n155" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 10 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 10 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } edge: { sourcename: "n154" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n160" label: "ProjIs 1 160" color: yellow info1: "visited: 10 +node: {title: "n160" label: "ProjIs 1 160" info1: "visited: 10 irg: PRIMA_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n160" targetname: "n158" label: "0" } edge: { sourcename: "n160" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n153" label: "AddIs 153" info1: "visited: 10 @@ -97,10 +99,10 @@ arity: 2 edge: {sourcename: "n153" targetname: "n160" label: "0" } edge: {sourcename: "n153" targetname: "n154" label: "1" } edge: { sourcename: "n153" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 10 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 10 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} edge: { sourcename: "n161" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n148" label: "Return 148" info1: "visited: 10 @@ -108,19 +110,19 @@ irg: PRIMA_c arity: 2 return in method of type c res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n148" targetname: "n161" label: "0" class:14 color:blue} edge: {sourcename: "n148" targetname: "n153" label: "1" } edge: { sourcename: "n148" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n147" label: "Block 147" color: lightyellow info1: "visited: 10 +node: {title: "n147" label: "Block 147" info1: "visited: 10 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n147" targetname: "n148" label: "0" class:13 color:red} -node: {title: "n146" label: "End 146" color: blue info1: "visited: 10 +node: {title: "n146" label: "End 146" info1: "visited: 10 irg: PRIMA_c arity: 0 -"} +"color: blue} edge: { sourcename: "n146" targetname: "n147" class:2 priority:2 linestyle:dotted} node: {title: "e14" label: "ent a" color: yellow info1: " @@ -157,13 +159,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 3 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 3 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -191,13 +196,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 3 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 3 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} diff --git a/testprograms/ref-results/PRIMA_c-pure.vcg b/testprograms/ref-results/PRIMA_c-pure.vcg index 41c2639cc..b21dffdb7 100644 --- a/testprograms/ref-results/PRIMA_c-pure.vcg +++ b/testprograms/ref-results/PRIMA_c-pure.vcg @@ -19,47 +19,49 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n151" label: "Block 151" color: lightyellow info1: "visited: 8 +node: {title: "n151" label: "Block 151" info1: "visited: 8 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n151" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n152" label: "Start 152" color: blue info1: "visited: 8 +node: {title: "n152" label: "Start 152" info1: "visited: 8 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n152" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 8 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 8 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} edge: { sourcename: "n150" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n149" label: "Block 149" color: lightyellow info1: "visited: 8 +node: {title: "n149" label: "Block 149" info1: "visited: 8 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n149" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n158" label: "ProjT 4 158" color: yellow info1: "visited: 8 +node: {title: "n158" label: "ProjT 4 158" info1: "visited: 8 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n158" targetname: "n152" label: "0" } edge: { sourcename: "n158" targetname: "n151" class:2 priority:2 linestyle:dotted} -node: {title: "n157" label: "ProjP 0 157" color: yellow info1: "visited: 8 +node: {title: "n157" label: "ProjP 0 157" info1: "visited: 8 irg: PRIMA_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n157" targetname: "n158" label: "0" } edge: { sourcename: "n157" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n159" label: "ProjM 1 159" color: yellow info1: "visited: 8 +node: {title: "n159" label: "ProjM 1 159" info1: "visited: 8 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n159" targetname: "n152" label: "0" class:14 color:blue} edge: { sourcename: "n159" targetname: "n151" class:2 priority:2 linestyle:dotted} node: {title: "n156" label: "Sel a 156" info1: "visited: 8 @@ -74,20 +76,20 @@ edge: { sourcename: "n156" targetname: "n149" class:2 priority:2 linestyle:dotte node: {title: "n155" label: "Load 155" info1: "visited: 8 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } edge: { sourcename: "n155" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 8 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 8 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } edge: { sourcename: "n154" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n160" label: "ProjIs 1 160" color: yellow info1: "visited: 8 +node: {title: "n160" label: "ProjIs 1 160" info1: "visited: 8 irg: PRIMA_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n160" targetname: "n158" label: "0" } edge: { sourcename: "n160" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n153" label: "AddIs 153" info1: "visited: 8 @@ -97,10 +99,10 @@ arity: 2 edge: {sourcename: "n153" targetname: "n160" label: "0" } edge: {sourcename: "n153" targetname: "n154" label: "1" } edge: { sourcename: "n153" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 8 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 8 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} edge: { sourcename: "n161" targetname: "n149" class:2 priority:2 linestyle:dotted} node: {title: "n148" label: "Return 148" info1: "visited: 8 @@ -108,18 +110,18 @@ irg: PRIMA_c arity: 2 return in method of type c res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n148" targetname: "n161" label: "0" class:14 color:blue} edge: {sourcename: "n148" targetname: "n153" label: "1" } edge: { sourcename: "n148" targetname: "n149" class:2 priority:2 linestyle:dotted} -node: {title: "n147" label: "Block 147" color: lightyellow info1: "visited: 8 +node: {title: "n147" label: "Block 147" info1: "visited: 8 irg: PRIMA_c arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n147" targetname: "n148" label: "0" class:13 color:red} -node: {title: "n146" label: "End 146" color: blue info1: "visited: 8 +node: {title: "n146" label: "End 146" info1: "visited: 8 irg: PRIMA_c arity: 0 -"} +"color: blue} edge: { sourcename: "n146" targetname: "n147" class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_c-type.vcg b/testprograms/ref-results/PRIMA_c-type.vcg index dd150539c..7d85240b2 100644 --- a/testprograms/ref-results/PRIMA_c-type.vcg +++ b/testprograms/ref-results/PRIMA_c-type.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "e14" label: "ent a" color: yellow info1: " @@ -55,13 +57,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 9 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 9 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -89,13 +94,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 9 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 9 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg index 2710f7c37..5ae68d525 100644 --- a/testprograms/ref-results/PRIMA_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n147" label: "Block 147" status:clustered color:yellow edge: {sourcename: "n147" targetname: "n148" label: "0" class:13 color:red} -node: {title: "n146" label: "End 146" color: blue info1: "visited: 13 +node: {title: "n146" label: "End 146" info1: "visited: 13 irg: PRIMA_c arity: 0 -"} +"color: blue} } graph: { title: "n149" label: "Block 149" status:clustered color:yellow @@ -36,13 +38,13 @@ irg: PRIMA_c arity: 2 return in method of type c res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n148" targetname: "n161" label: "0" class:14 color:blue} edge: {sourcename: "n148" targetname: "n153" label: "1" } -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 13 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 13 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 13 irg: PRIMA_c @@ -50,20 +52,20 @@ arity: 2 "} edge: {sourcename: "n153" targetname: "n160" label: "0" } edge: {sourcename: "n153" targetname: "n154" label: "1" } -node: {title: "n160" label: "ProjIs 1 160" color: yellow info1: "visited: 13 +node: {title: "n160" label: "ProjIs 1 160" info1: "visited: 13 irg: PRIMA_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n160" targetname: "n158" label: "0" } -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 13 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 13 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } node: {title: "n155" label: "Load 155" info1: "visited: 13 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 13 @@ -74,37 +76,37 @@ Selecting entity of type int "} edge: {sourcename: "n156" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n157" label: "1" } -node: {title: "n157" label: "ProjP 0 157" color: yellow info1: "visited: 13 +node: {title: "n157" label: "ProjP 0 157" info1: "visited: 13 irg: PRIMA_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n157" targetname: "n158" label: "0" } } graph: { title: "n151" label: "Block 151" status:clustered color:yellow edge: {sourcename: "n151" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n159" label: "ProjM 1 159" color: yellow info1: "visited: 13 +node: {title: "n159" label: "ProjM 1 159" info1: "visited: 13 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n159" targetname: "n152" label: "0" class:14 color:blue} -node: {title: "n158" label: "ProjT 4 158" color: yellow info1: "visited: 13 +node: {title: "n158" label: "ProjT 4 158" info1: "visited: 13 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n158" targetname: "n152" label: "0" } -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 13 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 13 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} -node: {title: "n152" label: "Start 152" color: blue info1: "visited: 13 +node: {title: "n152" label: "Start 152" info1: "visited: 13 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -144,13 +146,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 6 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 6 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -178,13 +183,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 6 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 6 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} diff --git a/testprograms/ref-results/PRIMA_c.vcg b/testprograms/ref-results/PRIMA_c.vcg index 62f9bf287..431401e47 100644 --- a/testprograms/ref-results/PRIMA_c.vcg +++ b/testprograms/ref-results/PRIMA_c.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g90" label: "PRIMA_c" status:clustered color:white graph: { title: "n147" label: "Block 147" status:clustered color:yellow edge: {sourcename: "n147" targetname: "n148" label: "0" class:13 color:red} -node: {title: "n146" label: "End 146" color: blue info1: "visited: 9 +node: {title: "n146" label: "End 146" info1: "visited: 9 irg: PRIMA_c arity: 0 -"} +"color: blue} } graph: { title: "n149" label: "Block 149" status:clustered color:yellow @@ -36,13 +38,13 @@ irg: PRIMA_c arity: 2 return in method of type c res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n148" targetname: "n161" label: "0" class:14 color:blue} edge: {sourcename: "n148" targetname: "n153" label: "1" } -node: {title: "n161" label: "ProjM 0 161" color: yellow info1: "visited: 9 +node: {title: "n161" label: "ProjM 0 161" info1: "visited: 9 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n161" targetname: "n155" label: "0" class:14 color:blue} node: {title: "n153" label: "AddIs 153" info1: "visited: 9 irg: PRIMA_c @@ -50,20 +52,20 @@ arity: 2 "} edge: {sourcename: "n153" targetname: "n160" label: "0" } edge: {sourcename: "n153" targetname: "n154" label: "1" } -node: {title: "n160" label: "ProjIs 1 160" color: yellow info1: "visited: 9 +node: {title: "n160" label: "ProjIs 1 160" info1: "visited: 9 irg: PRIMA_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n160" targetname: "n158" label: "0" } -node: {title: "n154" label: "ProjIs 2 154" color: yellow info1: "visited: 9 +node: {title: "n154" label: "ProjIs 2 154" info1: "visited: 9 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n154" targetname: "n155" label: "0" } node: {title: "n155" label: "Load 155" info1: "visited: 9 irg: PRIMA_c arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n155" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n155" targetname: "n156" label: "1" } node: {title: "n156" label: "Sel a 156" info1: "visited: 9 @@ -74,37 +76,37 @@ Selecting entity of type int "} edge: {sourcename: "n156" targetname: "n159" label: "0" class:14 color:blue} edge: {sourcename: "n156" targetname: "n157" label: "1" } -node: {title: "n157" label: "ProjP 0 157" color: yellow info1: "visited: 9 +node: {title: "n157" label: "ProjP 0 157" info1: "visited: 9 irg: PRIMA_c arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n157" targetname: "n158" label: "0" } } graph: { title: "n151" label: "Block 151" status:clustered color:yellow edge: {sourcename: "n151" targetname: "n150" label: "0" class:13 color:red} -node: {title: "n159" label: "ProjM 1 159" color: yellow info1: "visited: 9 +node: {title: "n159" label: "ProjM 1 159" info1: "visited: 9 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n159" targetname: "n152" label: "0" class:14 color:blue} -node: {title: "n158" label: "ProjT 4 158" color: yellow info1: "visited: 9 +node: {title: "n158" label: "ProjT 4 158" info1: "visited: 9 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n158" targetname: "n152" label: "0" } -node: {title: "n150" label: "ProjX 0 150" color: yellow info1: "visited: 9 +node: {title: "n150" label: "ProjX 0 150" info1: "visited: 9 irg: PRIMA_c arity: 1 -"} +"color: yellow} edge: {sourcename: "n150" targetname: "n152" label: "0" class:13 color:red} -node: {title: "n152" label: "Start 152" color: blue info1: "visited: 9 +node: {title: "n152" label: "Start 152" info1: "visited: 9 irg: PRIMA_c arity: 0 start of method of type c param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg index 76ae01a22..29bb9a360 100644 --- a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg @@ -19,53 +19,55 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n134" label: "Block 134" color: lightyellow info1: "visited: 10 +node: {title: "n134" label: "Block 134" info1: "visited: 10 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n134" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n135" label: "Start 135" color: blue info1: "visited: 10 +node: {title: "n135" label: "Start 135" info1: "visited: 10 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n135" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 10 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 10 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} edge: { sourcename: "n133" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n132" label: "Block 132" color: lightyellow info1: "visited: 10 +node: {title: "n132" label: "Block 132" info1: "visited: 10 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n139" label: "ProjT 4 139" color: yellow info1: "visited: 10 +node: {title: "n139" label: "ProjT 4 139" info1: "visited: 10 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n139" targetname: "n135" label: "0" } edge: { sourcename: "n139" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n138" label: "ProjIs 1 138" color: yellow info1: "visited: 10 +node: {title: "n138" label: "ProjIs 1 138" info1: "visited: 10 irg: PRIMA_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n138" targetname: "n139" label: "0" } edge: { sourcename: "n138" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n141" label: "ProjP 0 141" color: yellow info1: "visited: 10 +node: {title: "n141" label: "ProjP 0 141" info1: "visited: 10 irg: PRIMA_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n141" targetname: "n139" label: "0" } edge: { sourcename: "n141" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n142" label: "ProjM 1 142" color: yellow info1: "visited: 10 +node: {title: "n142" label: "ProjM 1 142" info1: "visited: 10 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n142" targetname: "n135" label: "0" class:14 color:blue} edge: { sourcename: "n142" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n140" label: "Sel a 140" info1: "visited: 10 @@ -80,33 +82,33 @@ edge: { sourcename: "n140" targetname: "n132" class:2 priority:2 linestyle:dotte node: {title: "n137" label: "Store 137" info1: "visited: 10 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n138" label: "2" } edge: { sourcename: "n137" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 10 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 10 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} edge: { sourcename: "n136" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n131" label: "Return 131" info1: "visited: 10 irg: PRIMA_set_a arity: 1 return in method of type set_a -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n131" targetname: "n136" label: "0" class:14 color:blue} edge: { sourcename: "n131" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n130" label: "Block 130" color: lightyellow info1: "visited: 10 +node: {title: "n130" label: "Block 130" info1: "visited: 10 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n130" targetname: "n131" label: "0" class:13 color:red} -node: {title: "n129" label: "End 129" color: blue info1: "visited: 10 +node: {title: "n129" label: "End 129" info1: "visited: 10 irg: PRIMA_set_a arity: 0 -"} +"color: blue} edge: { sourcename: "n129" targetname: "n130" class:2 priority:2 linestyle:dotted} node: {title: "e14" label: "ent a" color: yellow info1: " @@ -143,13 +145,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 2 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 2 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -177,13 +182,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 2 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 2 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} diff --git a/testprograms/ref-results/PRIMA_set_a-pure.vcg b/testprograms/ref-results/PRIMA_set_a-pure.vcg index a9739f543..b64ad6638 100644 --- a/testprograms/ref-results/PRIMA_set_a-pure.vcg +++ b/testprograms/ref-results/PRIMA_set_a-pure.vcg @@ -19,53 +19,55 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" -node: {title: "n134" label: "Block 134" color: lightyellow info1: "visited: 8 +node: {title: "n134" label: "Block 134" info1: "visited: 8 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n134" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n135" label: "Start 135" color: blue info1: "visited: 8 +node: {title: "n135" label: "Start 135" info1: "visited: 8 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} edge: { sourcename: "n135" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 8 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 8 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} edge: { sourcename: "n133" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n132" label: "Block 132" color: lightyellow info1: "visited: 8 +node: {title: "n132" label: "Block 132" info1: "visited: 8 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n132" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n139" label: "ProjT 4 139" color: yellow info1: "visited: 8 +node: {title: "n139" label: "ProjT 4 139" info1: "visited: 8 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n139" targetname: "n135" label: "0" } edge: { sourcename: "n139" targetname: "n134" class:2 priority:2 linestyle:dotted} -node: {title: "n138" label: "ProjIs 1 138" color: yellow info1: "visited: 8 +node: {title: "n138" label: "ProjIs 1 138" info1: "visited: 8 irg: PRIMA_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n138" targetname: "n139" label: "0" } edge: { sourcename: "n138" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n141" label: "ProjP 0 141" color: yellow info1: "visited: 8 +node: {title: "n141" label: "ProjP 0 141" info1: "visited: 8 irg: PRIMA_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n141" targetname: "n139" label: "0" } edge: { sourcename: "n141" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n142" label: "ProjM 1 142" color: yellow info1: "visited: 8 +node: {title: "n142" label: "ProjM 1 142" info1: "visited: 8 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n142" targetname: "n135" label: "0" class:14 color:blue} edge: { sourcename: "n142" targetname: "n134" class:2 priority:2 linestyle:dotted} node: {title: "n140" label: "Sel a 140" info1: "visited: 8 @@ -80,32 +82,32 @@ edge: { sourcename: "n140" targetname: "n132" class:2 priority:2 linestyle:dotte node: {title: "n137" label: "Store 137" info1: "visited: 8 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n138" label: "2" } edge: { sourcename: "n137" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 8 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 8 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} edge: { sourcename: "n136" targetname: "n132" class:2 priority:2 linestyle:dotted} node: {title: "n131" label: "Return 131" info1: "visited: 8 irg: PRIMA_set_a arity: 1 return in method of type set_a -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n131" targetname: "n136" label: "0" class:14 color:blue} edge: { sourcename: "n131" targetname: "n132" class:2 priority:2 linestyle:dotted} -node: {title: "n130" label: "Block 130" color: lightyellow info1: "visited: 8 +node: {title: "n130" label: "Block 130" info1: "visited: 8 irg: PRIMA_set_a arity: 1 backedges: -"} +" info2: "((get_irn_irg(n) && get_irn_irg(n) == irg)) && Block node has wrong irg attribute"color: lightyellow} edge: {sourcename: "n130" targetname: "n131" label: "0" class:13 color:red} -node: {title: "n129" label: "End 129" color: blue info1: "visited: 8 +node: {title: "n129" label: "End 129" info1: "visited: 8 irg: PRIMA_set_a arity: 0 -"} +"color: blue} edge: { sourcename: "n129" targetname: "n130" class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_set_a-type.vcg b/testprograms/ref-results/PRIMA_set_a-type.vcg index 37c79e5dd..dcbb8355c 100644 --- a/testprograms/ref-results/PRIMA_set_a-type.vcg +++ b/testprograms/ref-results/PRIMA_set_a-type.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "e14" label: "ent a" color: yellow info1: " @@ -55,13 +57,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 8 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 8 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -89,13 +94,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 8 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 8 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} diff --git a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg index f6dbebc94..757ab1ee1 100644 --- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n130" label: "Block 130" status:clustered color:yellow edge: {sourcename: "n130" targetname: "n131" label: "0" class:13 color:red} -node: {title: "n129" label: "End 129" color: blue info1: "visited: 13 +node: {title: "n129" label: "End 129" info1: "visited: 13 irg: PRIMA_set_a arity: 0 -"} +"color: blue} } graph: { title: "n132" label: "Block 132" status:clustered color:yellow @@ -35,17 +37,17 @@ node: {title: "n131" label: "Return 131" info1: "visited: 13 irg: PRIMA_set_a arity: 1 return in method of type set_a -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n131" targetname: "n136" label: "0" class:14 color:blue} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 13 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 13 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 13 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n138" label: "2" } @@ -57,42 +59,42 @@ Selecting entity of type int "} edge: {sourcename: "n140" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n141" label: "1" } -node: {title: "n141" label: "ProjP 0 141" color: yellow info1: "visited: 13 +node: {title: "n141" label: "ProjP 0 141" info1: "visited: 13 irg: PRIMA_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n141" targetname: "n139" label: "0" } -node: {title: "n138" label: "ProjIs 1 138" color: yellow info1: "visited: 13 +node: {title: "n138" label: "ProjIs 1 138" info1: "visited: 13 irg: PRIMA_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n138" targetname: "n139" label: "0" } } graph: { title: "n134" label: "Block 134" status:clustered color:yellow edge: {sourcename: "n134" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n142" label: "ProjM 1 142" color: yellow info1: "visited: 13 +node: {title: "n142" label: "ProjM 1 142" info1: "visited: 13 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n142" targetname: "n135" label: "0" class:14 color:blue} -node: {title: "n139" label: "ProjT 4 139" color: yellow info1: "visited: 13 +node: {title: "n139" label: "ProjT 4 139" info1: "visited: 13 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n139" targetname: "n135" label: "0" } -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 13 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 13 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} -node: {title: "n135" label: "Start 135" color: blue info1: "visited: 13 +node: {title: "n135" label: "Start 135" info1: "visited: 13 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } @@ -132,13 +134,16 @@ irg = g68" } edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red} edge: { sourcename: "e17" targetname: "n16"label: "value 0"} -node: {title: "n16" label: "&(PRIMA_set_a)P 16" color: yellow info1: "visited: 5 +node: {title: "n16" label: "&(PRIMA_set_a)P 16" info1: "visited: 5 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t15" label: "method set_a" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 0 "} edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green} @@ -166,13 +171,16 @@ irg = g90" } edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red} edge: { sourcename: "e20" targetname: "n19"label: "value 0"} -node: {title: "n19" label: "&(PRIMA_c)P 19" color: yellow info1: "visited: 5 +node: {title: "n19" label: "&(PRIMA_c)P 19" info1: "visited: 5 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t18" label: "method c" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 2 +results: 1 "} edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green} diff --git a/testprograms/ref-results/PRIMA_set_a.vcg b/testprograms/ref-results/PRIMA_set_a.vcg index 6eec15139..e557fb082 100644 --- a/testprograms/ref-results/PRIMA_set_a.vcg +++ b/testprograms/ref-results/PRIMA_set_a.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g68" label: "PRIMA_set_a" status:clustered color:white graph: { title: "n130" label: "Block 130" status:clustered color:yellow edge: {sourcename: "n130" targetname: "n131" label: "0" class:13 color:red} -node: {title: "n129" label: "End 129" color: blue info1: "visited: 9 +node: {title: "n129" label: "End 129" info1: "visited: 9 irg: PRIMA_set_a arity: 0 -"} +"color: blue} } graph: { title: "n132" label: "Block 132" status:clustered color:yellow @@ -35,17 +37,17 @@ node: {title: "n131" label: "Return 131" info1: "visited: 9 irg: PRIMA_set_a arity: 1 return in method of type set_a -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n131" targetname: "n136" label: "0" class:14 color:blue} -node: {title: "n136" label: "ProjM 0 136" color: yellow info1: "visited: 9 +node: {title: "n136" label: "ProjM 0 136" info1: "visited: 9 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n136" targetname: "n137" label: "0" class:14 color:blue} node: {title: "n137" label: "Store 137" info1: "visited: 9 irg: PRIMA_set_a arity: 3 -"} +" info2: "mymode == mode_T && Store node"} edge: {sourcename: "n137" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n137" targetname: "n140" label: "1" } edge: {sourcename: "n137" targetname: "n138" label: "2" } @@ -57,42 +59,42 @@ Selecting entity of type int "} edge: {sourcename: "n140" targetname: "n142" label: "0" class:14 color:blue} edge: {sourcename: "n140" targetname: "n141" label: "1" } -node: {title: "n141" label: "ProjP 0 141" color: yellow info1: "visited: 9 +node: {title: "n141" label: "ProjP 0 141" info1: "visited: 9 irg: PRIMA_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n141" targetname: "n139" label: "0" } -node: {title: "n138" label: "ProjIs 1 138" color: yellow info1: "visited: 9 +node: {title: "n138" label: "ProjIs 1 138" info1: "visited: 9 irg: PRIMA_set_a arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n138" targetname: "n139" label: "0" } } graph: { title: "n134" label: "Block 134" status:clustered color:yellow edge: {sourcename: "n134" targetname: "n133" label: "0" class:13 color:red} -node: {title: "n142" label: "ProjM 1 142" color: yellow info1: "visited: 9 +node: {title: "n142" label: "ProjM 1 142" info1: "visited: 9 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n142" targetname: "n135" label: "0" class:14 color:blue} -node: {title: "n139" label: "ProjT 4 139" color: yellow info1: "visited: 9 +node: {title: "n139" label: "ProjT 4 139" info1: "visited: 9 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n139" targetname: "n135" label: "0" } -node: {title: "n133" label: "ProjX 0 133" color: yellow info1: "visited: 9 +node: {title: "n133" label: "ProjX 0 133" info1: "visited: 9 irg: PRIMA_set_a arity: 1 -"} +"color: yellow} edge: {sourcename: "n133" targetname: "n135" label: "0" class:13 color:red} -node: {title: "n135" label: "Start 135" color: blue info1: "visited: 9 +node: {title: "n135" label: "Start 135" info1: "visited: 9 irg: PRIMA_set_a arity: 0 start of method of type set_a param 0 type: class_prima_ptr param 1 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg index 041cfc3fd..3adddc894 100644 --- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg +++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "n75" label: "Block n75" } edge: { sourcename: "n75" targetname: "n77"} diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg index 857f0f593..061b8db6e 100644 --- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg +++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g26" label: "THREE_CFPRED_EXAMPLE_main" status:clustered color:white graph: { title: "n75" label: "Block 75" status:clustered color:yellow edge: {sourcename: "n75" targetname: "n76" label: "0" class:13 color:red} -node: {title: "n74" label: "End 74" color: blue info1: "visited: 8 +node: {title: "n74" label: "End 74" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n77" label: "Block 77" status:clustered color:yellow @@ -38,13 +40,13 @@ irg: THREE_CFPRED_EXAMPLE_main arity: 2 return in method of type THREE_CFPRED_EXAMPLE_main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n76" targetname: "n106" label: "0" class:14 color:blue} edge: {sourcename: "n76" targetname: "n103" label: "1" } -node: {title: "n103" label: "PhiIs 103" color: green info1: "visited: 8 +node: {title: "n103" label: "PhiIs 103" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 3 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n103" targetname: "n105" label: "0" } edge: {sourcename: "n103" targetname: "n104" label: "1" } edge: {sourcename: "n103" targetname: "n104" label: "2" } @@ -55,7 +57,7 @@ edge: {sourcename: "n101" targetname: "n102" label: "0" class:13 color:red} node: {title: "n100" label: "Jmp 100" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n98" label: "Block 98" status:clustered color:yellow @@ -63,7 +65,7 @@ edge: {sourcename: "n98" targetname: "n99" label: "0" class:13 color:red} node: {title: "n97" label: "Jmp 97" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n79" label: "Block 79" status:clustered color:yellow @@ -71,30 +73,30 @@ edge: {sourcename: "n79" targetname: "n80" label: "0" class:13 color:red} node: {title: "n78" label: "Jmp 78" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n81" label: "Block 81" status:clustered color:yellow edge: {sourcename: "n81" targetname: "n82" label: "0" class:13 color:red} -node: {title: "n99" label: "ProjX 0 99" color: yellow info1: "visited: 8 +node: {title: "n99" label: "ProjX 0 99" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n99" targetname: "n93" label: "0" class:13 color:red} -node: {title: "n80" label: "ProjX 1 80" color: yellow info1: "visited: 8 +node: {title: "n80" label: "ProjX 1 80" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n80" targetname: "n93" label: "0" class:13 color:red} node: {title: "n93" label: "Cond 93" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n93" targetname: "n94" label: "0" } -node: {title: "n94" label: "Projb Eq 94" color: yellow info1: "visited: 8 +node: {title: "n94" label: "Projb Eq 94" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n94" targetname: "n95" label: "0" } node: {title: "n95" label: "CmpT 95" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main @@ -106,25 +108,25 @@ edge: {sourcename: "n95" targetname: "n90" label: "1" } graph: { title: "n83" label: "Block 83" status:clustered color:yellow edge: {sourcename: "n83" targetname: "n84" label: "0" class:13 color:red} -node: {title: "n102" label: "ProjX 1 102" color: yellow info1: "visited: 8 +node: {title: "n102" label: "ProjX 1 102" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n102" targetname: "n87" label: "0" class:13 color:red} -node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 8 +node: {title: "n82" label: "ProjX 0 82" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n82" targetname: "n87" label: "0" class:13 color:red} node: {title: "n87" label: "Cond 87" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n87" targetname: "n88" label: "0" } -node: {title: "n88" label: "Projb Eq 88" color: yellow info1: "visited: 8 +node: {title: "n88" label: "Projb Eq 88" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n88" targetname: "n89" label: "0" } node: {title: "n89" label: "CmpT 89" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main @@ -132,56 +134,56 @@ arity: 2 "} edge: {sourcename: "n89" targetname: "n92" label: "0" } edge: {sourcename: "n89" targetname: "n90" label: "1" } -node: {title: "n90" label: "ProjIs 0 90" color: yellow info1: "visited: 8 +node: {title: "n90" label: "ProjIs 0 90" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n90" targetname: "n91" label: "0" } } graph: { title: "n85" label: "Block 85" status:clustered color:yellow edge: {sourcename: "n85" targetname: "n84" label: "0" class:13 color:red} -node: {title: "n106" label: "ProjM 1 106" color: yellow info1: "visited: 8 +node: {title: "n106" label: "ProjM 1 106" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n106" targetname: "n86" label: "0" class:14 color:blue} -node: {title: "n105" label: "0x5Is 105" color: yellow info1: "visited: 8 +node: {title: "n105" label: "0x5Is 105" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n104" label: "0x6Is 104" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n104" label: "0x6Is 104" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n96" label: "0x3Is 96" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n96" label: "0x3Is 96" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n92" label: "0x1Is 92" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n92" label: "0x1Is 92" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n91" label: "ProjT 4 91" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n91" label: "ProjT 4 91" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n91" targetname: "n86" label: "0" } -node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 8 +node: {title: "n84" label: "ProjX 0 84" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n84" targetname: "n86" label: "0" class:13 color:red} -node: {title: "n86" label: "Start 86" color: blue info1: "visited: 8 +node: {title: "n86" label: "Start 86" info1: "visited: 8 irg: THREE_CFPRED_EXAMPLE_main arity: 0 start of method of type THREE_CFPRED_EXAMPLE_main param 0 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg index 57e467735..91792b49b 100644 --- a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg +++ b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g27" label: "WHILE_EXAMPLE_main" status:clustered color:white graph: { title: "n65" label: "Block 65" status:clustered color:yellow edge: {sourcename: "n65" targetname: "n66" label: "0" class:13 color:red} -node: {title: "n64" label: "End 64" color: blue info1: "visited: 15 +node: {title: "n64" label: "End 64" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 -"} +"color: blue} } graph: { title: "n67" label: "Block 67" status:clustered color:yellow @@ -36,7 +38,7 @@ irg: WHILE_EXAMPLE_main arity: 2 return in method of type main_tp res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n66" targetname: "n88" label: "0" class:14 color:blue} edge: {sourcename: "n66" targetname: "n87" label: "1" } node: {title: "n87" label: "SubIs 87" info1: "visited: 15 @@ -50,25 +52,25 @@ edge: {sourcename: "n87" targetname: "n76" label: "1" } graph: { title: "n69" label: "Block 69" status:clustered color:yellow edge: {sourcename: "n69" targetname: "n86" label: "0" class:13 color:red} edge: {sourcename: "n69" targetname: "n70" label: "1" class:13 color:red} -node: {title: "n68" label: "ProjX 0 68" color: yellow info1: "visited: 15 +node: {title: "n68" label: "ProjX 0 68" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n68" targetname: "n73" label: "0" class:13 color:red} -node: {title: "n72" label: "ProjX 1 72" color: yellow info1: "visited: 15 +node: {title: "n72" label: "ProjX 1 72" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n72" targetname: "n73" label: "0" class:13 color:red} node: {title: "n73" label: "Cond 73" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 -"} +" info2: "mymode == mode_T && Cond mode is not a tuple"} edge: {sourcename: "n73" targetname: "n74" label: "0" } -node: {title: "n74" label: "Projb Eq 74" color: yellow info1: "visited: 15 +node: {title: "n74" label: "Projb Eq 74" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n74" targetname: "n75" label: "0" } node: {title: "n75" label: "CmpT 75" info1: "visited: 15 irg: WHILE_EXAMPLE_main @@ -76,16 +78,16 @@ arity: 2 "} edge: {sourcename: "n75" targetname: "n85" label: "0" } edge: {sourcename: "n75" targetname: "n76" label: "1" } -node: {title: "n76" label: "PhiIs 76" color: green info1: "visited: 15 +node: {title: "n76" label: "PhiIs 76" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n76" targetname: "n84" label: "0" } edge: {sourcename: "n76" targetname: "n77" label: "1" } -node: {title: "n77" label: "PhiIs 77" color: green info1: "visited: 15 +node: {title: "n77" label: "PhiIs 77" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 2 backedges: -"} +" info2: "mode_is_dataM(mymode) && Phi node"color: green} edge: {sourcename: "n77" targetname: "n78" label: "0" } edge: {sourcename: "n77" targetname: "n76" label: "1" } } @@ -95,7 +97,7 @@ edge: {sourcename: "n71" targetname: "n72" label: "0" class:13 color:red} node: {title: "n70" label: "Jmp 70" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 -"} +" info2: "mymode == mode_X && Jmp node"} } graph: { title: "n79" label: "Block 79" status:clustered color:yellow @@ -103,47 +105,47 @@ edge: {sourcename: "n79" targetname: "n80" label: "0" class:13 color:red} node: {title: "n86" label: "Jmp 86" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 -"} -node: {title: "n78" label: "ProjIs 0 78" color: yellow info1: "visited: 15 +" info2: "mymode == mode_X && Jmp node"} +node: {title: "n78" label: "ProjIs 0 78" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 -"} +" info2: "(mode == get_type_mode(get_method_param_type(mt, proj))) && Mode of Proj from Start doesn't match mode of param type."color: yellow} edge: {sourcename: "n78" targetname: "n83" label: "0" } } graph: { title: "n81" label: "Block 81" status:clustered color:yellow edge: {sourcename: "n81" targetname: "n80" label: "0" class:13 color:red} -node: {title: "n88" label: "ProjM 1 88" color: yellow info1: "visited: 15 +node: {title: "n88" label: "ProjM 1 88" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n88" targetname: "n82" label: "0" class:14 color:blue} -node: {title: "n85" label: "0x0Is 85" color: yellow info1: "visited: 15 +node: {title: "n85" label: "0x0Is 85" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n84" label: "0x1Is 84" color: yellow info1: "visited: 15 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n84" label: "0x1Is 84" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 Const of type type_unknown -"} -node: {title: "n83" label: "ProjT 4 83" color: yellow info1: "visited: 15 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n83" label: "ProjT 4 83" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n83" targetname: "n82" label: "0" } -node: {title: "n80" label: "ProjX 0 80" color: yellow info1: "visited: 15 +node: {title: "n80" label: "ProjX 0 80" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 1 -"} +"color: yellow} edge: {sourcename: "n80" targetname: "n82" label: "0" class:13 color:red} -node: {title: "n82" label: "Start 82" color: blue info1: "visited: 15 +node: {title: "n82" label: "Start 82" info1: "visited: 15 irg: WHILE_EXAMPLE_main arity: 0 start of method of type main_tp param 0 type: int -"} +" info2: "mymode == mode_T && Start node"color: blue} } } diff --git a/testprograms/ref-results/class_hierarchy.vcg b/testprograms/ref-results/class_hierarchy.vcg index 03d2d1ca5..97b75b60c 100644 --- a/testprograms/ref-results/class_hierarchy.vcg +++ b/testprograms/ref-results/class_hierarchy.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined size: -1B, diff --git a/testprograms/ref-results/main-type.vcg b/testprograms/ref-results/main-type.vcg index 3c7f1f413..dc9edb7db 100644 --- a/testprograms/ref-results/main-type.vcg +++ b/testprograms/ref-results/main-type.vcg @@ -19,6 +19,8 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" node: {title: "e19" label: "ent a_tp_elem_ent" color: yellow info1: " @@ -40,14 +42,14 @@ edge: { sourcename: "t16" targetname: "t11"class: 10 label: "arr elt tp" color:g edge: { sourcename: "t16" targetname: "e19"class: 10 label: "arr ent" color: green} edge: { sourcename: "n20" targetname: "t16"label: "upper 0"} edge: { sourcename: "n21" targetname: "t16"label: "lower 0"} -node: {title: "n20" label: "0x9Iu 20" color: yellow info1: "visited: 1 +node: {title: "n20" label: "0x9Iu 20" info1: "visited: 1 arity: 0 Const of type type_unknown -"} -node: {title: "n21" label: "0x0Iu 21" color: yellow info1: "visited: 1 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n21" label: "0x0Iu 21" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t11" label: "primitive int" info1: "state: layout_fixed, mode: Is, size: 4B, @@ -85,10 +87,10 @@ irg = g33" } edge: { sourcename: "e15" targetname: "t13"class: 3 label: "type" color: red} edge: { sourcename: "e15" targetname: "n14"label: "value 0"} -node: {title: "n14" label: "&(ARRAY-STACK_EXAMPLE_main)P 14" color: yellow info1: "visited: 1 +node: {title: "n14" label: "&(ARRAY-STACK_EXAMPLE_main)P 14" info1: "visited: 1 arity: 0 Const of type type_unknown -"} +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} node: {title: "t12" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined size: -1B, peculiarity: peculiarity_existent @@ -97,6 +99,9 @@ edge: { sourcename: "t12" targetname: "e15"class: 12 label: "member" color:blue} node: {title: "t13" label: "method main" info1: "state: layout_fixed, mode: P, size: 4B, +variadicity: variadicity_non_variadic +params: 0 +results: 1 "} edge: { sourcename: "t13" targetname: "t11"class: 6 label: "res 0" color: green} } diff --git a/testprograms/ref-results/main.vcg b/testprograms/ref-results/main.vcg index a186661b0..167c946bf 100644 --- a/testprograms/ref-results/main.vcg +++ b/testprograms/ref-results/main.vcg @@ -19,14 +19,16 @@ classname 9: "Points-to" classname 10: "Array Element Type" classname 11: "Overwrites" classname 12: "Member" +infoname 1: "Attribute" +infoname 2: "Verification errors" graph: { title: "g33" label: "main" status:clustered color:white graph: { title: "n47" label: "Block 47" status:clustered color:yellow edge: {sourcename: "n47" targetname: "n48" label: "0" class:13 color:red} -node: {title: "n46" label: "End 46" color: blue info1: "visited: 8 +node: {title: "n46" label: "End 46" info1: "visited: 8 irg: main arity: 0 -"} +"color: blue} } graph: { title: "n49" label: "Block 49" status:clustered color:yellow @@ -36,23 +38,23 @@ irg: main arity: 2 return in method of type main res 0 type: int -"} +" info2: "mymode == mode_X && Result X"} edge: {sourcename: "n48" targetname: "n60" label: "0" class:14 color:blue} edge: {sourcename: "n48" targetname: "n53" label: "1" } -node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 8 +node: {title: "n60" label: "ProjM 0 60" info1: "visited: 8 irg: main arity: 1 -"} +"color: yellow} edge: {sourcename: "n60" targetname: "n54" label: "0" class:14 color:blue} -node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 8 +node: {title: "n53" label: "ProjIs 2 53" info1: "visited: 8 irg: main arity: 1 -"} +"color: yellow} edge: {sourcename: "n53" targetname: "n54" label: "0" } node: {title: "n54" label: "Load 54" info1: "visited: 8 irg: main arity: 2 -"} +" info2: "mymode == mode_T && Load node"} edge: {sourcename: "n54" targetname: "n59" label: "0" class:14 color:blue} edge: {sourcename: "n54" targetname: "n55" label: "1" } node: {title: "n55" label: "Sel a_tp_elem_ent 55" info1: "visited: 8 @@ -76,31 +78,31 @@ edge: {sourcename: "n57" targetname: "n58" label: "1" } graph: { title: "n51" label: "Block 51" status:clustered color:yellow edge: {sourcename: "n51" targetname: "n50" label: "0" class:13 color:red} -node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 8 +node: {title: "n59" label: "ProjM 1 59" info1: "visited: 8 irg: main arity: 1 -"} +"color: yellow} edge: {sourcename: "n59" targetname: "n52" label: "0" class:14 color:blue} -node: {title: "n58" label: "ProjP 2 58" color: yellow info1: "visited: 8 +node: {title: "n58" label: "ProjP 2 58" info1: "visited: 8 irg: main arity: 1 -"} +"color: yellow} edge: {sourcename: "n58" targetname: "n52" label: "0" } -node: {title: "n56" label: "0x3Iu 56" color: yellow info1: "visited: 8 +node: {title: "n56" label: "0x3Iu 56" info1: "visited: 8 irg: main arity: 0 Const of type type_unknown -"} -node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 8 +" info2: "(mode_is_data (mymode) || mymode == mode_b) && Const node"color: yellow} +node: {title: "n50" label: "ProjX 0 50" info1: "visited: 8 irg: main arity: 1 -"} +"color: yellow} edge: {sourcename: "n50" targetname: "n52" label: "0" class:13 color:red} -node: {title: "n52" label: "Start 52" color: blue info1: "visited: 8 +node: {title: "n52" label: "Start 52" info1: "visited: 8 irg: main arity: 0 start of method of type main -"} +" info2: "mymode == mode_T && Start node"color: blue} } }