HEX output differs, correct global vars

[r1096]

diff --git a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
index 1e498f1..11a10ad 100644 (file)
--- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
@@ -30,7 +30,7 @@ edge: {sourcename: "n36" targetname: "n35" label: "0" color: red}
 node: {title: "n35" label: "ProjX 0 35" color: yellow}
 edge: {sourcename: "n35" targetname: "n37" label: "0" color: red}
 node: {title: "n37" label: "Start  37" color: blue}
-node: {title: "n40" label: "Hello world!P  40" color: yellow}
+node: {title: "n40" label: "!!TODO: BROKEN TEST CODEP  40" color: yellow}
 node: {title: "n42" label: "ProjM 1 42" color: yellow}
 edge: {sourcename: "n42" targetname: "n37" label: "0" color: blue}
 }

diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg
index aad147f..557f381 100644 (file)
--- a/testprograms/ref-results/COND_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg
@@ -63,7 +63,7 @@ node: {title: "n55" label: "ProjX 0 55" color: yellow}
 edge: {sourcename: "n55" targetname: "n57" label: "0" color: red}
 node: {title: "n57" label: "Start  57" color: blue}
 node: {title: "n61" label: "0x0Is  61" color: yellow}
-node: {title: "n66" label: "0xaIs  66" color: yellow}
+node: {title: "n66" label: "0xAIs  66" color: yellow}
 node: {title: "n68" label: "ProjT 4 68" color: yellow}
 edge: {sourcename: "n68" targetname: "n57" label: "0" }
 node: {title: "n72" label: "0x2Is  72" color: yellow}

diff --git a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
index 2cab73d..6ddf120 100644 (file)
--- a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
@@ -25,7 +25,7 @@ edge: {sourcename: "n39" targetname: "n38" label: "0" color: red}
 node: {title: "n38" label: "ProjX 0 38" color: yellow}
 edge: {sourcename: "n38" targetname: "n40" label: "0" color: red}
 node: {title: "n40" label: "Start  40" color: blue}
-node: {title: "n41" label: "0xcIs  41" color: yellow}
+node: {title: "n41" label: "0xCIs  41" color: yellow}
 node: {title: "n42" label: "ProjM 1 42" color: yellow}
 edge: {sourcename: "n42" targetname: "n40" label: "0" color: blue}
 }

diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
index 9ae0aaa..863d60c 100644 (file)
--- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
@@ -7,52 +7,56 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n63"  label: "63" status:clustered color:yellow
-node: {title: "n62" label: "End  62" color: blue}
-edge: {sourcename: "n62" targetname: "n68" label: "0" color: red}
-edge: {sourcename: "n62" targetname: "n74" label: "1" }
+graph: { title: "n64"  label: "64" status:clustered color:yellow
+node: {title: "n63" label: "End  63" color: blue}
+edge: {sourcename: "n63" targetname: "n69" label: "0" color: red}
+edge: {sourcename: "n63" targetname: "n75" label: "1" }
 }
 
-graph: { title: "n68"  label: "68" status:clustered color:yellow
-edge: {sourcename: "n68" targetname: "n72" label: "0" color: red}
-edge: {sourcename: "n68" targetname: "n69" label: "1" color: red}
-node: {title: "n74" label: "PhiM  74" color: green}
-edge: {sourcename: "n74" targetname: "n85" label: "0" color: blue}
-edge: {sourcename: "n74" targetname: "n75" label: "1" color: blue}
-node: {title: "n69" label: "Jmp  69" }
-node: {title: "n75" label: "ProjM 0 75" color: yellow}
-edge: {sourcename: "n75" targetname: "n76" label: "0" color: blue}
-node: {title: "n76" label: "Store  76" }
-edge: {sourcename: "n76" targetname: "n74" label: "0" color: blue}
-edge: {sourcename: "n76" targetname: "n83" label: "1" }
-edge: {sourcename: "n76" targetname: "n78" label: "2" }
-node: {title: "n78" label: "PhiIs  78" color: green}
-edge: {sourcename: "n78" targetname: "n81" label: "0" }
-edge: {sourcename: "n78" targetname: "n79" label: "1" }
+graph: { title: "n69"  label: "69" status:clustered color:yellow
+edge: {sourcename: "n69" targetname: "n73" label: "0" color: red}
+edge: {sourcename: "n69" targetname: "n70" label: "1" color: red}
+node: {title: "n75" label: "PhiM  75" color: green}
+edge: {sourcename: "n75" targetname: "n87" label: "0" color: blue}
+edge: {sourcename: "n75" targetname: "n76" label: "1" color: blue}
+node: {title: "n70" label: "Jmp  70" }
+node: {title: "n76" label: "ProjM 0 76" color: yellow}
+edge: {sourcename: "n76" targetname: "n77" label: "0" color: blue}
+node: {title: "n77" label: "Store  77" }
+edge: {sourcename: "n77" targetname: "n75" label: "0" color: blue}
+edge: {sourcename: "n77" targetname: "n84" label: "1" }
+edge: {sourcename: "n77" targetname: "n79" label: "2" }
 node: {title: "n79" label: "PhiIs  79" color: green}
-edge: {sourcename: "n79" targetname: "n80" label: "0" }
-edge: {sourcename: "n79" targetname: "n78" label: "1" }
+edge: {sourcename: "n79" targetname: "n82" label: "0" }
+edge: {sourcename: "n79" targetname: "n80" label: "1" }
+node: {title: "n80" label: "PhiIs  80" color: green}
+edge: {sourcename: "n80" targetname: "n81" label: "0" }
+edge: {sourcename: "n80" targetname: "n79" label: "1" }
+node: {title: "n84" label: "Sel VAR_A 84" }
+edge: {sourcename: "n84" targetname: "n75" label: "0" color: blue}
+edge: {sourcename: "n84" targetname: "n85" label: "1" }
 }
 
-graph: { title: "n73"  label: "73" status:clustered color:yellow
-edge: {sourcename: "n73" targetname: "n66" label: "0" color: red}
-node: {title: "n72" label: "Jmp  72" }
-node: {title: "n81" label: "ProjIs 0 81" color: yellow}
-edge: {sourcename: "n81" targetname: "n82" label: "0" }
+graph: { title: "n74"  label: "74" status:clustered color:yellow
+edge: {sourcename: "n74" targetname: "n67" label: "0" color: red}
+node: {title: "n73" label: "Jmp  73" }
+node: {title: "n82" label: "ProjIs 0 82" color: yellow}
+edge: {sourcename: "n82" targetname: "n83" label: "0" }
 }
 
-graph: { title: "n65"  label: "65" status:clustered color:yellow
-edge: {sourcename: "n65" targetname: "n66" label: "0" color: red}
-node: {title: "n66" label: "ProjX 0 66" color: yellow}
+graph: { title: "n66"  label: "66" status:clustered color:yellow
 edge: {sourcename: "n66" targetname: "n67" label: "0" color: red}
-node: {title: "n67" label: "Start  67" color: blue}
-node: {title: "n80" label: "0x1Is  80" color: yellow}
-node: {title: "n82" label: "ProjT 4 82" color: yellow}
-edge: {sourcename: "n82" targetname: "n67" label: "0" }
-node: {title: "n83" label: "VAR_AP  83" color: yellow}
-node: {title: "n85" label: "ProjM 1 85" color: yellow}
-edge: {sourcename: "n85" targetname: "n67" label: "0" color: blue}
+node: {title: "n67" label: "ProjX 0 67" color: yellow}
+edge: {sourcename: "n67" targetname: "n68" label: "0" color: red}
+node: {title: "n68" label: "Start  68" color: blue}
+node: {title: "n81" label: "0x1Is  81" color: yellow}
+node: {title: "n83" label: "ProjT 4 83" color: yellow}
+edge: {sourcename: "n83" targetname: "n68" label: "0" }
+node: {title: "n85" label: "ProjP 3 85" color: yellow}
+edge: {sourcename: "n85" targetname: "n68" label: "0" }
+node: {title: "n87" label: "ProjM 1 87" color: yellow}
+edge: {sourcename: "n87" targetname: "n68" label: "0" color: blue}
 }
 
-node: {title: "n64" label: "Bad  64" }
+node: {title: "n65" label: "Bad  65" }
 }

diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
index 9a90a64..dda0783 100644 (file)
--- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
@@ -7,99 +7,105 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n65"  label: "65" status:clustered color:yellow
-edge: {sourcename: "n65" targetname: "n66" label: "0" color: red}
-node: {title: "n64" label: "End  64" color: blue}
-}
-
 graph: { title: "n67"  label: "67" status:clustered color:yellow
 edge: {sourcename: "n67" targetname: "n68" label: "0" color: red}
-node: {title: "n66" label: "Return  66" }
-edge: {sourcename: "n66" targetname: "n101" label: "0" color: blue}
-edge: {sourcename: "n66" targetname: "n99" label: "1" }
-node: {title: "n99" label: "ProjIu 2 99" color: yellow}
-edge: {sourcename: "n99" targetname: "n100" label: "0" }
-node: {title: "n100" label: "Load  100" }
-edge: {sourcename: "n100" targetname: "n81" label: "0" color: blue}
-edge: {sourcename: "n100" targetname: "n76" label: "1" }
-node: {title: "n101" label: "ProjM 0 101" color: yellow}
-edge: {sourcename: "n101" targetname: "n100" label: "0" color: blue}
+node: {title: "n66" label: "End  66" color: blue}
 }
 
 graph: { title: "n69"  label: "69" status:clustered color:yellow
-edge: {sourcename: "n69" targetname: "n98" label: "0" color: red}
-edge: {sourcename: "n69" targetname: "n70" label: "1" color: red}
-node: {title: "n68" label: "ProjX 1 68" color: yellow}
-edge: {sourcename: "n68" targetname: "n71" label: "0" color: red}
-node: {title: "n70" label: "ProjX 0 70" color: yellow}
-edge: {sourcename: "n70" targetname: "n71" label: "0" color: red}
-node: {title: "n71" label: "Cond  71" }
-edge: {sourcename: "n71" targetname: "n72" label: "0" }
-node: {title: "n72" label: "Projb Gt 72" color: yellow}
-edge: {sourcename: "n72" targetname: "n73" label: "0" }
-node: {title: "n73" label: "CmpT  73" }
-edge: {sourcename: "n73" targetname: "n96" label: "0" }
-edge: {sourcename: "n73" targetname: "n74" label: "1" }
-node: {title: "n74" label: "ProjIu 2 74" color: yellow}
+edge: {sourcename: "n69" targetname: "n70" label: "0" color: red}
+node: {title: "n68" label: "Return  68" }
+edge: {sourcename: "n68" targetname: "n104" label: "0" color: blue}
+edge: {sourcename: "n68" targetname: "n102" label: "1" }
+node: {title: "n102" label: "ProjIu 2 102" color: yellow}
+edge: {sourcename: "n102" targetname: "n103" label: "0" }
+node: {title: "n103" label: "Load  103" }
+edge: {sourcename: "n103" targetname: "n86" label: "0" color: blue}
+edge: {sourcename: "n103" targetname: "n78" label: "1" }
+node: {title: "n104" label: "ProjM 0 104" color: yellow}
+edge: {sourcename: "n104" targetname: "n103" label: "0" color: blue}
+}
+
+graph: { title: "n71"  label: "71" status:clustered color:yellow
+edge: {sourcename: "n71" targetname: "n101" label: "0" color: red}
+edge: {sourcename: "n71" targetname: "n72" label: "1" color: red}
+node: {title: "n70" label: "ProjX 1 70" color: yellow}
+edge: {sourcename: "n70" targetname: "n73" label: "0" color: red}
+node: {title: "n72" label: "ProjX 0 72" color: yellow}
+edge: {sourcename: "n72" targetname: "n73" label: "0" color: red}
+node: {title: "n73" label: "Cond  73" }
+edge: {sourcename: "n73" targetname: "n74" label: "0" }
+node: {title: "n74" label: "Projb Gt 74" color: yellow}
 edge: {sourcename: "n74" targetname: "n75" label: "0" }
-node: {title: "n75" label: "Load  75" }
-edge: {sourcename: "n75" targetname: "n80" label: "0" color: blue}
+node: {title: "n75" label: "CmpT  75" }
+edge: {sourcename: "n75" targetname: "n100" label: "0" }
 edge: {sourcename: "n75" targetname: "n76" label: "1" }
-node: {title: "n80" label: "PhiM  80" color: green}
-edge: {sourcename: "n80" targetname: "n90" label: "0" color: blue}
-edge: {sourcename: "n80" targetname: "n81" label: "1" color: blue}
-node: {title: "n81" label: "ProjM 0 81" color: yellow}
-edge: {sourcename: "n81" targetname: "n82" label: "0" color: blue}
-node: {title: "n82" label: "Store  82" }
-edge: {sourcename: "n82" targetname: "n84" label: "0" color: blue}
-edge: {sourcename: "n82" targetname: "n83" label: "1" }
-edge: {sourcename: "n82" targetname: "n74" label: "2" }
-node: {title: "n84" label: "ProjM 0 84" color: yellow}
-edge: {sourcename: "n84" targetname: "n85" label: "0" color: blue}
-node: {title: "n85" label: "Store  85" }
-edge: {sourcename: "n85" targetname: "n89" label: "0" color: blue}
-edge: {sourcename: "n85" targetname: "n76" label: "1" }
-edge: {sourcename: "n85" targetname: "n86" label: "2" }
-node: {title: "n86" label: "ProjIu 2 86" color: yellow}
-edge: {sourcename: "n86" targetname: "n87" label: "0" }
-node: {title: "n87" label: "Load  87" }
-edge: {sourcename: "n87" targetname: "n88" label: "0" color: blue}
-edge: {sourcename: "n87" targetname: "n83" label: "1" }
-node: {title: "n88" label: "ProjM 0 88" color: yellow}
-edge: {sourcename: "n88" targetname: "n75" label: "0" color: blue}
+node: {title: "n76" label: "ProjIu 2 76" color: yellow}
+edge: {sourcename: "n76" targetname: "n77" label: "0" }
+node: {title: "n77" label: "Load  77" }
+edge: {sourcename: "n77" targetname: "n85" label: "0" color: blue}
+edge: {sourcename: "n77" targetname: "n78" label: "1" }
+node: {title: "n85" label: "PhiM  85" color: green}
+edge: {sourcename: "n85" targetname: "n95" label: "0" color: blue}
+edge: {sourcename: "n85" targetname: "n86" label: "1" color: blue}
+node: {title: "n86" label: "ProjM 0 86" color: yellow}
+edge: {sourcename: "n86" targetname: "n87" label: "0" color: blue}
+node: {title: "n87" label: "Store  87" }
+edge: {sourcename: "n87" targetname: "n89" label: "0" color: blue}
+edge: {sourcename: "n87" targetname: "n88" label: "1" }
+edge: {sourcename: "n87" targetname: "n76" label: "2" }
 node: {title: "n89" label: "ProjM 0 89" color: yellow}
-edge: {sourcename: "n89" targetname: "n87" label: "0" color: blue}
+edge: {sourcename: "n89" targetname: "n90" label: "0" color: blue}
+node: {title: "n90" label: "Store  90" }
+edge: {sourcename: "n90" targetname: "n94" label: "0" color: blue}
+edge: {sourcename: "n90" targetname: "n78" label: "1" }
+edge: {sourcename: "n90" targetname: "n91" label: "2" }
+node: {title: "n91" label: "ProjIu 2 91" color: yellow}
+edge: {sourcename: "n91" targetname: "n92" label: "0" }
+node: {title: "n92" label: "Load  92" }
+edge: {sourcename: "n92" targetname: "n93" label: "0" color: blue}
+edge: {sourcename: "n92" targetname: "n88" label: "1" }
+node: {title: "n93" label: "ProjM 0 93" color: yellow}
+edge: {sourcename: "n93" targetname: "n77" label: "0" color: blue}
+node: {title: "n94" label: "ProjM 0 94" color: yellow}
+edge: {sourcename: "n94" targetname: "n92" label: "0" color: blue}
 }
 
-graph: { title: "n91"  label: "91" status:clustered color:yellow
-edge: {sourcename: "n91" targetname: "n78" label: "0" color: red}
-node: {title: "n90" label: "ProjM 0 90" color: yellow}
-edge: {sourcename: "n90" targetname: "n92" label: "0" color: blue}
-node: {title: "n92" label: "Store  92" }
-edge: {sourcename: "n92" targetname: "n94" label: "0" color: blue}
-edge: {sourcename: "n92" targetname: "n83" label: "1" }
-edge: {sourcename: "n92" targetname: "n93" label: "2" }
-node: {title: "n94" label: "ProjM 0 94" color: yellow}
-edge: {sourcename: "n94" targetname: "n95" label: "0" color: blue}
-node: {title: "n95" label: "Store  95" }
-edge: {sourcename: "n95" targetname: "n97" label: "0" color: blue}
-edge: {sourcename: "n95" targetname: "n76" label: "1" }
-edge: {sourcename: "n95" targetname: "n96" label: "2" }
-node: {title: "n98" label: "Jmp  98" }
+graph: { title: "n79"  label: "79" status:clustered color:yellow
+edge: {sourcename: "n79" targetname: "n80" label: "0" color: red}
+node: {title: "n78" label: "Sel VAR_A 78" }
+edge: {sourcename: "n78" targetname: "n84" label: "0" color: blue}
+edge: {sourcename: "n78" targetname: "n83" label: "1" }
+node: {title: "n88" label: "Sel VAR_B 88" }
+edge: {sourcename: "n88" targetname: "n84" label: "0" color: blue}
+edge: {sourcename: "n88" targetname: "n83" label: "1" }
+node: {title: "n95" label: "ProjM 0 95" color: yellow}
+edge: {sourcename: "n95" targetname: "n96" label: "0" color: blue}
+node: {title: "n96" label: "Store  96" }
+edge: {sourcename: "n96" targetname: "n98" label: "0" color: blue}
+edge: {sourcename: "n96" targetname: "n88" label: "1" }
+edge: {sourcename: "n96" targetname: "n97" label: "2" }
+node: {title: "n98" label: "ProjM 0 98" color: yellow}
+edge: {sourcename: "n98" targetname: "n99" label: "0" color: blue}
+node: {title: "n99" label: "Store  99" }
+edge: {sourcename: "n99" targetname: "n84" label: "0" color: blue}
+edge: {sourcename: "n99" targetname: "n78" label: "1" }
+edge: {sourcename: "n99" targetname: "n100" label: "2" }
+node: {title: "n101" label: "Jmp  101" }
 }
 
-graph: { title: "n77"  label: "77" status:clustered color:yellow
-edge: {sourcename: "n77" targetname: "n78" label: "0" color: red}
-node: {title: "n76" label: "VAR_AP  76" color: yellow}
-node: {title: "n78" label: "ProjX 0 78" color: yellow}
-edge: {sourcename: "n78" targetname: "n79" label: "0" color: red}
-node: {title: "n79" label: "Start  79" color: blue}
-node: {title: "n83" label: "VAR_BP  83" color: yellow}
-node: {title: "n93" label: "0x1Iu  93" color: yellow}
-node: {title: "n96" label: "0x0Iu  96" color: yellow}
-node: {title: "n97" label: "ProjM 1 97" color: yellow}
-edge: {sourcename: "n97" targetname: "n79" label: "0" color: blue}
+graph: { title: "n81"  label: "81" status:clustered color:yellow
+edge: {sourcename: "n81" targetname: "n80" label: "0" color: red}
+node: {title: "n80" label: "ProjX 0 80" color: yellow}
+edge: {sourcename: "n80" targetname: "n82" label: "0" color: red}
+node: {title: "n82" label: "Start  82" color: blue}
+node: {title: "n83" label: "ProjP 3 83" color: yellow}
+edge: {sourcename: "n83" targetname: "n82" label: "0" }
+node: {title: "n84" label: "ProjM 1 84" color: yellow}
+edge: {sourcename: "n84" targetname: "n82" label: "0" color: blue}
+node: {title: "n97" label: "0x1Iu  97" color: yellow}
+node: {title: "n100" label: "0x0Iu  100" color: yellow}
 }
 
-node: {title: "n105" label: "Bad  105" }
+node: {title: "n107" label: "Bad  107" }
 }