--- sml/trunk/src/compiler/CodeGen/main/machine-gen.sml	2001/12/14 21:01:29	1008
+++ sml/trunk/src/compiler/CodeGen/main/machine-gen.sml	2002/01/09 19:44:22	1009
@@ -47,6 +47,26 @@
    structure MachSpec   = MachSpec
    structure MLTreeComp = MLTreeComp
 
+   (* expand copies into their primitive moves.
+    * Copies are no longer treated as span dependent, which was a hack.
+    *)
+   structure ExpandCpys = 
+     CFGExpandCopies 
+	 (structure CFG = CFG
+	  structure ExpandCopies = 
+	     struct
+		structure I = I
+		fun expandCopies(I.COPY{k, dst, src, tmp, ...}) = 
+		     (case k
+		       of CellsBasis.GP => Shuffle.shuffle{dst=dst, src=src, tmp=tmp} 
+			| CellsBasis.FP => Shuffle.shufflefp{dst=dst, src=src, tmp=tmp}
+			| _ => MLRiscErrorMsg.error ("MachineGen", "expandCopies")
+		     (*esac*))
+		  | expandCopies(I.ANNOTATION{i, ...}) = expandCopies(i)
+		  | expandCopies instr = [instr]
+	     end
+	  )
+
    fun omitFramePointer(cfg as G.GRAPH graph) = let
      val CFG.INFO{annotations, ...} = #graph_info graph 
    in
@@ -62,17 +82,19 @@
    fun phase x = Stats.doPhase (Stats.makePhase x)
    fun makePhase(name,f) = (name, phase name f)
 
-   val mc      = phase "MLRISC BackPatch.bbsched" BackPatch.bbsched
-   val finish  = phase "MLRISC BackPatch.finish" BackPatch.finish
-   val ra      = phase "MLRISC ra" RA.run
-   val omitfp  = phase "MLRISC omit frame pointer" omitFramePointer
+   val mc         = phase "MLRISC BackPatch.bbsched" BackPatch.bbsched
+   val finish     = phase "MLRISC BackPatch.finish" BackPatch.finish
+   val ra         = phase "MLRISC ra" RA.run
+   val omitfp     = phase "MLRISC omit frame pointer" omitFramePointer
+   val expandCpys = phase "MLRISC expand copies" ExpandCpys.run
 
    val raPhase = ("ra",ra)
 
 
    val optimizerHook = 
      ref [("ra", ra),
-	  ("omitfp", omitfp)
+	  ("omitfp", omitfp),
+	  ("expand copies", expandCpys)
 	 ]

<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 [(&quot;ra&quot;, ra),
-	  (&quot;omitfp&quot;, omitfp)
+	  (&quot;omitfp&quot;, omitfp),
+	  (&quot;expand copies&quot;, expandCpys)
 	 ]</div>
</div></div>
</body></html>