Thread: [fbt-commit] SF.net SVN: fbt:[67] trunk/bin

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 67
          http://fbt.svn.sourceforge.net/fbt/?rev=67&view=rev
Author:   dave_infj
Date:     2008-12-04 18:31:17 +0000 (Thu, 04 Dec 2008)

Log Message:
-----------
Big reorganisation prior to release.  Apologies in advance if it breaks stuff.

To summarise:

	- djm_pyhelp renamed util

	- Changed function def comments into docstrings

	- formalised module headers

	- Modularised mkvdeps and mkvproj

	- Changed how mkvproj calls the tool requested, including
	  how the default is set

Modularisation:	

* parts of mkvdeps.py split into parse_{vhdl,verilog,coregen}.py and DepList.py

Support for other languages can be fairly easily added by adding a new module
and editing src_parser_map in mkvdeps.py.

* parts of mkvproj.py split into tool_sim_modelsim.py, tool_synth_synplify.py 
  and tool_common.py

Support for new project writers can be added simply by writing the appropriate
module and putting it in the right place.

tool_common contains constants and utilities required by all project writers.

The default tool for a given operation can be changed by altering the 
appropriate symlink.

Modified Paths:
--------------
    trunk/bin/comp_filter.py
    trunk/bin/mkvdeps.py
    trunk/bin/mkvproj.py
    trunk/bin/synplify_wrapper.py

Added Paths:
-----------
    trunk/bin/DepList.py
    trunk/bin/parse_coregen.py
    trunk/bin/parse_verilog.py
    trunk/bin/parse_vhdl.py
    trunk/bin/tool_common.py
    trunk/bin/tool_sim_default.py
    trunk/bin/tool_sim_modelsim.py
    trunk/bin/tool_synth_default.py
    trunk/bin/tool_synth_synplify.py
    trunk/bin/util.py

Removed Paths:
-------------
    trunk/bin/djm_pyhelp.py

Copied: trunk/bin/DepList.py (from rev 66, trunk/bin/mkvdeps.py)
===================================================================

--- trunk/bin/DepList.py	                        (rev 0)
+++ trunk/bin/DepList.py	2008-12-04 18:31:17 UTC (rev 67)
@@ -0,0 +1,143 @@
+################################################################################
+#
+# DepList.py
+#
+# PURPOSE:
+#
+# Container class which maintains candidate entities and their dependencies.
+# Functions like an ordinary dictionary, but copes with ambiguous entity
+# implementations.
+#
+# $Id$
+
+from __future__ import with_statement
+from util import *
+
+import re
+import os
+
+import tool_common
+
+
+class DepList:
+    """
+    Helper class for storing lists of entity dependencies
+    
+    Usage:
+       Inputs are individual candidates added via DepList.add_dep()
+       Outputs are always sets of candidates indexed by entity
+    """
+    
+    def __init__(self):
+        self.list = {}
+        # Regex for parsing dependency caches
+        self.m_deps = re.compile( '(\w+)\s*\(\s*([\w.-]+)\s*\)\s*:(.*)' )
+
+        
+    def add_dep(self, ent, hdl_src, deps, core_src = '' ):
+        """
+        Add a dependency to the list
+        """
+        
+        try:
+            self.list[ent].append( (hdl_src, deps, core_src) )
+        except KeyError:
+            self.list[ent]     = [ (hdl_src, deps, core_src) ]
+
+            
+    def merge(self, src):
+        """
+        Update a dependencies dictionary with a new entry, merging if required.
+        """
+        
+        for ent, dep_rec in src.list.iteritems():
+            try:
+                self.list[ent] = self.list[ent] + dep_rec
+            except KeyError:
+                self.list[ent] = dep_rec
+
+                
+    def write_deps_cache(self, df):
+        """
+        Write out the DepList in a linear .depends cache file.  df is an handle
+        and must already be open.
+        """
+
+        with df:
+            df.write("""\
+# Dependencies automatically generated by %s.  Do not edit!
+# $Id$
+#
+
+""" % (prog_name()) )
+
+            for ent, candidates in self.iteritems():
+                for hdl_src, deps, core_src in candidates:
+                    df.write( '%s(%s): %s%s\n' % (ent,
+                                                  os.path.basename(hdl_src),
+                                                  os.path.basename(core_src),
+                                                ' '.join(deps)) )
+
+                    
+    def read_deps_cache(self, df, path):
+        """
+        Import depencency data from a .depends cache file.  df is an handle and
+        must already be open
+        """
+        
+        with df:
+            for lno, dep_line in enumerate(df):
+                # Delete any comments
+                try:
+                    dep_line = dep_line[:dep_line.index('#')]
+                except ValueError:
+                    pass
+                dep_line = dep_line.strip()
+                if not dep_line:
+                    continue
+
+                # Parse components
+                match = self.m_deps.search(dep_line)
+                if not match:
+                    raise Panic("%s:%d: invalid dependency line" %
+                                ( relpath(os.path.join(path,
+                                                       tool_common.DEPS_FILE)),
+                                  (lno+1) )
+                                )
+                ent, hdl_src, deps = match.groups()
+                deps = deps.split()
+                
+                # If deps contains a single object ending in '.xco', then it
+                # is a core reference.
+                if len(deps) == 1 and deps[0].endswith('.xco'):
+                    self.add_dep( ent,
+                                  os.path.join(tool_common.CORES_DIR, hdl_src),
+                                  [],    # no entity dependencies
+                                  os.path.join(path, deps[0] ) )
+                else:
+                    self.add_dep( ent,
+                                  os.path.join(path, hdl_src),
+                                  deps )
+
+
+    def iterkeys(self):
+        return self.list.iterkeys()
+
+    
+    def iteritems(self):
+        return self.list.iteritems()
+    
+
+    def __iter__(self):
+        return self.iterkeys()
+    
+
+    def __contains__(self, ent):
+        return ent in self.list
+
+
+    def __getitem__(self, ent):
+        return self.list[ent]
+
+        
+


