diff options
| author | Tristan Gingold <tgingold@free.fr> | 2014-06-24 22:09:22 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2014-06-24 22:09:22 +0200 |
| commit | 8b3ec6b7edf3aedbe7084609881571d1603e9621 (patch) | |
| tree | de07a6cefc5f9ea045a7df4390cb95a829bddcd5 /configuration.adb | |
| parent | 43c5002a7838d2b721f0b5d373ad6769293dbd6e (diff) | |
| download | ghdl-8b3ec6b7edf3aedbe7084609881571d1603e9621.tar.gz ghdl-8b3ec6b7edf3aedbe7084609881571d1603e9621.tar.bz2 ghdl-8b3ec6b7edf3aedbe7084609881571d1603e9621.zip | |
Use library unit instead of design unit.
Diffstat (limited to 'configuration.adb')
| -rw-r--r-- | configuration.adb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configuration.adb b/configuration.adb index ab03bca3b..8c75f8ac1 100644 --- a/configuration.adb +++ b/configuration.adb @@ -125,7 +125,7 @@ package body Configuration is -- find all sub-configuration Libraries.Load_Design_Unit (Unit, From); Lib_Unit := Get_Library_Unit (Unit); - Add_Design_Unit (Get_Entity (Lib_Unit), Unit); + Add_Design_Unit (Get_Design_Unit (Get_Entity (Lib_Unit)), Unit); declare Blk : Iir_Block_Configuration; Prev_Configuration : Iir_Configuration_Declaration; @@ -248,12 +248,12 @@ package body Configuration is case Get_Kind (Aspect) is when Iir_Kind_Entity_Aspect_Entity => -- Add the entity. - Entity := Get_Entity (Aspect); + Entity_Lib := Get_Entity (Aspect); + Entity := Get_Design_Unit (Entity_Lib); Add_Design_Unit (Entity, Aspect); -- Extract and add the architecture. Arch := Get_Architecture (Aspect); - Entity_Lib := Get_Library_Unit (Entity); if Arch /= Null_Iir then case Get_Kind (Arch) is when Iir_Kind_Simple_Name => @@ -293,7 +293,8 @@ package body Configuration is end if; end if; when Iir_Kind_Entity_Aspect_Configuration => - Add_Design_Unit (Get_Configuration (Aspect), Aspect); + Add_Design_Unit + (Get_Design_Unit (Get_Configuration (Aspect)), Aspect); when Iir_Kind_Entity_Aspect_Open => null; when others => |