[project @ 1998-12-02 13:17:09 by simonm]

[ghc-hetmet.git] / ghc / compiler / simplCore / SAT.lhs

diff --git a/ghc/compiler/simplCore/SAT.lhs b/ghc/compiler/simplCore/SAT.lhs
index 72c6709..c79a174 100644 (file)
--- a/ghc/compiler/simplCore/SAT.lhs
+++ b/ghc/compiler/simplCore/SAT.lhs
@@ -1,5 +1,5 @@
 %
-% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996
+% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 %************************************************************************
 %*                                                                     *
@@ -38,27 +38,31 @@ Experimental Evidence: Heap: +/- 7%
                       Instrs: Always improves for 2 or more Static Args.
 
 \begin{code}
-#include "HsVersions.h"
-
 module SAT ( doStaticArgs ) where
 
-import Ubiq{-uitous-}
+#include "HsVersions.h"
+
 import Util            ( panic )
 
 doStaticArgs = panic "SAT.doStaticArgs (ToDo)"
 
 {- LATER: to end of file:
 
-import Maybes          ( Maybe(..) )
 import SATMonad
 import Util
 \end{code}
 
 \begin{code}
-doStaticArgs :: [CoreBinding] -> UniqSupply -> [CoreBinding]
+doStaticArgs :: [CoreBind] -> UniqSupply -> [CoreBind]
 
 doStaticArgs binds
-  = initSAT (mapSAT sat_bind binds)
+  = do {
+       beginPass "Static argument";
+       let { binds' = initSAT (mapSAT sat_bind binds) };
+       endPass "Static argument" 
+               False           -- No specific flag for dumping SAT
+               binds'
+    }
   where
     sat_bind (NonRec binder expr)
       = emptyEnvSAT  `thenSAT_`
@@ -165,13 +169,9 @@ satExpr (Let (Rec binds) body)
     mapSAT satExpr rhss                    `thenSAT` \ rhss' ->
     returnSAT (Let (Rec (zipEqual "satExpr:Rec" binders rhss')) body')
 
-satExpr (SCC cc expr)
-  = satExpr expr                   `thenSAT` \ expr2 ->
-    returnSAT (SCC cc expr2)
-
-satExpr (Coerce c ty expr)
+satExpr (Note note expr)
   = satExpr expr                   `thenSAT` \ expr2 ->
-    returnSAT (Coerce c ty expr2)
+    returnSAT (Note note expr2)
 \end{code}
 
 \begin{code}