Property changes on: trunk/bin/DepList.py
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/bin/comp_filter.py
===================================================================
--- trunk/bin/comp_filter.py	2008-12-01 23:31:06 UTC (rev 66)
+++ trunk/bin/comp_filter.py	2008-12-04 18:31:17 UTC (rev 67)
@@ -1,13 +1,21 @@
 ################################################################################
 #
-# accept():
+# comp_filter.py
 #
-# Entity instances for which accept() returns False will be excluded from
-# dependency lists.
+# PURPOSE:
 #
+# Provides a means for the HDL parsers to reject certain entity instantiations
+# because they are provided by third party simulation libraries
+#
 # $Id$
 
+
 def accept(comp_decl):
+    """
+    Entity instances for which accept() returns False will be excluded from
+    dependency lists.
+    """
+
     if not comp_decl:
         # Reject None, etc
         return False

Deleted: trunk/bin/djm_pyhelp.py
===================================================================
--- trunk/bin/djm_pyhelp.py	2008-12-01 23:31:06 UTC (rev 66)
+++ trunk/bin/djm_pyhelp.py	2008-12-04 18:31:17 UTC (rev 67)
@@ -1,110 +0,0 @@
-
-# $Id$
-
-import sys
-import os
-
-#
-# prog_name()
-#
-# Returns programme name
-def prog_name():
-    return os.path.basename(sys.argv[0])
-
-
-#
-# Panic exception
-#
-# For equivalent of perl die "message"
-class Panic(Exception):
-    def __init__(self, value):
-        self.value = value
-
-    def __str__(self):
-        return "%s: panic: %s" % (prog_name(), self.value)
-
-    
-# relpath.py
-# R.Barran 30/08/2004
-
-def relpath(target, base=os.curdir):
-    """
-    Return a relative path to the target from either the current dir or an optional base dir.
-    Base can be a directory specified either as absolute or relative to current dir.
-    """
-
-# check commented out: not clear this is required, djm 11/6/08
-#    if not os.path.exists(target):
-#        raise OSError, 'Target does not exist: '+target
-
-    if not os.path.isdir(base):
-        raise OSError, 'Base is not a directory or does not exist: '+base
-
-    base_list = (os.path.abspath(base)).split(os.sep)
-    target_list = (os.path.abspath(target)).split(os.sep)
-
-    # On the windows platform the target may be on a completely different drive from the base.
-    if os.name in ['nt','dos','os2'] and base_list[0] <> target_list[0]:
-        raise OSError, 'Target is on a different drive to base. Target: '+target_list[0].upper()+', base: '+base_list[0].upper()
-
-    # Starting from the filepath root, work out how much of the filepath is
-    # shared by base and target.
-    for i in range(min(len(base_list), len(target_list))):
-        if base_list[i] <> target_list[i]: break
-    else:
-        # If we broke out of the loop, i is pointing to the first differing
-        # path elements.  If we didn't break out of the loop, i is pointing to
-        # identical path elements.  Increment i so that in all cases it points
-        # to the first differing path elements.
-        i+=1
-
-    rel_list = [os.pardir] * (len(base_list)-i) + target_list[i:]
-    return os.path.join(*rel_list)
-
-#
-# walk_dirlist()
-#
-# Conditionally walks the list of directories given.  Only directories
-# beginning with a + will be searched recursively.  Version control directories
-# will be filtered out along the way.
-def walk_dirlist(dirlist):
-    excl_dirs = []
-    for dir in dirlist:
-        dir = dir.strip()
-        if not dir:
-            continue
-
-        # Those directories with a leading - should be excluded from the walk.
-        if dir.startswith('-'):
-            excl_dirs.append( dir.lstrip('-') )
-            continue
-
-        # Only those directories with a leading + should be recursed into.  
-        recurse = dir.startswith('+')
-        for path, dirs, files in os.walk( dir.lstrip('+') ):
-            if not recurse:
-                del dirs[:]
-
-            # Skip revision control directories
-            try:
-                del dirs[dirs.index('.svn')]
-                del dirs[dirs.index('CVS')]
-                del dirs[dirs.index('RCS')]
-                del dirs[dirs.index('work')]
-            except ValueError:
-                pass
-
-            # Skip any excludes
-            for i in reversed(xrange(len(dirs))):
-                for excl in excl_dirs:
-                    try:
-                        if os.path.samefile( os.path.join(path, dirs[i]), excl ):
-                            del dirs[i]
-                    except OSError:
-                        sys.stderr.write( "%s: ignoring invalid ignore %s\n" % (
-                                prog_name(),
-                                excl ) )
-            
-            yield (path, dirs, files)
-
-

