1 files changed, 17 insertions, 17 deletions

diff --git a/src/ghdldrv/ghdlsimul.adb b/src/ghdldrv/ghdlsimul.adb
index 5fd84b13c..bfd7bea2d 100644
--- a/src/ghdldrv/ghdlsimul.adb
+++ b/src/ghdldrv/ghdlsimul.adb
@@ -31,11 +31,11 @@ with Libraries;
 with Canon;
 with Configuration;
 with Iirs_Utils;
-with Annotations;
-with Elaboration;
-with Simulation.Main;
-with Debugger;
-with Execution;
+with Simul.Annotations;
+with Simul.Elaboration;
+with Simul.Simulation.Main;
+with Simul.Debugger;
+with Simul.Execution;
 
 with Ghdlcomp;
 
@@ -60,7 +60,7 @@ package body Ghdlsimul is
       Libraries.Load_Std_Library;
 
       -- Here, time_base can be set.
-      Annotations.Annotate (Std_Package.Std_Standard_Unit);
+      Simul.Annotations.Annotate (Std_Package.Std_Standard_Unit);
 
       Canon.Canon_Flag_Add_Labels := True;
       Canon.Canon_Flag_Sequentials_Stmts := True;
@@ -115,7 +115,7 @@ package body Ghdlsimul is
 
       --  Annotate all units.
       for I in Design_Units.First .. Design_Units.Last loop
-         Annotations.Annotate (Design_Units.Table (I));
+         Simul.Annotations.Annotate (Design_Units.Table (I));
       end loop;
    end Compile_Elab;
 
@@ -136,23 +136,23 @@ package body Ghdlsimul is
       for I in Args'Range loop
          Arg := Args (I);
          if Arg.all = "--disp-tree" then
-            Simulation.Disp_Tree := True;
+            Simul.Simulation.Disp_Tree := True;
          elsif Arg.all = "--expect-failure" then
             Decode_Option (Arg.all, Status);
             pragma Assert (Status = Decode_Option_Ok);
          elsif Arg.all = "--trace-elab" then
-            Elaboration.Trace_Elaboration := True;
+            Simul.Elaboration.Trace_Elaboration := True;
          elsif Arg.all = "--trace-drivers" then
-            Elaboration.Trace_Drivers := True;
+            Simul.Elaboration.Trace_Drivers := True;
          elsif Arg.all = "--trace-simu" then
-            Simulation.Trace_Simulation := True;
+            Simul.Simulation.Trace_Simulation := True;
          elsif Arg.all = "--trace-stmt" then
-            Execution.Trace_Statements := True;
+            Simul.Execution.Trace_Statements := True;
          elsif Arg.all = "--stats" then
-            Simulation.Disp_Stats := True;
+            Simul.Simulation.Disp_Stats := True;
          elsif Arg.all = "-i" then
-            Debugger.Flag_Debugger := True;
-            Debugger.Flag_Interractive := True;
+            Simul.Debugger.Flag_Debugger := True;
+            Simul.Debugger.Flag_Interractive := True;
          else
             Decode_Option (Arg.all, Status);
             case Status is
@@ -181,7 +181,7 @@ package body Ghdlsimul is
 
       Grtlink.Flag_String := Flags.Flag_String;
 
-      Simulation.Main.Simulation_Entity (Top_Conf);
+      Simul.Simulation.Main.Simulation_Entity (Top_Conf);
 
       Set_Exit_Status (Exit_Status (Grt.Errors.Exit_Status));
    end Run;
@@ -190,7 +190,7 @@ package body Ghdlsimul is
    is
    begin
       if Option = "--debug" or Option = "-g" then
-         Debugger.Flag_Debugger := True;
+         Simul.Debugger.Flag_Debugger := True;
       else
          return False;
       end if;