diff options
| author | Tristan Gingold <tgingold@free.fr> | 2020-01-27 18:54:17 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2020-01-30 06:27:04 +0100 |
| commit | 27a38f0c1b1cf8a2af13882861511018d9f4c5c9 (patch) | |
| tree | 9f27a4584d089fde01cfb43a8040590b9d23e9b2 | |
| parent | 1bd51bf8c6adfb77c2bf572f9c38ca4439dc9a6b (diff) | |
| download | ghdl-27a38f0c1b1cf8a2af13882861511018d9f4c5c9.tar.gz ghdl-27a38f0c1b1cf8a2af13882861511018d9f4c5c9.tar.bz2 ghdl-27a38f0c1b1cf8a2af13882861511018d9f4c5c9.zip | |
ghdlcomp: renaming; allow files in any order for --synth.
| -rw-r--r-- | src/ghdldrv/ghdlcomp.adb | 10 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlcomp.ads | 10 | ||||
| -rw-r--r-- | src/ghdldrv/ghdlsynth.adb | 2 | ||||
| -rw-r--r-- | src/vhdl/libghdl/libghdl.adb | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/src/ghdldrv/ghdlcomp.adb b/src/ghdldrv/ghdlcomp.adb index a20ff932a..941ee62e9 100644 --- a/src/ghdldrv/ghdlcomp.adb +++ b/src/ghdldrv/ghdlcomp.adb @@ -213,7 +213,7 @@ package body Ghdlcomp is end if; end Compile_Analyze_Init; - procedure Compile_Analyze_File (File : String) + procedure Compile_Load_File (File : String) is Res : Iir_Design_File; Design : Iir; @@ -232,9 +232,9 @@ package body Ghdlcomp is Libraries.Add_Design_Unit_Into_Library (Design); Design := Next_Design; end loop; - end Compile_Analyze_File; + end Compile_Load_File; - function Compile_Analyze_File2 (File : String) return Iir + function Compile_Analyze_File (File : String) return Iir is Id : constant Name_Id := Name_Table.Get_Identifier (File); Design_File : Iir_Design_File; @@ -280,7 +280,7 @@ package body Ghdlcomp is end loop; return New_Design_File; - end Compile_Analyze_File2; + end Compile_Analyze_File; procedure Compile_Elaborate (Unit_Name : String_Access) is @@ -372,7 +372,7 @@ package body Ghdlcomp is Elab_Arg := I + 1; exit; else - Compile_Analyze_File (Arg); + Compile_Load_File (Arg); end if; end; end loop; diff --git a/src/ghdldrv/ghdlcomp.ads b/src/ghdldrv/ghdlcomp.ads index c87676d20..396f550e7 100644 --- a/src/ghdldrv/ghdlcomp.ads +++ b/src/ghdldrv/ghdlcomp.ads @@ -96,8 +96,14 @@ package Ghdlcomp is -- Functionnal interface. -- Must be first initialized by Compile_Init procedure Compile_Analyze_Init (Load_Work : Boolean := True); - procedure Compile_Analyze_File (File : String); - function Compile_Analyze_File2 (File : String) return Iir; + + -- Load and parse FILE, put library units in the work library (without + -- analyzing them). + procedure Compile_Load_File (File : String); + + -- Load, parse and analyze FILE. + function Compile_Analyze_File (File : String) return Iir; + procedure Compile_Elaborate (Unit_Name : String_Access); procedure Compile_Run; end Ghdlcomp; diff --git a/src/ghdldrv/ghdlsynth.adb b/src/ghdldrv/ghdlsynth.adb index 243120b21..739bd778f 100644 --- a/src/ghdldrv/ghdlsynth.adb +++ b/src/ghdldrv/ghdlsynth.adb @@ -201,7 +201,7 @@ package body Ghdlsynth is return Null_Iir; end if; else - Design_File := Ghdlcomp.Compile_Analyze_File2 (Arg); + Ghdlcomp.Compile_Load_File (Arg); end if; end; end loop; diff --git a/src/vhdl/libghdl/libghdl.adb b/src/vhdl/libghdl/libghdl.adb index 4ab3dc74a..67de461cf 100644 --- a/src/vhdl/libghdl/libghdl.adb +++ b/src/vhdl/libghdl/libghdl.adb @@ -95,7 +95,7 @@ package body Libghdl is function Analyze_File (File : Thin_String_Ptr; Len : Natural) return Iir is begin - return Ghdlcomp.Compile_Analyze_File2 (File (1 .. Len)); + return Ghdlcomp.Compile_Analyze_File (File (1 .. Len)); end Analyze_File; procedure Set_Exec_Prefix (Prefix : Thin_String_Ptr; Len : Natural) is |