diff options
| author | Tristan Gingold <tgingold@free.fr> | 2016-02-02 20:48:55 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2016-02-06 04:45:30 +0100 |
| commit | d8b55e17cad36f3f34f57434ab6c97b2c2afa964 (patch) | |
| tree | 0223bb1eb0a13ef50add7fc280eed51499a38529 /src/vhdl/simulate/execution.adb | |
| parent | e332c2d9a3b29f3a8606be7c912a4a8ada45d5da (diff) | |
| download | ghdl-d8b55e17cad36f3f34f57434ab6c97b2c2afa964.tar.gz ghdl-d8b55e17cad36f3f34f57434ab6c97b2c2afa964.tar.bz2 ghdl-d8b55e17cad36f3f34f57434ab6c97b2c2afa964.zip | |
simul: support of package instantiation.
Diffstat (limited to 'src/vhdl/simulate/execution.adb')
| -rw-r--r-- | src/vhdl/simulate/execution.adb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/vhdl/simulate/execution.adb b/src/vhdl/simulate/execution.adb index b299d648e..25774f1e9 100644 --- a/src/vhdl/simulate/execution.adb +++ b/src/vhdl/simulate/execution.adb @@ -42,6 +42,7 @@ with Grt_Interface; with Grt.Values; with Grt.Errors; with Grt.Std_Logic_1164; +with Sem_Inst; package body Execution is @@ -3274,9 +3275,15 @@ package body Execution is function Execute_Function_Body (Instance : Block_Instance_Acc; Func : Iir) return Iir_Value_Literal_Acc is - Subprg_Body : constant Iir := Get_Subprogram_Body (Func); + Subprg_Body : Iir; Res : Iir_Value_Literal_Acc; begin + Subprg_Body := Get_Subprogram_Body (Func); + if Subprg_Body = Null_Iir then + pragma Assert (Sem_Inst.Get_Origin (Func) /= Null_Iir); + Subprg_Body := Get_Subprogram_Body (Sem_Inst.Get_Origin (Func)); + end if; + Current_Process.Instance := Instance; Elaborate_Declarative_Part |