Skip to content

Commit c582784

Browse files
author
Oron Port
committed
fix ghdl simulation run for different ghdl backends
fix vhdl.v93 simulation finish run
1 parent 50f9b7f commit c582784

File tree

1 file changed

+2
-4
lines changed
  • lib/src/main/scala/dfhdl/tools/toolsCore

1 file changed

+2
-4
lines changed

lib/src/main/scala/dfhdl/tools/toolsCore/GHDL.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ object GHDL extends VHDLLinter, VHDLSimulator:
6262
SimulatorOptions,
6363
MemberGetSet
6464
): String = constructCommand(
65-
"-r"
65+
"--elab-run"
6666
)
6767

6868
override protected def simulateCmdPostLangFlags(using
@@ -96,9 +96,7 @@ object GHDL extends VHDLLinter, VHDLSimulator:
9696
finishedSuccessfully = true
9797
println(s"simulation finished @$time")
9898
true
99-
else if (finishedSuccessfully)
100-
line == "ghdl:error: report failed" || line == "ghdl:error: simulation failed"
101-
else false
99+
else finishedSuccessfully // suppress all other lines after the first finish
102100
else false,
103101
// GHDL does not report error codes for runtime errors, so we need to detect errors manually
104102
// even when using VHDL'2008 and later

0 commit comments

Comments
 (0)