Jan 26, 2023 · Jan 27, 2023 · Jan 27, 2023 · Jan 28, 2023 · Jan 13, 2025 · Jan 27, 2023
diff --git a/hdl_checker/builders/xsim.py b/hdl_checker/builders/xsim.py
 import tempfile
 from typing import Iterable, Mapping, Optional

 from .base_builder import BaseBuilder

 from hdl_checker.diagnostics import BuilderDiag, DiagType
 from hdl_checker.parsers.elements.identifier import Identifier
 from hdl_checker.path import Path
 from hdl_checker.types import BuildFlags, FileType
 from hdl_checker.utils import runShellCommand

 from .base_builder import BaseBuilder

 _ITER_REBUILD_UNITS = re.compile(
    r"ERROR:\s*\[[^\]]*\]\s*"
    r"'?.*/(?P<library_name>\w+)/(?P<unit_name>\w+)\.vdb'?"
    def __init__(self, *args, **kwargs):
        # type: (...) -> None
        self._version = ""
        super(XSIM, self).__init__(*args, **kwargs)
        super().__init__(*args, **kwargs)
        self._xsimini = p.join(self._work_folder, ".xsim.init")
        # Create the ini file
        open(self._xsimini, "w").close()
        with open(self._xsimini, "w", encoding="utf8"):
            pass

    def _makeRecords(self, line):
        # type: (str) -> Iterable[BuilderDiag]
        )
        self._version = re.findall(r"^Vivado Simulator\s+([\d\.]+)", stdout[0])[0]
        self._logger.info(
            "xvhdl version string: '%s'." "Version number is '%s'",
            "xvhdl version string: '%s'. Version number is '%s'",
            stdout[:-1],
            self._version,
        )

    def _createLibrary(self, library):
        # type: (Identifier) -> None
        with open(self._xsimini, mode="w") as fd:
        with open(self._xsimini, mode="w", encoding="utf8") as fd:
            content = "\n".join(
                [
 "%s=%s" %(x,p.join(self._work_folder, x.name))
 f"{x}=%s" % p.join(self._work_folder, x.name)
                    for x in self._added_libraries
                ]
            )
            fd.write(content)

    def _buildSource(self, path, library, flags=None):
        # type: (Path, Identifier, Optional[BuildFlags]) -> Iterable[str]
 xsimCmd = None
 xsim_cmd = None
        filetype = FileType.fromPath(path)
        if filetype == FileType.vhdl:
 xsimCmd = "xvhdl"
 xsim_cmd = "xvhdl"
        if filetype in (FileType.verilog, FileType.systemverilog):
 xsimCmd = "xvlog"
        assert( xsimCmd != None )
 xsim_cmd = "xvlog"
        assert xsim_cmd is not None
        cmd = [
 xsimCmd,
 xsim_cmd,
            "--nolog",
            "--verbose",
            "0",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,14 +22,14 @@
		import tempfile
		from typing import Iterable, Mapping, Optional

		from .base_builder import BaseBuilder

		from hdl_checker.diagnostics import BuilderDiag, DiagType
		from hdl_checker.parsers.elements.identifier import Identifier
		from hdl_checker.path import Path
		from hdl_checker.types import BuildFlags, FileType
		from hdl_checker.utils import runShellCommand

		from .base_builder import BaseBuilder

		_ITER_REBUILD_UNITS = re.compile(
		r"ERROR:\s\[[^\]]\]\s*"
		r"'?.*/(?P<library_name>\w+)/(?P<unit_name>\w+)\.vdb'?"
Expand DownExpand Up		@@ -74,10 +74,11 @@ def _shouldIgnoreLine(self, line):
		def __init__(self, args, *kwargs):
		# type: (...) -> None
		self._version = ""
		super(XSIM, self).__init__(args, *kwargs)
		super().__init__(args, *kwargs)
		self._xsimini = p.join(self._work_folder, ".xsim.init")
		# Create the ini file
		open(self._xsimini, "w").close()
		with open(self._xsimini, "w", encoding="utf8"):
		pass

		def _makeRecords(self, line):
		# type: (str) -> Iterable[BuilderDiag]
Expand DownExpand Up		@@ -125,7 +126,7 @@ def _checkEnvironment(self):
		)
		self._version = re.findall(r"^Vivado Simulator\s+([\d\.]+)", stdout[0])[0]
		self._logger.info(
		"xvhdl version string: '%s'." "Version number is '%s'",
		"xvhdl version string: '%s'. Version number is '%s'",
		stdout[:-1],
		self._version,
		)
Expand All		@@ -144,26 +145,26 @@ def isAvailable():

		def _createLibrary(self, library):
		# type: (Identifier) -> None
		with open(self._xsimini, mode="w") as fd:
		with open(self._xsimini, mode="w", encoding="utf8") as fd:
		content = "\n".join(
		[
		"%s=%s" %(x,p.join(self._work_folder, x.name))
		f"{x}=%s" % p.join(self._work_folder, x.name)
		for x in self._added_libraries
		]
		)
		fd.write(content)

		def _buildSource(self, path, library, flags=None):
		# type: (Path, Identifier, Optional[BuildFlags]) -> Iterable[str]
		xsimCmd = None
		xsim_cmd = None
		filetype = FileType.fromPath(path)
		if filetype == FileType.vhdl:
		xsimCmd = "xvhdl"
		xsim_cmd = "xvhdl"
		if filetype in (FileType.verilog, FileType.systemverilog):
		xsimCmd = "xvlog"
		assert( xsimCmd != None )
		xsim_cmd = "xvlog"
		assert xsim_cmd is not None
		cmd = [
		xsimCmd,
		xsim_cmd,
		"--nolog",
		"--verbose",
		"0",
Expand Down