changed dumper, updated reference files

[r4522]

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
index 4424e1a..4d8fc9d 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
@@ -111,10 +111,10 @@ edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &ARRAY-HEAP_EXAMPLE_main  16"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.ARRAY-HEAP_EXAMPLE_main (17)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 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 6beb993..0615d5f 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg
@@ -133,10 +133,10 @@ edge: { sourcename: "e18" targetname: "n17"label: "value 0"}
 node: {title: "n17" label: "SymC &main  17"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity ARRAY-STACK_EXAMPLE.main (18)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t15" 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 2fb3a5a..d64158a 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
@@ -231,10 +231,10 @@ edge: { sourcename: "e18" targetname: "n17"label: "value 0"}
 node: {title: "n17" label: "SymC &main  17"  info1: "mode:    P
 visited: 2
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity ARRAY-STACK_EXAMPLE.main (18)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t15" 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 7c24542..15d123d 100644 (file)
--- a/testprograms/ref-results/All_graphs.vcg
+++ b/testprograms/ref-results/All_graphs.vcg
@@ -117,10 +117,10 @@ node: {title: "n199n174" label: "SymC &c  174"  info1: "mode:    P
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n199" targetname: "n199n174" label: "0" class:16 priority:10}
 }
@@ -149,8 +149,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" label: "1" class:16 priority:10}
@@ -172,10 +172,10 @@ node: {title: "n193n175" label: "SymC &set_a  175"  info1: "mode:    P
 visited: 51
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n193" targetname: "n193n175" label: "0" class:16 priority:10}
 }

diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg
index f16a4c7..acc874b 100644 (file)
--- a/testprograms/ref-results/All_types.vcg
+++ b/testprograms/ref-results/All_types.vcg
@@ -93,10 +93,10 @@ edge: { sourcename: "e18" targetname: "n17"label: "value 0"}
 node: {title: "n17" label: "SymC &main  17"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity WHILE_EXAMPLE.main (18)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 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 9bd3539..2fc3778 100644 (file)
--- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
@@ -101,17 +101,17 @@ node: {title: "n52" label: "SymC f  52"  info1: "mode:    P
 visited: 9
 irg:     CALL_STR_EXAMPLE_main
 arity: 0
-kind addr_name
-SymConst of type type_unknown
+kind: addr_name
+SymConst of type: type_unknown
 "}
 node: {title: "n51" label: "SymC &constStr  51"  info1: "mode:    P
 visited: 9
 irg:     CALL_STR_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.constStr (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "n44" label: "ProjX 0 44"  info1: "mode:    X
 visited: 9

diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
index 572368e..237d496 100644 (file)
--- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
@@ -165,13 +165,13 @@ start of method of type main_tp
 }
 
 graph: { title: "n20"  label: "Block 20" status:clustered color:yellow
-node: {title: "n77" label: "End  77"  info1: "mode:    X
+node: {title: "n76" label: "End  76"  info1: "mode:    X
 visited: 22
 irg:     ENDLESS_LOOP_EXAMPLE_main
 arity: 2
 "color: blue}
-edge: {sourcename: "n77" targetname: "n36" label: "0" class:13 priority:60 color:red}
-edge: {sourcename: "n77" targetname: "n66" label: "1" }
+edge: {sourcename: "n76" targetname: "n36" label: "0" class:13 priority:60 color:red}
+edge: {sourcename: "n76" targetname: "n66" label: "1" }
 }
 
 }

diff --git a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
index 5753e0a..abab3fc 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
@@ -192,10 +192,10 @@ edge: { sourcename: "e17" targetname: "n16"label: "value 0"}
 node: {title: "n16" label: "SymC &GLOBAL_VAR_main  16"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.GLOBAL_VAR_main (17)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t15" label: "method GLOBAL_VAR_main" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg
index 3da5a63..66c6fbc 100644 (file)
--- a/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg
+++ b/testprograms/ref-results/IF_WHILE_EXAMPLE_main-pure.vcg
@@ -218,4 +218,46 @@ visited: 17
 irg:     IF_WHILE_EXAMPLE_main
 arity: 0
 "color: blue}
-edge: { sourcename: "n77" targetname: "n20" class:2  pri
+edge: { sourcename: "n77" targetname: "n20" class:2  priority:50 linestyle:dotted}
+edge: {sourcename: "n23" targetname: "n26" color: red linestyle: dashed}
+edge: {sourcename: "n23" targetname: "n29" color: red linestyle: dashed}
+edge: {sourcename: "n26" targetname: "n32" color: red linestyle: dashed}
+edge: {sourcename: "n26" targetname: "n22" color: red linestyle: dashed}
+edge: {sourcename: "n32" targetname: "n35" color: red linestyle: dashed}
+edge: {sourcename: "n35" targetname: "n38" color: red linestyle: dashed}
+edge: {sourcename: "n38" targetname: "n45" color: red linestyle: dashed}
+edge: {sourcename: "n38" targetname: "n43" color: red linestyle: dashed}
+edge: {sourcename: "n38" targetname: "n42" color: red linestyle: dashed}
+edge: {sourcename: "n38" targetname: "n41" color: red linestyle: dashed}
+edge: {sourcename: "n38" targetname: "n44" color: red linestyle: dashed}
+edge: {sourcename: "n38" targetname: "n58" color: red linestyle: dashed}
+edge: {sourcename: "n38" targetname: "n53" color: red linestyle: dashed}
+edge: {sourcename: "n45" targetname: "n46" color: red linestyle: dashed}
+edge: {sourcename: "n46" targetname: "n47" color: red linestyle: dashed}
+edge: {sourcename: "n47" targetname: "n38" color: red linestyle: dashed}
+edge: {sourcename: "n43" targetname: "n45" color: red linestyle: dashed}
+edge: {sourcename: "n43" targetname: "n44" color: red linestyle: dashed}
+edge: {sourcename: "n44" targetname: "n60" color: red linestyle: dashed}
+edge: {sourcename: "n60" targetname: "n76" color: red linestyle: dashed}
+edge: {sourcename: "n60" targetname: "n65" color: red linestyle: dashed}
+edge: {sourcename: "n76" targetname: "n20" color: red linestyle: dashed}
+edge: {sourcename: "n20" targetname: "n77" color: red linestyle: dashed}
+edge: {sourcename: "n65" targetname: "n76" color: red linestyle: dashed}
+edge: {sourcename: "n42" targetname: "n43" color: red linestyle: dashed}
+edge: {sourcename: "n41" targetname: "n42" color: red linestyle: dashed}
+edge: {sourcename: "n58" targetname: "n53" color: red linestyle: dashed}
+edge: {sourcename: "n58" targetname: "n65" color: red linestyle: dashed}
+edge: {sourcename: "n53" targetname: "n58" color: red linestyle: dashed}
+edge: {sourcename: "n53" targetname: "n65" color: red linestyle: dashed}
+edge: {sourcename: "n22" targetname: "n26" color: red linestyle: dashed}
+edge: {sourcename: "n22" targetname: "n23" color: red linestyle: dashed}
+edge: {sourcename: "n22" targetname: "n39" color: red linestyle: dashed}
+edge: {sourcename: "n22" targetname: "n29" color: red linestyle: dashed}
+edge: {sourcename: "n22" targetname: "n33" color: red linestyle: dashed}
+edge: {sourcename: "n22" targetname: "n34" color: red linestyle: dashed}
+edge: {sourcename: "n39" targetname: "n41" color: red linestyle: dashed}
+edge: {sourcename: "n39" targetname: "n41" color: red linestyle: dashed}
+edge: {sourcename: "n29" targetname: "n76" color: red linestyle: dashed}
+edge: {sourcename: "n33" targetname: "n58" color: red linestyle: dashed}
+edge: {sourcename: "n34" targetname: "n53" color: red linestyle: dashed}
+}

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
index 6b67eeb..ed61639 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
@@ -179,8 +179,8 @@ node: {title: "n43" label: "SymC PRIMA_INLINE size  43"  info1: "mode:    Iu
 visited: 26
 irg:     OO_INLINE_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 node: {title: "n42" label: "0x5Is  42"  info1: "mode:    Is
 visited: 26
@@ -259,10 +259,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA_INLINE.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -305,10 +305,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA_INLINE.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" label: "method c" info1: "state: layout_fixed,
 mode: P,
@@ -343,10 +343,10 @@ edge: { sourcename: "e26" targetname: "n25"label: "value 0"}
 node: {title: "n25" label: "SymC &OO_INLINE_EXAMPLE_main  25"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.OO_INLINE_EXAMPLE_main (26)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 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 d34ad33..ff20377 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
@@ -179,8 +179,8 @@ node: {title: "n43" label: "SymC PRIMA_INLINE size  43"  info1: "mode:    Iu
 visited: 25
 irg:     OO_INLINE_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 node: {title: "n42" label: "0x5Is  42"  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 f95855c..dd50d86 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg
@@ -117,10 +117,10 @@ node: {title: "n199n174" label: "SymC &c  174"  info1: "mode:    P
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n199" targetname: "n199n174" label: "0" class:16 priority:10}
 }
@@ -149,8 +149,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" label: "1" class:16 priority:10}
@@ -172,10 +172,10 @@ node: {title: "n193n175" label: "SymC &set_a  175"  info1: "mode:    P
 visited: 34
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n193" targetname: "n193n175" label: "0" class:16 priority:10}
 }

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 34fd3f9..18b6fa3 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg
@@ -90,10 +90,10 @@ node: {title: "n193n175" label: "SymC &set_a  175"  info1: "mode:    P
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n193" targetname: "n193n175" label: "0" class:16 priority:10}
 edge: { sourcename: "n193" targetname: "n191" class:2  priority:50 linestyle:dotted}
@@ -175,10 +175,10 @@ node: {title: "n199n174" label: "SymC &c  174"  info1: "mode:    P
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n199" targetname: "n199n174" label: "0" class:16 priority:10}
 edge: { sourcename: "n199" targetname: "n197" class:2  priority:50 linestyle:dotted}
@@ -280,8 +280,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 32
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" label: "1" class:16 priority:10}

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 9488fe6..6af7bd7 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
@@ -90,10 +90,10 @@ node: {title: "n193n175" label: "SymC &set_a  175"  info1: "mode:    P
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n193" targetname: "n193n175" label: "0" class:16 priority:10}
 edge: { sourcename: "n193" targetname: "n191" class:2  priority:50 linestyle:dotted}
@@ -175,10 +175,10 @@ node: {title: "n199n174" label: "SymC &c  174"  info1: "mode:    P
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n199" targetname: "n199n174" label: "0" class:16 priority:10}
 edge: { sourcename: "n199" targetname: "n197" class:2  priority:50 linestyle:dotted}
@@ -280,8 +280,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 36
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" label: "1" class:16 priority:10}
@@ -513,10 +513,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 39
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -559,10 +559,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 40
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" label: "method c" info1: "state: layout_fixed,
 mode: P,
@@ -597,10 +597,10 @@ edge: { sourcename: "e26" targetname: "n25"label: "value 0"}
 node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main  25"  info1: "mode:    P
 visited: 41
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.OO_PROGRAM_EXAMPLE_main (26)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 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 6bbc09d..c6c92cc 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
@@ -95,8 +95,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 20
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" label: "1" class:16 priority:10}
@@ -290,10 +290,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -327,10 +327,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "e26" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
  info1: "entity OO_PROGRAM_EXAMPLE_main (26)
@@ -355,10 +355,10 @@ edge: { sourcename: "e26" targetname: "n25"label: "value 0"}
 node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main  25"  info1: "mode:    P
 visited: 1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.OO_PROGRAM_EXAMPLE_main (26)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 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 e181416..6487596 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg
@@ -95,8 +95,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 18
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" 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 08bcf98..f1760f7 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg
@@ -118,10 +118,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 7
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -155,10 +155,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 7
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "e26" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
  info1: "entity OO_PROGRAM_EXAMPLE_main (26)
@@ -183,10 +183,10 @@ edge: { sourcename: "e26" targetname: "n25"label: "value 0"}
 node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main  25"  info1: "mode:    P
 visited: 7
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.OO_PROGRAM_EXAMPLE_main (26)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 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 cdb5cb4..608f196 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
@@ -117,10 +117,10 @@ node: {title: "n199n174" label: "SymC &c  174"  info1: "mode:    P
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n199" targetname: "n199n174" label: "0" class:16 priority:10}
 }
@@ -149,8 +149,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" label: "1" class:16 priority:10}
@@ -172,10 +172,10 @@ node: {title: "n193n175" label: "SymC &set_a  175"  info1: "mode:    P
 visited: 44
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n193" targetname: "n193n175" label: "0" class:16 priority:10}
 }
@@ -461,10 +461,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 47
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -507,10 +507,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 48
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" label: "method c" info1: "state: layout_fixed,
 mode: P,
@@ -545,10 +545,10 @@ edge: { sourcename: "e26" targetname: "n25"label: "value 0"}
 node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main  25"  info1: "mode:    P
 visited: 49
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.OO_PROGRAM_EXAMPLE_main (26)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 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 413150a..9b4a12d 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg
@@ -174,8 +174,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 23
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" label: "1" class:16 priority:10}
@@ -271,10 +271,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 4
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -308,10 +308,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 4
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "e26" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
  info1: "entity OO_PROGRAM_EXAMPLE_main (26)
@@ -336,10 +336,10 @@ edge: { sourcename: "e26" targetname: "n25"label: "value 0"}
 node: {title: "n25" label: "SymC &OO_PROGRAM_EXAMPLE_main  25"  info1: "mode:    P
 visited: 4
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.OO_PROGRAM_EXAMPLE_main (26)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 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 a4dc255..ef420fe 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
@@ -174,8 +174,8 @@ node: {title: "n45n43" label: "SymC PRIMA size  43"  info1: "mode:    Iu
 visited: 19
 irg:     OO_PROGRAM_EXAMPLE_main
 arity: 0
-kind size
-SymConst of type type_unknown
+kind: size
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n45" targetname: "n37" label: "0" class:17 priority:10 color:blue}
 edge: {sourcename: "n45" targetname: "n45n43" 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 b0cf21b..31adfa6 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
@@ -216,10 +216,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 3
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA_INLINE.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -262,10 +262,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 3
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA_INLINE.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" 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 6a4c906..0a3dd6c 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
@@ -188,10 +188,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 2
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA_INLINE.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -234,10 +234,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 2
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA_INLINE.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" 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 3ab5492..464135c 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
@@ -218,10 +218,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 3
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -264,10 +264,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 3
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" 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 230332e..ff2493f 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-type.vcg
+++ b/testprograms/ref-results/PRIMA_c-type.vcg
@@ -99,10 +99,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 9
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -145,10 +145,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 9
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" 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 da64e3b..9380ed7 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg
@@ -202,10 +202,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 6
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -248,10 +248,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 6
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" 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 56eb09c..9c775cf 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
@@ -202,10 +202,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 2
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -248,10 +248,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 2
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" 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 c9b7c30..05bc58d 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-type.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-type.vcg
@@ -99,10 +99,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 8
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -145,10 +145,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 8
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" 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 3378c57..8d8a544 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
@@ -188,10 +188,10 @@ edge: { sourcename: "e20" targetname: "n19"label: "value 0"}
 node: {title: "n19" label: "SymC &set_a  19"  info1: "mode:    P
 visited: 5
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.set_a (20)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t18" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
@@ -234,10 +234,10 @@ edge: { sourcename: "e23" targetname: "n22"label: "value 0"}
 node: {title: "n22" label: "SymC &c  22"  info1: "mode:    P
 visited: 5
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity PRIMA.c (23)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "t21" label: "method c" info1: "state: layout_fixed,
 mode: P,

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg
index 56f89c4..5901ebb 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg
@@ -109,10 +109,10 @@ node: {title: "n550n62" label: "SymC &a2  62"  info1: "mode:    P
 visited: 37
 irg:     STRENGTH_RED_EXAMPLE_m1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a2 (32)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n550" targetname: "n550n62" label: "0" class:16 priority:10}
 edge: {sourcename: "n550" targetname: "n551" label: "1" class:16 priority:10}
@@ -125,10 +125,10 @@ node: {title: "n542n61" label: "SymC &a  61"  info1: "mode:    P
 visited: 37
 irg:     STRENGTH_RED_EXAMPLE_m1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (31)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n542" targetname: "n542n61" label: "0" class:16 priority:10}
 edge: {sourcename: "n542" targetname: "n543" label: "1" class:16 priority:10}
@@ -141,10 +141,10 @@ node: {title: "n559n61" label: "SymC &a  61"  info1: "mode:    P
 visited: 37
 irg:     STRENGTH_RED_EXAMPLE_m1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (31)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n559" targetname: "n559n61" label: "0" class:16 priority:10}
 edge: {sourcename: "n559" targetname: "n555" label: "1" class:16 priority:10}

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1.vcg
index cc734a6..02c79d6 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1.vcg
@@ -222,10 +222,10 @@ node: {title: "n67n62" label: "SymC &a2  62"  info1: "mode:    P
 visited: 26
 irg:     STRENGTH_RED_EXAMPLE_m1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a2 (32)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n67" targetname: "n67n62" label: "0" class:16 priority:10}
 edge: {sourcename: "n67" targetname: "n66" label: "1" class:1  priority:50}
@@ -251,10 +251,10 @@ node: {title: "n65n61" label: "SymC &a  61"  info1: "mode:    P
 visited: 26
 irg:     STRENGTH_RED_EXAMPLE_m1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (31)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n65" targetname: "n65n61" label: "0" class:16 priority:10}
 edge: {sourcename: "n65" targetname: "n64" label: "1" class:1  priority:50}
@@ -323,10 +323,10 @@ node: {title: "n107n61" label: "SymC &a  61"  info1: "mode:    P
 visited: 26
 irg:     STRENGTH_RED_EXAMPLE_m1
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (31)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n107" targetname: "n107n61" label: "0" class:16 priority:10}
 edge: {sourcename: "n107" targetname: "n106" label: "1" class:1  priority:50}

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2-strength_reduced.vcg
index 35c913f..52dd0c2 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2-strength_reduced.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2-strength_reduced.vcg
@@ -224,10 +224,10 @@ node: {title: "n564n151" label: "SymC &a  151"  info1: "mode:    P
 visited: 28
 irg:     STRENGTH_RED_EXAMPLE_m2
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (135)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "n564n163" label: "0xDIs  163"  info1: "mode:    Is
 visited: 28

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2.vcg
index 474ce18..2f54dab 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m2.vcg
@@ -191,10 +191,10 @@ node: {title: "n170n151" label: "SymC &a  151"  info1: "mode:    P
 visited: 17
 irg:     STRENGTH_RED_EXAMPLE_m2
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (135)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n170" targetname: "n168" label: "0" class:1  priority:50}
 edge: {sourcename: "n170" targetname: "n170n151" label: "1" class:16 priority:10}

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3-strength_reduced.vcg
index 2366e8e..ad1bf0e 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3-strength_reduced.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3-strength_reduced.vcg
@@ -244,10 +244,10 @@ node: {title: "n590n216" label: "SymC &a  216"  info1: "mode:    P
 visited: 28
 irg:     STRENGTH_RED_EXAMPLE_m3
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (200)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "n590n228" label: "0x4Is  228"  info1: "mode:    Is
 visited: 28

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3.vcg
index e88e116..484ef7d 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m3.vcg
@@ -224,10 +224,10 @@ node: {title: "n233n216" label: "SymC &a  216"  info1: "mode:    P
 visited: 17
 irg:     STRENGTH_RED_EXAMPLE_m3
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (200)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n233" targetname: "n231" label: "0" class:1  priority:50}
 edge: {sourcename: "n233" targetname: "n233n216" label: "1" class:16 priority:10}

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4-strength_reduced.vcg
index 5b5d794..2ed376e 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4-strength_reduced.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4-strength_reduced.vcg
@@ -239,10 +239,10 @@ node: {title: "n618n282" label: "SymC &a  282"  info1: "mode:    P
 visited: 32
 irg:     STRENGTH_RED_EXAMPLE_m4
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (266)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "n618n295" label: "0x8Is  295"  info1: "mode:    Is
 visited: 32
@@ -281,10 +281,10 @@ node: {title: "n612n282" label: "SymC &a  282"  info1: "mode:    P
 visited: 32
 irg:     STRENGTH_RED_EXAMPLE_m4
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (266)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "n612n294" label: "0x4Is  294"  info1: "mode:    Is
 visited: 32

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4.vcg
index 1b7f2e6..06a9b0c 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m4.vcg
@@ -193,10 +193,10 @@ node: {title: "n300n282" label: "SymC &a  282"  info1: "mode:    P
 visited: 21
 irg:     STRENGTH_RED_EXAMPLE_m4
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (266)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n300" targetname: "n298" label: "0" class:1  priority:50}
 edge: {sourcename: "n300" targetname: "n300n282" label: "1" class:16 priority:10}
@@ -222,10 +222,10 @@ node: {title: "n306n282" label: "SymC &a  282"  info1: "mode:    P
 visited: 21
 irg:     STRENGTH_RED_EXAMPLE_m4
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (266)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n306" targetname: "n306n282" label: "0" class:16 priority:10}
 edge: {sourcename: "n306" targetname: "n305" label: "1" class:1  priority:50}

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5-strength_reduced.vcg
index 18126e5..1ba3492 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5-strength_reduced.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5-strength_reduced.vcg
@@ -204,10 +204,10 @@ node: {title: "n648n349" label: "SymC &a  349"  info1: "mode:    P
 visited: 27
 irg:     STRENGTH_RED_EXAMPLE_m5
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (333)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "n648n646" label: "0xFFFFFFFCIs  646"  info1: "mode:    Is
 visited: 27

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5.vcg
index 4cf0f2b..974026f 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m5.vcg
@@ -210,10 +210,10 @@ node: {title: "n368n349" label: "SymC &a  349"  info1: "mode:    P
 visited: 16
 irg:     STRENGTH_RED_EXAMPLE_m5
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (333)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n368" targetname: "n366" label: "0" class:1  priority:50}
 edge: {sourcename: "n368" targetname: "n368n349" label: "1" class:16 priority:10}

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m6-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m6-strength_reduced.vcg
index a151611..4a952d9 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m6-strength_reduced.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m6-strength_reduced.vcg
@@ -217,10 +217,10 @@ node: {title: "n673n415" label: "SymC &a  415"  info1: "mode:    P
 visited: 27
 irg:     STRENGTH_RED_EXAMPLE_m6
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (399)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "n673n671" label: "0xFFFFFFFCIs  671"  info1: "mode:    Is
 visited: 27

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m6.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m6.vcg
index 6b7eb99..e6fc8a8 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m6.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m6.vcg
@@ -223,10 +223,10 @@ node: {title: "n433n415" label: "SymC &a  415"  info1: "mode:    P
 visited: 16
 irg:     STRENGTH_RED_EXAMPLE_m6
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (399)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n433" targetname: "n431" label: "0" class:1  priority:50}
 edge: {sourcename: "n433" targetname: "n433n415" label: "1" class:16 priority:10}

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m7-strength_reduced.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m7-strength_reduced.vcg
index ef364d2..b43c7d5 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m7-strength_reduced.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m7-strength_reduced.vcg
@@ -211,10 +211,10 @@ node: {title: "n701n482" label: "SymC &a  482"  info1: "mode:    P
 visited: 28
 irg:     STRENGTH_RED_EXAMPLE_m7
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (465)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 node: {title: "n701n699" label: "0x5CIs  699"  info1: "mode:    Is
 visited: 28

diff --git a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m7.vcg b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m7.vcg
index c3d336a..1598e91 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m7.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m7.vcg
@@ -178,10 +178,10 @@ node: {title: "n501n482" label: "SymC &a  482"  info1: "mode:    P
 visited: 17
 irg:     STRENGTH_RED_EXAMPLE_m7
 arity: 0
-kind addr_ent
+kind: addr_ent
 entity GlobalType.a (465)
 
-SymConst of type type_unknown
+SymConst of type: type_unknown
 "}
 edge: {sourcename: "n501" targetname: "n499" label: "0" class:1  priority:50}
 edge: {sourcename: "n501" targetname: "n501n482" label: "1" class:16 priority:10}

diff --git a/testprograms/ref-results/run-result.txt b/testprograms/ref-results/run-result.txt
index a76fe9e..e791c32 100644 (file)
--- a/testprograms/ref-results/run-result.txt
+++ b/testprograms/ref-results/run-result.txt
@@ -100,6 +100,13 @@ use xvcg to view this graph:
 /ben/goetz/bin/xvcg GRAPHNAME
 
 
+Creating an IR graph: IF_WHILE_EXAMPLE...
+Optimizing ...
+Done building the graph.  Dumping it with out-edges.
+Use xvcg to view this graph:
+/ben/goetz/bin/xvcg GRAPHNAME
+
+
 Creating type information for INHERITANCE_EXAMPLE ...
 Done building the graph.  Dumping it.
 use xvcg to view this graph: