Skip to content

fix simulator exit #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
weilanad wants to merge 4 commits into from
Closed

fix simulator exit #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a60421
v2.3.0
Paebbels May 14, 2026
b904027
v3.0.0
Paebbels Jun 28, 2026
b59389b
set exitScript with simulator variable tcl_interactive
weilanad Jul 9, 2026
238342f
updated OSVVM-AXI4
weilanad Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/OSVVM-AXI4
Open in desktop
Submodule OSVVM-AXI4 updated 4 files
+2 −0 Axi4/src/Axi4Manager_a.vhd
+119 −126 Axi4/src/Axi4Subordinate_a.vhd
+3 −1 Axi4/src/deprecated/Axi4Manager_a.vhd
+8 −15 Axi4/src/deprecated/Axi4Subordinate_a.vhd
3 changes: 1 addition & 2 deletions regression.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,11 @@ set defaultStep "all"
set regressionLevels [createRegressionLevels osvvm poc test] ; # clean, all

# -P -projectRoot set project folder root for poc scripting
# -g -gui disables system exit (i.e. on errors)
# -v -vendor Vendor name
# -b -board Board name
# -p -projectFile Path to the local_configuration file
# -c -configFile Path to the project_configuration file
configurePoC -P ${root} -g
configurePoC -P ${root}

# -s -stop <i> set the stop counts to <i>
# -d -debug enable debugging
Expand Down
24 changes: 15 additions & 9 deletions tools/poc.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace eval ::poc {
variable putsPrefix "\[PoC\] "
variable putsPrefixNs "\[PoC\] "

proc getEnv {var {default ""}} {
if {[info exists ::env($var)]} {
return $::env($var)
Expand All @@ -19,8 +20,6 @@ namespace eval ::poc {
variable localConfigurationFile "$localConfigurationFolder/local_configuration.vhdl"
variable localConfigurationPath "$projectRoot/src/$localConfigurationFolder/local_configuration.vhdl"

variable disableExit 0

# Skip report generation if executed within Sigasi/VS Code
if {[info exists ::env(OSVVM_TOOL)] && $::env(OSVVM_TOOL) eq "Sigasi"} {
set ::osvvm::GenerateOsvvmReports "false"
Expand All @@ -31,17 +30,29 @@ namespace eval ::poc {
} else {
set buildNamePrefix "${::osvvm::ToolName}-"
}

# WORKAROUND for Riviera-PRO: tcl_interactive is always 1 (even on CI server)
if {$::osvvm::ToolName eq "RivieraPRO"} {
global tcl_interactive
set tcl_interactive 0
}

} elseif {[info exists ::env(GITHUB_ACTIONS)]} {
set buildNamePrefix ""
} else {
set buildNamePrefix "${::osvvm::ToolNameVersion}-"
}

# WORKAROUND for NVC: tcl_interactive is not implemented yet (https://github.com/nickg/nvc/issues/1608)
if {$::osvvm::ToolName eq "NVC"} {
set ::tcl_interactive 0
}

proc exitScript {{code 1}} {
if {$::poc::disableExit == 1} {
global tcl_interactive
if {$tcl_interactive == 1} {
return
}

set toolsWithDashCode {ActiveHDL ModelSim NVC QuestaSim RivieraPRO}

if {[lsearch -exact $toolsWithDashCode $::osvvm::ToolName] >= 0} {
Expand Down Expand Up @@ -127,11 +138,6 @@ ${::poc::putsPrefix}======================================
set arg [lindex $args $i]

switch -glob -- $arg {
"-gui" -
"-g" {
set ::poc::disableExit 1
}

"-vendor" -
"-v" {
incr i
Expand Down
Loading