blocks and ir_graphs have now info1 (attributes) and info3 (debug info) fields

calling conventions added

strenght reduce bugfixed: places now add code into the right blocks

[r6751]

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 c248cc1..c1707bd 100644 (file)
--- a/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg
+++ b/testprograms/ref-results/STRENGTH_RED_EXAMPLE_m1-strength_reduced.vcg
@@ -54,7 +54,41 @@ colorentry 124:  255 240  240
 colorentry 125:  255 250  250
 
 graph: { title: "g43" label: "STRENGTH_RED_EXAMPLE_m1" status:clustered color:white
+info1: "entity STRENGTH_RED_EXAMPLE_m1 (18)
+  type:  STRENGTH_RED_EXAMPLE_meth_tp (16)
+  owner: GlobalType (0)
+  Does not overwrite other entities.
+  Is not overwritten by other entities.
+  allocation:  allocation_static
+  visibility:  visibility_local
+  variability: variability_constant
+  calling convention: cdecl
+  atomic value: SymC &STRENGTH_RED_EXAMPLE_m1
+  volatility:  volatility_non_volatile
+  peculiarity: peculiarity_existent
+  ld_name: no yet set
+  offset:  -1 bits, -1 bytes
+  irg = 43
+
+"
 graph: { title: "n93"  label: "Block 93" status:clustered color:yellow
+ info1: "Block 93
+  mode:    BB
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   2
+  pred nodes:
+     0:    Proj 55
+     1: be Jmp 114
+  Private Attributes:
+  backedges:  1
+  in loop 539 with depth 1
+  block visited: 2
+  dom depth 4
+  tree pre num 3
+  max subtree pre num 4
+  Execution freqency statistics:
+"
 edge: {sourcename: "n93" targetname: "n55" label: "0" class:13 priority:60 color:red}
 backedge: {sourcename: "n93" targetname: "n114" label: "1" linestyle:dashed class:13 priority:60 color:red}
 node: {title: "n120" label: "PhiM 120"  info1: "Phi 120
@@ -88,32 +122,6 @@ node: {title: "n560" label: "PhiP 560"  info1: "Phi 560
 color: green}
 edge: {sourcename: "n560" targetname: "n562" label: "0" class:16 priority:10}
 edge: {sourcename: "n560" targetname: "n561" label: "1" class:16 priority:10}
-node: {title: "n558" label: "MulIs 558"  info1: "Mul 558
-  mode:    Is
-  visited: 36
-  irg:     STRENGTH_RED_EXAMPLE_m1
-  arity:   2
-  pred nodes:
-    -1:    Block 93
-     0:    0x4 59
-     1:    Phi 92
-  Private Attributes:
-"
-}
-node: {title: "n558n59" label: "0x4Is 59"  info1: "0x4 59
-  mode:    Is
-  visited: 36
-  irg:     STRENGTH_RED_EXAMPLE_m1
-  arity:   0
-  pred nodes:
-    -1:    Block 34
-  Private Attributes:
-  in loop 526 with depth 0
-  Const of type type_unknown
-"
-color: yellow}
-edge: {sourcename: "n558" targetname: "n558n59" label: "0" class:16 priority:10}
-edge: {sourcename: "n558" targetname: "n92" label: "1" class:16 priority:10}
 node: {title: "n100" label: "Jmp 100"  info1: "Jmp 100
   mode:    X
   visited: 36
@@ -128,6 +136,23 @@ node: {title: "n100" label: "Jmp 100"  info1: "Jmp 100
 }
 
 graph: { title: "n47"  label: "Block 47" status:clustered color:yellow
+ info1: "Block 47
+  mode:    BB
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   2
+  pred nodes:
+     0:    Jmp 46
+     1: be Jmp 85
+  Private Attributes:
+  backedges:  1
+  in loop 538 with depth 1
+  block visited: 2
+  dom depth 3
+  tree pre num 2
+  max subtree pre num 5
+  Execution freqency statistics:
+"
 edge: {sourcename: "n47" targetname: "n46" label: "0" class:13 priority:60 color:red}
 backedge: {sourcename: "n47" targetname: "n85" label: "1" linestyle:dashed class:13 priority:60 color:red}
 node: {title: "n91" label: "PhiM 91"  info1: "Phi 91
@@ -234,7 +259,33 @@ node: {title: "n562n61" label: "SymC &a 61"  info1: "SymC &a 61
 "
 }
 edge: {sourcename: "n562" targetname: "n562n61" label: "0" class:16 priority:10}
-edge: {sourcename: "n562" targetname: "n558" label: "1" class:16 priority:10}
+edge: {sourcename: "n562" targetname: "n558" label: "1" class:1  priority:50}
+node: {title: "n558" label: "MulIs 558"  info1: "Mul 558
+  mode:    Is
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   2
+  pred nodes:
+    -1:    Block 47
+     0:    0x4 59
+     1:    Phi 92
+  Private Attributes:
+"
+}
+node: {title: "n558n59" label: "0x4Is 59"  info1: "0x4 59
+  mode:    Is
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   0
+  pred nodes:
+    -1:    Block 34
+  Private Attributes:
+  in loop 526 with depth 0
+  Const of type type_unknown
+"
+color: yellow}
+edge: {sourcename: "n558" targetname: "n558n59" label: "0" class:16 priority:10}
+edge: {sourcename: "n558" targetname: "n92" label: "1" class:1  priority:50}
 node: {title: "n55" label: "ProjX false 55"  info1: "Proj 55
   mode:    X
   visited: 36
@@ -350,6 +401,22 @@ edge: {sourcename: "n92" targetname: "n84" label: "1" class:16 priority:10}
 }
 
 graph: { title: "n44"  label: "Block 44" status:clustered color:yellow
+ info1: "Block 44
+  mode:    BB
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   1
+  pred nodes:
+     0:    Proj 38
+  Private Attributes:
+  backedges:
+  in loop 537 with depth 0
+  block visited: 2
+  dom depth 2
+  tree pre num 1
+  max subtree pre num 5
+  Execution freqency statistics:
+"
 edge: {sourcename: "n44" targetname: "n38" label: "0" class:13 priority:60 color:red}
 node: {title: "n46" label: "Jmp 46"  info1: "Jmp 46
   mode:    X
@@ -365,6 +432,22 @@ node: {title: "n46" label: "Jmp 46"  info1: "Jmp 46
 }
 
 graph: { title: "n57"  label: "Block 57" status:clustered color:yellow
+ info1: "Block 57
+  mode:    BB
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   1
+  pred nodes:
+     0:    Proj 56
+  Private Attributes:
+  backedges:
+  in loop 538 with depth 1
+  block visited: 2
+  dom depth 4
+  tree pre num 5
+  max subtree pre num 5
+  Execution freqency statistics:
+"
 edge: {sourcename: "n57" targetname: "n56" label: "0" class:13 priority:60 color:red}
 node: {title: "n83" label: "ProjM M 83"  info1: "Proj 83
   mode:    M
@@ -594,6 +677,22 @@ edge: {sourcename: "n84" targetname: "n92" label: "1" class:16 priority:10}
 }
 
 graph: { title: "n103"  label: "Block 103" status:clustered color:yellow
+ info1: "Block 103
+  mode:    BB
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   1
+  pred nodes:
+     0:    Jmp 100
+  Private Attributes:
+  backedges:
+  in loop 539 with depth 1
+  block visited: 2
+  dom depth 5
+  tree pre num 4
+  max subtree pre num 4
+  Execution freqency statistics:
+"
 edge: {sourcename: "n103" targetname: "n100" label: "0" class:13 priority:60 color:red}
 node: {title: "n112" label: "ProjM M 112"  info1: "Proj 112
   mode:    M
@@ -679,6 +778,22 @@ node: {title: "n114" label: "Jmp 114"  info1: "Jmp 114
 }
 
 graph: { title: "n32"  label: "Block 32" status:clustered color:yellow
+ info1: "Block 32
+  mode:    BB
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   1
+  pred nodes:
+     0:    Bad 36
+  Private Attributes:
+  backedges:
+  in loop 537 with depth 0
+  block visited: 1
+  dom depth -1
+  tree pre num 0
+  max subtree pre num 0
+  Execution freqency statistics:
+"
 edge: {sourcename: "n32" targetname: "n32n36" label: "0" class:13 priority:60 color:red}
 node: {title: "n33" label: "End 33"  info1: "End 33
   mode:    X
@@ -709,6 +824,22 @@ node: {title: "n32n36" label: "Bad 36"  info1: "Bad 36
 }
 
 graph: { title: "n34"  label: "Block 34" status:clustered color:yellow
+ info1: "Block 34
+  mode:    BB
+  visited: 36
+  irg:     STRENGTH_RED_EXAMPLE_m1
+  arity:   1
+  pred nodes:
+     0:    Proj 38
+  Private Attributes:
+  backedges:
+  in loop 537 with depth 0
+  block visited: 2
+  dom depth 1
+  tree pre num 0
+  max subtree pre num 5
+  Execution freqency statistics:
+"
 edge: {sourcename: "n34" targetname: "n38" label: "0" class:13 priority:60 color:red}
 node: {title: "n41" label: "ProjM 1 41"  info1: "Proj 41
   mode:    M