Create an entity for each function.

The entity does not yet contain the actual VHDL entity, but does contain
the argument / result to port name map.

diff --git a/Pretty.hs b/Pretty.hs
index d4ed8f01d93da2ddcc46be08d6c5f83eed1db487..3797fe2ad1e0f3a45b8a8094e39742b1fa3ac5bd 100644 (file)
--- a/Pretty.hs
+++ b/Pretty.hs
@@ -7,9 +7,13 @@ import qualified HscTypes
 import Text.PrettyPrint.HughesPJClass
 import Outputable ( showSDoc, ppr, Outputable, OutputableBndr)
 
+import qualified ForSyDe.Backend.Ppr
+import qualified ForSyDe.Backend.VHDL.AST as AST
+
 import HsValueMap
 import FlattenTypes
 import TranslatorTypes
+import VHDLTypes
 
 instance Pretty HsFunction where
   pPrint (HsFunction name args res) =
@@ -52,18 +56,33 @@ instance Pretty VHDLSession where
     $+$ text "NameCount: " $$ nest 15 (int nameCount)
     $+$ text "Functions: " $$ nest 15 (vcat (map ppfunc (Map.toList funcs)))
     where
-      ppfunc (hsfunc, (FuncData flatfunc)) =
+      ppfunc (hsfunc, (FuncData flatfunc entity)) =
         pPrint hsfunc $+$ (text "Flattened: " $$ nest 15 (ppffunc flatfunc))
+        $+$ (text "Entity") $$ nest 15 (ppent entity)
       ppffunc (Just f) = pPrint f
       ppffunc Nothing  = text "Nothing"
+      ppent (Just e)   = pPrint e
+      ppent Nothing    = text "Nothing"
       modname = showSDoc $ Module.pprModule (HscTypes.cm_module mod)
 
+instance Pretty Entity where
+  pPrint (Entity args res decl) =
+    text "Args: " $$ nest 10 (pPrint args)
+    $+$ text "Result: " $$ nest 10 (pPrint res)
+    $+$ ppdecl decl
+    where
+      ppdecl Nothing = text "VHDL entity not present"
+      ppdecl (Just _) = text "VHDL entity present"
+
 instance (OutputableBndr b) => Pretty (CoreSyn.Bind b) where
   pPrint (CoreSyn.NonRec b expr) =
     text "NonRec: " $$ nest 10 (prettyBind (b, expr))
   pPrint (CoreSyn.Rec binds) =
     text "Rec: " $$ nest 10 (vcat $ map (prettyBind) binds)
 
+instance Pretty AST.VHDLId where
+  pPrint id = ForSyDe.Backend.Ppr.ppr id
+
 prettyBind :: (Outputable b, Outputable e) => (b, e) -> Doc
 prettyBind (b, expr) =
   text b' <> text " = " <> text expr'

diff --git a/Translator.hs b/Translator.hs
index 6b96ebca98a04566fb07e0adaeec609fc94a5d77..30a71c5a2e68b51ef744ec917fa43f6c150e1a0f 100644 (file)
--- a/Translator.hs
+++ b/Translator.hs
@@ -69,6 +69,7 @@ main =
       -- Create entities and architectures for them
       mapM processBind binds
       modFuncs nameFlatFunction
+      modFuncs VHDL.createEntity
       return $ AST.DesignFile 
         []
         []

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 271a5d39c019b56faab9e2112c6cedcdf13e9e94..75967c2d4c94e1672feed90ea6d1b715cc056c4d 100644 (file)
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -5,9 +5,12 @@
 module TranslatorTypes where
 
 import qualified Control.Monad.State as State
-import qualified HscTypes
 import qualified Data.Map as Map
+
+import qualified HscTypes
+
 import FlattenTypes
+import VHDLTypes
 import HsValueMap
 
 
@@ -17,7 +20,8 @@ type FuncMap  = Map.Map HsFunction FuncData
 
 -- | Some stuff we collect about a function along the way.
 data FuncData = FuncData {
-  flatFunc :: Maybe FlatFunction
+  flatFunc :: Maybe FlatFunction,
+  entity   :: Maybe Entity
 }
 
 data VHDLSession = VHDLSession {
@@ -30,7 +34,7 @@ data VHDLSession = VHDLSession {
 addFunc :: HsFunction -> VHDLState ()
 addFunc hsfunc = do
   fs <- State.gets funcs -- Get the funcs element from the session
-  let fs' = Map.insert hsfunc (FuncData Nothing) fs -- Insert function
+  let fs' = Map.insert hsfunc (FuncData Nothing Nothing) fs -- Insert function
   State.modify (\x -> x {funcs = fs' })
 
 -- | Find the given function in the current session

diff --git a/VHDL.hs b/VHDL.hs
index c5e7cbc5e18187d19f430ed07c7dcb6b25fd849d..956237732dd214610dbfa807074b1577b661c9e8 100644 (file)
--- a/VHDL.hs
+++ b/VHDL.hs
@@ -3,14 +3,59 @@
 --
 module VHDL where
 
-import Flatten
+import Data.Traversable
+import qualified Maybe
+
 import qualified Type
 import qualified Name
 import qualified TyCon
-import qualified Maybe
 import Outputable ( showSDoc, ppr )
+
 import qualified ForSyDe.Backend.VHDL.AST as AST
 
+import VHDLTypes
+import FlattenTypes
+import TranslatorTypes
+
+-- | Create an entity for a given function
+createEntity ::
+  HsFunction        -- | The function signature
+  -> FuncData       -- | The function data collected so far
+  -> FuncData       -- | The modified function data
+
+createEntity hsfunc fdata = 
+  let func = flatFunc fdata in
+  case func of
+    -- Skip (builtin) functions without a FlatFunction
+    Nothing -> fdata
+    -- Create an entity for all other functions
+    Just flatfunc ->
+      
+      let 
+        s       = sigs flatfunc
+        a       = args flatfunc
+        r       = res  flatfunc
+        args'   = map (fmap (mkMap s)) a
+        res'    = fmap (mkMap s) r
+        entity' = Entity args' res' Nothing
+      in
+        fdata { entity = Just entity' }
+  where
+    mkMap :: Eq id => [(id, SignalInfo)] -> id -> AST.VHDLId
+    mkMap sigmap id =
+      mkVHDLId nm
+      where
+        info = Maybe.fromMaybe
+          (error $ "Signal not found in the name map? This should not happen!")
+          (lookup id sigmap)
+        nm = Maybe.fromMaybe
+          (error $ "Signal not named? This should not happen!")
+          (name info)
+      
+
+
+
+
 -- | The VHDL Bit type
 bit_ty :: AST.TypeMark
 bit_ty = AST.unsafeVHDLBasicId "Bit"