diff options
| -rw-r--r-- | testsuite/gna/bug17203/bug.vhdl | 37 | ||||
| -rwxr-xr-x | testsuite/gna/bug17203/testsuite.sh | 10 | ||||
| -rw-r--r-- | translate/translation.adb | 46 |
3 files changed, 84 insertions, 9 deletions
diff --git a/testsuite/gna/bug17203/bug.vhdl b/testsuite/gna/bug17203/bug.vhdl new file mode 100644 index 0000000..8c2e6a5 --- /dev/null +++ b/testsuite/gna/bug17203/bug.vhdl @@ -0,0 +1,37 @@ +use std.textio.all; + +package read_string is + function read_string_time (s : string) return time; +end read_string; + +package body read_string is + function read_string_time (s : string) return time is + variable l : line := new string'(s); + variable t : time; + variable read_ok : boolean; + begin + read(l, t, read_ok); + if not read_ok then + report "read time failed" severity failure; + end if; + return t; + end function; +end package body read_string; + +use work.read_string.all; + +entity test_time is + generic (test_t : time := read_string_time("123 ps")); +end test_time; + +architecture test of test_time is +begin + process + variable t : time; + begin + t := read_string_time("321 ps"); + report "t=" & time'image(t) severity warning; + wait; + end process; +end test; + diff --git a/testsuite/gna/bug17203/testsuite.sh b/testsuite/gna/bug17203/testsuite.sh new file mode 100755 index 0000000..2d521dd --- /dev/null +++ b/testsuite/gna/bug17203/testsuite.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +. ../../testenv.sh + +analyze bug.vhdl +elab_simulate test_time + +clean + +echo "Test successful" diff --git a/translate/translation.adb b/translate/translation.adb index d699b4b..b2bf042 100644 --- a/translate/translation.adb +++ b/translate/translation.adb @@ -449,6 +449,7 @@ package body Translation is procedure Elab_Package_Body (Spec : Iir_Package_Declaration; Bod : Iir); + -- Elaborate packages that DESIGN_UNIT depends on (except std.standard). procedure Elab_Dependence (Design_Unit: Iir_Design_Unit); -- Subprograms instances. @@ -1240,6 +1241,11 @@ package body Translation is -- Size of the block instance. Block_Instance_Size : O_Dnode; + -- Only for an entity: procedure that elaborate the packages this + -- units depend on. That must be done before elaborating the + -- entity and before evaluating default expressions in generics. + Block_Elab_Pkg_Subprg : O_Dnode; + -- RTI constant for the block. Block_Rti_Const : O_Dnode := O_Dnode_Null; when Kind_Component => @@ -3973,6 +3979,11 @@ package body Translation is Chap2.Add_Subprg_Instance_Interfaces (Interface_List, Instance); Finish_Subprogram_Decl (Interface_List, Info.Block_Elab_Subprg); + -- Entity dependences elaborator. + Start_Procedure_Decl (Interface_List, Create_Identifier ("PKG_ELAB"), + Global_Storage); + Finish_Subprogram_Decl (Interface_List, Info.Block_Elab_Pkg_Subprg); + -- Generate RTI. if Flag_Rti then Rtis.Generate_Unit (Entity); @@ -3985,13 +3996,20 @@ package body Translation is -- Entity declaration and process subprograms. Chap9.Translate_Block_Subprograms (Entity, Entity); + -- Package elaborator Body. + Start_Subprogram_Body (Info.Block_Elab_Pkg_Subprg); + Push_Local_Factory; + New_Debug_Line_Stmt (Get_Line_Number (Entity)); + Chap2.Elab_Dependence (Get_Design_Unit (Entity)); + Pop_Local_Factory; + Finish_Subprogram_Body; + -- Elaborator Body. Start_Subprogram_Body (Info.Block_Elab_Subprg); Push_Local_Factory; Chap2.Start_Subprg_Instance_Use (Instance); - -- Set entity name. New_Debug_Line_Stmt (Get_Line_Number (Entity)); - Chap2.Elab_Dependence (Get_Design_Unit (Entity)); + Chap9.Elab_Block_Declarations (Entity, Entity); Chap2.Finish_Subprg_Instance_Use (Instance); Pop_Local_Factory; @@ -4123,12 +4141,8 @@ package body Translation is Start_Subprogram_Body (Info.Block_Elab_Subprg); Push_Local_Factory; - ---- Allocate memory for the instance. - --New_Assign_Stmt - -- (Instance, Gen_Alloc (Alloc_Memory, - -- New_Sizeof (Info.Block_Decls_Type, - -- Ghdl_Index_Type), - -- Info.Block_Decls_Ptr_Type)); + -- Create a variable for the architecture instance (with the right + -- type, instead of the entity instance type). New_Var_Decl (Var_Arch_Instance, Wki_Arch_Instance, O_Storage_Local, Info.Block_Decls_Ptr_Type); New_Assign_Stmt @@ -4147,7 +4161,7 @@ package body Translation is Rtis.Ghdl_Rti_Access)); end if; - -- Call entity elaborator. + -- Call entity elaborators. Start_Association (Constr, Entity_Info.Block_Elab_Subprg); New_Association (Constr, New_Value (New_Obj (Instance))); New_Procedure_Call (Constr); @@ -22794,6 +22808,15 @@ package body Translation is end case; end; + -- Elab entity packages. + declare + Assoc : O_Assoc_List; + begin + Start_Association (Assoc, Entity_Info.Block_Elab_Pkg_Subprg); + New_Procedure_Call (Assoc); + end; + + -- Elab map aspects. Push_Scope (Entity_Info.Block_Decls_Type, Var_Sub); Chap5.Elab_Map_Aspect (Mapping, Entity); Pop_Scope (Entity_Info.Block_Decls_Type); @@ -29612,6 +29635,11 @@ package body Translation is Gen_Filename (Get_Design_File (Get_Design_Unit (Entity))); + -- Elab package dependences of top entity (so that default + -- expressions can be evaluated). + Start_Association (Assoc, Entity_Info.Block_Elab_Pkg_Subprg); + New_Procedure_Call (Assoc); + -- init instance Push_Scope (Entity_Info.Block_Decls_Type, Instance); Push_Identifier_Prefix (Mark, ""); |