Refactoring in simulate in order to link with ortho.

2 files changed, 6 insertions, 44 deletions

diff --git a/src/ghdldrv/ghdlsimul.adb b/src/ghdldrv/ghdlsimul.adb
index 2f28e7c09..e17d83c2f 100644
--- a/src/ghdldrv/ghdlsimul.adb
+++ b/src/ghdldrv/ghdlsimul.adb
@@ -36,7 +36,8 @@ with Iirs_Utils;
 with Annotations;
 with Elaboration;
 with Sim_Be;
-with Simulation;
+with Simulation.Main;
+with Debugger;
 with Execution;
 
 with Ghdlcomp;
@@ -153,8 +154,8 @@ package body Ghdlsimul is
          elsif Arg.all = "--stats" then
             Simulation.Disp_Stats := True;
          elsif Arg.all = "-i" then
-            Simulation.Flag_Debugger := True;
-            Simulation.Flag_Interractive := True;
+            Debugger.Flag_Debugger := True;
+            Debugger.Flag_Interractive := True;
          else
             Decode_Option (Arg.all, Status);
             case Status is
@@ -183,7 +184,7 @@ package body Ghdlsimul is
 
       Grtlink.Flag_String := Flags.Flag_String;
 
-      Simulation.Simulation_Entity (Top_Conf);
+      Simulation.Main.Simulation_Entity (Top_Conf);
 
       Set_Exit_Status (Exit_Status (Grt.Errors.Exit_Status));
    end Run;
@@ -192,7 +193,7 @@ package body Ghdlsimul is
    is
    begin
       if Option = "--debug" or Option = "-g" then
-         Simulation.Flag_Debugger := True;
+         Debugger.Flag_Debugger := True;
       else
          return False;
       end if;
diff --git a/src/ghdldrv/grtlink.ads b/src/ghdldrv/grtlink.ads
deleted file mode 100644
index 4b3951e78..000000000
--- a/src/ghdldrv/grtlink.ads
+++ /dev/null
@@ -1,39 +0,0 @@
---  GHDL driver - shared variables with grt.
---  Copyright (C) 2011 Tristan Gingold
---
---  GHDL is free software; you can redistribute it and/or modify it under
---  the terms of the GNU General Public License as published by the Free
---  Software Foundation; either version 2, or (at your option) any later
---  version.
---
---  GHDL is distributed in the hope that it will be useful, but WITHOUT ANY
---  WARRANTY; without even the implied warranty of MERCHANTABILITY or
---  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
---  for more details.
---
---  You should have received a copy of the GNU General Public License
---  along with GCC; see the file COPYING.  If not, write to the Free
---  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
---  02111-1307, USA.
-with System; use System;
-
-package Grtlink is
-
-   Flag_String : String (1 .. 5);
-   pragma Export (C, Flag_String, "__ghdl_flag_string");
-
-   Std_Standard_Bit_RTI_Ptr : Address := Null_Address;
-
-   Std_Standard_Boolean_RTI_Ptr : Address := Null_Address;
-
-   pragma Export (C, Std_Standard_Bit_RTI_Ptr,
-                  "std__standard__bit__RTI_ptr");
-
-   pragma Export (C, Std_Standard_Boolean_RTI_Ptr,
-                  "std__standard__boolean__RTI_ptr");
-
-   Ieee_Std_Logic_1164_Resolved_Resolv_Ptr : Address := Null_Address;
-   pragma Export (C, Ieee_Std_Logic_1164_Resolved_Resolv_Ptr,
-                  "ieee__std_logic_1164__resolved_RESOLV_ptr");
-
-end Grtlink;