1
0
mirror of https://github.com/myhdl/myhdl.git synced 2024-12-14 07:44:38 +08:00

Moved to 2008 version of ghdl - requires 0.33, expect travis fail

This commit is contained in:
Jan Decaluwe 2016-03-01 16:06:29 +01:00
parent 755d2b8c13
commit 62aa73f2c2

View File

@ -22,7 +22,7 @@ _simulators = {}
sim = namedtuple('sim', 'name hdl analyze elaborate simulate skiplines skipchars ignore') sim = namedtuple('sim', 'name hdl analyze elaborate simulate skiplines skipchars ignore')
def registerSimulator(name=None, hdl=None, analyze=None, elaborate=None, simulate=None, def registerSimulator(name=None, hdl=None, analyze=None, elaborate=None, simulate=None,
skiplines=None, skipchars=None, ignore=None): skiplines=None, skipchars=None, ignore=None):
if not isinstance(name, str) or (name.strip() == ""): if not isinstance(name, str) or (name.strip() == ""):
raise ValueError("Invalid simulator name") raise ValueError("Invalid simulator name")
@ -41,8 +41,8 @@ def registerSimulator(name=None, hdl=None, analyze=None, elaborate=None, simulat
registerSimulator( registerSimulator(
name="ghdl", name="ghdl",
hdl="VHDL", hdl="VHDL",
analyze="ghdl -a --workdir=work pck_myhdl_%(version)s.vhd %(topname)s.vhd", analyze="ghdl -a --std=08 --workdir=work pck_myhdl_%(version)s.vhd %(topname)s.vhd",
elaborate="ghdl -e --workdir=work -o %(unitname)s %(topname)s", elaborate="ghdl -e --std=08 --workdir=work %(unitname)s",
simulate="ghdl -r --workdir=work %(unitname)s" simulate="ghdl -r --workdir=work %(unitname)s"
) )
@ -96,7 +96,7 @@ class _VerificationClass(object):
__slots__ = ("simulator", "_analyzeOnly") __slots__ = ("simulator", "_analyzeOnly")
def __init__(self, analyzeOnly=False): def __init__(self, analyzeOnly=False):
self.simulator = None self.simulator = None
self._analyzeOnly = analyzeOnly self._analyzeOnly = analyzeOnly
@ -178,7 +178,7 @@ class _VerificationClass(object):
if ret != 0: if ret != 0:
print("Elaboration failed", file=sys.stderr) print("Elaboration failed", file=sys.stderr)
return ret return ret
g = tempfile.TemporaryFile(mode='w+t') g = tempfile.TemporaryFile(mode='w+t')
#print(simulate) #print(simulate)
ret = subprocess.call(simulate, stdout=g, shell=True) ret = subprocess.call(simulate, stdout=g, shell=True)