Modified: trunk/bin/mkvdeps.py
===================================================================
--- trunk/bin/mkvdeps.py	2008-12-01 23:31:06 UTC (rev 66)
+++ trunk/bin/mkvdeps.py	2008-12-04 18:31:17 UTC (rev 67)
@@ -1,294 +1,52 @@
 #!/usr/bin/python
 
+################################################################################
+#
+# mkvdeps.py
+#
+# PURPOSE:
+#
+# Auto depencies resolver.  When used stand-alone, it will write a dependency
+# cache in the specified directories.  Can be imported as a module such as to
+# provide dependency resolution in mkvproj.py.
+#
 # $Id$
 
 from __future__ import with_statement
+from util import *
+
 import sys
 import getopt
 import re
 import os
-import glob
-import comp_filter
 
-from djm_pyhelp import *
+import DepList
+import parse_vhdl
+import parse_verilog
+import parse_coregen
+import tool_common
 
-#
-# Constants
-#
 
-# Output directory for coregen
-CORES_DIR = 'cores'
-
-# Dependency cache file name
-DEPS_FILE = '.depends'
-
-################################################################################
-#
-# Helper class for storing lists of entity dependencies
-#
-# Usage:
-#    Inputs are individual candidates added via DepList.add_dep()
-#    Outputs are always sets of candidates indexed by entity
-class DepList:
-    def __init__(self):
-        self.list = {}
-        # Regex for parsing dependency caches
-        self.m_deps = re.compile( '(\w+)\s*\(\s*([\w.-]+)\s*\)\s*:(.*)' )
-
-    #
-    # add_dep()
-    #
-    # Add a dependency to the list
-    def add_dep(self, ent, hdl_src, deps, core_src = '' ):
-        try:
-            self.list[ent].append( (hdl_src, deps, core_src) )
-        except KeyError:
-            self.list[ent]     = [ (hdl_src, deps, core_src) ]
-
-    #
-    # merge_deps()
-    #
-    # Update a dependencies dictionary with a new entry, merging if required.
-    def merge(self, src):
-        for ent, dep_rec in src.list.iteritems():
-            try:
-                self.list[ent] = self.list[ent] + dep_rec
-            except KeyError:
-                self.list[ent] = dep_rec
-
-    #
-    # write_deps_cache()
-    #
-    # Write out the DepList in a linear .depends cache file.  df is an handle
-    # and must already be open.
-    def write_deps_cache(self, df):
-        with df:
-            df.write("""\
-# Dependencies automatically generated by %s.  Do not edit!
-# $Id$
-#
-
-""" % (prog_name()) )
-
-            for ent, candidates in self.iteritems():
-                for hdl_src, deps, core_src in candidates:
-                    df.write( '%s(%s): %s%s\n' % (ent,
-                                                  os.path.basename(hdl_src),
-                                                  os.path.basename(core_src),
-                                                ' '.join(deps)) )
-    #
-    # read_deps_cache()
-    #
-    # Import depencency data from a .depends cache file.  df is an handle and
-    # must already be open
-    def read_deps_cache(self, df, path):
-        with df:
-            for lno, dep_line in enumerate(df):
-                # Delete any comments
-                try:
-                    dep_line = dep_line[:dep_line.index('#')]
-                except ValueError:
-                    pass
-                dep_line = dep_line.strip()
-                if not dep_line:
-                    continue
-
-                # Parse components
-                match = self.m_deps.search(dep_line)
-                if not match:
-                    raise Panic("%s:%d: invalid dependency line" %
-                                ( relpath(os.path.join(path, DEPS_FILE)),
-                                  (lno+1) )
-                                )
-                ent, hdl_src, deps = match.groups()
-                deps = deps.split()
-                
-                # If deps contains a single object ending in '.xco', then it
-                # is a core reference.
-                if len(deps) == 1 and deps[0].endswith('.xco'):
-                    self.add_dep( ent,
-                                  os.path.join(CORES_DIR, hdl_src),  
-                                  [],    # no entity dependencies
-                                  os.path.join(path, deps[0] ) )
-                else:
-                    self.add_dep( ent,
-                                  os.path.join(path, hdl_src),
-                                  deps )
-
-
-    def iterkeys(self):
-        return self.list.iterkeys()
-
-    def iteritems(self):
-        return self.list.iteritems()
-    
-    def __iter__(self):
-        return self.iterkeys()
-    
-    def __contains__(self, ent):
-        return ent in self.list
-
-    def __getitem__(self, ent):
-        return self.list[ent]
-
-        
-
-################################################################################
-#
-# parse_deps_vhdl()
-#
-# Determine dependencies for a given file (VHDL mode)
-
-m_dep_vhdl = re.compile("""
-        use \s+ (?P<lib> \w+) \. (?P<pkg> \w+) \.all \s* ;   | # pkg import
-
-        (?: entity|package) \s+ (?P<ent> \w+) \s+ is         | # entity decl
-
-        component \s+ (?P<comp> \w+)                         | # component decl
-
-        \w+ \s* : \s* entity \s+ (?: work\.)? (?P<inst> \w+)   # instance decl
-        """, re.I|re.X)
-
-def parse_deps_vhdl(hdl_src):
-    ent      = None
-    deps     = []
-    dep_list = DepList()
-    
-    with open(hdl_src) as vf:
-        for line in vf:
-            # Delete any comments. 
-            try:
-                line = line[:line.index('--')]
-            except ValueError:
-                pass
-            # Since VHDL is case insensitive, convert everything to lowercase
-            line = line.lower()
-            
-            match = m_dep_vhdl.search(line)
-            if match:
-                # A package import decl after an entity or package body is
-                # defined means we have hit a new entity, so we must output
-                # what we've got and start over
-                if match.group('pkg') and ent:
-                    dep_list.add_dep( ent, hdl_src, deps )
-                    ent  = None
-                    deps = []
-
-                # Find out what we've matched and handle appropriately
-                if match.group('ent'):
-                    if ent:
-                        raise Panic("""\
-%s: unexpected entity %s found when processing entity %s.  missing package imports?""" % (relpath(self.hdl_src),
-          e,
-          self.ent) )
-              
-                    else:
-                        ent = match.group('ent')
-                        
-                    if ent in dep_list:
-                        raise Panic( "duplicate entity %s declaration found in %s (previous in %s)" % (ent, relpath(hdl_src), relpath(dep_list[ent][0]) ) )
-                    
-                # If it's a package import decl, then lib and pkg will be
-                # defined. Only add a package if the library is 'work'.
-                if match.group('lib') == 'work':
-                    deps.append( match.group('pkg') )
-
-                # If it's an instance decl, then inst will be defined.
-                if match.group('inst'):
-                    deps.append( match.group('inst') )
-
-                # If it's a component decl, add it so long as it's not
-                # marked to be ignored
-                if comp_filter.accept(match.group('comp')):
-                    deps.append( match.group('comp') )
-
-    dep_list.add_dep( ent, hdl_src, deps )
-    return dep_list
-
-
-#
-# parse_deps_verilog()
-#
-# Determine dependencies for a given file (verilog mode)
-def parse_deps_verilog(hdl_src):
-    sys.stderr.write('%s:%s: warning: unsupported verilog source ignored.\n' %
-                     ( prog_name(), relpath(hdl_src) ))
-
-    return DepList()
-
-
-m_parse_xco = re.compile( "^\s*\w+\s+(\w+)\s*=\s*(.*)$" )
-
-#
-# parse_coregen()
-#
-# Determine the entity and HDL source provided by the given core
-def parse_coregen(hdl_src):
-    def bool(s):
-        return s in ['yes', 'true', '1']
-    
-    attribs = {}
-
-    # Read in project settings and attributes
-    with open(hdl_src) as vf:
-        for line in vf:
-            # Delete any comments. 
-            try:
-                line = line[:line.index('#')]
-            except ValueError:
-                pass
-
-            match = m_parse_xco.search( line )
-            if match:
-                attribs[match.group(1).lower()] = match.group(2)
-
-    # sanity check
-    try:
-        ent             = attribs['component_name']
-        use_vhdl        = bool(attribs['vhdlsim'])
-        use_verilog     = bool(attribs['verilogsim'])
-    except KeyError, e:
-        raise Panic( '%s: missing parameter %s' % (hdl_src, e) )
-
-    if not use_vhdl ^ use_verilog:
-        raise Panic( "%s: exactly one simulation (VHDL or verilog) is required" % relpath(hdl_src) )
-
-    # The simulation source file will be the entity name with the appropriate
-    # extension attached
-    sim_src = os.path.join( CORES_DIR, ent )
-    if use_vhdl:
-        sim_src += '.vhd'
-    else:
-        sim_src += '.v'
-
-    # Generate dependency record and return
-    dep_list = DepList()
-    dep_list.add_dep( ent, sim_src, [], hdl_src )
-
-    return dep_list
-
-#
-# source_get_all_deps()
-#
-# Generate a list of dependencies in all VHDL and verilog files in the given
-# list of directories, optionally writing out a cache of the results
-#
-# Returns a hash indexed by entity of lists in which the first element is the
-# path to where that entity is declared, and the remaining elements are the
-# entities on which that entity depends.
-#
 src_parser_map = {
-    '.vhd' : parse_deps_vhdl,
-    '.vhdl': parse_deps_vhdl,
-    '.v'   : parse_deps_verilog,
+    '.vhd' : parse_vhdl,
+    '.vhdl': parse_vhdl,
+    '.v'   : parse_verilog,
     '.xco' : parse_coregen
     } 
 
 def source_get_all_deps(src_dirs, write_cache=False, verbose=False):
