better output of testprograms, warning removed,

pointer removed from output

[r2052]

diff --git a/testprograms/if_while_example.c b/testprograms/if_while_example.c
index dddb2d2..f2558f6 100644 (file)
--- a/testprograms/if_while_example.c
+++ b/testprograms/if_while_example.c
@@ -17,6 +17,7 @@
 # include "irvrfy.h"
 # include "irdump.h"
 # include "firm.h"
+# include "irouts.h"
 
 /**
 *  This file constructs the ir for the following pseudo-program:

diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c
index 8b7fed3..3af3767 100644 (file)
--- a/testprograms/oo_program_example.c
+++ b/testprograms/oo_program_example.c
@@ -247,9 +247,28 @@ main(void)
   /* Touch ld names to distinguish names from oo_inline names. */
   get_entity_ld_ident(proc_set_a_e);
   get_entity_ld_ident(proc_c_e);
+
+
+  dump_all_ir_graphs(dump_ir_graph);
   dump_all_ir_graphs(dump_ir_block_graph);
+  dump_all_ir_graphs(dump_ir_graph_w_types);
   dump_all_ir_graphs(dump_ir_block_graph_w_types);
+  dump_all_ir_graphs(dump_type_graph);
   dump_all_types();
+  dump_class_hierarchy (true);
+
+
+  entity **free_methods;
+  int arr_len;
+  cgana(&arr_len, &free_methods);
+  cg_construct(arr_len, free_methods);
+
+  interprocedural_view = 1;
+  dump_ir_graph(main_irg);
+  dump_ir_block_graph(main_irg);
+  dump_ir_graph_w_types(main_irg);
+  dump_ir_block_graph_w_types(main_irg);
+  dump_all_cg_block_graph();
 
   printf("Use xvcg to view these graphs:\n");
   printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n");

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
index 2f3a273..20b3a95 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae350" label: "ARRAY-HEAP_EXAMPLE_main" status:clustered color:white
+graph: { title: "g32" label: "ARRAY-HEAP_EXAMPLE_main" status:clustered color:white
 graph: { title: "n49"  label: "Block 49" status:clustered color:yellow
 edge: {sourcename: "n49" targetname: "n50" label: "0" color: red}
 node: {title: "n48" label: "End  48" color: blue info1: "visited: 8

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
index be70960..593dd0e 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae410" label: "main" status:clustered color:white
+graph: { title: "g33" label: "main" status:clustered color:white
 graph: { title: "n47"  label: "Block 47" status:clustered color:yellow
 edge: {sourcename: "n47" targetname: "n48" label: "0" color: red}
 node: {title: "n46" label: "End  46" color: blue info1: "visited: 10

diff --git a/testprograms/ref-results/All_graphs.vcg b/testprograms/ref-results/All_graphs.vcg
index 962c89f..347ee80 100644 (file)
--- a/testprograms/ref-results/All_graphs.vcg
+++ b/testprograms/ref-results/All_graphs.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80aea48" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
+graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
 graph: { title: "n108"  label: "Block 108" status:clustered color:yellow
 edge: {sourcename: "n108" targetname: "n109" label: "0" color: red}
 node: {title: "n107" label: "End  107" color: blue info1: "visited: 46
@@ -101,7 +101,7 @@ start of method of type OO_PROGRAM_EXAMPLE_main
 
 }
 
-graph: { title: "0x80b1028" label: "set_a" status:clustered color:white
+graph: { title: "g71" label: "set_a" status:clustered color:white
 graph: { title: "n186"  label: "Block 186" status:clustered color:yellow
 edge: {sourcename: "n186" targetname: "n185" label: "0" color: red}
 node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 46
@@ -154,7 +154,7 @@ start of method of type set_a
 
 }
 
-graph: { title: "0x80b3640" label: "c" status:clustered color:white
+graph: { title: "g94" label: "c" status:clustered color:white
 graph: { title: "n178"  label: "Block 178" status:clustered color:yellow
 edge: {sourcename: "n178" targetname: "n177" label: "0" color: red}
 node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 46

diff --git a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
index d2a5527..f214d0f 100644 (file)
--- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80af6e8" label: "CALL_STR_EXAMPLE_main" status:clustered color:white
+graph: { title: "g45" label: "CALL_STR_EXAMPLE_main" status:clustered color:white
 graph: { title: "n56"  label: "Block 56" status:clustered color:yellow
 edge: {sourcename: "n56" targetname: "n57" label: "0" color: red}
 node: {title: "n55" label: "End  55" color: blue info1: "visited: 6

diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg
index a998128..ae28cea 100644 (file)
--- a/testprograms/ref-results/COND_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae390" label: "main" status:clustered color:white
+graph: { title: "g29" label: "main" status:clustered color:white
 graph: { title: "n61"  label: "Block 61" status:clustered color:yellow
 edge: {sourcename: "n61" targetname: "n62" label: "0" color: red}
 node: {title: "n60" label: "End  60" color: blue info1: "visited: 9

diff --git a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
index a23c416..284f901 100644 (file)
--- a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae290" label: "main" status:clustered color:white
+graph: { title: "g29" label: "main" status:clustered color:white
 graph: { title: "n46"  label: "Block 46" status:clustered color:yellow
 edge: {sourcename: "n46" targetname: "n47" label: "0" color: red}
 node: {title: "n45" label: "End  45" color: blue info1: "visited: 4

diff --git a/testprograms/ref-results/DEAD_BLOCK_main.vcg b/testprograms/ref-results/DEAD_BLOCK_main.vcg
index 6ca2770..238f7ea 100644 (file)
--- a/testprograms/ref-results/DEAD_BLOCK_main.vcg
+++ b/testprograms/ref-results/DEAD_BLOCK_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae2d0" label: "main" status:clustered color:white
+graph: { title: "g29" label: "main" status:clustered color:white
 graph: { title: "n59"  label: "Block 59" status:clustered color:yellow
 edge: {sourcename: "n59" targetname: "n60" label: "0" color: red}
 node: {title: "n58" label: "End  58" color: blue info1: "visited: 9

diff --git a/testprograms/ref-results/EMPTY_main.vcg b/testprograms/ref-results/EMPTY_main.vcg
index a8e0ad2..015f2e4 100644 (file)
--- a/testprograms/ref-results/EMPTY_main.vcg
+++ b/testprograms/ref-results/EMPTY_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ad0f8" label: "EMPTY_main" status:clustered color:white
+graph: { title: "g27" label: "EMPTY_main" status:clustered color:white
 graph: { title: "n16"  label: "Block 16" status:clustered color:yellow
 edge: {sourcename: "n16" targetname: "n30" label: "0" color: red}
 node: {title: "n17" label: "End  17" color: blue info1: "visited: 4

diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
index 9dc4316..dd94c18 100644 (file)
--- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae450" label: "main" status:clustered color:white
+graph: { title: "g29" label: "main" status:clustered color:white
 graph: { title: "n80"  label: "Block 80" status:clustered color:yellow
 edge: {sourcename: "n80" targetname: "n84" label: "0" color: red}
 edge: {sourcename: "n80" targetname: "n81" label: "1" color: red}

diff --git a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg
index 479e588..acc6a96 100644 (file)
--- a/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/FLOAT_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ad150" label: "FLOAT_EXAMPLE_main" status:clustered color:white
+graph: { title: "g28" label: "FLOAT_EXAMPLE_main" status:clustered color:white
 graph: { title: "n17"  label: "Block 17" status:clustered color:yellow
 edge: {sourcename: "n17" targetname: "n32" label: "0" color: red}
 node: {title: "n18" label: "End  18" color: blue info1: "visited: 4

diff --git a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
index d5aca85..07a5a1d 100644 (file)
--- a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae348" label: "GLOBAL_CSE_EXAMPLE_main" status:clustered color:white
+graph: { title: "g28" label: "GLOBAL_CSE_EXAMPLE_main" status:clustered color:white
 graph: { title: "n64"  label: "Block 64" status:clustered color:yellow
 edge: {sourcename: "n64" targetname: "n65" label: "0" color: red}
 node: {title: "n63" label: "End  63" color: blue info1: "visited: 12

diff --git a/testprograms/ref-results/GLOBAL_VAR_main.vcg b/testprograms/ref-results/GLOBAL_VAR_main.vcg
index 44e574c..a7a0405 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae208" label: "GLOBAL_VAR_main" status:clustered color:white
+graph: { title: "g29" label: "GLOBAL_VAR_main" status:clustered color:white
 graph: { title: "n40"  label: "Block 40" status:clustered color:yellow
 edge: {sourcename: "n40" targetname: "n41" label: "0" color: red}
 node: {title: "n39" label: "End  39" color: blue info1: "visited: 7

diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg
index ff9e700..6463f20 100644 (file)
--- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg
+++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-ip.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80aea48" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
+graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
 graph: { title: "n108"  label: "Block 108" status:clustered color:yellow
 edge: {sourcename: "n108" targetname: "n109" label: "0" color: red}
 node: {title: "n107" label: "End  107" color: blue info1: "visited: 31
@@ -101,7 +101,7 @@ start of method of type OO_PROGRAM_EXAMPLE_main
 
 }
 
-graph: { title: "0x80b1028" label: "set_a" status:clustered color:white
+graph: { title: "g71" label: "set_a" status:clustered color:white
 graph: { title: "n186"  label: "Block 186" status:clustered color:yellow
 edge: {sourcename: "n186" targetname: "n185" label: "0" color: red}
 node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 31
@@ -154,7 +154,7 @@ start of method of type set_a
 
 }
 
-graph: { title: "0x80b3640" label: "c" status:clustered color:white
+graph: { title: "g94" label: "c" status:clustered color:white
 graph: { title: "n178"  label: "Block 178" status:clustered color:yellow
 edge: {sourcename: "n178" targetname: "n177" label: "0" color: red}
 node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 31

diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
index 2a3eb22..d68b306 100644 (file)
--- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
+++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80aea48" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
+graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
 graph: { title: "n108"  label: "Block 108" status:clustered color:yellow
 edge: {sourcename: "n108" targetname: "n109" label: "0" color: red}
 node: {title: "n107" label: "End  107" color: blue info1: "visited: 40
@@ -101,7 +101,7 @@ start of method of type OO_PROGRAM_EXAMPLE_main
 
 }
 
-graph: { title: "0x80b1028" label: "set_a" status:clustered color:white
+graph: { title: "g71" label: "set_a" status:clustered color:white
 graph: { title: "n186"  label: "Block 186" status:clustered color:yellow
 edge: {sourcename: "n186" targetname: "n185" label: "0" color: red}
 node: {title: "n192" label: "ProjX 0 192" color: yellow info1: "visited: 40
@@ -154,7 +154,7 @@ start of method of type set_a
 
 }
 
-graph: { title: "0x80b3640" label: "c" status:clustered color:white
+graph: { title: "g94" label: "c" status:clustered color:white
 graph: { title: "n178"  label: "Block 178" status:clustered color:yellow
 edge: {sourcename: "n178" targetname: "n177" label: "0" color: red}
 node: {title: "n198" label: "ProjX 0 198" color: yellow info1: "visited: 40

diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg
index 38befa1..9897b6f 100644 (file)
--- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80aea48" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
+graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
 graph: { title: "n108"  label: "Block 108" status:clustered color:yellow
 edge: {sourcename: "n108" targetname: "n109" label: "0" color: red}
 node: {title: "n107" label: "End  107" color: blue info1: "visited: 20

diff --git a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
index f48e91a..5897006 100644 (file)
--- a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae2a8" label: "IF_ELSE_EXAMPLE_main" status:clustered color:white
+graph: { title: "g28" label: "IF_ELSE_EXAMPLE_main" status:clustered color:white
 graph: { title: "n62"  label: "Block 62" status:clustered color:yellow
 edge: {sourcename: "n62" targetname: "n63" label: "0" color: red}
 node: {title: "n61" label: "End  61" color: blue info1: "visited: 13

diff --git a/testprograms/ref-results/IF_EXAMPLE_main.vcg b/testprograms/ref-results/IF_EXAMPLE_main.vcg
index f7bd191..59e1c2f 100644 (file)
--- a/testprograms/ref-results/IF_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/IF_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae248" label: "IF_EXAMPLE_main" status:clustered color:white
+graph: { title: "g28" label: "IF_EXAMPLE_main" status:clustered color:white
 graph: { title: "n17"  label: "Block 17" status:clustered color:yellow
 edge: {sourcename: "n17" targetname: "n52" label: "0" color: red}
 node: {title: "n18" label: "End  18" color: blue info1: "visited: 8

diff --git a/testprograms/ref-results/IRREGULAR_CF_main.vcg b/testprograms/ref-results/IRREGULAR_CF_main.vcg
index ddb7203..a9077bb 100644 (file)
--- a/testprograms/ref-results/IRREGULAR_CF_main.vcg
+++ b/testprograms/ref-results/IRREGULAR_CF_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae340" label: "main" status:clustered color:white
+graph: { title: "g28" label: "main" status:clustered color:white
 graph: { title: "n65"  label: "Block 65" status:clustered color:yellow
 edge: {sourcename: "n65" targetname: "n66" label: "0" color: red}
 node: {title: "n64" label: "End  64" color: blue info1: "visited: 5

diff --git a/testprograms/ref-results/IRR_LOOP_main.vcg b/testprograms/ref-results/IRR_LOOP_main.vcg
index 91f79d0..863d68f 100644 (file)
--- a/testprograms/ref-results/IRR_LOOP_main.vcg
+++ b/testprograms/ref-results/IRR_LOOP_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae340" label: "main" status:clustered color:white
+graph: { title: "g28" label: "main" status:clustered color:white
 graph: { title: "n62"  label: "Block 62" status:clustered color:yellow
 edge: {sourcename: "n62" targetname: "n63" label: "0" color: red}
 node: {title: "n61" label: "End  61" color: blue info1: "visited: 5

diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
index 168d05c..01418da 100644 (file)
--- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae490" label: "main" status:clustered color:white
+graph: { title: "g29" label: "main" status:clustered color:white
 graph: { title: "n78"  label: "Block 78" status:clustered color:yellow
 edge: {sourcename: "n78" targetname: "n79" label: "0" color: red}
 node: {title: "n77" label: "End  77" color: blue info1: "visited: 15

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
index cb81fa8..b4bf4df 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80aec28" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white
+graph: { title: "g37" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white
 graph: { title: "n200"  label: "Block 200" status:clustered color:yellow
 edge: {sourcename: "n200" targetname: "n202" label: "0" color: red}
 edge: {sourcename: "n200" targetname: "n201" label: "1" color: red}

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
index 2cc4836..13852d2 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80aec28" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white
+graph: { title: "g37" label: "OO_INLINE_EXAMPLE_main" status:clustered color:white
 graph: { title: "n200"  label: "Block 200" status:clustered color:yellow
 edge: {sourcename: "n200" targetname: "n202" label: "0" color: red}
 edge: {sourcename: "n200" targetname: "n201" label: "1" color: red}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
index 076569b..53d71fe 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80aea48" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
+graph: { title: "g37" label: "OO_PROGRAM_EXAMPLE_main" status:clustered color:white
 graph: { title: "n108"  label: "Block 108" status:clustered color:yellow
 edge: {sourcename: "n108" targetname: "n109" label: "0" color: red}
 node: {title: "n107" label: "End  107" color: blue info1: "visited: 16

diff --git a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
index 74e1d73..ed4bea8 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80b3820" label: "c" status:clustered color:white
+graph: { title: "g94" label: "c" status:clustered color:white
 graph: { title: "n248"  label: "Block 248" status:clustered color:yellow
 edge: {sourcename: "n248" targetname: "n250" label: "0" color: red}
 edge: {sourcename: "n248" targetname: "n249" label: "1" color: red}

diff --git a/testprograms/ref-results/PRIMA_INLINE_c.vcg b/testprograms/ref-results/PRIMA_INLINE_c.vcg
index 67f2dc5..c3e9ec9 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_c.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_c.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80b3820" label: "c" status:clustered color:white
+graph: { title: "g94" label: "c" status:clustered color:white
 graph: { title: "n248"  label: "Block 248" status:clustered color:yellow
 edge: {sourcename: "n248" targetname: "n250" label: "0" color: red}
 edge: {sourcename: "n248" targetname: "n249" label: "1" color: red}

diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
index 6baf0e4..a0b4cfd 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80b1208" label: "set_a" status:clustered color:white
+graph: { title: "g71" label: "set_a" status:clustered color:white
 graph: { title: "n225"  label: "Block 225" status:clustered color:yellow
 edge: {sourcename: "n225" targetname: "n226" label: "0" color: red}
 node: {title: "n224" label: "End  224" color: blue info1: "visited: 17

diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg
index 46cf6c4..8ae749c 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80b1208" label: "set_a" status:clustered color:white
+graph: { title: "g71" label: "set_a" status:clustered color:white
 graph: { title: "n225"  label: "Block 225" status:clustered color:yellow
 edge: {sourcename: "n225" targetname: "n226" label: "0" color: red}
 node: {title: "n224" label: "End  224" color: blue info1: "visited: 16

diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg
index ea7c0a4..7c13168 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80b3640" label: "c" status:clustered color:white
+graph: { title: "g94" label: "c" status:clustered color:white
 graph: { title: "n153"  label: "Block 153" status:clustered color:yellow
 edge: {sourcename: "n153" targetname: "n154" label: "0" color: red}
 node: {title: "n152" label: "End  152" color: blue info1: "visited: 13

diff --git a/testprograms/ref-results/PRIMA_c.vcg b/testprograms/ref-results/PRIMA_c.vcg
index 9858f98..75f655c 100644 (file)
--- a/testprograms/ref-results/PRIMA_c.vcg
+++ b/testprograms/ref-results/PRIMA_c.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80b3640" label: "c" status:clustered color:white
+graph: { title: "g94" label: "c" status:clustered color:white
 graph: { title: "n153"  label: "Block 153" status:clustered color:yellow
 edge: {sourcename: "n153" targetname: "n154" label: "0" color: red}
 node: {title: "n152" label: "End  152" color: blue info1: "visited: 9

diff --git a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
index 84f746a..264285b 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80b1028" label: "set_a" status:clustered color:white
+graph: { title: "g71" label: "set_a" status:clustered color:white
 graph: { title: "n135"  label: "Block 135" status:clustered color:yellow
 edge: {sourcename: "n135" targetname: "n136" label: "0" color: red}
 node: {title: "n134" label: "End  134" color: blue info1: "visited: 13

diff --git a/testprograms/ref-results/PRIMA_set_a.vcg b/testprograms/ref-results/PRIMA_set_a.vcg
index e22d968..d99c18b 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a.vcg
+++ b/testprograms/ref-results/PRIMA_set_a.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80b1028" label: "set_a" status:clustered color:white
+graph: { title: "g71" label: "set_a" status:clustered color:white
 graph: { title: "n135"  label: "Block 135" status:clustered color:yellow
 edge: {sourcename: "n135" targetname: "n136" label: "0" color: red}
 node: {title: "n134" label: "End  134" color: blue info1: "visited: 9

diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
index fe76a3a..3079b4b 100644 (file)
--- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae348" label: "THREE_CFPRED_EXAMPLE_main" status:clustered color:white
+graph: { title: "g28" label: "THREE_CFPRED_EXAMPLE_main" status:clustered color:white
 graph: { title: "n77"  label: "Block 77" status:clustered color:yellow
 edge: {sourcename: "n77" targetname: "n78" label: "0" color: red}
 node: {title: "n76" label: "End  76" color: blue info1: "visited: 8

diff --git a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
index d855e75..311bc20 100644 (file)
--- a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae390" label: "main" status:clustered color:white
+graph: { title: "g29" label: "main" status:clustered color:white
 graph: { title: "n67"  label: "Block 67" status:clustered color:yellow
 edge: {sourcename: "n67" targetname: "n68" label: "0" color: red}
 node: {title: "n66" label: "End  66" color: blue info1: "visited: 15

diff --git a/testprograms/ref-results/main.vcg b/testprograms/ref-results/main.vcg
index ac4a8da..f7c13c7 100644 (file)
--- a/testprograms/ref-results/main.vcg
+++ b/testprograms/ref-results/main.vcg
@@ -17,7 +17,7 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-graph: { title: "0x80ae410" label: "main" status:clustered color:white
+graph: { title: "g33" label: "main" status:clustered color:white
 graph: { title: "n47"  label: "Block 47" status:clustered color:yellow
 edge: {sourcename: "n47" targetname: "n48" label: "0" color: red}
 node: {title: "n46" label: "End  46" color: blue info1: "visited: 8