diff options
| author | Tristan Gingold <tgingold@free.fr> | 2017-12-07 05:19:59 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2017-12-07 05:19:59 +0100 |
| commit | 42641daafe6c448c24c6781e0c9876db8d377017 (patch) | |
| tree | a9fdd25de3433a7e9affd80cc2a65c2c09e76365 /src | |
| parent | 86427c52303b2eaa3f158d012a3ea3455c861451 (diff) | |
| download | ghdl-42641daafe6c448c24c6781e0c9876db8d377017.tar.gz ghdl-42641daafe6c448c24c6781e0c9876db8d377017.tar.bz2 ghdl-42641daafe6c448c24c6781e0c9876db8d377017.zip | |
simul: handle nested package instantiation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/vhdl/simulate/simul-annotations.adb | 4 | ||||
| -rw-r--r-- | src/vhdl/simulate/simul-elaboration.adb | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/vhdl/simulate/simul-annotations.adb b/src/vhdl/simulate/simul-annotations.adb index eac35f50f..879ca0470 100644 --- a/src/vhdl/simulate/simul-annotations.adb +++ b/src/vhdl/simulate/simul-annotations.adb @@ -596,8 +596,10 @@ package body Simul.Annotations is procedure Annotate_Declaration (Block_Info: Sim_Info_Acc; Decl: Iir) is begin case Get_Kind (Decl) is - when Iir_Kind_Package_Declaration => + when Iir_Kind_Package_Declaration + | Iir_Kind_Package_Instantiation_Declaration => Annotate_Package_Declaration (Block_Info, Decl); + when Iir_Kind_Package_Body => Annotate_Package_Body (Decl); diff --git a/src/vhdl/simulate/simul-elaboration.adb b/src/vhdl/simulate/simul-elaboration.adb index 58764d301..586549b5c 100644 --- a/src/vhdl/simulate/simul-elaboration.adb +++ b/src/vhdl/simulate/simul-elaboration.adb @@ -2672,7 +2672,8 @@ package body Simul.Elaboration is when Iir_Kind_Protected_Type_Body => null; - when Iir_Kind_Package_Declaration => + when Iir_Kind_Package_Declaration + | Iir_Kind_Package_Instantiation_Declaration => Elaborate_Package_Declaration (Instance, Decl); when Iir_Kind_Package_Body => Elaborate_Package_Body (Instance, Decl); |