diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-07-14 06:10:00 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-07-14 06:10:00 +0200 |
| commit | fb1c1e0018af55dd59abd52a4b43781ad6747c62 (patch) | |
| tree | 5aa5a12d9ed8f33b385193674f61436266154c4c /src/vhdl/vhdl-configuration.adb | |
| parent | 657f8e0d2b78a53d660ff144153f79083a3ec91d (diff) | |
| download | ghdl-fb1c1e0018af55dd59abd52a4b43781ad6747c62.tar.gz ghdl-fb1c1e0018af55dd59abd52a4b43781ad6747c62.tar.bz2 ghdl-fb1c1e0018af55dd59abd52a4b43781ad6747c62.zip | |
vhdl: fixes in find_top_entity (handle for-generate, remove early return)
Diffstat (limited to 'src/vhdl/vhdl-configuration.adb')
| -rw-r--r-- | src/vhdl/vhdl-configuration.adb | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/vhdl/vhdl-configuration.adb b/src/vhdl/vhdl-configuration.adb index 42db12342..c3d2db613 100644 --- a/src/vhdl/vhdl-configuration.adb +++ b/src/vhdl/vhdl-configuration.adb @@ -792,12 +792,16 @@ package body Vhdl.Configuration is package body Top is use Nodes_Walk; + -- Add entities to the name table (so that they easily could be found). function Add_Entity_Cb (Design : Iir) return Walk_Status is Kind : constant Iir_Kind := Get_Kind (Get_Library_Unit (Design)); begin - if Get_Date (Design) < Date_Analyzed then - return Walk_Continue; + if not Flags.Flag_Elaborate_With_Outdated then + -- Discard obsolete or non-analyzed units. + if Get_Date (Design) < Date_Analyzed then + return Walk_Continue; + end if; end if; case Iir_Kinds_Library_Unit (Kind) is @@ -886,8 +890,10 @@ package body Vhdl.Configuration is Unit : constant Iir := Get_Library_Unit (Design); Status : Walk_Status; begin - if Get_Date (Design) < Date_Analyzed then - return Walk_Continue; + if not Flags.Flag_Elaborate_With_Outdated then + if Get_Date (Design) < Date_Analyzed then + return Walk_Continue; + end if; end if; case Iir_Kinds_Library_Unit (Get_Kind (Unit)) is @@ -938,8 +944,13 @@ package body Vhdl.Configuration is begin if Get_Kind (Unit) = Iir_Kind_Entity_Declaration then if Get_Elab_Flag (Design) then + -- Clean elab flag. Set_Elab_Flag (Design, False); else + if Flags.Verbose then + Report_Msg (Msgid_Note, Elaboration, +Unit, + "candidate for top entity: %n", (1 => +Unit)); + end if; Nbr_Top_Entities := Nbr_Top_Entities + 1; if Nbr_Top_Entities = 1 then First_Top_Entity := Unit; |