diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/simul/simul-vhdl_elab.adb | 3 | ||||
| -rw-r--r-- | src/synth/elab-vhdl_stmts.adb | 32 |
2 files changed, 30 insertions, 5 deletions
diff --git a/src/simul/simul-vhdl_elab.adb b/src/simul/simul-vhdl_elab.adb index 1f1a17b31..26092341b 100644 --- a/src/simul/simul-vhdl_elab.adb +++ b/src/simul/simul-vhdl_elab.adb @@ -208,7 +208,8 @@ package body Simul.Vhdl_Elab is | Iir_Kind_Function_Body | Iir_Kind_Procedure_Body | Iir_Kind_Component_Declaration - | Iir_Kind_File_Declaration => + | Iir_Kind_File_Declaration + | Iir_Kind_Use_Clause => null; when others => Error_Kind ("gather_processes_decl", Decl); diff --git a/src/synth/elab-vhdl_stmts.adb b/src/synth/elab-vhdl_stmts.adb index e6c93a327..25ef975aa 100644 --- a/src/synth/elab-vhdl_stmts.adb +++ b/src/synth/elab-vhdl_stmts.adb @@ -68,6 +68,7 @@ package body Elab.Vhdl_Stmts is It_Rng : Type_Acc; Val : Valtyp; Ival : Valtyp; + Dval : Int64; Len : Uns32; begin if It_Type /= Null_Node then @@ -85,28 +86,51 @@ package body Elab.Vhdl_Stmts is Create_Sub_Instance (Syn_Inst, Stmt, Gen_Inst); for I in 1 .. Len loop + -- Create a copy of the current iterator value for the generate + -- block. + Dval := Read_Discrete (Val); + Ival := Create_Value_Discrete (Dval, It_Rng); + -- Find and apply the config block. declare Spec : Node; + Default : Node; + Idxes : Node_Flist; + Drng : Discrete_Range_Type; begin + -- TODO: do not recompute indexes and ranges for each sub-block + -- TODO: mark & release memory + Default := Null_Node; Config := Configs; while Config /= Null_Node loop Spec := Get_Block_Specification (Config); case Get_Kind (Spec) is when Iir_Kind_Simple_Name => exit; + when Iir_Kind_Indexed_Name => + Idxes := Get_Index_List (Spec); + if Idxes = Iir_Flist_Others then + Default := Config; + else + Val := Synth_Expression_With_Type + (Syn_Inst, Get_Nth_Element (Idxes, 0), It_Rng); + exit when Is_Equal (Val, Ival); + end if; + when Iir_Kind_Slice_Name => + Synth_Discrete_Range (Syn_Inst, Get_Suffix (Spec), Drng); + exit when In_Range (Drng, Dval); when others => Error_Kind ("elab_for_generate_statement", Spec); end case; Config := Get_Prev_Block_Configuration (Config); end loop; + + if Config = Null_Node then + Config := Default; + end if; Apply_Block_Configuration (Config, Bod); end; - -- Create a copy of the current iterator value for the generate - -- block. - Ival := Create_Value_Discrete (Read_Discrete (Val), It_Rng); - Sub_Inst := Elab_Generate_Statement_Body (Gen_Inst, Bod, Config, Iterator, Ival); Set_Generate_Sub_Instance (Gen_Inst, Positive (I), Sub_Inst); |