diff options
| author | Tristan Gingold <tgingold@free.fr> | 2022-09-06 20:42:55 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2022-09-06 20:42:55 +0200 |
| commit | 5954723f26a0600e2f3f69de482c30e585e75ba2 (patch) | |
| tree | 53ff984f436022b09994b74abf67c5907aaaaf75 /src/simul | |
| parent | 0061426b03bd806424e813fc7065478a8791d1e7 (diff) | |
| download | ghdl-5954723f26a0600e2f3f69de482c30e585e75ba2.tar.gz ghdl-5954723f26a0600e2f3f69de482c30e585e75ba2.tar.bz2 ghdl-5954723f26a0600e2f3f69de482c30e585e75ba2.zip | |
synth: handle generics in blocks
Diffstat (limited to 'src/simul')
| -rw-r--r-- | src/simul/simul-vhdl_elab.adb | 20 | ||||
| -rw-r--r-- | src/simul/simul-vhdl_simul.adb | 4 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/simul/simul-vhdl_elab.adb b/src/simul/simul-vhdl_elab.adb index 2a254279c..1332b479b 100644 --- a/src/simul/simul-vhdl_elab.adb +++ b/src/simul/simul-vhdl_elab.adb @@ -740,8 +740,13 @@ package body Simul.Vhdl_Elab is declare Sub : constant Synth_Instance_Acc := Get_Sub_Instance (Inst, Stmt); + Hdr : constant Node := Get_Block_Header (Stmt); begin Gather_Processes_1 (Sub); + if Hdr /= Null_Node then + Gather_Connections (Sub, Get_Port_Chain (Hdr), + Inst, Get_Port_Map_Aspect_Chain (Hdr)); + end if; end; when Iir_Kinds_Concurrent_Signal_Assignment | Iir_Kind_Concurrent_Assertion_Statement @@ -813,8 +818,19 @@ package body Simul.Vhdl_Elab is Gather_Processes_1 (Comp_Inst); end if; end; - when Iir_Kind_Generate_Statement_Body - | Iir_Kind_Block_Statement => + when Iir_Kind_Block_Statement => + declare + Hdr : constant Node := Get_Block_Header (N); + begin + if Hdr /= Null_Node then + Gather_Processes_Decls (Inst, Get_Port_Chain (Hdr)); + end if; + Gather_Processes_Decls + (Inst, Get_Declaration_Chain (N)); + Gather_Processes_Stmts + (Inst, Get_Concurrent_Statement_Chain (N)); + end; + when Iir_Kind_Generate_Statement_Body => Gather_Processes_Decls (Inst, Get_Declaration_Chain (N)); Gather_Processes_Stmts diff --git a/src/simul/simul-vhdl_simul.adb b/src/simul/simul-vhdl_simul.adb index a3638f21e..a9393b277 100644 --- a/src/simul/simul-vhdl_simul.adb +++ b/src/simul/simul-vhdl_simul.adb @@ -2579,13 +2579,14 @@ package body Simul.Vhdl_Simul is declare C : Connect_Entry renames Connect_Table.Table (I); Val : Valtyp; + Marker : Mark_Type; begin if not C.Collapsed then if C.Actual.Base /= No_Signal_Index then Create_Connect (C); elsif Get_Expr_Staticness (Get_Actual (C.Assoc)) >= Globally then - -- TODO: association with static expr. + Mark_Expr_Pool (Marker); Val := Synth.Vhdl_Expr.Synth_Expression_With_Type (C.Assoc_Inst, Get_Actual (C.Assoc), C.Formal.Typ); Signal_Associate_Cst @@ -2593,6 +2594,7 @@ package body Simul.Vhdl_Simul is C.Formal.Offs.Net_Off), C.Formal.Typ, Val.Val.Mem); + Release_Expr_Pool (Marker); end if; end if; end; |