Really revert all of the recent rotating changes.

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

diff --git a/FlattenTypes.hs b/FlattenTypes.hs
index eba0599e271ce1245c5bf5549814a866d9d9be54..bd6c1d5996cf2a75c6f6b9595444a795684c6e31 100644 (file)
--- a/FlattenTypes.hs
+++ b/FlattenTypes.hs
@@ -3,12 +3,13 @@ module FlattenTypes where
 import qualified Maybe
 import Data.Traversable
 import qualified Data.Foldable as Foldable
-import qualified Control.Monad.State as State
+import qualified Control.Monad.Trans.State as State
 
 import CoreSyn
 import qualified Type
 
 import HsValueMap
+import CoreShow
 
 -- | A signal identifier
 type SignalId = Int
@@ -102,13 +103,30 @@ is_FApp d = case d of
   (FApp _ _ _) -> True
   _ -> False
 
+-- | Which signals are used by the given SigDef?
+sigDefUses :: SigDef -> [SignalId]
+sigDefUses (UncondDef (Left id) _) = [id]
+sigDefUses (UncondDef (Right expr) _) = sigExprUses expr
+sigDefUses (CondDef cond true false _) = [cond, true, false]
+sigDefUses (FApp _ args _) = concat $ map Foldable.toList args
+
 -- | An expression on signals
 data SignalExpr = 
   EqLit SignalId String -- ^ Is the given signal equal to the given (VHDL) literal
-  | Literal String -- ^ A literal value
+  | Literal String (Maybe Type.Type)-- ^ A literal value, with an optional type to cast to
   | Eq SignalId SignalId -- ^ A comparison between to signals
   deriving (Show, Eq)
 
+-- Instantiate Eq for Type, so we can derive Eq for SignalExpr.
+instance Eq Type.Type where
+  (==) = Type.coreEqType
+
+-- | Which signals are used by the given SignalExpr?
+sigExprUses :: SignalExpr -> [SignalId]
+sigExprUses (EqLit id _) = [id]
+sigExprUses (Literal _ _) = []
+sigExprUses (Eq a b) = [a, b]
+
 -- Returns the function used by the given SigDef, if any
 usedHsFunc :: SigDef -> Maybe HsFunction
 usedHsFunc (FApp hsfunc _ _) = Just hsfunc
@@ -122,6 +140,7 @@ data SigUse =
   | SigStateOld StateId  -- | Use as the current internal state
   | SigStateNew StateId  -- | Use as the new internal state
   | SigSubState      -- | Do not use, state variable is used in a subcircuit
+  deriving (Show)
 
 -- | Is this a port signal use?
 isPortSigUse :: SigUse -> Bool
@@ -140,13 +159,21 @@ isInternalSigUse :: SigUse -> Bool
 isInternalSigUse SigInternal = True
 isInternalSigUse _ = False
 
+oldStateId :: SigUse -> Maybe StateId
+oldStateId (SigStateOld id) = Just id
+oldStateId _ = Nothing
+
+newStateId :: SigUse -> Maybe StateId
+newStateId (SigStateNew id) = Just id
+newStateId _ = Nothing
+
 -- | Information on a signal definition
 data SignalInfo = SignalInfo {
   sigName :: Maybe String,
   sigUse  :: SigUse,
   sigTy   :: Type.Type,
   nameHints :: [String]
-}
+} deriving (Show)
 
 -- | A flattened function
 data FlatFunction = FlatFunction {
@@ -154,7 +181,7 @@ data FlatFunction = FlatFunction {
   flat_res    :: SignalMap,
   flat_defs   :: [SigDef],
   flat_sigs   :: [(SignalId, SignalInfo)]
-}
+} deriving (Show)
 
 -- | Lookup a given signal id in a signal map, and return the associated
 --   SignalInfo. Errors out if the signal was not found.