-    dep_list = DepList()
+    """
+    Generate a list of dependencies in all VHDL and verilog files in the given
+    list of directories, optionally writing out a cache of the results
+    
+    Returns a hash indexed by entity of lists in which the first element is the
+    path to where that entity is declared, and the remaining elements are the
+    entities on which that entity depends.
+    """
+    dep_list = DepList.DepList()
 
     for path, dirs, hdl_srcs in walk_dirlist(src_dirs):
-        dir_deps = DepList()
+        dir_deps = DepList.DepList()
         
         for src in hdl_srcs:
             path_src = os.path.join(path, src)
@@ -300,60 +58,61 @@
                 print path_src
                 
             # Parse this file
-            src_ent_list = src_parser_map[src_ext](path_src)
+            src_ent_list = src_parser_map[src_ext].parse(path_src)
             dep_list.merge( src_ent_list )
             dir_deps.merge( src_ent_list )
 
         # Write out cache if that option is enabled
         if write_cache and dir_deps:
-            with open(os.path.join(path, DEPS_FILE), 'w') as deps_file:
-                dir_deps.write_deps_cache( deps_file )
+            with open(os.path.join(path, tool_common.DEPS_FILE), 'w') as df:
+                dir_deps.write_deps_cache( df )
 
     return dep_list
 
