suport for in module instantiations

Convert.hs

@@ -11,6 +11,7 @@ import Language.SystemVerilog.AST
 import qualified Convert.AlwaysKW
 import qualified Convert.Logic
 import qualified Convert.Typedef
+import qualified Convert.StarPort
 
 type Phase = AST -> AST
 
@@ -19,6 +20,7 @@ phases =
     [ Convert.AlwaysKW.convert
     , Convert.Logic.convert
     , Convert.Typedef.convert
+    , Convert.StarPort.convert
     ]
 
 run :: Phase

Convert/StarPort.hs

+{- sv2v
+ - Author: Zachary Snow <zach@zachjs.com>
+ -
+ - Conversion for `.*` in module instantiation
+ -}
+
+module Convert.StarPort (convert) where
+
+import Data.Maybe
+import qualified Data.Map.Strict as Map
+
+import Language.SystemVerilog.AST
+
+type ModulePorts = Map.Map String [String]
+
+convert :: AST -> AST
+convert descriptions = map (convertDescription portsInfo) descriptions
+    where
+        portsInfo = Map.fromList $ mapMaybe getPorts descriptions
+        getPorts :: Description -> Maybe (Identifier, [Identifier])
+        getPorts (Module name ports _) = Just (name, ports)
+        getPorts _ = Nothing
+
+convertDescription :: ModulePorts -> Description -> Description
+convertDescription info (Module name ports items) =
+    Module name ports $ map (convertModuleItem info) items
+convertDescription _ other = other
+
+convertModuleItem :: ModulePorts -> ModuleItem -> ModuleItem
+convertModuleItem info (Instance m p x Nothing) =
+    Instance m p x (Just portBindings)
+    where
+        ports = case Map.lookup m info of
+            Nothing -> error $ "could not convert `.*` in instantiation of " ++ m
+            Just l -> l
+        portBindings = map (\port -> (port, Just $ Ident port)) ports
+convertModuleItem _ other = other

Language/SystemVerilog/AST.hs

@@ -92,7 +92,7 @@ data ModuleItem
   | LocalNet   Type Identifier RangesOrAssignment
   | AlwaysC    AlwaysKW Stmt
   | Assign     LHS Expr
-  | Instance   Identifier [PortBinding] Identifier [PortBinding]
+  | Instance   Identifier [PortBinding] Identifier (Maybe [PortBinding]) -- `Nothing` represents `.*`
   | Function   (Maybe FuncRet) Identifier [(Bool, BlockItemDeclaration)] Stmt
   | Genvar     Identifier
   | Generate   [GenItem]
@@ -139,14 +139,17 @@ instance Show ModuleItem where
     AlwaysC    k b   -> printf "%s %s" (show k) (show b)
     Assign     a b   -> printf "assign %s = %s;" (show a) (show b)
     Instance   m params i ports
-      | null params -> printf "%s %s %s;"     m                                  i (showPorts show ports)
-      | otherwise   -> printf "%s #%s %s %s;" m (showPorts show params) i (showPorts show ports)
+      | null params -> printf "%s %s%s;"     m                    i (showMaybePorts ports)
+      | otherwise   -> printf "%s #%s %s%s;" m (showPorts params) i (showMaybePorts ports)
     Function   t x i b -> printf "function %s%s;\n%s\n%s\nendfunction" (showFuncRet t) x (indent $ unlines' $ map showFunctionItem i) (indent $ show b)
     Genvar     x -> printf "genvar %s;" x
     Generate   b -> printf "generate\n%s\nendgenerate" (indent $ unlines' $ map show b)
     where
-    showPorts :: (Expr -> String) -> [(Identifier, Maybe Expr)] -> String
-    showPorts s ports = indentedParenList [ if i == "" then show (fromJust arg) else printf ".%s(%s)" i (if isJust arg then s $ fromJust arg else "") | (i, arg) <- ports ]
+    showMaybePorts :: Maybe [(Identifier, Maybe Expr)] -> String
+    showMaybePorts Nothing = "(.*)"
+    showMaybePorts (Just ports) = showPorts ports
+    showPorts :: [(Identifier, Maybe Expr)] -> String
+    showPorts ports = indentedParenList [ if i == "" then show (fromJust arg) else printf ".%s(%s)" i (if isJust arg then show $ fromJust arg else "") | (i, arg) <- ports ]
     showFunctionItem :: (Bool, BlockItemDeclaration) -> String
     showFunctionItem (b, item) = prefix ++ (show item)
       where prefix = if b then "input " else ""

Language/SystemVerilog/Parser/Parse.y

@@ -260,11 +260,12 @@ AlwaysKW :: { AlwaysKW }
   | "always_ff"    { AlwaysFF    }
   | "always_latch" { AlwaysLatch }
 
-ModuleInstantiations :: { [(Identifier, [PortBinding])] }
+ModuleInstantiations :: { [(Identifier, Maybe [PortBinding])] }
   : ModuleInstantiation                          { [$1] }
   | ModuleInstantiations "," ModuleInstantiation { $1 ++ [$3] }
-ModuleInstantiation :: { (Identifier, [PortBinding]) }
-  : Identifier "(" Bindings ")"  { ($1, $3) }
+ModuleInstantiation :: { (Identifier, Maybe [PortBinding]) }
+  : Identifier "(" Bindings ")" { ($1, Just $3) }
+  | Identifier "(" ".*"     ")" { ($1, Nothing) }
 
 FunctionItems :: { [(Bool, BlockItemDeclaration)] }
   : "(" FunctionPortList ";" BlockItemDeclarations { (map ((,) True) $2) ++ (map ((,) False) $4) }

sv2v.cabal

@@ -62,6 +62,7 @@ executable sv2v
     Convert
     Convert.AlwaysKW
     Convert.Logic
+    Convert.StarPort
     Convert.Typedef
     Convert.Template.ModuleItem
   ghc-options: