From c5cb3c29db21ec1da5d89332868473e552d1b436 Mon Sep 17 00:00:00 2001 From: FIRM Projekt Account Date: Fri, 15 Apr 2005 12:41:06 +0000 Subject: [PATCH] more verbose irdump [r5703] --- .../ARRAY-HEAP_EXAMPLE_main-type.vcg | 92 ++++++-- .../ARRAY-STACK_EXAMPLE_main-type.vcg | 104 +++++++-- .../ARRAY-STACK_EXAMPLE_main-wtypes.vcg | 104 +++++++-- testprograms/ref-results/All_types.vcg | 72 +++++-- .../ref-results/DEAD_BLOCK_main-cfg.vcg | 36 +++- .../GLOBAL_VAR_main-pure-wtypes.vcg | 88 ++++++-- .../IF_WHILE_EXAMPLE_main-pure.vcg | 12 +- .../ref-results/IRREGULAR_CF_main-cfg.vcg | 98 ++++++++- .../ref-results/IRR_LOOP_loop1-cfg.vcg | 81 ++++++- .../ref-results/IRR_LOOP_loop2-cfg.vcg | 109 +++++++++- .../OO_INLINE_EXAMPLE_main-wtypes.vcg | 176 +++++++++++++--- .../OO_PROGRAM_EXAMPLE_main-pure-ip.vcg | 22 +- ...OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg | 198 ++++++++++++++---- .../OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg | 182 ++++++++++++---- .../OO_PROGRAM_EXAMPLE_main-pure.vcg | 6 +- .../OO_PROGRAM_EXAMPLE_main-type.vcg | 176 +++++++++++++--- .../OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg | 176 +++++++++++++--- .../OO_PROGRAM_EXAMPLE_main-wtypes.vcg | 176 +++++++++++++--- .../ref-results/PRIMA_INLINE_c-wtypes.vcg | 130 +++++++++--- .../ref-results/PRIMA_INLINE_set_a-wtypes.vcg | 130 +++++++++--- .../ref-results/PRIMA_c-pure-wtypes.vcg | 136 +++++++++--- testprograms/ref-results/PRIMA_c-pure.vcg | 6 +- testprograms/ref-results/PRIMA_c-type.vcg | 130 +++++++++--- testprograms/ref-results/PRIMA_c-wtypes.vcg | 130 +++++++++--- .../ref-results/PRIMA_set_a-pure-wtypes.vcg | 136 +++++++++--- testprograms/ref-results/PRIMA_set_a-pure.vcg | 6 +- testprograms/ref-results/PRIMA_set_a-type.vcg | 130 +++++++++--- .../ref-results/PRIMA_set_a-wtypes.vcg | 130 +++++++++--- .../THREE_CFPRED_EXAMPLE_main-cfg.vcg | 98 ++++++++- testprograms/ref-results/class_hierarchy.vcg | 54 ++++- 30 files changed, 2568 insertions(+), 556 deletions(-) diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg index 75dcb6536..7f7f677d4 100644 --- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg @@ -67,8 +67,25 @@ node: {title: "e21" label: "ent a_elem_ent" color: yellow " } edge: { sourcename: "e21" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t18" label: "array a" info1: "state: layout_undefined -size: -1b, +node: {title: "t18" label: "array a" info1: "array type a (18) + array [0 .. 0] of + order: <0> + entity a_elem_ent (21) + type: int (14) + owner: a (18) + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t14"class: 10 label: "arr elt tp" color:green} edge: { sourcename: "t18" targetname: "e21"class: 10 label: "arr ent" color: green} @@ -94,9 +111,14 @@ node: {title: "n23" label: "0x0Iu 23" info1: "0x0 23 Const of type type_unknown " color: yellow} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e17" label: "ent ARRAY-HEAP_EXAMPLE_main" color: yellow info1: "entity ARRAY-HEAP_EXAMPLE_main (17) @@ -131,21 +153,57 @@ node: {title: "n16" label: "SymC &ARRAY-HEAP_EXAMPLE_main 16" info1: "SymC &ARR type of value: type_unknown " } -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + entity ARRAY-HEAP_EXAMPLE_main (17) + type: ARRAY-HEAP_EXAMPLE_main (15) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &ARRAY-HEAP_EXAMPLE_main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + irg = 36 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t0" targetname: "e17"class: 12 label: "member" color:blue} -node: {title: "t15" label: "method ARRAY-HEAP_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t15" label: "method ARRAY-HEAP_EXAMPLE_main" info1: "method type ARRAY-HEAP_EXAMPLE_main (15) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t15" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t24" label: "class ARRAY-HEAP_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t24" label: "class ARRAY-HEAP_EXAMPLE_mainframe_tp" info1: "class type ARRAY-HEAP_EXAMPLE_mainframe_tp (24) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} } diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg index 07d5430a5..f05b91746 100644 --- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg @@ -67,8 +67,25 @@ node: {title: "e22" label: "ent a_tp_elem_ent" color: yellow " } edge: { sourcename: "e22" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t19" label: "array a_tp" info1: "state: layout_undefined -size: -1b, +node: {title: "t19" label: "array a_tp" info1: "array type a_tp (19) + array [0 .. 0] of + order: <0> + entity a_tp_elem_ent (22) + type: int (14) + owner: a_tp (19) + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + "} edge: { sourcename: "t19" targetname: "t14"class: 10 label: "arr elt tp" color:green} edge: { sourcename: "t19" targetname: "e22"class: 10 label: "arr ent" color: green} @@ -94,9 +111,14 @@ node: {title: "n24" label: "0x0Iu 24" info1: "0x0 24 Const of type type_unknown " color: yellow} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e39" label: "ent a" color: yellow info1: "entity a (39) @@ -115,9 +137,29 @@ node: {title: "e39" label: "ent a" color: yellow " } edge: { sourcename: "e39" targetname: "t19"class: 3 label: "type" color: red} -node: {title: "t25" label: "class mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t25" label: "class mainframe_tp" info1: "class type mainframe_tp (25) + members: + entity a (39) + type: a_tp (19) + owner: mainframe_tp (25) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t25" targetname: "e39"class: 12 label: "member" color:blue} node: {title: "e18" label: "ent ARRAY-STACK_EXAMPLE_main" color: yellow @@ -153,17 +195,45 @@ node: {title: "n17" label: "SymC &main 17" info1: "SymC &main 17 type of value: type_unknown " } -node: {title: "t15" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class ARRAY-STACK_EXAMPLE" info1: "class type ARRAY-STACK_EXAMPLE (15) + members: + entity main (18) + type: main_tp (16) + owner: ARRAY-STACK_EXAMPLE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: ARRAY-STACK_EXAMPLE_main + offset: -1 + irg = 37 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e18"class: 12 label: "member" color:blue} -node: {title: "t16" label: "method main_tp" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t16" label: "method main_tp" info1: "method type main_tp (16) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t14"class: 6 label: "res 0" color: green} } diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg index 2c77fa3b6..d27d3c801 100644 --- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg @@ -243,8 +243,25 @@ node: {title: "e22" label: "ent a_tp_elem_ent" color: yellow " } edge: { sourcename: "e22" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t19" label: "array a_tp" info1: "state: layout_undefined -size: -1b, +node: {title: "t19" label: "array a_tp" info1: "array type a_tp (19) + array [0 .. 0] of + order: <0> + entity a_tp_elem_ent (22) + type: int (14) + owner: a_tp (19) + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + "} edge: { sourcename: "t19" targetname: "t14"class: 10 label: "arr elt tp" color:green} edge: { sourcename: "t19" targetname: "e22"class: 10 label: "arr ent" color: green} @@ -270,9 +287,14 @@ node: {title: "n24" label: "0x0Iu 24" info1: "0x0 24 Const of type type_unknown " color: yellow} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e39" label: "ent a" color: yellow info1: "entity a (39) @@ -291,9 +313,29 @@ node: {title: "e39" label: "ent a" color: yellow " } edge: { sourcename: "e39" targetname: "t19"class: 3 label: "type" color: red} -node: {title: "t25" label: "class mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t25" label: "class mainframe_tp" info1: "class type mainframe_tp (25) + members: + entity a (39) + type: a_tp (19) + owner: mainframe_tp (25) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t25" targetname: "e39"class: 12 label: "member" color:blue} node: {title: "e18" label: "ent ARRAY-STACK_EXAMPLE_main" color: yellow @@ -329,17 +371,45 @@ node: {title: "n17" label: "SymC &main 17" info1: "SymC &main 17 type of value: type_unknown " } -node: {title: "t15" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class ARRAY-STACK_EXAMPLE" info1: "class type ARRAY-STACK_EXAMPLE (15) + members: + entity main (18) + type: main_tp (16) + owner: ARRAY-STACK_EXAMPLE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: ARRAY-STACK_EXAMPLE_main + offset: -1 + irg = 37 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e18"class: 12 label: "member" color:blue} -node: {title: "t16" label: "method main_tp" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t16" label: "method main_tp" info1: "method type main_tp (16) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t14"class: 6 label: "res 0" color: green} edge: { sourcename: "n43" targetname: "e22"class:2 priority:2 linestyle:dotted} diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg index 54c0d73aa..37701162c 100644 --- a/testprograms/ref-results/All_types.vcg +++ b/testprograms/ref-results/All_types.vcg @@ -52,22 +52,56 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} -node: {title: "t15" label: "method main_tp" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 1 -results: 1 +node: {title: "t15" label: "method main_tp" info1: "method type main_tp (15) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 1 + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t15" targetname: "t14"class: 5 label: "param 0" color: green} edge: { sourcename: "t15" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t16" label: "class WHILE_EXAMPLE" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t16" label: "class WHILE_EXAMPLE" info1: "class type WHILE_EXAMPLE (16) + members: + entity main (18) + type: main_tp (15) + owner: WHILE_EXAMPLE (16) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: WHILE_EXAMPLE_main + offset: -1 + irg = 31 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t16" targetname: "e18"class: 12 label: "member" color:blue} node: {title: "e18" label: "ent WHILE_EXAMPLE_main" color: yellow @@ -103,8 +137,16 @@ node: {title: "n17" label: "SymC &main 17" info1: "SymC &main 17 type of value: type_unknown " } -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} } diff --git a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg index 8f24a4250..cc6117575 100644 --- a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg +++ b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg @@ -52,13 +52,43 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -node: {title: "n20" label: "End Block n20" info1:"arity: 1 +node: {title: "n20" label: "End Block n20" info1:"Block 20 + mode: BB + visited: 12 + irg: DEAD_BLOCK_main + arity: 1 + pred nodes: + 0: Return 51 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: " color:blue } edge: { sourcename: "n20" targetname: "n32"} -node: {title: "n32" label: "Block n32" info1:"arity: 1 +node: {title: "n32" label: "Block n32" info1:"Block 32 + mode: BB + visited: 12 + irg: DEAD_BLOCK_main + arity: 1 + pred nodes: + 0: Proj 26 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n32" targetname: "n22"} -node: {title: "n22" label: "Start Block n22" info1:"arity: 1 +node: {title: "n22" label: "Start Block n22" info1:"Block 22 + mode: BB + visited: 12 + irg: DEAD_BLOCK_main + arity: 1 + pred nodes: + 0: Proj 26 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: " color:blue } edge: { sourcename: "n22" targetname: "n22"} node: {title: "n61" label: "Bad 61" info1: "Bad 61 diff --git a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg index 9fd7ce9a7..7dee194d4 100644 --- a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg +++ b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg @@ -62,7 +62,7 @@ node: {title: "n22" label: "Block 22" info1: "Block 22 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n22" targetname: "n26" label: "0" class:13 priority:60 color:red} @@ -101,7 +101,7 @@ node: {title: "n32" label: "Block 32" info1: "Block 32 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n32" targetname: "n26" label: "0" class:13 priority:60 color:red} @@ -217,7 +217,7 @@ node: {title: "n20" label: "Block 20" info1: "Block 20 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n20" targetname: "n39" label: "0" class:13 priority:60 color:red} @@ -249,9 +249,43 @@ node: {title: "e18" label: "ent i" color: yellow " } edge: { sourcename: "e18" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + entity GLOBAL_VAR_main (17) + type: GLOBAL_VAR_main (15) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &GLOBAL_VAR_main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + irg = 31 + entity i (18) + type: int (14) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t0" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t0" targetname: "e18"class: 12 label: "member" color:blue} @@ -288,20 +322,38 @@ node: {title: "n16" label: "SymC &GLOBAL_VAR_main 16" info1: "SymC &GLOBAL_VAR_ type of value: type_unknown " } -node: {title: "t15" label: "method GLOBAL_VAR_main" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 0 +node: {title: "t15" label: "method GLOBAL_VAR_main" info1: "method type GLOBAL_VAR_main (15) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} -node: {title: "t19" label: "class GLOBAL_VAR_mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t19" label: "class GLOBAL_VAR_mainframe_tp" info1: "class type GLOBAL_VAR_mainframe_tp (19) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n34" targetname: "e18"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg index df95e6949..b098912a4 100644 --- a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg +++ b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg @@ -87,7 +87,7 @@ node: {title: "n22" label: "Block 22" info1: "Block 22 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n22" targetname: "n26" label: "0" class:13 priority:60 color:red} @@ -169,7 +169,7 @@ node: {title: "n46" label: "Block 46" info1: "Block 46 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n46" targetname: "n45" label: "0" class:13 priority:60 color:red} @@ -194,7 +194,7 @@ node: {title: "n32" label: "Block 32" info1: "Block 32 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n32" targetname: "n26" label: "0" class:13 priority:60 color:red} @@ -220,7 +220,7 @@ node: {title: "n38" label: "Block 38" info1: "Block 38 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n38" targetname: "n35" label: "0" class:13 priority:60 color:red} @@ -248,7 +248,7 @@ node: {title: "n60" label: "Block 60" info1: "Block 60 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n60" targetname: "n44" label: "0" class:13 priority:60 color:red} @@ -363,7 +363,7 @@ node: {title: "n20" label: "Block 20" info1: "Block 20 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n20" targetname: "n76" label: "0" class:13 priority:60 color:red} diff --git a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg index b6197d7eb..43369e0f7 100644 --- a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg +++ b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg @@ -52,30 +52,112 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -node: {title: "n19" label: "End Block n19" info1:"arity: 1 +node: {title: "n19" label: "End Block n19" info1:"Block 19 + mode: BB + visited: 8 + irg: IRREGULAR_CF_main + arity: 1 + pred nodes: + 0: Return 54 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: " color:blue } edge: { sourcename: "n19" targetname: "n52"} -node: {title: "n52" label: "Block n52" info1:"arity: 2 +node: {title: "n52" label: "Block n52" info1:"Block 52 + mode: BB + visited: 8 + irg: IRREGULAR_CF_main + arity: 2 + pred nodes: + 0: Jmp 51 + 1: Jmp 49 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n52" targetname: "n50"} edge: { sourcename: "n52" targetname: "n48"} -node: {title: "n48" label: "Block n48" info1:"arity: 2 +node: {title: "n48" label: "Block n48" info1:"Block 48 + mode: BB + visited: 8 + irg: IRREGULAR_CF_main + arity: 2 + pred nodes: + 0: Proj 47 + 1: Jmp 41 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n48" targetname: "n42"} edge: { sourcename: "n48" targetname: "n40"} -node: {title: "n40" label: "Block n40" info1:"arity: 1 +node: {title: "n40" label: "Block n40" info1:"Block 40 + mode: BB + visited: 8 + irg: IRREGULAR_CF_main + arity: 1 + pred nodes: + 0: Proj 39 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n40" targetname: "n31"} -node: {title: "n31" label: "Block n31" info1:"arity: 1 +node: {title: "n31" label: "Block n31" info1:"Block 31 + mode: BB + visited: 8 + irg: IRREGULAR_CF_main + arity: 1 + pred nodes: + 0: Proj 25 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n31" targetname: "n21"} -node: {title: "n21" label: "Start Block n21" info1:"arity: 1 +node: {title: "n21" label: "Start Block n21" info1:"Block 21 + mode: BB + visited: 8 + irg: IRREGULAR_CF_main + arity: 1 + pred nodes: + 0: Proj 25 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: " color:blue } edge: { sourcename: "n21" targetname: "n21"} -node: {title: "n42" label: "Block n42" info1:"arity: 1 +node: {title: "n42" label: "Block n42" info1:"Block 42 + mode: BB + visited: 8 + irg: IRREGULAR_CF_main + arity: 1 + pred nodes: + 0: Proj 38 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n42" targetname: "n31"} -node: {title: "n50" label: "Block n50" info1:"arity: 1 +node: {title: "n50" label: "Block n50" info1:"Block 50 + mode: BB + visited: 8 + irg: IRREGULAR_CF_main + arity: 1 + pred nodes: + 0: Proj 46 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n50" targetname: "n42"} node: {title: "n67" label: "Bad 67" info1: "Bad 67 diff --git a/testprograms/ref-results/IRR_LOOP_loop1-cfg.vcg b/testprograms/ref-results/IRR_LOOP_loop1-cfg.vcg index 9eeb6f94e..30eee8188 100644 --- a/testprograms/ref-results/IRR_LOOP_loop1-cfg.vcg +++ b/testprograms/ref-results/IRR_LOOP_loop1-cfg.vcg @@ -52,25 +52,94 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -node: {title: "n19" label: "End Block n19" info1:"arity: 1 +node: {title: "n19" label: "End Block n19" info1:"Block 19 + mode: BB + visited: 6 + irg: IRR_LOOP_loop1 + arity: 1 + pred nodes: + 0: Return 55 + Private Attributes: + backedges: + in loop 128 with depth 0 + block visited: 1 + Execution freqency statistics: " color:blue } edge: { sourcename: "n19" targetname: "n53"} -node: {title: "n53" label: "Block n53" info1:"arity: 2 +node: {title: "n53" label: "Block n53" info1:"Block 53 + mode: BB + visited: 6 + irg: IRR_LOOP_loop1 + arity: 2 + pred nodes: + 0: Proj 51 + 1: Proj 45 + Private Attributes: + backedges: + in loop 128 with depth 0 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n53" targetname: "n47"} edge: { sourcename: "n53" targetname: "n41"} -node: {title: "n41" label: "Block n41" info1:"arity: 2 +node: {title: "n41" label: "Block n41" info1:"Block 41 + mode: BB + visited: 6 + irg: IRR_LOOP_loop1 + arity: 2 + pred nodes: + 0: Proj 40 + 1: be Proj 52 + Private Attributes: + backedges: 1 + in loop 129 with depth 1 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n41" targetname: "n31"} edge: { sourcename: "n41" targetname: "n47"} -node: {title: "n47" label: "Block n47" info1:"arity: 2 +node: {title: "n47" label: "Block n47" info1:"Block 47 + mode: BB + visited: 6 + irg: IRR_LOOP_loop1 + arity: 2 + pred nodes: + 0: Proj 39 + 1: Proj 46 + Private Attributes: + backedges: + in loop 129 with depth 1 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n47" targetname: "n31"} edge: { sourcename: "n47" targetname: "n41"} -node: {title: "n31" label: "Block n31" info1:"arity: 1 +node: {title: "n31" label: "Block n31" info1:"Block 31 + mode: BB + visited: 6 + irg: IRR_LOOP_loop1 + arity: 1 + pred nodes: + 0: Proj 25 + Private Attributes: + backedges: + in loop 128 with depth 0 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n31" targetname: "n21"} -node: {title: "n21" label: "Start Block n21" info1:"arity: 1 +node: {title: "n21" label: "Start Block n21" info1:"Block 21 + mode: BB + visited: 6 + irg: IRR_LOOP_loop1 + arity: 1 + pred nodes: + 0: Proj 25 + Private Attributes: + backedges: + in loop 128 with depth 0 + block visited: 1 + Execution freqency statistics: " color:blue } edge: { sourcename: "n21" targetname: "n21"} node: {title: "n23" label: "Bad 23" info1: "Bad 23 diff --git a/testprograms/ref-results/IRR_LOOP_loop2-cfg.vcg b/testprograms/ref-results/IRR_LOOP_loop2-cfg.vcg index 2c74d6219..acf5d0edb 100644 --- a/testprograms/ref-results/IRR_LOOP_loop2-cfg.vcg +++ b/testprograms/ref-results/IRR_LOOP_loop2-cfg.vcg @@ -52,33 +52,126 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -node: {title: "n66" label: "End Block n66" info1:"arity: 1 +node: {title: "n66" label: "End Block n66" info1:"Block 66 + mode: BB + visited: 6 + irg: IRR_LOOP_loop2 + arity: 1 + pred nodes: + 0: Return 116 + Private Attributes: + backedges: + in loop 130 with depth 0 + block visited: 1 + Execution freqency statistics: " color:blue } edge: { sourcename: "n66" targetname: "n114"} -node: {title: "n114" label: "Block n114" info1:"arity: 2 +node: {title: "n114" label: "Block n114" info1:"Block 114 + mode: BB + visited: 6 + irg: IRR_LOOP_loop2 + arity: 2 + pred nodes: + 0: Proj 100 + 1: Proj 112 + Private Attributes: + backedges: + in loop 130 with depth 0 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n114" targetname: "n96"} edge: { sourcename: "n114" targetname: "n108"} -node: {title: "n108" label: "Block n108" info1:"arity: 2 +node: {title: "n108" label: "Block n108" info1:"Block 108 + mode: BB + visited: 6 + irg: IRR_LOOP_loop2 + arity: 2 + pred nodes: + 0: Proj 88 + 1: be Proj 106 + Private Attributes: + backedges: 1 + in loop 131 with depth 1 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n108" targetname: "n78"} edge: { sourcename: "n108" targetname: "n102"} -node: {title: "n102" label: "Block n102" info1:"arity: 3 +node: {title: "n102" label: "Block n102" info1:"Block 102 + mode: BB + visited: 6 + irg: IRR_LOOP_loop2 + arity: 3 + pred nodes: + 0: Proj 94 + 1: Proj 101 + 2: Proj 113 + Private Attributes: + backedges: + in loop 132 with depth 2 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n102" targetname: "n90"} edge: { sourcename: "n102" targetname: "n96"} edge: { sourcename: "n102" targetname: "n108"} -node: {title: "n96" label: "Block n96" info1:"arity: 2 +node: {title: "n96" label: "Block n96" info1:"Block 96 + mode: BB + visited: 6 + irg: IRR_LOOP_loop2 + arity: 2 + pred nodes: + 0: Proj 95 + 1: be Proj 107 + Private Attributes: + backedges: 1 + in loop 132 with depth 2 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n96" targetname: "n90"} edge: { sourcename: "n96" targetname: "n102"} -node: {title: "n90" label: "Block n90" info1:"arity: 1 +node: {title: "n90" label: "Block n90" info1:"Block 90 + mode: BB + visited: 6 + irg: IRR_LOOP_loop2 + arity: 1 + pred nodes: + 0: Proj 89 + Private Attributes: + backedges: + in loop 130 with depth 0 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n90" targetname: "n78"} -node: {title: "n78" label: "Block n78" info1:"arity: 1 +node: {title: "n78" label: "Block n78" info1:"Block 78 + mode: BB + visited: 6 + irg: IRR_LOOP_loop2 + arity: 1 + pred nodes: + 0: Proj 72 + Private Attributes: + backedges: + in loop 130 with depth 0 + block visited: 1 + Execution freqency statistics: "} edge: { sourcename: "n78" targetname: "n68"} -node: {title: "n68" label: "Start Block n68" info1:"arity: 1 +node: {title: "n68" label: "Start Block n68" info1:"Block 68 + mode: BB + visited: 6 + irg: IRR_LOOP_loop2 + arity: 1 + pred nodes: + 0: Proj 72 + Private Attributes: + backedges: + in loop 130 with depth 0 + block visited: 1 + Execution freqency statistics: " color:blue } edge: { sourcename: "n68" targetname: "n68"} node: {title: "n70" label: "Bad 70" info1: "Bad 70 diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg index 3c60ed21e..71db4c1d6 100644 --- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg @@ -381,9 +381,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA_INLINE" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE (15) + members: + entity a (17) + type: int (14) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_INLINE_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_INLINE_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -421,23 +469,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA_INLINE (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow info1: "entity c (23) @@ -472,12 +538,20 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} @@ -515,22 +589,58 @@ node: {title: "n25" label: "SymC &OO_INLINE_EXAMPLE_main 25" info1: "SymC &OO_I type of value: type_unknown " } -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + entity OO_INLINE_EXAMPLE_main (26) + type: OO_INLINE_EXAMPLE_main (24) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &OO_INLINE_EXAMPLE_main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + irg = 39 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue} -node: {title: "t24" label: "method OO_INLINE_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t24" label: "method OO_INLINE_EXAMPLE_main" info1: "method type OO_INLINE_EXAMPLE_main (24) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t27" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t27" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "class type OO_INLINE_EXAMPLE_mainframe_tp (27) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n191" targetname: "e17"class:2 priority:2 linestyle:dotted} edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted} diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg index 39e639005..d62dca1bb 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg @@ -65,7 +65,7 @@ node: {title: "n30" label: "Block 30" info1: "Block 30 0: Proj 34 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n30" targetname: "n34" label: "0" class:13 priority:60 color:red} @@ -107,7 +107,7 @@ node: {title: "n191" label: "Block 191" info1: "Block 191 0: Proj 34 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n191" targetname: "n34" label: "0" class:13 priority:60 color:red} @@ -167,7 +167,7 @@ node: {title: "n64" label: "Block 64" info1: "Block 64 0: Proj 195 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n64" targetname: "n195" label: "0" class:13 priority:60 color:red} @@ -211,7 +211,7 @@ node: {title: "n74" label: "Block 74" info1: "Block 74 0: Proj 68 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n74" targetname: "n68" label: "0" class:13 priority:60 color:red} @@ -239,7 +239,7 @@ node: {title: "n188" label: "Block 188" info1: "Block 188 0: Jmp 187 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n188" targetname: "n187" label: "0" class:13 priority:60 color:red} @@ -280,7 +280,7 @@ node: {title: "n197" label: "Block 197" info1: "Block 197 0: Proj 194 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n197" targetname: "n194" label: "0" class:13 priority:60 color:red} @@ -340,7 +340,7 @@ node: {title: "n87" label: "Block 87" info1: "Block 87 0: Proj 201 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n87" targetname: "n201" label: "0" class:13 priority:60 color:red} @@ -384,7 +384,7 @@ node: {title: "n97" label: "Block 97" info1: "Block 97 0: Proj 91 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n97" targetname: "n91" label: "0" class:13 priority:60 color:red} @@ -412,7 +412,7 @@ node: {title: "n180" label: "Block 180" info1: "Block 180 0: Jmp 179 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n180" targetname: "n179" label: "0" class:13 priority:60 color:red} @@ -453,7 +453,7 @@ node: {title: "n40" label: "Block 40" info1: "Block 40 0: Proj 200 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n40" targetname: "n200" label: "0" class:13 priority:60 color:red} @@ -857,7 +857,7 @@ node: {title: "n28" label: "Block 28" info1: "Block 28 0: Return 59 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n28" targetname: "n59" label: "0" class:13 priority:60 color:red} diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg index 37bac57cc..8f719dd92 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg @@ -65,7 +65,7 @@ node: {title: "n30" label: "Block 30" info1: "Block 30 0: Proj 34 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n30" targetname: "n34" label: "0" class:13 priority:60 color:red} @@ -107,7 +107,7 @@ node: {title: "n191" label: "Block 191" info1: "Block 191 0: Proj 34 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n191" targetname: "n34" label: "0" class:13 priority:60 color:red} @@ -167,7 +167,7 @@ node: {title: "n64" label: "Block 64" info1: "Block 64 0: Proj 195 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n64" targetname: "n195" label: "0" class:13 priority:60 color:red} @@ -211,7 +211,7 @@ node: {title: "n74" label: "Block 74" info1: "Block 74 0: Proj 68 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n74" targetname: "n68" label: "0" class:13 priority:60 color:red} @@ -239,7 +239,7 @@ node: {title: "n188" label: "Block 188" info1: "Block 188 0: Jmp 187 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n188" targetname: "n187" label: "0" class:13 priority:60 color:red} @@ -280,7 +280,7 @@ node: {title: "n197" label: "Block 197" info1: "Block 197 0: Proj 194 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n197" targetname: "n194" label: "0" class:13 priority:60 color:red} @@ -340,7 +340,7 @@ node: {title: "n87" label: "Block 87" info1: "Block 87 0: Proj 201 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n87" targetname: "n201" label: "0" class:13 priority:60 color:red} @@ -384,7 +384,7 @@ node: {title: "n97" label: "Block 97" info1: "Block 97 0: Proj 91 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n97" targetname: "n91" label: "0" class:13 priority:60 color:red} @@ -412,7 +412,7 @@ node: {title: "n180" label: "Block 180" info1: "Block 180 0: Jmp 179 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n180" targetname: "n179" label: "0" class:13 priority:60 color:red} @@ -453,7 +453,7 @@ node: {title: "n40" label: "Block 40" info1: "Block 40 0: Proj 200 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n40" targetname: "n200" label: "0" class:13 priority:60 color:red} @@ -857,7 +857,7 @@ node: {title: "n28" label: "Block 28" info1: "Block 28 0: Return 59 backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n28" targetname: "n59" label: "0" class:13 priority:60 color:red} @@ -891,9 +891,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -931,23 +979,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_c" color: yellow info1: "entity c (23) @@ -982,12 +1048,20 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} @@ -1025,22 +1099,58 @@ node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main 25" info1: "SymC &OO_ type of value: type_unknown " } -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + entity OO_PROGRAM_EXAMPLE_main (26) + type: OO_PROGRAM_EXAMPLE_main (24) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &OO_PROGRAM_EXAMPLE_main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + irg = 39 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue} -node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n101" targetname: "e17"class:2 priority:2 linestyle:dotted} edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted} 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 9e21e18d9..113107d1a 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg @@ -62,7 +62,7 @@ node: {title: "n30" label: "Block 30" info1: "Block 30 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n30" targetname: "n34" label: "0" class:13 priority:60 color:red} @@ -101,7 +101,7 @@ node: {title: "n40" label: "Block 40" info1: "Block 40 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n40" targetname: "n34" label: "0" class:13 priority:60 color:red} @@ -359,7 +359,7 @@ node: {title: "n28" label: "Block 28" info1: "Block 28 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n28" targetname: "n59" label: "0" class:13 priority:60 color:red} @@ -374,24 +374,86 @@ node: {title: "n109" label: "End 109" info1: "End 109 " color: blue} edge: { sourcename: "n109" targetname: "n28" class:2 priority:50 linestyle:dotted} -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -413,9 +475,14 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e20" label: "ent PRIMA_set_a" color: yellow info1: "entity set_a (20) @@ -450,12 +517,19 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} @@ -525,22 +599,58 @@ node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main 25" info1: "SymC &OO_ type of value: type_unknown " } -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + entity OO_PROGRAM_EXAMPLE_main (26) + type: OO_PROGRAM_EXAMPLE_main (24) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &OO_PROGRAM_EXAMPLE_main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + irg = 39 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue} -node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n54" targetname: "t21"class:2 priority:2 linestyle:dotted} edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted} diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg index 66ac2e8d3..d4d228323 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg @@ -62,7 +62,7 @@ node: {title: "n30" label: "Block 30" info1: "Block 30 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n30" targetname: "n34" label: "0" class:13 priority:60 color:red} @@ -101,7 +101,7 @@ node: {title: "n40" label: "Block 40" info1: "Block 40 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n40" targetname: "n34" label: "0" class:13 priority:60 color:red} @@ -359,7 +359,7 @@ node: {title: "n28" label: "Block 28" info1: "Block 28 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n28" targetname: "n59" label: "0" class:13 priority:60 color:red} diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg index e849a6e0e..2fee848b3 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg @@ -52,24 +52,86 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -91,9 +153,14 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e20" label: "ent PRIMA_set_a" color: yellow info1: "entity set_a (20) @@ -128,12 +195,19 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} @@ -203,21 +277,57 @@ node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main 25" info1: "SymC &OO_ type of value: type_unknown " } -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + entity OO_PROGRAM_EXAMPLE_main (26) + type: OO_PROGRAM_EXAMPLE_main (24) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &OO_PROGRAM_EXAMPLE_main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + irg = 39 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue} -node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} } diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg index f7e67ee1f..e01595925 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg @@ -718,9 +718,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -758,23 +806,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_c" color: yellow info1: "entity c (23) @@ -809,12 +875,20 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} @@ -852,22 +926,58 @@ node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main 25" info1: "SymC &OO_ type of value: type_unknown " } -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + entity OO_PROGRAM_EXAMPLE_main (26) + type: OO_PROGRAM_EXAMPLE_main (24) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &OO_PROGRAM_EXAMPLE_main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + irg = 39 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue} -node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n101" targetname: "e17"class:2 priority:2 linestyle:dotted} edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted} diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg index 16a5e05b3..13e6b4eed 100644 --- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg +++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg @@ -331,24 +331,86 @@ color: blue} } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -370,9 +432,14 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e20" label: "ent PRIMA_set_a" color: yellow info1: "entity set_a (20) @@ -407,12 +474,19 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} @@ -482,22 +556,58 @@ node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main 25" info1: "SymC &OO_ type of value: type_unknown " } -node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0) + members: + entity OO_PROGRAM_EXAMPLE_main (26) + type: OO_PROGRAM_EXAMPLE_main (24) + owner: GlobalType (0) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &OO_PROGRAM_EXAMPLE_main + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + irg = 39 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue} -node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 0 -results: 1 +node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 0 + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n54" targetname: "t21"class:2 priority:2 linestyle:dotted} edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted} diff --git a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg index 589b01be4..e5e6f59e6 100644 --- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg @@ -296,9 +296,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA_INLINE" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE (15) + members: + entity a (17) + type: int (14) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_INLINE_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_INLINE_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -336,23 +384,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA_INLINE (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow info1: "entity c (23) @@ -387,19 +453,35 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t84" label: "class cframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t84" label: "class cframe_tp" info1: "class type cframe_tp (84) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n116" targetname: "e17"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg index cd77aafcd..b8626b1f6 100644 --- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg @@ -227,9 +227,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA_INLINE" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE (15) + members: + entity a (17) + type: int (14) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_INLINE_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA_INLINE (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_INLINE_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -267,23 +315,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA_INLINE (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow info1: "entity c (23) @@ -318,19 +384,35 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t61" label: "class set_aframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t61" label: "class set_aframe_tp" info1: "class type set_aframe_tp (61) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n78" targetname: "e17"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg index dcfd474dc..ab6a62fd4 100644 --- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg @@ -62,7 +62,7 @@ node: {title: "n87" label: "Block 87" info1: "Block 87 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n87" targetname: "n91" label: "0" class:13 priority:60 color:red} @@ -103,7 +103,7 @@ node: {title: "n97" label: "Block 97" info1: "Block 97 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n97" targetname: "n91" label: "0" class:13 priority:60 color:red} @@ -263,7 +263,7 @@ node: {title: "n85" label: "Block 85" info1: "Block 85 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n85" targetname: "n107" label: "0" class:13 priority:60 color:red} @@ -295,9 +295,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -335,23 +383,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_c" color: yellow info1: "entity c (23) @@ -386,19 +452,35 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t84" label: "class cframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t84" label: "class cframe_tp" info1: "class type cframe_tp (84) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n101" targetname: "e17"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_c-pure.vcg b/testprograms/ref-results/PRIMA_c-pure.vcg index c41340fd3..02920a72a 100644 --- a/testprograms/ref-results/PRIMA_c-pure.vcg +++ b/testprograms/ref-results/PRIMA_c-pure.vcg @@ -62,7 +62,7 @@ node: {title: "n87" label: "Block 87" info1: "Block 87 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n87" targetname: "n91" label: "0" class:13 priority:60 color:red} @@ -103,7 +103,7 @@ node: {title: "n97" label: "Block 97" info1: "Block 97 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n97" targetname: "n91" label: "0" class:13 priority:60 color:red} @@ -263,7 +263,7 @@ node: {title: "n85" label: "Block 85" info1: "Block 85 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n85" targetname: "n107" label: "0" class:13 priority:60 color:red} diff --git a/testprograms/ref-results/PRIMA_c-type.vcg b/testprograms/ref-results/PRIMA_c-type.vcg index 7621bfeca..9fdebe544 100644 --- a/testprograms/ref-results/PRIMA_c-type.vcg +++ b/testprograms/ref-results/PRIMA_c-type.vcg @@ -69,9 +69,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -109,23 +157,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_c" color: yellow info1: "entity c (23) @@ -160,18 +226,34 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t84" label: "class cframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t84" label: "class cframe_tp" info1: "class type cframe_tp (84) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} } diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg index f6e79c807..c611ff88d 100644 --- a/testprograms/ref-results/PRIMA_c-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg @@ -255,9 +255,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -295,23 +343,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_c" color: yellow info1: "entity c (23) @@ -346,19 +412,35 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t84" label: "class cframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t84" label: "class cframe_tp" info1: "class type cframe_tp (84) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n101" targetname: "e17"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg index ad99301ea..4b4f19156 100644 --- a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg @@ -62,7 +62,7 @@ node: {title: "n64" label: "Block 64" info1: "Block 64 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n64" targetname: "n68" label: "0" class:13 priority:60 color:red} @@ -103,7 +103,7 @@ node: {title: "n74" label: "Block 74" info1: "Block 74 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n74" targetname: "n68" label: "0" class:13 priority:60 color:red} @@ -233,7 +233,7 @@ node: {title: "n62" label: "Block 62" info1: "Block 62 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n62" targetname: "n82" label: "0" class:13 priority:60 color:red} @@ -265,9 +265,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -305,23 +353,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_c" color: yellow info1: "entity c (23) @@ -356,19 +422,35 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t61" label: "class set_aframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t61" label: "class set_aframe_tp" info1: "class type set_aframe_tp (61) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n78" targetname: "e17"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/PRIMA_set_a-pure.vcg b/testprograms/ref-results/PRIMA_set_a-pure.vcg index d82930cbb..d1520b931 100644 --- a/testprograms/ref-results/PRIMA_set_a-pure.vcg +++ b/testprograms/ref-results/PRIMA_set_a-pure.vcg @@ -62,7 +62,7 @@ node: {title: "n64" label: "Block 64" info1: "Block 64 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n64" targetname: "n68" label: "0" class:13 priority:60 color:red} @@ -103,7 +103,7 @@ node: {title: "n74" label: "Block 74" info1: "Block 74 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n74" targetname: "n68" label: "0" class:13 priority:60 color:red} @@ -233,7 +233,7 @@ node: {title: "n62" label: "Block 62" info1: "Block 62 Private Attributes: backedges: block visited: 0 - dominator info: output not implemented + Execution freqency statistics: " color: lightyellow} edge: {sourcename: "n62" targetname: "n82" label: "0" class:13 priority:60 color:red} diff --git a/testprograms/ref-results/PRIMA_set_a-type.vcg b/testprograms/ref-results/PRIMA_set_a-type.vcg index 3be5adecf..164b06386 100644 --- a/testprograms/ref-results/PRIMA_set_a-type.vcg +++ b/testprograms/ref-results/PRIMA_set_a-type.vcg @@ -69,9 +69,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -109,23 +157,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_c" color: yellow info1: "entity c (23) @@ -160,18 +226,34 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t61" label: "class set_aframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t61" label: "class set_aframe_tp" info1: "class type set_aframe_tp (61) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} } diff --git a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg index 534f3a233..ca2af8e44 100644 --- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg +++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg @@ -227,9 +227,57 @@ node: {title: "e17" label: "ent a" color: yellow " } edge: { sourcename: "e17" targetname: "t14"class: 3 label: "type" color: red} -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue} edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue} @@ -267,23 +315,41 @@ node: {title: "n19" label: "SymC &set_a 19" info1: "SymC &set_a 19 type of value: type_unknown " } -node: {title: "t18" label: "method set_a" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 0 +node: {title: "t18" label: "method set_a" info1: "method type set_a (18) + variadicity: variadicity_non_variadic + return types: 0 + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green} -node: {title: "t16" label: "pointer class_prima_ptr" info1: "state: layout_fixed, -mode: P, -size: 32b, +node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16) + points to PRIMA (15) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green} -node: {title: "t14" label: "primitive int" info1: "state: layout_fixed, -mode: Is, -size: 32b, +node: {title: "t14" label: "primitive int" info1: "primitive type int (14) + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: Is, + dbg info: (nil), + + "} node: {title: "e23" label: "ent PRIMA_c" color: yellow info1: "entity c (23) @@ -318,19 +384,35 @@ node: {title: "n22" label: "SymC &c 22" info1: "SymC &c 22 type of value: type_unknown " } -node: {title: "t21" label: "method c" info1: "state: layout_fixed, -mode: P, -size: 32b, -variadicity: variadicity_non_variadic -params: 2 -results: 1 +node: {title: "t21" label: "method c" info1: "method type c (21) + variadicity: variadicity_non_variadic + return types: 1 + int + parameter types: 2 + class_prima_ptr + int + state: layout_fixed, + size: 32 Bits, + alignment: 32 Bits, + mode: P, + dbg info: (nil), + + "} edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green} edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green} edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green} -node: {title: "t61" label: "class set_aframe_tp" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t61" label: "class set_aframe_tp" info1: "class type set_aframe_tp (61) + members: + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 0 Bits, + dbg info: (nil), + + " color: green} edge: { sourcename: "n78" targetname: "e17"class:2 priority:2 linestyle:dotted} } diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg index 71e85699c..f892cc7df 100644 --- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg +++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg @@ -52,30 +52,112 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -node: {title: "n19" label: "End Block n19" info1:"arity: 1 +node: {title: "n19" label: "End Block n19" info1:"Block 19 + mode: BB + visited: 11 + irg: THREE_CFPRED_EXAMPLE_main + arity: 1 + pred nodes: + 0: Return 61 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: " color:blue } edge: { sourcename: "n19" targetname: "n41"} -node: {title: "n41" label: "Block n41" info1:"arity: 3 +node: {title: "n41" label: "Block n41" info1:"Block 41 + mode: BB + visited: 11 + irg: THREE_CFPRED_EXAMPLE_main + arity: 3 + pred nodes: + 0: Jmp 44 + 1: Jmp 56 + 2: Jmp 58 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n41" targetname: "n42"} edge: { sourcename: "n41" targetname: "n55"} edge: { sourcename: "n41" targetname: "n57"} -node: {title: "n57" label: "Block n57" info1:"arity: 1 +node: {title: "n57" label: "Block n57" info1:"Block 57 + mode: BB + visited: 11 + irg: THREE_CFPRED_EXAMPLE_main + arity: 1 + pred nodes: + 0: Proj 54 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n57" targetname: "n45"} -node: {title: "n45" label: "Block n45" info1:"arity: 1 +node: {title: "n45" label: "Block n45" info1:"Block 45 + mode: BB + visited: 11 + irg: THREE_CFPRED_EXAMPLE_main + arity: 1 + pred nodes: + 0: Proj 39 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n45" targetname: "n31"} -node: {title: "n31" label: "Block n31" info1:"arity: 1 +node: {title: "n31" label: "Block n31" info1:"Block 31 + mode: BB + visited: 11 + irg: THREE_CFPRED_EXAMPLE_main + arity: 1 + pred nodes: + 0: Proj 25 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n31" targetname: "n21"} -node: {title: "n21" label: "Start Block n21" info1:"arity: 1 +node: {title: "n21" label: "Start Block n21" info1:"Block 21 + mode: BB + visited: 11 + irg: THREE_CFPRED_EXAMPLE_main + arity: 1 + pred nodes: + 0: Proj 25 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: " color:blue } edge: { sourcename: "n21" targetname: "n21"} -node: {title: "n55" label: "Block n55" info1:"arity: 1 +node: {title: "n55" label: "Block n55" info1:"Block 55 + mode: BB + visited: 11 + irg: THREE_CFPRED_EXAMPLE_main + arity: 1 + pred nodes: + 0: Proj 53 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n55" targetname: "n45"} -node: {title: "n42" label: "Block n42" info1:"arity: 1 +node: {title: "n42" label: "Block n42" info1:"Block 42 + mode: BB + visited: 11 + irg: THREE_CFPRED_EXAMPLE_main + arity: 1 + pred nodes: + 0: Proj 40 + Private Attributes: + backedges: + block visited: 2 + Execution freqency statistics: "} edge: { sourcename: "n42" targetname: "n31"} node: {title: "n81" label: "Bad 81" info1: "Bad 81 diff --git a/testprograms/ref-results/class_hierarchy.vcg b/testprograms/ref-results/class_hierarchy.vcg index 74a52d842..5fc9b529d 100644 --- a/testprograms/ref-results/class_hierarchy.vcg +++ b/testprograms/ref-results/class_hierarchy.vcg @@ -52,9 +52,57 @@ colorentry 123: 255 220 220 colorentry 124: 255 240 240 colorentry 125: 255 250 250 -node: {title: "t15" label: "class PRIMA" info1: "state: layout_undefined -size: -1b, -peculiarity: peculiarity_existent +node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15) + members: + entity a (17) + type: int (14) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_automatic + visibility: visibility_local + variability: variability_uninitialized + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: no yet set + offset: -1 + entity set_a (20) + type: set_a (18) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &set_a + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_set_a + offset: -1 + irg = 73 + entity c (23) + type: c (21) + owner: PRIMA (15) + Does not overwrite other entities. + Is not overwritten by other entities. + allocation: allocation_static + visibility: visibility_local + variability: variability_constant + atomic value: SymC &c + volatility: volatility_non_volatile + peculiarity: peculiarity_existent + ld_name: PRIMA_c + offset: -1 + irg = 96 + supertypes: + subtypes: + peculiarity: peculiarity_existent + state: layout_undefined, + size: -1 Bits, + alignment: 32 Bits, + dbg info: (nil), + + " color: green} node: {title: "e20" label: "ent PRIMA_set_a" color: yellow info1: "entity set_a (20) -- 2.20.1