-#
-# cache_get_all_deps()
-#
-# like source_get_all_deps(), but reads from .depends cache
+
 def cache_get_all_deps(src_dirs, verbose=False):
-    dep_list = DepList()
+    """
+    like source_get_all_deps(), but reads from .depends cache
+    """
+    dep_list = DepList.DepList()
 
     # Read in all .depends files
     for path, dirs, files in walk_dirlist(src_dirs):
         # Not all directories will have cache files
-        if DEPS_FILE not in files:
+        if tool_common.DEPS_FILE not in files:
             continue
         
         # Read through .depends file and build dependencies list
-        with open(os.path.join(path, DEPS_FILE)) as deps_file:
-            dep_list.read_deps_cache( deps_file, path )
+        with open(os.path.join(path, tool_common.DEPS_FILE)) as df:
+            dep_list.read_deps_cache( df, path )
 
     return dep_list
 
-#
-# resolve_deps()
-#
-# Resolve the dependencies arising from the top module as specified in the
-# configuration.  Returns an ordered list of sources.
+
 def resolve_deps(top_ent, dep_list, disambig):
-    #
-    # what_srcs()
-    #
-    # Return a list of files that depend on the specified entity
+    """
+    Resolve the dependencies arising from the top module as specified in the
+    configuration.  Returns an ordered list of sources.
+    """
+
     def what_srcs(what_ent):
