aboutsummaryrefslogtreecommitdiffstats
path: root/src/ghdldrv
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2018-08-10 19:22:54 +0200
committerTristan Gingold <tgingold@free.fr>2018-08-10 19:22:54 +0200
commit4405210cb84262f8c0a9650333fca8841bbebe04 (patch)
tree5db58dbc51027361c7277e105c329104d03876a6 /src/ghdldrv
parent4b16ef4c7c491590a5a3cd80e7bff3233471e674 (diff)
downloadghdl-4405210cb84262f8c0a9650333fca8841bbebe04.tar.gz
ghdl-4405210cb84262f8c0a9650333fca8841bbebe04.tar.bz2
ghdl-4405210cb84262f8c0a9650333fca8841bbebe04.zip
ghdl_simul: adjust after ghdlcomp change.
Diffstat (limited to 'src/ghdldrv')
-rw-r--r--src/ghdldrv/ghdlsimul.adb18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/ghdldrv/ghdlsimul.adb b/src/ghdldrv/ghdlsimul.adb
index bfd7bea2d..e0a5ce649 100644
--- a/src/ghdldrv/ghdlsimul.adb
+++ b/src/ghdldrv/ghdlsimul.adb
@@ -37,7 +37,7 @@ with Simul.Simulation.Main;
with Simul.Debugger;
with Simul.Execution;
-with Ghdlcomp;
+with Ghdlcomp; use Ghdlcomp;
with Grt.Types;
with Grt.Options;
@@ -53,13 +53,21 @@ package body Ghdlsimul is
procedure Compile_Init (Analyze_Only : Boolean) is
begin
if Analyze_Only then
- return;
+ Setup_Libraries (True);
+ else
+ Setup_Libraries (False);
+ Libraries.Load_Std_Library;
+ -- WORK library is not loaded. FIXME: why ?
+ end if;
+
+ if Time_Resolution /= 'a' then
+ Std_Package.Set_Time_Resolution (Time_Resolution);
end if;
- Setup_Libraries (False);
- Libraries.Load_Std_Library;
+ if Analyze_Only then
+ return;
+ end if;
- -- Here, time_base can be set.
Simul.Annotations.Annotate (Std_Package.Std_Standard_Unit);
Canon.Canon_Flag_Add_Labels := True;