From: Matthijs Kooijman Date: Tue, 27 Jan 2009 16:34:38 +0000 (+0100) Subject: Use spaces instead of tabs. X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=c26287ccb501b5645531cc7c8e7f07de0efe7340;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git Use spaces instead of tabs. --- diff --git a/Parser.hs b/Parser.hs index d2bd651..44b77eb 100644 --- a/Parser.hs +++ b/Parser.hs @@ -5,27 +5,27 @@ import Language.Haskell.Parser import GHC main = - do - let filename = "adder.hs" - -- Read the file - file <- readFile filename - -- Parse the file - let mode = ParseMode {parseFilename = filename} - ParseOk mod = parseModuleWithMode mode file - -- Print funky stuff - --putStr $ foldl (\s d -> s ++ (show d) ++ "\n\n") "" (decls mod) - putList (findfunc "exp_adder" (decls mod)) + do + let filename = "adder.hs" + -- Read the file + file <- readFile filename + -- Parse the file + let mode = ParseMode {parseFilename = filename} + ParseOk mod = parseModuleWithMode mode file + -- Print funky stuff + --putStr $ foldl (\s d -> s ++ (show d) ++ "\n\n") "" (decls mod) + putList (findfunc "exp_adder" (decls mod)) decls (HsModule _ _ _ _ decls) = - decls + decls name (HsModule _ n _ _ _) = - n + n findfunc :: String -- Function name to find -> [HsDecl] -- Decls to search - -> [HsMatch] + -> [HsMatch] findfunc name decls = foldl (findmatches name) [] decls @@ -35,39 +35,41 @@ findmatches name res _ = res -- Look at a single match and see if it has the sought name filtermatch name (HsMatch _ (HsIdent n) _ _ _) = - n == name + n == name -- Print a list of showable things, separated by newlines instead of , -- Also pretty prints them putList :: (Show a, Pretty a) => [a] -> IO () putList (x:xs) = - do - indent 0 (show x) - putStr "\n" - putStr $ prettyPrint x - putStr "\n\n" - putList xs + do + indent 0 (show x) + putStr "\n" + putStr $ prettyPrint x + putStr "\n\n" + putList xs putList [] = - do return () + do return () -- Add indentations to the given string indent :: Int -> String -> IO () indent n (x:xs) = do - if x `elem` "[(" - then do - putChar x - putStr "\n" - putStr (replicate (n + 1) ' ') - indent (n + 1) xs - else if x `elem` "])" - then do - putStr "\n" - putStr (replicate (n - 1) ' ') - putChar x - indent (n - 1) xs - else do - putChar x - indent n xs + if x `elem` "[(" + then do + putChar x + putStr "\n" + putStr (replicate (n + 1) ' ') + indent (n + 1) xs + else if x `elem` "])" + then do + putStr "\n" + putStr (replicate (n - 1) ' ') + putChar x + indent (n - 1) xs + else do + putChar x + indent n xs indent n [] = do return () + +-- vim: set ts=8 sw=2 sts=2 expandtab: diff --git a/Translator.hs b/Translator.hs index 64e009e..ad4feeb 100644 --- a/Translator.hs +++ b/Translator.hs @@ -28,194 +28,194 @@ import qualified ForSyDe.Backend.Ppr import Text.PrettyPrint.HughesPJ (render) main = - do - defaultErrorHandler defaultDynFlags $ do - runGhc (Just libdir) $ do - dflags <- getSessionDynFlags - setSessionDynFlags dflags - --target <- guessTarget "adder.hs" Nothing - --liftIO (print (showSDoc (ppr (target)))) - --liftIO $ printTarget target - --setTargets [target] - --load LoadAllTargets - --core <- GHC.compileToCoreSimplified "Adders.hs" - core <- GHC.compileToCoreSimplified "Adders.hs" - liftIO $ printBinds (cm_binds core) - let bind = findBind "half_adder" (cm_binds core) - let NonRec var expr = bind - -- Turn bind into VHDL - let vhdl = State.evalState (mkVHDL bind) (VHDLSession 0 builtin_funcs) - liftIO $ putStr $ showSDoc $ ppr expr - liftIO $ putStr "\n\n" - liftIO $ putStr $ render $ ForSyDe.Backend.Ppr.ppr $ vhdl - return expr - where - -- Turns the given bind into VHDL - mkVHDL bind = do - -- Get the function signature - (name, f) <- mkHWFunction bind - -- Add it to the session - addFunc name f - arch <- getArchitecture bind - return arch + do + defaultErrorHandler defaultDynFlags $ do + runGhc (Just libdir) $ do + dflags <- getSessionDynFlags + setSessionDynFlags dflags + --target <- guessTarget "adder.hs" Nothing + --liftIO (print (showSDoc (ppr (target)))) + --liftIO $ printTarget target + --setTargets [target] + --load LoadAllTargets + --core <- GHC.compileToCoreSimplified "Adders.hs" + core <- GHC.compileToCoreSimplified "Adders.hs" + liftIO $ printBinds (cm_binds core) + let bind = findBind "half_adder" (cm_binds core) + let NonRec var expr = bind + -- Turn bind into VHDL + let vhdl = State.evalState (mkVHDL bind) (VHDLSession 0 builtin_funcs) + liftIO $ putStr $ showSDoc $ ppr expr + liftIO $ putStr "\n\n" + liftIO $ putStr $ render $ ForSyDe.Backend.Ppr.ppr $ vhdl + return expr + where + -- Turns the given bind into VHDL + mkVHDL bind = do + -- Get the function signature + (name, f) <- mkHWFunction bind + -- Add it to the session + addFunc name f + arch <- getArchitecture bind + return arch printTarget (Target (TargetFile file (Just x)) obj Nothing) = - print $ show file + print $ show file printBinds [] = putStr "done\n\n" printBinds (b:bs) = do - printBind b - putStr "\n" - printBinds bs + printBind b + putStr "\n" + printBinds bs printBind (NonRec b expr) = do - putStr "NonRec: " - printBind' (b, expr) + putStr "NonRec: " + printBind' (b, expr) printBind (Rec binds) = do - putStr "Rec: \n" - foldl1 (>>) (map printBind' binds) + putStr "Rec: \n" + foldl1 (>>) (map printBind' binds) printBind' (b, expr) = do - putStr $ getOccString b - --putStr $ showSDoc $ ppr expr - putStr "\n" + putStr $ getOccString b + --putStr $ showSDoc $ ppr expr + putStr "\n" findBind :: String -> [CoreBind] -> CoreBind findBind lookfor = - -- This ignores Recs and compares the name of the bind with lookfor, - -- disregarding any namespaces in OccName and extra attributes in Name and - -- Var. - Maybe.fromJust . find (\b -> case b of - Rec l -> False - NonRec var _ -> lookfor == (occNameString $ nameOccName $ getName var) - ) + -- This ignores Recs and compares the name of the bind with lookfor, + -- disregarding any namespaces in OccName and extra attributes in Name and + -- Var. + Maybe.fromJust . find (\b -> case b of + Rec l -> False + NonRec var _ -> lookfor == (occNameString $ nameOccName $ getName var) + ) -- Accepts a port name and an argument to map to it. -- Returns the appropriate line for in the port map getPortMapEntry binds (Port portname) (Var id) = - (Just (AST.unsafeVHDLBasicId portname)) AST.:=>: (AST.ADName (AST.NSimple (AST.unsafeVHDLBasicId signalname))) - where - Port signalname = Maybe.fromMaybe - (error $ "Argument " ++ getOccString id ++ "is unknown") - (lookup id binds) + (Just (AST.unsafeVHDLBasicId portname)) AST.:=>: (AST.ADName (AST.NSimple (AST.unsafeVHDLBasicId signalname))) + where + Port signalname = Maybe.fromMaybe + (error $ "Argument " ++ getOccString id ++ "is unknown") + (lookup id binds) getPortMapEntry binds _ a = error $ "Unsupported argument: " ++ (showSDoc $ ppr a) getInstantiations :: - [PortNameMap] -- The arguments that need to be applied to the - -- expression. - -> PortNameMap -- The output ports that the expression should generate. - -> [(CoreBndr, PortNameMap)] -- A list of bindings in effect - -> CoreSyn.CoreExpr -- The expression to generate an architecture for - -> VHDLState [AST.ConcSm] -- The resulting VHDL code + [PortNameMap] -- The arguments that need to be applied to the + -- expression. + -> PortNameMap -- The output ports that the expression should generate. + -> [(CoreBndr, PortNameMap)] -- A list of bindings in effect + -> CoreSyn.CoreExpr -- The expression to generate an architecture for + -> VHDLState [AST.ConcSm] -- The resulting VHDL code -- A lambda expression binds the first argument (a) to the binder b. getInstantiations (a:as) outs binds (Lam b expr) = - getInstantiations as outs ((b, a):binds) expr + getInstantiations as outs ((b, a):binds) expr -- A case expression that checks a single variable and has a single -- alternative, can be used to take tuples apart getInstantiations args outs binds (Case (Var v) b _ [res]) = - case altcon of - DataAlt datacon -> - if (DataCon.isTupleCon datacon) then - getInstantiations args outs binds' expr - else - error "Data constructors other than tuples not supported" - otherwise -> - error "Case binders other than tuples not supported" - where - binds' = (zip bind_vars tuple_ports) ++ binds - (altcon, bind_vars, expr) = res - -- Find the portnamemaps for each of the tuple's elements - Tuple tuple_ports = Maybe.fromMaybe - (error $ "Case expression uses unknown scrutinee " ++ getOccString v) - (lookup v binds) + case altcon of + DataAlt datacon -> + if (DataCon.isTupleCon datacon) then + getInstantiations args outs binds' expr + else + error "Data constructors other than tuples not supported" + otherwise -> + error "Case binders other than tuples not supported" + where + binds' = (zip bind_vars tuple_ports) ++ binds + (altcon, bind_vars, expr) = res + -- Find the portnamemaps for each of the tuple's elements + Tuple tuple_ports = Maybe.fromMaybe + (error $ "Case expression uses unknown scrutinee " ++ getOccString v) + (lookup v binds) -- An application is an instantiation of a component getInstantiations args outs binds app@(App expr arg) = do - let ((Var f), fargs) = collectArgs app - name = getOccString f - if isTupleConstructor f - then do - let Tuple outports = outs - (tys, vals) = splitTupleConstructorArgs fargs - insts <- sequence $ zipWith - (\outs' expr' -> getInstantiations args outs' binds expr') - outports vals - return $ concat insts - else do - HWFunction inports outport <- getHWFunc name - let comp = AST.CompInsSm - (AST.unsafeVHDLBasicId "app") - (AST.IUEntity (AST.NSimple (AST.unsafeVHDLBasicId name))) - (AST.PMapAspect ports) - ports = - zipWith (getPortMapEntry binds) inports fargs - ++ mapOutputPorts outport outs - return [AST.CSISm comp] + let ((Var f), fargs) = collectArgs app + name = getOccString f + if isTupleConstructor f + then do + let Tuple outports = outs + (tys, vals) = splitTupleConstructorArgs fargs + insts <- sequence $ zipWith + (\outs' expr' -> getInstantiations args outs' binds expr') + outports vals + return $ concat insts + else do + HWFunction inports outport <- getHWFunc name + let comp = AST.CompInsSm + (AST.unsafeVHDLBasicId "app") + (AST.IUEntity (AST.NSimple (AST.unsafeVHDLBasicId name))) + (AST.PMapAspect ports) + ports = + zipWith (getPortMapEntry binds) inports fargs + ++ mapOutputPorts outport outs + return [AST.CSISm comp] getInstantiations args outs binds expr = - error $ "Unsupported expression" ++ (showSDoc $ ppr $ expr) + error $ "Unsupported expression" ++ (showSDoc $ ppr $ expr) -- Is the given name a (binary) tuple constructor isTupleConstructor :: Var.Var -> Bool isTupleConstructor var = - Name.isWiredInName name - && Name.nameModule name == tuple_mod - && (Name.occNameString $ Name.nameOccName name) == "(,)" - where - name = Var.varName var - mod = nameModule name - tuple_mod = Module.mkModule (Module.stringToPackageId "ghc-prim") (Module.mkModuleName "GHC.Tuple") + Name.isWiredInName name + && Name.nameModule name == tuple_mod + && (Name.occNameString $ Name.nameOccName name) == "(,)" + where + name = Var.varName var + mod = nameModule name + tuple_mod = Module.mkModule (Module.stringToPackageId "ghc-prim") (Module.mkModuleName "GHC.Tuple") -- Split arguments into type arguments and value arguments This is probably -- not really sufficient (not sure if Types can actually occur as value -- arguments...) splitTupleConstructorArgs :: [CoreExpr] -> ([CoreExpr], [CoreExpr]) splitTupleConstructorArgs (e:es) = - case e of - Type t -> (e:tys, vals) - otherwise -> (tys, e:vals) - where - (tys, vals) = splitTupleConstructorArgs es + case e of + Type t -> (e:tys, vals) + otherwise -> (tys, e:vals) + where + (tys, vals) = splitTupleConstructorArgs es mapOutputPorts :: - PortNameMap -- The output portnames of the component - -> PortNameMap -- The output portnames and/or signals to map these to - -> [AST.AssocElem] -- The resulting output ports + PortNameMap -- The output portnames of the component + -> PortNameMap -- The output portnames and/or signals to map these to + -> [AST.AssocElem] -- The resulting output ports -- Map the output port of a component to the output port of the containing -- entity. mapOutputPorts (Port portname) (Port signalname) = - [(Just (AST.unsafeVHDLBasicId portname)) AST.:=>: (AST.ADName (AST.NSimple (AST.unsafeVHDLBasicId signalname)))] + [(Just (AST.unsafeVHDLBasicId portname)) AST.:=>: (AST.ADName (AST.NSimple (AST.unsafeVHDLBasicId signalname)))] -- Map matching output ports in the tuple mapOutputPorts (Tuple ports) (Tuple signals) = - concat (zipWith mapOutputPorts ports signals) + concat (zipWith mapOutputPorts ports signals) getArchitecture :: - CoreBind -- The binder to expand into an architecture - -> VHDLState AST.ArchBody -- The resulting architecture - + CoreBind -- The binder to expand into an architecture + -> VHDLState AST.ArchBody -- The resulting architecture + getArchitecture (Rec _) = error "Recursive binders not supported" getArchitecture (NonRec var expr) = do - let name = (getOccString var) - HWFunction inports outport <- getHWFunc name - sess <- State.get - insts <- getInstantiations inports outport [] expr - return $ AST.ArchBody - (AST.unsafeVHDLBasicId "structural") - -- Use unsafe for now, to prevent pulling in ForSyDe error handling - (AST.NSimple (AST.unsafeVHDLBasicId name)) - [] - (insts) + let name = (getOccString var) + HWFunction inports outport <- getHWFunc name + sess <- State.get + insts <- getInstantiations inports outport [] expr + return $ AST.ArchBody + (AST.unsafeVHDLBasicId "structural") + -- Use unsafe for now, to prevent pulling in ForSyDe error handling + (AST.NSimple (AST.unsafeVHDLBasicId name)) + [] + (insts) data PortNameMap = - Tuple [PortNameMap] - | Port String + Tuple [PortNameMap] + | Port String deriving (Show) -- Generate a port name map (or multiple for tuple types) in the given direction for @@ -223,51 +223,51 @@ data PortNameMap = getPortNameMapForTys :: String -> Int -> [Type] -> [PortNameMap] getPortNameMapForTys prefix num [] = [] getPortNameMapForTys prefix num (t:ts) = - (getPortNameMapForTy (prefix ++ show num) t) : getPortNameMapForTys prefix (num + 1) ts + (getPortNameMapForTy (prefix ++ show num) t) : getPortNameMapForTys prefix (num + 1) ts -getPortNameMapForTy :: String -> Type -> PortNameMap +getPortNameMapForTy :: String -> Type -> PortNameMap getPortNameMapForTy name ty = - if (TyCon.isTupleTyCon tycon) then - -- Expand tuples we find - Tuple (getPortNameMapForTys name 0 args) - else -- Assume it's a type constructor application, ie simple data type - -- TODO: Add type? - Port name - where - (tycon, args) = Type.splitTyConApp ty + if (TyCon.isTupleTyCon tycon) then + -- Expand tuples we find + Tuple (getPortNameMapForTys name 0 args) + else -- Assume it's a type constructor application, ie simple data type + -- TODO: Add type? + Port name + where + (tycon, args) = Type.splitTyConApp ty data HWFunction = HWFunction { -- A function that is available in hardware - inPorts :: [PortNameMap], - outPort :: PortNameMap - --entity :: AST.EntityDec + inPorts :: [PortNameMap], + outPort :: PortNameMap + --entity :: AST.EntityDec } deriving (Show) -- Turns a CoreExpr describing a function into a description of its input and -- output ports. mkHWFunction :: - CoreBind -- The core binder to generate the interface for - -> VHDLState (String, HWFunction) -- The name of the function and its interface + CoreBind -- The core binder to generate the interface for + -> VHDLState (String, HWFunction) -- The name of the function and its interface mkHWFunction (NonRec var expr) = - return (name, HWFunction inports outport) - where - name = (getOccString var) - ty = CoreUtils.exprType expr - (fargs, res) = Type.splitFunTys ty - args = if length fargs == 1 then fargs else (init fargs) - --state = if length fargs == 1 then () else (last fargs) - inports = case args of - -- Handle a single port specially, to prevent an extra 0 in the name - [port] -> [getPortNameMapForTy "portin" port] - ps -> getPortNameMapForTys "portin" 0 ps - outport = getPortNameMapForTy "portout" res + return (name, HWFunction inports outport) + where + name = (getOccString var) + ty = CoreUtils.exprType expr + (fargs, res) = Type.splitFunTys ty + args = if length fargs == 1 then fargs else (init fargs) + --state = if length fargs == 1 then () else (last fargs) + inports = case args of + -- Handle a single port specially, to prevent an extra 0 in the name + [port] -> [getPortNameMapForTy "portin" port] + ps -> getPortNameMapForTys "portin" 0 ps + outport = getPortNameMapForTy "portout" res mkHWFunction (Rec _) = - error "Recursive binders not supported" + error "Recursive binders not supported" data VHDLSession = VHDLSession { - nameCount :: Int, -- A counter that can be used to generate unique names - funcs :: [(String, HWFunction)] -- All functions available, indexed by name + nameCount :: Int, -- A counter that can be used to generate unique names + funcs :: [(String, HWFunction)] -- All functions available, indexed by name } deriving (Show) type VHDLState = State.State VHDLSession @@ -275,20 +275,22 @@ type VHDLState = State.State VHDLSession -- Add the function to the session addFunc :: String -> HWFunction -> VHDLState () addFunc name f = do - fs <- State.gets funcs -- Get the funcs element from the session - State.modify (\x -> x {funcs = (name, f) : fs }) -- Prepend name and f + fs <- State.gets funcs -- Get the funcs element from the session + State.modify (\x -> x {funcs = (name, f) : fs }) -- Prepend name and f -- Lookup the function with the given name in the current session. Errors if -- it was not found. getHWFunc :: String -> VHDLState HWFunction getHWFunc name = do - fs <- State.gets funcs -- Get the funcs element from the session - return $ Maybe.fromMaybe - (error $ "Function " ++ name ++ "is unknown? This should not happen!") - (lookup name fs) + fs <- State.gets funcs -- Get the funcs element from the session + return $ Maybe.fromMaybe + (error $ "Function " ++ name ++ "is unknown? This should not happen!") + (lookup name fs) builtin_funcs = - [ - ("hwxor", HWFunction [Port "a", Port "b"] (Port "o")), - ("hwand", HWFunction [Port "a", Port "b"] (Port "o")) - ] + [ + ("hwxor", HWFunction [Port "a", Port "b"] (Port "o")), + ("hwand", HWFunction [Port "a", Port "b"] (Port "o")) + ] + +-- vim: set ts=8 sw=2 sts=2 expandtab: