diff options
Diffstat (limited to 'src/vhdl/sem.adb')
| -rw-r--r-- | src/vhdl/sem.adb | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/vhdl/sem.adb b/src/vhdl/sem.adb index 83308a74c..7408d05e7 100644 --- a/src/vhdl/sem.adb +++ b/src/vhdl/sem.adb @@ -15,7 +15,6 @@ -- along with GHDL; see the file COPYING. If not, write to the Free -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. -with Ada.Unchecked_Conversion; with Errorout; use Errorout; with Std_Package; use Std_Package; with Ieee.Std_Logic_1164; @@ -28,6 +27,7 @@ with Sem_Specs; use Sem_Specs; with Sem_Decls; use Sem_Decls; with Sem_Assocs; use Sem_Assocs; with Sem_Inst; +with Sem_Lib; use Sem_Lib; with Iirs_Utils; use Iirs_Utils; with Flags; use Flags; with Str_Table; @@ -110,7 +110,7 @@ package body Sem is -- architecture body is in the declarative region of its entity, -- the entity name is directly visible. But we cannot really use -- that rule as is, as we don't know which is the entity. - Entity := Libraries.Load_Primary_Unit + Entity := Load_Primary_Unit (Library, Get_Identifier (Name), Library_Unit); if Entity = Null_Iir then Error_Msg_Sem (+Library_Unit, "entity %n was not analysed", +Name); @@ -930,7 +930,7 @@ package body Sem is -- declaration: at the place of the block specification in a -- block configuration for an external block whose interface -- is defined by that entity declaration. - Design := Libraries.Load_Secondary_Unit + Design := Load_Secondary_Unit (Get_Design_Unit (Get_Entity (Father)), Get_Identifier (Block_Spec), Block_Conf); @@ -995,10 +995,9 @@ package body Sem is return; end if; - Design := Libraries.Load_Secondary_Unit - (Get_Design_Unit (Entity), - Get_Identifier (Block_Spec), - Block_Conf); + Design := Load_Secondary_Unit (Get_Design_Unit (Entity), + Get_Identifier (Block_Spec), + Block_Conf); if Design = Null_Iir then Error_Msg_Sem (+Block_Conf, "no architecture %i", +Block_Spec); @@ -2704,7 +2703,7 @@ package body Sem is declare Design_Unit: Iir_Design_Unit; begin - Design_Unit := Libraries.Load_Primary_Unit + Design_Unit := Load_Primary_Unit (Get_Library (Get_Design_File (Get_Current_Design_Unit)), Package_Ident, Decl); if Design_Unit = Null_Iir then @@ -2840,7 +2839,7 @@ package body Sem is if Get_Need_Body (Pkg) and then not Is_Nested_Package (Pkg) then Bod := Get_Package_Body (Pkg); if Is_Null (Bod) then - Bod := Libraries.Load_Secondary_Unit + Bod := Load_Secondary_Unit (Get_Design_Unit (Pkg), Null_Identifier, Decl); else Bod := Get_Design_Unit (Bod); |