changed information in entity nodes

[r3804]

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
index a6d3738..196b2d2 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
@@ -25,16 +25,18 @@ infoname 1: "Attribute"
 infoname 2: "Verification errors"
 
 node: {title: "e18" label: "ent a_elem_ent" color: yellow
- info1: "
-id: e18
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a_elem_ent
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a_elem_ent (18)
+  type:  int (11)
+  owner: a (15)
+  allocation:  allocation_automatic
+  visibility:  visibility_local
+  variability: variability_uninitialized
+  volatility:  volatility_non_volatile
+  peculiarity: peculiarity_existent
+  ld_name: no yet set
+  offset:  -1
+
+"
 }
 edge: { sourcename: "e18" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t15" label: "array a" info1: "state: layout_undefined
@@ -59,23 +61,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e14" label: "ent ARRAY-HEAP_EXAMPLE_main" color: yellow
- info1: "
-id: e14
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         ARRAY-HEAP_EXAMPLE_main
-ld_name:      no yet set
-offset(bits): -1
-irg = g32"
+ info1: "entity ARRAY-HEAP_EXAMPLE_main (14)
+  type:  ARRAY-HEAP_EXAMPLE_main (12)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 32
+
+"
 }
 edge: { sourcename: "e14" targetname: "t12"class: 3 label: "type" color: red}
 edge: { sourcename: "e14" targetname: "n13"label: "value 0"}
 node: {title: "n13" label: "SymC &ARRAY-HEAP_EXAMPLE_main  13"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1b,

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg
index e2443cc..41527b2 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg
@@ -25,16 +25,18 @@ infoname 1: "Attribute"
 infoname 2: "Verification errors"
 
 node: {title: "e19" label: "ent a_tp_elem_ent" color: yellow
- info1: "
-id: e19
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a_tp_elem_ent
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a_tp_elem_ent (19)
+  type:  int (11)
+  owner: a_tp (16)
+  allocation:  allocation_automatic
+  visibility:  visibility_local
+  variability: variability_uninitialized
+  volatility:  volatility_non_volatile
+  peculiarity: peculiarity_existent
+  ld_name: no yet set
+  offset:  -1
+
+"
 }
 edge: { sourcename: "e19" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t16" label: "array a_tp" info1: "state: layout_undefined
@@ -59,16 +61,20 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e35" label: "ent a" color: yellow
- info1: "
-id: e35
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (35)
+  type:  a_tp (16)
+  owner: mainframe_tp (22)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e35" targetname: "t16"class: 3 label: "type" color: red}
 node: {title: "t22" label: "class mainframe_tp" info1: "state: layout_undefined
@@ -77,23 +83,29 @@ peculiarity: peculiarity_existent
 " color: green}
 edge: { sourcename: "t22" targetname: "e35"class: 12 label: "member" color:blue}
 node: {title: "e15" label: "ent ARRAY-STACK_EXAMPLE_main" color: yellow
- info1: "
-id: e15
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         main
-ld_name:      ARRAY-STACK_EXAMPLE_main
-offset(bits): -1
-irg = g33"
+ info1: "entity main (15)
+  type:  main_tp (13)
+  owner: ARRAY-STACK_EXAMPLE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 33
+
+"
 }
 edge: { sourcename: "e15" targetname: "t13"class: 3 label: "type" color: red}
 edge: { sourcename: "e15" targetname: "n14"label: "value 0"}
 node: {title: "n14" label: "SymC &main  14"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t12" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined
 size: -1b,

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
index 26a3b38..b7f5bc4 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
@@ -122,16 +122,18 @@ start of method of type main_tp
 }
 
 node: {title: "e19" label: "ent a_tp_elem_ent" color: yellow
- info1: "
-id: e19
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a_tp_elem_ent
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a_tp_elem_ent (19)
+  type:  int (11)
+  owner: a_tp (16)
+  allocation:  allocation_automatic
+  visibility:  visibility_local
+  variability: variability_uninitialized
+  volatility:  volatility_non_volatile
+  peculiarity: peculiarity_existent
+  ld_name: no yet set
+  offset:  -1
+
+"
 }
 edge: { sourcename: "e19" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t16" label: "array a_tp" info1: "state: layout_undefined
@@ -156,16 +158,20 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e35" label: "ent a" color: yellow
- info1: "
-id: e35
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (35)
+  type:  a_tp (16)
+  owner: mainframe_tp (22)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e35" targetname: "t16"class: 3 label: "type" color: red}
 node: {title: "t22" label: "class mainframe_tp" info1: "state: layout_undefined
@@ -174,23 +180,29 @@ peculiarity: peculiarity_existent
 " color: green}
 edge: { sourcename: "t22" targetname: "e35"class: 12 label: "member" color:blue}
 node: {title: "e15" label: "ent ARRAY-STACK_EXAMPLE_main" color: yellow
- info1: "
-id: e15
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         main
-ld_name:      ARRAY-STACK_EXAMPLE_main
-offset(bits): -1
-irg = g33"
+ info1: "entity main (15)
+  type:  main_tp (13)
+  owner: ARRAY-STACK_EXAMPLE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 33
+
+"
 }
 edge: { sourcename: "e15" targetname: "t13"class: 3 label: "type" color: red}
 edge: { sourcename: "e15" targetname: "n14"label: "value 0"}
 node: {title: "n14" label: "SymC &main  14"  info1: "mode:    P
 visited: 2
 arity: 0
+kind addr_ent
 "}
 node: {title: "t12" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined
 size: -1b,

diff --git a/testprograms/ref-results/All_graphs.vcg b/testprograms/ref-results/All_graphs.vcg
index 119c248..d914f84 100644 (file)
--- a/testprograms/ref-results/All_graphs.vcg
+++ b/testprograms/ref-results/All_graphs.vcg
@@ -27,7 +27,7 @@ infoname 2: "Verification errors"
 graph: { title: "g35" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
 graph: { title: "n105"  label: "Block 105" status:clustered color:yellow
 edge: {sourcename: "n105" targetname: "n106" label: "0" class:13 priority:60 color:red}
-node: {title: "n103" label: "End  103"  info1: "mode:    X
+node: {title: "n103" label: "End OO_PROGRAM_EXAMPLE_main  103"  info1: "mode:    X
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 2
@@ -77,7 +77,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
 "color: yellow}
 edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 priority:60 color:red}
-node: {title: "n190" label: "CallBegin  190"  info1: "mode:    T
+node: {title: "n190" label: "CallBegin c  190"  info1: "mode:    T
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -88,6 +88,7 @@ node: {title: "n190n165" label: "SymC &c  165"  info1: "mode:    P
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n190" targetname: "n190n165" label: "0" class:16 priority:10}
 }
@@ -116,6 +117,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}
@@ -125,7 +127,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
 "color: yellow}
 edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 priority:60 color:red}
-node: {title: "n184" label: "CallBegin  184"  info1: "mode:    T
+node: {title: "n184" label: "CallBegin set_a  184"  info1: "mode:    T
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -136,6 +138,7 @@ node: {title: "n184n166" label: "SymC &set_a  166"  info1: "mode:    P
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n184" targetname: "n184n166" label: "0" class:16 priority:10}
 }
@@ -173,7 +176,7 @@ irg:     PRIMA_set_a
 arity: 1
 "color: yellow}
 edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 priority:60 color:red}
-node: {title: "n180" label: "EndReg  180"  info1: "mode:    T
+node: {title: "n180" label: "EndReg PRIMA_set_a  180"  info1: "mode:    T
 visited: 51
 irg:     PRIMA_set_a
 arity: 0
@@ -271,7 +274,7 @@ irg:     PRIMA_c
 arity: 1
 "color: yellow}
 edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 priority:60 color:red}
-node: {title: "n172" label: "EndReg  172"  info1: "mode:    T
+node: {title: "n172" label: "EndReg PRIMA_c  172"  info1: "mode:    T
 visited: 51
 irg:     PRIMA_c
 arity: 0

diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg
index 70640a0..ec9deb9 100644 (file)
--- a/testprograms/ref-results/All_types.vcg
+++ b/testprograms/ref-results/All_types.vcg
@@ -43,23 +43,29 @@ peculiarity: peculiarity_existent
 " color: green}
 edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue}
 node: {title: "e15" label: "ent WHILE_EXAMPLE_main" color: yellow
- info1: "
-id: e15
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         main
-ld_name:      WHILE_EXAMPLE_main
-offset(bits): -1
-irg = g27"
+ info1: "entity main (15)
+  type:  main_tp (12)
+  owner: WHILE_EXAMPLE (13)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 27
+
+"
 }
 edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red}
 edge: { sourcename: "e15" targetname: "n14"label: "value 0"}
 node: {title: "n14" label: "SymC &main  14"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1b,

diff --git a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
index 6ba66cd..b22c813 100644 (file)
--- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
@@ -73,11 +73,13 @@ node: {title: "n66" label: "SymC f  66"  info1: "mode:    P
 visited: 9
 irg:     CALL_STR_EXAMPLE_main
 arity: 0
+kind addr_name
 "}
 node: {title: "n65" label: "SymC &constStr  65"  info1: "mode:    P
 visited: 9
 irg:     CALL_STR_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 node: {title: "n60" label: "ProjX 0 60"  info1: "mode:    X
 visited: 9

diff --git a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
index 4c345fc..95e3ccf 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
@@ -118,16 +118,20 @@ arity: 0
 "color: blue}
 edge: { sourcename: "n37" targetname: "n39" class:2  priority:50 linestyle:dotted}
 node: {title: "e15" label: "ent i" color: yellow
- info1: "
-id: e15
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         i
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity i (15)
+  type:  int (11)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e15" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
@@ -137,23 +141,29 @@ peculiarity: peculiarity_existent
 edge: { sourcename: "t0" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t0" targetname: "e15"class: 12 label: "member" color:blue}
 node: {title: "e14" label: "ent GLOBAL_VAR_main" color: yellow
- info1: "
-id: e14
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         GLOBAL_VAR_main
-ld_name:      no yet set
-offset(bits): -1
-irg = g27"
+ info1: "entity GLOBAL_VAR_main (14)
+  type:  GLOBAL_VAR_main (12)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 27
+
+"
 }
 edge: { sourcename: "e14" targetname: "t12"class: 3 label: "type" color: red}
 edge: { sourcename: "e14" targetname: "n13"label: "value 0"}
 node: {title: "n13" label: "SymC &GLOBAL_VAR_main  13"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t12" label: "method GLOBAL_VAR_main" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
index 95f335f..aca6d3b 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
@@ -149,6 +149,7 @@ node: {title: "n208" label: "SymC PRIMA_INLINE size  208"  info1: "mode:    Iu
 visited: 26
 irg:     OO_INLINE_EXAMPLE_main
 arity: 0
+kind size
 "}
 node: {title: "n204" label: "0x5Is  204"  info1: "mode:    Is
 visited: 26
@@ -181,16 +182,20 @@ arity: 2
 }
 
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA_INLINE" info1: "state: layout_undefined
@@ -201,23 +206,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_INLINE_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_INLINE_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -238,23 +249,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_INLINE_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_INLINE_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,
@@ -267,23 +284,29 @@ edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: gree
 edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t18" targetname: "t11"class: 6 label: "res 0" color: green}
 node: {title: "e23" label: "ent OO_INLINE_EXAMPLE_main" color: yellow
- info1: "
-id: e23
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         OO_INLINE_EXAMPLE_main
-ld_name:      no yet set
-offset(bits): -1
-irg = g35"
+ info1: "entity OO_INLINE_EXAMPLE_main (23)
+  type:  OO_INLINE_EXAMPLE_main (21)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 35
+
+"
 }
 edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red}
 edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &OO_INLINE_EXAMPLE_main  22"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1b,

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
index 642c10f..69f413f 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
@@ -149,6 +149,7 @@ node: {title: "n208" label: "SymC PRIMA_INLINE size  208"  info1: "mode:    Iu
 visited: 25
 irg:     OO_INLINE_EXAMPLE_main
 arity: 0
+kind size
 "}
 node: {title: "n204" label: "0x5Is  204"  info1: "mode:    Is
 visited: 25

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg
index 2a51985..0c973f8 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg
@@ -27,7 +27,7 @@ infoname 2: "Verification errors"
 graph: { title: "g35" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
 graph: { title: "n105"  label: "Block 105" status:clustered color:yellow
 edge: {sourcename: "n105" targetname: "n106" label: "0" class:13 priority:60 color:red}
-node: {title: "n103" label: "End  103"  info1: "mode:    X
+node: {title: "n103" label: "End OO_PROGRAM_EXAMPLE_main  103"  info1: "mode:    X
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 2
@@ -77,7 +77,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
 "color: yellow}
 edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 priority:60 color:red}
-node: {title: "n190" label: "CallBegin  190"  info1: "mode:    T
+node: {title: "n190" label: "CallBegin c  190"  info1: "mode:    T
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -88,6 +88,7 @@ node: {title: "n190n165" label: "SymC &c  165"  info1: "mode:    P
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n190" targetname: "n190n165" label: "0" class:16 priority:10}
 }
@@ -116,6 +117,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}
@@ -125,7 +127,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
 "color: yellow}
 edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 priority:60 color:red}
-node: {title: "n184" label: "CallBegin  184"  info1: "mode:    T
+node: {title: "n184" label: "CallBegin set_a  184"  info1: "mode:    T
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -136,6 +138,7 @@ node: {title: "n184n166" label: "SymC &set_a  166"  info1: "mode:    P
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n184" targetname: "n184n166" label: "0" class:16 priority:10}
 }
@@ -173,7 +176,7 @@ irg:     PRIMA_set_a
 arity: 1
 "color: yellow}
 edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 priority:60 color:red}
-node: {title: "n180" label: "EndReg  180"  info1: "mode:    T
+node: {title: "n180" label: "EndReg PRIMA_set_a  180"  info1: "mode:    T
 visited: 34
 irg:     PRIMA_set_a
 arity: 0
@@ -271,7 +274,7 @@ irg:     PRIMA_c
 arity: 1
 "color: yellow}
 edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 priority:60 color:red}
-node: {title: "n172" label: "EndReg  172"  info1: "mode:    T
+node: {title: "n172" label: "EndReg PRIMA_c  172"  info1: "mode:    T
 visited: 34
 irg:     PRIMA_c
 arity: 0

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 f1979c9..b1180a4 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg
@@ -50,7 +50,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n182" targetname: "n108" label: "0" class:13 priority:60 color:red}
-node: {title: "n184" label: "CallBegin  184"  info1: "mode:    T
+node: {title: "n184" label: "CallBegin set_a  184"  info1: "mode:    T
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -61,6 +61,7 @@ node: {title: "n184n166" label: "SymC &set_a  166"  info1: "mode:    P
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n184" targetname: "n184n166" label: "0" class:16 priority:10}
 edge: { sourcename: "n184" targetname: "n182" class:2  priority:50 linestyle:dotted}
@@ -111,7 +112,7 @@ irg:     PRIMA_set_a
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 priority:60 color:red}
-node: {title: "n180" label: "EndReg  180"  info1: "mode:    T
+node: {title: "n180" label: "EndReg PRIMA_set_a  180"  info1: "mode:    T
 visited: 32
 irg:     PRIMA_set_a
 arity: 0
@@ -130,7 +131,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 priority:60 color:red}
-node: {title: "n190" label: "CallBegin  190"  info1: "mode:    T
+node: {title: "n190" label: "CallBegin c  190"  info1: "mode:    T
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -141,6 +142,7 @@ node: {title: "n190n165" label: "SymC &c  165"  info1: "mode:    P
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n190" targetname: "n190n165" label: "0" class:16 priority:10}
 edge: { sourcename: "n190" targetname: "n188" class:2  priority:50 linestyle:dotted}
@@ -191,7 +193,7 @@ irg:     PRIMA_c
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 priority:60 color:red}
-node: {title: "n172" label: "EndReg  172"  info1: "mode:    T
+node: {title: "n172" label: "EndReg PRIMA_c  172"  info1: "mode:    T
 visited: 32
 irg:     PRIMA_c
 arity: 0
@@ -242,6 +244,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}
@@ -418,7 +421,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n105" targetname: "n106" label: "0" class:13 priority:60 color:red}
-node: {title: "n103" label: "End  103"  info1: "mode:    X
+node: {title: "n103" label: "End OO_PROGRAM_EXAMPLE_main  103"  info1: "mode:    X
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 2

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 27f67b3..7eb89fe 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg
@@ -50,7 +50,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n182" targetname: "n108" label: "0" class:13 priority:60 color:red}
-node: {title: "n184" label: "CallBegin  184"  info1: "mode:    T
+node: {title: "n184" label: "CallBegin set_a  184"  info1: "mode:    T
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -61,6 +61,7 @@ node: {title: "n184n166" label: "SymC &set_a  166"  info1: "mode:    P
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n184" targetname: "n184n166" label: "0" class:16 priority:10}
 edge: { sourcename: "n184" targetname: "n182" class:2  priority:50 linestyle:dotted}
@@ -111,7 +112,7 @@ irg:     PRIMA_set_a
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n179" targetname: "n178" label: "0" class:13 priority:60 color:red}
-node: {title: "n180" label: "EndReg  180"  info1: "mode:    T
+node: {title: "n180" label: "EndReg PRIMA_set_a  180"  info1: "mode:    T
 visited: 36
 irg:     PRIMA_set_a
 arity: 0
@@ -130,7 +131,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n188" targetname: "n185" label: "0" class:13 priority:60 color:red}
-node: {title: "n190" label: "CallBegin  190"  info1: "mode:    T
+node: {title: "n190" label: "CallBegin c  190"  info1: "mode:    T
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -141,6 +142,7 @@ node: {title: "n190n165" label: "SymC &c  165"  info1: "mode:    P
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n190" targetname: "n190n165" label: "0" class:16 priority:10}
 edge: { sourcename: "n190" targetname: "n188" class:2  priority:50 linestyle:dotted}
@@ -191,7 +193,7 @@ irg:     PRIMA_c
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n171" targetname: "n170" label: "0" class:13 priority:60 color:red}
-node: {title: "n172" label: "EndReg  172"  info1: "mode:    T
+node: {title: "n172" label: "EndReg PRIMA_c  172"  info1: "mode:    T
 visited: 36
 irg:     PRIMA_c
 arity: 0
@@ -242,6 +244,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}
@@ -418,23 +421,27 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1 backedges:
 "color: lightyellow}
 edge: {sourcename: "n105" targetname: "n106" label: "0" class:13 priority:60 color:red}
-node: {title: "n103" label: "End  103"  info1: "mode:    X
+node: {title: "n103" label: "End OO_PROGRAM_EXAMPLE_main  103"  info1: "mode:    X
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 2
 "color: blue}
 edge: { sourcename: "n103" targetname: "n105" class:2  priority:50 linestyle:dotted}
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
@@ -445,23 +452,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 39
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -482,23 +495,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 40
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,
@@ -511,23 +530,29 @@ edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: gree
 edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t18" targetname: "t11"class: 6 label: "res 0" color: green}
 node: {title: "e23" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
- info1: "
-id: e23
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         OO_PROGRAM_EXAMPLE_main
-ld_name:      no yet set
-offset(bits): -1
-irg = g35"
+ info1: "entity OO_PROGRAM_EXAMPLE_main (23)
+  type:  OO_PROGRAM_EXAMPLE_main (21)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 35
+
+"
 }
 edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red}
 edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &OO_PROGRAM_EXAMPLE_main  22"  info1: "mode:    P
 visited: 41
 arity: 0
+kind addr_ent
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1b,

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 41436eb..b88eb05 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
@@ -67,6 +67,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 20
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}
@@ -217,16 +218,20 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t11" label: "primitive int" info1: "state: layout_fixed,
@@ -234,23 +239,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -262,42 +273,54 @@ results: 0
 edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "e23" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
- info1: "
-id: e23
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         OO_PROGRAM_EXAMPLE_main
-ld_name:      no yet set
-offset(bits): -1
-irg = g35"
+ info1: "entity OO_PROGRAM_EXAMPLE_main (23)
+  type:  OO_PROGRAM_EXAMPLE_main (21)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 35
+
+"
 }
 edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red}
 edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &OO_PROGRAM_EXAMPLE_main  22"  info1: "mode:    P
 visited: 1
 arity: 0
+kind addr_ent
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1b,

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg
index 44a2f1d..5163a94 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg
@@ -67,6 +67,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 18
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg
index 13b74f9..f6b5bc6 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg
@@ -47,16 +47,20 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t11" label: "primitive int" info1: "state: layout_fixed,
@@ -64,23 +68,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 7
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -92,42 +102,54 @@ results: 0
 edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 7
 arity: 0
+kind addr_ent
 "}
 node: {title: "e23" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
- info1: "
-id: e23
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         OO_PROGRAM_EXAMPLE_main
-ld_name:      no yet set
-offset(bits): -1
-irg = g35"
+ info1: "entity OO_PROGRAM_EXAMPLE_main (23)
+  type:  OO_PROGRAM_EXAMPLE_main (21)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 35
+
+"
 }
 edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red}
 edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &OO_PROGRAM_EXAMPLE_main  22"  info1: "mode:    P
 visited: 7
 arity: 0
+kind addr_ent
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1b,

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 fb1e6ee..4f8c3dd 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
@@ -27,7 +27,7 @@ infoname 2: "Verification errors"
 graph: { title: "g35" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
 graph: { title: "n105"  label: "Block 105" status:clustered color:yellow
 edge: {sourcename: "n105" targetname: "n106" label: "0" class:13 priority:60 color:red}
-node: {title: "n103" label: "End  103"  info1: "mode:    X
+node: {title: "n103" label: "End OO_PROGRAM_EXAMPLE_main  103"  info1: "mode:    X
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 2
@@ -77,7 +77,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
 "color: yellow}
 edge: {sourcename: "n192" targetname: "n190" label: "0" class:13 priority:60 color:red}
-node: {title: "n190" label: "CallBegin  190"  info1: "mode:    T
+node: {title: "n190" label: "CallBegin c  190"  info1: "mode:    T
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -88,6 +88,7 @@ node: {title: "n190n165" label: "SymC &c  165"  info1: "mode:    P
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n190" targetname: "n190n165" label: "0" class:16 priority:10}
 }
@@ -116,6 +117,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}
@@ -125,7 +127,7 @@ irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
 "color: yellow}
 edge: {sourcename: "n186" targetname: "n184" label: "0" class:13 priority:60 color:red}
-node: {title: "n184" label: "CallBegin  184"  info1: "mode:    T
+node: {title: "n184" label: "CallBegin set_a  184"  info1: "mode:    T
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 1
@@ -136,6 +138,7 @@ node: {title: "n184n166" label: "SymC &set_a  166"  info1: "mode:    P
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind addr_ent
 "}
 edge: {sourcename: "n184" targetname: "n184n166" label: "0" class:16 priority:10}
 }
@@ -173,7 +176,7 @@ irg:     PRIMA_set_a
 arity: 1
 "color: yellow}
 edge: {sourcename: "n185" targetname: "n180" label: "0" class:13 priority:60 color:red}
-node: {title: "n180" label: "EndReg  180"  info1: "mode:    T
+node: {title: "n180" label: "EndReg PRIMA_set_a  180"  info1: "mode:    T
 visited: 44
 irg:     PRIMA_set_a
 arity: 0
@@ -271,7 +274,7 @@ irg:     PRIMA_c
 arity: 1
 "color: yellow}
 edge: {sourcename: "n191" targetname: "n172" label: "0" class:13 priority:60 color:red}
-node: {title: "n172" label: "EndReg  172"  info1: "mode:    T
+node: {title: "n172" label: "EndReg PRIMA_c  172"  info1: "mode:    T
 visited: 44
 irg:     PRIMA_c
 arity: 0
@@ -373,16 +376,20 @@ start of method of type c
 }
 
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
@@ -393,23 +400,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 47
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -430,23 +443,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 48
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,
@@ -459,23 +478,29 @@ edge: { sourcename: "t18" targetname: "t13"class: 5 label: "param 0" color: gree
 edge: { sourcename: "t18" targetname: "t11"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t18" targetname: "t11"class: 6 label: "res 0" color: green}
 node: {title: "e23" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
- info1: "
-id: e23
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         OO_PROGRAM_EXAMPLE_main
-ld_name:      no yet set
-offset(bits): -1
-irg = g35"
+ info1: "entity OO_PROGRAM_EXAMPLE_main (23)
+  type:  OO_PROGRAM_EXAMPLE_main (21)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 35
+
+"
 }
 edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red}
 edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &OO_PROGRAM_EXAMPLE_main  22"  info1: "mode:    P
 visited: 49
 arity: 0
+kind addr_ent
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1b,

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg
index 96e9640..7aa996c 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg
@@ -146,6 +146,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 23
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}
@@ -198,16 +199,20 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t11" label: "primitive int" info1: "state: layout_fixed,
@@ -215,23 +220,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 4
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -243,42 +254,54 @@ results: 0
 edge: { sourcename: "t15" targetname: "t13"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t15" targetname: "t11"class: 5 label: "param 1" color: green}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 4
 arity: 0
+kind addr_ent
 "}
 node: {title: "e23" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
- info1: "
-id: e23
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         OO_PROGRAM_EXAMPLE_main
-ld_name:      no yet set
-offset(bits): -1
-irg = g35"
+ info1: "entity OO_PROGRAM_EXAMPLE_main (23)
+  type:  OO_PROGRAM_EXAMPLE_main (21)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 35
+
+"
 }
 edge: { sourcename: "e23" targetname: "t21"class: 3 label: "type" color: red}
 edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &OO_PROGRAM_EXAMPLE_main  22"  info1: "mode:    P
 visited: 4
 arity: 0
+kind addr_ent
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1b,

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
index 76ff2f0..48d83db 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
@@ -146,6 +146,7 @@ node: {title: "n116n117" label: "SymC PRIMA size  117"  info1: "mode:    Iu
 visited: 19
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
+kind size
 "}
 edge: {sourcename: "n116" targetname: "n118" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n116" targetname: "n116n117" label: "1" class:16 priority:10}

diff --git a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
index 1fb4b6a..df6648c 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
@@ -141,16 +141,20 @@ arity: 2
 }
 
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA_INLINE" info1: "state: layout_undefined
@@ -161,23 +165,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_INLINE_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_INLINE_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 3
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -198,23 +208,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_INLINE_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_INLINE_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 3
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
index ab40506..e2b157b 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
@@ -113,16 +113,20 @@ start of method of type set_a
 }
 
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA_INLINE" info1: "state: layout_undefined
@@ -133,23 +137,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_INLINE_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_INLINE_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 2
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -170,23 +180,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_INLINE_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_INLINE_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA_INLINE (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 2
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
index 75b84bb..bb5b474 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
@@ -143,16 +143,20 @@ arity: 0
 "color: blue}
 edge: { sourcename: "n146" targetname: "n148" class:2  priority:50 linestyle:dotted}
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
@@ -163,23 +167,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 3
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -200,23 +210,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 3
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/PRIMA_c-type.vcg b/testprograms/ref-results/PRIMA_c-type.vcg
index 0a4b977..e91bd1f 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-type.vcg
+++ b/testprograms/ref-results/PRIMA_c-type.vcg
@@ -25,16 +25,20 @@ infoname 1: "Attribute"
 infoname 2: "Verification errors"
 
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
@@ -45,23 +49,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 9
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -82,23 +92,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 9
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg
index fd354a9..111cedb 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg
@@ -127,16 +127,20 @@ start of method of type c
 }
 
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
@@ -147,23 +151,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 6
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -184,23 +194,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 6
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
index e73ae1c..04dfa59 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
@@ -127,16 +127,20 @@ arity: 0
 "color: blue}
 edge: { sourcename: "n129" targetname: "n131" class:2  priority:50 linestyle:dotted}
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
@@ -147,23 +151,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 2
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -184,23 +194,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 2
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/PRIMA_set_a-type.vcg b/testprograms/ref-results/PRIMA_set_a-type.vcg
index e09f793..d33ced1 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-type.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-type.vcg
@@ -25,16 +25,20 @@ infoname 1: "Attribute"
 infoname 2: "Verification errors"
 
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
@@ -45,23 +49,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 8
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -82,23 +92,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 8
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
index 4298646..9b2e07e 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
@@ -113,16 +113,20 @@ start of method of type set_a
 }
 
 node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
+ info1: "entity a (14)
+  type:  int (11)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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
+
+"
 }
 edge: { sourcename: "e14" targetname: "t11"class: 3 label: "type" color: red}
 node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
@@ -133,23 +137,29 @@ edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "e17" targetname: "t15"class: 3 label: "type" color: red}
 edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &set_a  16"  info1: "mode:    P
 visited: 5
 arity: 0
+kind addr_ent
 "}
 node: {title: "t15" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -170,23 +180,29 @@ mode: Is,
 size: 32b,
 "}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "e20" targetname: "t18"class: 3 label: "type" color: red}
 edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &c  19"  info1: "mode:    P
 visited: 5
 arity: 0
+kind addr_ent
 "}
 node: {title: "t18" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/class_hierarchy.vcg b/testprograms/ref-results/class_hierarchy.vcg
index d3d9afd..fa45c21 100644 (file)
--- a/testprograms/ref-results/class_hierarchy.vcg
+++ b/testprograms/ref-results/class_hierarchy.vcg
@@ -28,45 +28,42 @@ node: {title: "t12" label: "class PRIMA" info1: "state: layout_undefined
 size: -1b,
 peculiarity: peculiarity_existent
 " color: green}
-node: {title: "e14" label: "ent a" color: yellow
- info1: "
-id: e14
-allocation:  allocation_automatic
-visibility:  visibility_local
-variability: variability_uninitialized
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         a
-ld_name:      no yet set
-offset(bits): -1"
-}
-edge: { sourcename: "t12" targetname: "e14"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent PRIMA_set_a" color: yellow
- info1: "
-id: e17
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         set_a
-ld_name:      PRIMA_set_a
-offset(bits): -1
-irg = g68"
+ info1: "entity set_a (17)
+  type:  set_a (15)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 68
+
+"
 }
 edge: { sourcename: "t12" targetname: "e17"class: 12 label: "member" color:blue}
 node: {title: "e20" label: "ent PRIMA_c" color: yellow
- info1: "
-id: e20
-allocation:  allocation_static
-visibility:  visibility_local
-variability: variability_constant
-volatility:  volatility_non_volatile
-peculiarity:  peculiarity_existent
-name:         c
-ld_name:      PRIMA_c
-offset(bits): -1
-irg = g90"
+ info1: "entity c (20)
+  type:  c (18)
+  owner: PRIMA (12)
+  Does not overwrite other entities.
+  Is not overwriten 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 = 90
+
+"
 }
 edge: { sourcename: "t12" targetname: "e20"class: 12 label: "member" color:blue}
 }