--- sml/trunk/src/MLRISC/flowgraph/cfg.sml	2002/03/07 19:49:22	1124
+++ sml/trunk/src/MLRISC/flowgraph/cfg.sml	2002/03/07 21:04:13	1125
@@ -18,12 +18,11 @@
     structure I = I
     structure P = Asm.S.P
     structure C = I.C
-    structure W = Freq
     structure G = Graph
     structure A = Annotations
     structure S = Asm.S
-   
-    type weight = W.freq
+
+    type weight = real
 
     datatype block_kind = 
         START          (* entry node *)
@@ -144,7 +143,7 @@
     fun emitHeader (S.STREAM{comment,annotation,...}) 
                    (BLOCK{id,kind,freq,annotations,...}) = 
        (comment(kindName kind ^"["^Int.toString id^
-                    "] ("^W.toString (!freq)^")");
+                    "] ("^Real.toString (!freq)^")");
         nl();
         app annotation (!annotations)
        ) 
@@ -203,10 +202,10 @@
         (case #entries cfg () of
            [] =>
            let val i     = #new_id cfg ()
-               val start = newStart(i,ref 0)
+               val start = newStart(i,ref 0.0)
                val _     = #add_node cfg (i,start)
                val j     = #new_id cfg ()
-               val stop  = newStop(j,ref 0)
+               val stop  = newStop(j,ref 0.0)
                val _     = #add_node cfg (j,stop) 
            in (*  #add_edge cfg (i,j,EDGE{k=ENTRY,w=ref 0,a=ref []}); *)
                #set_entries cfg [i];
@@ -299,7 +298,7 @@
         	  | FLOWSTO	=> "flowsto"
 		(* end case *))
 	  in
-	    F.format "%s(%d)" [F.STR kind, F.INT(!w)]
+	    F.format "%s(%d)" [F.STR kind, F.REAL(!w)]
 	  end
 
     fun getString f x = let
@@ -324,7 +323,7 @@
 	    | prList (h::t) = (pr (h ^ ", "); prList t)
 	  val Asm.S.STREAM{emit,defineLabel,annotation,...} = 
         	AsmStream.withStream outS Asm.makeStream []
-	  fun showFreq (ref w) = F.format "[%s]" [F.STR(W.toString w)]
+	  fun showFreq (ref w) = F.format "[%f]" [F.REAL w]
 	  fun showEdge (blknum,e) = 
 		F.format "%d:%s" [F.INT blknum, F.STR(show_edge e)]
 	  fun showSucc (_, x, e) = showEdge(x,e)

<script type="text/javascript">//<![CDATA[
		function toggle_ffErrors() {
			var errorsblock = document.getElementById("ffErrorsBlock");
			var errorsgroup = document.getElementById("ffErrors");
			if (errorsblock.style.display == "none") {
				errorsblock.style.display = "block";
				errorsgroup.style.right = "10px";
			} else {
				errorsblock.style.display = "none";
				errorsgroup.style.right = "300px";
			}
		}
//]]></script>
<div id="ffErrors">
<a href="javascript:toggle_ffErrors();">Click to toggle</a>
<div id="ffErrorsBlock">
	<div class="error">does not end with &lt;/html&gt; tag</div>
	<div class="error">does not end with &lt;/body&gt; tag</div>
	<div class="info">The output has ended thus: = 
 		F.format &quot;%d:%s&quot; [F.INT blknum, F.STR(show_edge e)]
 	  fun showSucc (_, x, e) = showEdge(x,e)</div>
</div></div>
</body></html>