cleanup in errorout.

2 files changed, 11 insertions, 1 deletions

diff --git a/src/vhdl/simulate/debugger.adb b/src/vhdl/simulate/debugger.adb
index b56efafc6..a2532f2e7 100644
--- a/src/vhdl/simulate/debugger.adb
+++ b/src/vhdl/simulate/debugger.adb
@@ -123,6 +123,16 @@ package body Debugger is
    --  Current statement for next_stmt.
    Exec_Statement : Iir;
 
+   procedure Disp_Iir_Location (N : Iir) is
+   begin
+      if N = Null_Iir then
+         Put (Standard_Error, "??:??:??");
+      else
+         Put (Standard_Error, Disp_Location (N));
+      end if;
+      Put (Standard_Error, ": ");
+   end Disp_Iir_Location;
+
    -- Disp a message during execution.
    procedure Error_Msg_Exec (Msg: String; Loc: in Iir) is
    begin
diff --git a/src/vhdl/simulate/execution.adb b/src/vhdl/simulate/execution.adb
index c1af58888..ba97d3d68 100644
--- a/src/vhdl/simulate/execution.adb
+++ b/src/vhdl/simulate/execution.adb
@@ -4124,7 +4124,7 @@ package body Execution is
       -- The error message consists of at least:
 
       -- 4: name of the design unit containing the assertion.
-      Disp_Iir_Location (Stmt);
+      Put (Standard_Error, Disp_Location (Stmt));
 
       -- 1: an indication that this message is from an assertion.
       Put (Standard_Error, "(assertion ");