From b59389b9e63659ab0ed6a8f2b832c65c7e22ad7d Mon Sep 17 00:00:00 2001
From: "adrian.weiland" <adrian.weiland@plc2.de>
Date: Thu, 9 Jul 2026 15:57:52 +0200
Subject: [PATCH 1/2] set exitScript with simulator variable tcl_interactive

---
 regression.tcl |  3 +--
 tools/poc.tcl  | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/regression.tcl b/regression.tcl
index 9f4629e71..7d94bd22f 100644
--- a/regression.tcl
+++ b/regression.tcl
@@ -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
diff --git a/tools/poc.tcl b/tools/poc.tcl
index 7f22d640f..b063d8a06 100644
--- a/tools/poc.tcl
+++ b/tools/poc.tcl
@@ -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)
@@ -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"
@@ -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} {
@@ -127,11 +138,6 @@ ${::poc::putsPrefix}======================================
 			set arg [lindex $args $i]
 
 			switch -glob -- $arg {
-				"-gui" -
-				"-g" {
-					set ::poc::disableExit 1
-				}
-
 				"-vendor" -
 				"-v" {
 					incr i

From 238342f4c3e4a764b97959004389e1729028fe67 Mon Sep 17 00:00:00 2001
From: "adrian.weiland" <adrian.weiland@plc2.de>
Date: Thu, 9 Jul 2026 16:04:24 +0200
Subject: [PATCH 2/2] updated OSVVM-AXI4

---
 lib/OSVVM-AXI4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/OSVVM-AXI4 b/lib/OSVVM-AXI4
index 70b906124..664024732 160000
--- a/lib/OSVVM-AXI4
+++ b/lib/OSVVM-AXI4
@@ -1 +1 @@
-Subproject commit 70b906124f3f369bead730e1ed60d5069fcb5c78
+Subproject commit 66402473208b26b5e77f9874dedf36e8694cd508