Only save normalized tfp integers in the tfp-cache

[matthijs/master-project/cλash.git] / NormalizeTypes.hs

diff --git a/NormalizeTypes.hs b/NormalizeTypes.hs
index e61570abf05d673f86681ecc5fdde918f5c974a8..56cba91a411666a078e0eed852ffe5c084fea0f9 100644 (file)
--- a/NormalizeTypes.hs
+++ b/NormalizeTypes.hs
@@ -7,23 +7,51 @@ import qualified Control.Monad.Trans.Writer as Writer
 import qualified Control.Monad.Trans.State as State
 import qualified Data.Monoid as Monoid
 import qualified Data.Accessor.Template
 import qualified Control.Monad.Trans.State as State
 import qualified Data.Monoid as Monoid
 import qualified Data.Accessor.Template

+import Data.Accessor
+import qualified Data.Map as Map

 import Debug.Trace
 
 -- GHC API
 import CoreSyn
 import qualified UniqSupply
 import Debug.Trace
 
 -- GHC API
 import CoreSyn
 import qualified UniqSupply

+import qualified VarSet

 import Outputable ( Outputable, showSDoc, ppr )
 
 -- Local imports
 import CoreShow
 import Pretty
 import Outputable ( Outputable, showSDoc, ppr )
 
 -- Local imports
 import CoreShow
 import Pretty

+import VHDLTypes -- For TypeState

 
 data TransformState = TransformState {
 
 data TransformState = TransformState {

-  tsUniqSupply_ :: UniqSupply.UniqSupply
+    tsUniqSupply_ :: UniqSupply.UniqSupply
+  , tsBindings_ :: Map.Map CoreBndr CoreExpr
+  , tsNormalized_ :: VarSet.VarSet -- ^ The binders that have been normalized
+  , tsType_ :: TypeState

 }
 
 $( Data.Accessor.Template.deriveAccessors ''TransformState )
 
 }
 
 $( Data.Accessor.Template.deriveAccessors ''TransformState )
 

-type TransformMonad a = Writer.WriterT Monoid.Any (State.State TransformState) a
+-- A session of multiple transformations over multiple expressions
+type TransformSession = (State.State TransformState)
+-- Wrap a writer around a TransformSession, to run a single transformation
+-- over a single expression and track if the expression was changed.
+type TransformMonad = Writer.WriterT Monoid.Any TransformSession
+

 -- | Transforms a CoreExpr and keeps track if it has changed.
 type Transform = CoreExpr -> TransformMonad CoreExpr
 -- | Transforms a CoreExpr and keeps track if it has changed.
 type Transform = CoreExpr -> TransformMonad CoreExpr

+
+-- Finds the value of a global binding, if available
+getGlobalBind :: CoreBndr -> TransformSession (Maybe CoreExpr)
+getGlobalBind bndr = do
+  bindings <- getA tsBindings
+  return $ Map.lookup bndr bindings 
+
+-- Adds a new global binding with the given value
+addGlobalBind :: CoreBndr -> CoreExpr -> TransformSession ()
+addGlobalBind bndr expr = modA tsBindings (Map.insert bndr expr)
+
+-- Returns a list of all global binders
+getGlobalBinders :: TransformSession [CoreBndr]
+getGlobalBinders = do
+  bindings <- getA tsBindings
+  return $ Map.keys bindings