2 files changed, 10 insertions, 9 deletions
diff --git a/src/vhdl/simulate/elaboration.adb b/src/vhdl/simulate/elaboration.adb
index b5f948038..93d60d928 100644
--- a/src/vhdl/simulate/elaboration.adb
+++ b/src/vhdl/simulate/elaboration.adb
@@ -1892,7 +1892,7 @@ package body Elaboration is
       --  such a design entity.
       if not Is_Fully_Bound (Conf) then
          Warning_Msg_Elab
-           (Disp_Node (Stmt) & " not bound", Stmt, Warnid_Binding);
+           (Warnid_Binding, Stmt, Disp_Node (Stmt) & " not bound");
          return;
       end if;
 
@@ -1950,16 +1950,17 @@ package body Elaboration is
          if Arch_Name = Null_Identifier then
             Arch := Libraries.Get_Latest_Architecture (Entity);
             if Arch = Null_Iir then
-               Error_Msg_Elab ("no architecture analysed for "
-                                 & Disp_Node (Entity), Stmt);
+               Error_Msg_Elab (Stmt, "no architecture analysed for "
+                                 & Disp_Node (Entity));
             end if;
             Arch_Name := Get_Identifier (Arch);
          end if;
          Arch_Design := Libraries.Load_Secondary_Unit
            (Get_Design_Unit (Entity), Arch_Name, Stmt);
          if Arch_Design = Null_Iir then
-            Error_Msg_Elab ("no architecture `" & Name_Table.Image (Arch_Name)
-                              & "' for " & Disp_Node (Entity), Stmt);
+            Error_Msg_Elab (Stmt,
+                            "no architecture `" & Name_Table.Image (Arch_Name)
+                              & "' for " & Disp_Node (Entity));
          end if;
          Arch := Get_Library_Unit (Arch_Design);
       end if;
@@ -2815,8 +2816,8 @@ package body Elaboration is
               and then not Is_Fully_Constrained_Type (Get_Type (Formal))
             then
                Error_Msg_Elab
-                 ("top-level " & Disp_Node (Formal) & " must have a value",
-                  Formal);
+                 (Formal,
+                  "top-level " & Disp_Node (Formal) & " must have a value");
             end if;
          end if;
          Assoc := Get_Chain (Assoc);
diff --git a/src/vhdl/simulate/execution.adb b/src/vhdl/simulate/execution.adb
index a788255d8..936cbd3f3 100644
--- a/src/vhdl/simulate/execution.adb
+++ b/src/vhdl/simulate/execution.adb
@@ -1470,8 +1470,8 @@ package body Execution is
             end;
 
          when others =>
-            Error_Msg_Elab ("execute_implicit_function: unimplemented " &
-                              Iir_Predefined_Functions'Image (Func), Expr);
+            Error_Msg_Elab (Expr, "execute_implicit_function: unimplemented " &
+                              Iir_Predefined_Functions'Image (Func));
             raise Internal_Error;
       end case;
       return Result;