diff options
| author | Tristan Gingold <tgingold@free.fr> | 2016-02-23 06:55:52 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2016-02-23 18:52:23 +0100 |
| commit | f8181550a62857bf2d73710b0952af16726eba6c (patch) | |
| tree | cbdc7df3a25e6c727c9b203cc61cd0512837081b /src/vhdl/translate/trans-chap12.adb | |
| parent | 7969ec4835be2e8745b648bf47cd97c30ae71ade (diff) | |
| download | ghdl-f8181550a62857bf2d73710b0952af16726eba6c.tar.gz ghdl-f8181550a62857bf2d73710b0952af16726eba6c.tar.bz2 ghdl-f8181550a62857bf2d73710b0952af16726eba6c.zip | |
translate: separate decl and stmt elab subprograms.
Diffstat (limited to 'src/vhdl/translate/trans-chap12.adb')
| -rw-r--r-- | src/vhdl/translate/trans-chap12.adb | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/src/vhdl/translate/trans-chap12.adb b/src/vhdl/translate/trans-chap12.adb index 185a01e8f..779ad97ab 100644 --- a/src/vhdl/translate/trans-chap12.adb +++ b/src/vhdl/translate/trans-chap12.adb @@ -139,9 +139,11 @@ package body Trans.Chap12 is Chap1.Translate_Entity_Init_Ports (Entity); -- Elab instance. - Start_Association (Assoc, Arch_Info.Block_Elab_Subprg); - New_Association (Assoc, New_Obj_Value (Instance)); - New_Procedure_Call (Assoc); + for K in Elab_Kind loop + Start_Association (Assoc, Arch_Info.Block_Elab_Subprg (K)); + New_Association (Assoc, New_Obj_Value (Instance)); + New_Procedure_Call (Assoc); + end loop; -- Configure instance. Start_Association (Assoc, Config_Subprg); @@ -211,18 +213,20 @@ package body Trans.Chap12 is Finish_Init_Value (Const, Get_Scope_Size (Arch_Info.Block_Scope)); -- Elaborator. - Start_Procedure_Decl - (Inter_List, Create_Identifier ("ELAB"), O_Storage_Public); - New_Interface_Decl - (Inter_List, Instance, Wki_Instance, - Entity_Info.Block_Decls_Ptr_Type); - Finish_Subprogram_Decl (Inter_List, Subprg); + for K in Elab_Kind loop + Start_Procedure_Decl + (Inter_List, Create_Elab_Identifier (K), O_Storage_Public); + New_Interface_Decl + (Inter_List, Instance, Wki_Instance, + Entity_Info.Block_Decls_Ptr_Type); + Finish_Subprogram_Decl (Inter_List, Subprg); - Start_Subprogram_Body (Subprg); - Start_Association (Constr, Arch_Info.Block_Elab_Subprg); - New_Association (Constr, New_Obj_Value (Instance)); - New_Procedure_Call (Constr); - Finish_Subprogram_Body; + Start_Subprogram_Body (Subprg); + Start_Association (Constr, Arch_Info.Block_Elab_Subprg (K)); + New_Association (Constr, New_Obj_Value (Instance)); + New_Procedure_Call (Constr); + Finish_Subprogram_Body; + end loop; -- Default config. Config := Get_Library_Unit @@ -310,13 +314,16 @@ package body Trans.Chap12 is Finish_Init_Value (Const, Ghdl_Index_0); -- Elaborator. - Start_Procedure_Decl - (Inter_List, Create_Identifier ("ELAB"), O_Storage_Public); - New_Interface_Decl (Inter_List, Instance, Wki_Instance, Ghdl_Ptr_Type); - Finish_Subprogram_Decl (Inter_List, Subprg); + for K in Elab_Kind loop + Start_Procedure_Decl + (Inter_List, Create_Elab_Identifier (K), O_Storage_Public); + New_Interface_Decl + (Inter_List, Instance, Wki_Instance, Ghdl_Ptr_Type); + Finish_Subprogram_Decl (Inter_List, Subprg); - Start_Subprogram_Body (Subprg); - Finish_Subprogram_Body; + Start_Subprogram_Body (Subprg); + Finish_Subprogram_Body; + end loop; -- Default config. Start_Procedure_Decl |