From 42641daafe6c448c24c6781e0c9876db8d377017 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Thu, 7 Dec 2017 05:19:59 +0100 Subject: simul: handle nested package instantiation. --- src/vhdl/simulate/simul-annotations.adb | 4 +++- src/vhdl/simulate/simul-elaboration.adb | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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); -- cgit v1.2.3