+        """
+        Return a list of files that depend on the specified entity
+        """
         ws = []
         for ent, allcand in dep_list.iteritems():
             for hdl_src, deps, core_src in allcand:
                 if what_ent in deps:
                     ws.append(hdl_src)
         return ws
+
     
-    #
-    # disambiguate()
-    #
-    # Error check, select and return the dependencies for the given entity
-    # according to the disambiguation rules.
     def disambiguate(ent):
+        """
+        Error check, select and return the dependencies for the given entity
+        according to the disambiguation rules.
+        """
+
         # Check to make sure we know about unresolved entity ent
         if ent not in dep_list:
             raise Panic( """\
@@ -436,12 +195,12 @@
             
     return resolved
 
-################################################################################
-#
-# print_help()
-#
-# Print help message
+
 def print_help():
+    """
+    Print help message
+    """
+    
     print """
 Dependency cache builder
 
@@ -465,7 +224,7 @@
 """ % (prog_name())
     sys.exit(0)
 
-# main
+    
 def main(argv):
     verbose = False
     

Modified: trunk/bin/mkvproj.py
===================================================================
--- trunk/bin/mkvproj.py	2008-12-01 23:31:06 UTC (rev 66)
+++ trunk/bin/mkvproj.py	2008-12-04 18:31:17 UTC (rev 67)
@@ -1,305 +1,33 @@
 #!/usr/bin/python
 
-from __future__ import with_statement
-import sys
-import os
-import re
-import getopt
-
-from djm_pyhelp import *
-import mkvdeps
-
-#
-# Constants
-#
-
-# Simulation/synthesis: the name of the makefile containing coregen build rules
-COREGEN_MK = 'coregen.mk'
-
-# Simulation: name of the makefile containing modelsim build rules
-MDLSIM_MK  = 'modelsim.mk'
-
-# Synthesis: synplify output directory
-BUILD_DIR  = 'build'
-
-# Simulation: modelsim commands for compiling HDL source files
-mdlsim_compile = {
-    '.vhd' : '$(VCOM) $(VCOM_OPTS)',
-    '.vhdl': '$(VCOM) $(VCOM_OPTS)',
-    '.v'   : '$(VLOG) $(VLOG_OPTS)'
-    }
-
-# Synthesis: synthesis commands for adding HDL source files
-lang_flag = {'.vhd' :'-vhdl -lib work',
-             '.vhdl':'-vhdl -lib work',
-             '.v'   :'-verilog'}
-
-# Synthesis: FPGA Family name expansion from shorthand
-family_tab = {'2V'  : 'VIRTEX2',
-              '2VP' : 'VIRTEX2P',
-              '2S'  : 'SPARTAN2',
-              '2SE' : 'SPARTAN2E',
-              '3S'  : 'SPARTAN3'}
-
-
-
-#
-# class Config
-#
-# Storage object for configuration
-class Config:
-    def __init__(self):
-        #
-        # Defaults
-        #
-        self.verbose             = False
-        self.output_dir          = '.'
-        self.libpath             = []
-        self.disambig            = {}
-        self.part                = '<unspecified>'
-        self.top_ent             = ''
-        self.tool                = 'default'
-        self.cache_deps          = None
-        self.relative_paths      = True
-        self.constraints         = []
-
 ################################################################################
 #
-# rel_src()
+# mkvproj.py
 #
-# Conditionally return relative path of the given source file, with (some)
-# error checking
-def rel_src(cfg, hdl_src):
-    if cfg.relative_paths:
-        try:
-            return relpath(hdl_src, cfg.output_dir)
-        except OSError:
-            raise Panic( "missing source file %s.  Is dependency cache out of date?" % (x[1]) )
-    else:
-        return hdl_src
-    
-################################################################################
+# PURPOSE:
 #
-# mk_coregen_mf()
+# Simulation and synthesis project writer.  Uses autodeps service from
+# mkvdeps.py.
 #
-# Write out a coregen makefile from the list of (hdl_src, core_src).  
-def mk_coregen_mf(cfg, cores):
-
-    # Make the cores directory, if it doesn't already exist
-    cores_dir = os.path.join( cfg.output_dir, mkvdeps.CORES_DIR )
-    if not os.path.isdir( cores_dir ):
-        sys.stderr.write( 'mkdir %s\n' % (cores_dir) )
-        os.mkdir( cores_dir )
-
-    with open( os.path.join(cfg.output_dir, COREGEN_MK), 'w' ) as mf:
-        # Write out header
-        mf.write( """\
-# Coregen makefile automatically generated by %s.  Do not edit!
 # $Id$
-#
 
-COREGEN ?= coregen
+from __future__ import with_statement
+from util import *
 
-# default target
-""" % (prog_name()) )
-        
-        # Write out default target
-        mf.write( 'all: %s\n\n' % (' '.join( [hdl_src
-                                          for hdl_src, core_src in cores] )) )
+import sys
+import os
+import re
+import getopt
 
-        # Write out coregen invocation rules
-        for hdl_src, core_src in cores:
-            mf.write( """\
-%s: %s
-\tcd %s; $(COREGEN) -b ../%s
-""" % (hdl_src,                   # the build target (sim source)
-       rel_src(cfg, core_src),    # its dependency (core description [.xco])
-       mkvdeps.CORES_DIR,         # the cores subdirectory
-       rel_src(cfg, core_src) ) ) # the core description file [.xco]
-                
-################################################################################
-#
-# mk_mdlsim_proj()
-#
-# Write out a modelsim simulation project using the resolved sources
-def mk_mdlsim_proj(cfg):
-    #
-    # msim_lib()
-    #
-    # Helper macro for mk_mdlsim_proj() to express the filename of a modelsim
-    # library entity for the given entity
-    def msim_lib(ent):
-        return os.path.join( 'work', ent, '_primary.dat' )
+import mkvdeps
+import tool_common
 
-    # make the work library, if it doesn't exist
-    worklib = os.path.join(cfg.output_dir, 'work')
-    if not os.path.isdir(worklib):
-        sys.stderr.write( 'vlib %s\n' % (worklib) )
-        os.system( 'vlib %s' % (worklib) )
 
-    # write out the modelsim makefile
-    cores = []
-    with open( os.path.join(cfg.output_dir, MDLSIM_MK), 'w' ) as mf:
-        mf.write( """\
-# Modelsim makefile automatically generated by %s.  Do not edit!
-# $Id$
-#
-
-VCOM    ?= vcom
-VLOG    ?= vlog
-
-# default target
-""" % (prog_name()) )
-
-        # Write out default target
-        mf.write( "all: %s\n\n" % (msim_lib(cfg.top_ent)) )
-
-        for ent, hdl_src, deps, core_src in cfg.resolved_list:
-            rel_hdl_src = rel_src( cfg, hdl_src )
-
-            # Write rules to express this source's dependencies, if any...
 
[truncated message content]