diff options
Diffstat (limited to 'src/vhdl/vhdl-sem_utils.adb')
| -rw-r--r-- | src/vhdl/vhdl-sem_utils.adb | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/vhdl/vhdl-sem_utils.adb b/src/vhdl/vhdl-sem_utils.adb index 0f3045bdf..65ffda3c0 100644 --- a/src/vhdl/vhdl-sem_utils.adb +++ b/src/vhdl/vhdl-sem_utils.adb @@ -19,8 +19,8 @@ with Ada.Unchecked_Conversion; with Types; use Types; with Flags; use Flags; with Errorout; use Errorout; +with Vhdl.Nodes_Utils; use Vhdl.Nodes_Utils; with Vhdl.Utils; use Vhdl.Utils; -with Iir_Chains; use Iir_Chains; with Vhdl.Ieee.Std_Logic_1164; with Std_Names; with Vhdl.Std_Package; use Vhdl.Std_Package; @@ -128,7 +128,6 @@ package body Vhdl.Sem_Utils is procedure Create_Implicit_File_Primitives (Decl : Iir_Type_Declaration; Type_Definition : Iir_File_Type_Definition) is - use Iir_Chains.Interface_Declaration_Chain_Handling; Type_Mark : constant Iir := Get_File_Type_Mark (Type_Definition); Type_Mark_Type : constant Iir := Get_Type (Type_Mark); Proc: Iir_Procedure_Declaration; @@ -136,7 +135,7 @@ package body Vhdl.Sem_Utils is Inter: Iir; Loc : Location_Type; File_Interface_Kind : Iir_Kind; - Last_Interface : Iir; + First_Interface, Last_Interface : Iir; Last : Iir; begin Last := Decl; @@ -152,7 +151,7 @@ package body Vhdl.Sem_Utils is Set_Identifier (Proc, Std_Names.Name_File_Open); Set_Visible_Flag (Proc, True); Set_Wait_State (Proc, False); - Build_Init (Last_Interface); + Sub_Chain_Init (First_Interface, Last_Interface); case I is when 1 => Set_Implicit_Definition (Proc, Iir_Predefined_File_Open); @@ -168,7 +167,7 @@ package body Vhdl.Sem_Utils is Std_Package.File_Open_Status_Type_Definition); Set_Mode (Inter, Iir_Out_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); end case; -- File F : FT Inter := Create_Iir (Iir_Kind_Interface_File_Declaration); @@ -177,7 +176,7 @@ package body Vhdl.Sem_Utils is Set_Type (Inter, Type_Definition); Set_Mode (Inter, Iir_Inout_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); -- External_Name : in STRING Inter := Create_Iir (Iir_Kind_Interface_Constant_Declaration); Set_Location (Inter, Loc); @@ -185,7 +184,7 @@ package body Vhdl.Sem_Utils is Set_Type (Inter, Std_Package.String_Type_Definition); Set_Mode (Inter, Iir_In_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); -- Open_Kind : in File_Open_Kind := Read_Mode. Inter := Create_Iir (Iir_Kind_Interface_Constant_Declaration); Set_Location (Inter, Loc); @@ -196,7 +195,8 @@ package body Vhdl.Sem_Utils is (Inter, Build_Simple_Name (Std_Package.File_Open_Kind_Read_Mode, Loc)); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); + Set_Interface_Declaration_Chain (Proc, First_Interface); Compute_Subprogram_Hash (Proc); -- Add it to the list. Insert_Incr (Last, Proc); @@ -210,14 +210,13 @@ package body Vhdl.Sem_Utils is Set_Implicit_Definition (Proc, Iir_Predefined_File_Close); Set_Visible_Flag (Proc, True); Set_Wait_State (Proc, False); - Build_Init (Last_Interface); Inter := Create_Iir (Iir_Kind_Interface_File_Declaration); Set_Identifier (Inter, Std_Names.Name_F); Set_Location (Inter, Loc); Set_Type (Inter, Type_Definition); Set_Mode (Inter, Iir_Inout_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Set_Interface_Declaration_Chain (Proc, Inter); Compute_Subprogram_Hash (Proc); -- Add it to the list. Insert_Incr (Last, Proc); @@ -236,14 +235,14 @@ package body Vhdl.Sem_Utils is Set_Parent (Proc, Get_Parent (Decl)); Set_Visible_Flag (Proc, True); Set_Wait_State (Proc, False); - Build_Init (Last_Interface); + Sub_Chain_Init (First_Interface, Last_Interface); Inter := Create_Iir (File_Interface_Kind); Set_Identifier (Inter, Std_Names.Name_F); Set_Location (Inter, Loc); Set_Type (Inter, Type_Definition); Set_Mode (Inter, Iir_In_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); Inter := Create_Iir (Iir_Kind_Interface_Variable_Declaration); Set_Identifier (Inter, Std_Names.Name_Value); Set_Location (Inter, Loc); @@ -251,7 +250,7 @@ package body Vhdl.Sem_Utils is Set_Type (Inter, Type_Mark_Type); Set_Mode (Inter, Iir_Out_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); if Get_Kind (Type_Mark_Type) in Iir_Kinds_Array_Type_Definition and then Get_Constraint_State (Type_Mark_Type) /= Fully_Constrained then @@ -261,11 +260,12 @@ package body Vhdl.Sem_Utils is Set_Type (Inter, Std_Package.Natural_Subtype_Definition); Set_Mode (Inter, Iir_Out_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); Set_Implicit_Definition (Proc, Iir_Predefined_Read_Length); else Set_Implicit_Definition (Proc, Iir_Predefined_Read); end if; + Set_Interface_Declaration_Chain (Proc, First_Interface); Compute_Subprogram_Hash (Proc); -- Add it to the list. Insert_Incr (Last, Proc); @@ -277,7 +277,7 @@ package body Vhdl.Sem_Utils is Set_Parent (Proc, Get_Parent (Decl)); Set_Visible_Flag (Proc, True); Set_Wait_State (Proc, False); - Build_Init (Last_Interface); + Sub_Chain_Init (First_Interface, Last_Interface); Inter := Create_Iir (File_Interface_Kind); Set_Identifier (Inter, Std_Names.Name_F); Set_Location (Inter, Loc); @@ -286,7 +286,7 @@ package body Vhdl.Sem_Utils is Set_Name_Staticness (Inter, Locally); Set_Expr_Staticness (Inter, None); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); Inter := Create_Iir (Iir_Kind_Interface_Constant_Declaration); Set_Identifier (Inter, Std_Names.Name_Value); Set_Location (Inter, Loc); @@ -294,8 +294,9 @@ package body Vhdl.Sem_Utils is Set_Type (Inter, Type_Mark_Type); Set_Mode (Inter, Iir_In_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); + Sub_Chain_Append (First_Interface, Last_Interface, Inter); Set_Implicit_Definition (Proc, Iir_Predefined_Write); + Set_Interface_Declaration_Chain (Proc, First_Interface); Compute_Subprogram_Hash (Proc); -- Add it to the list. Insert_Incr (Last, Proc); @@ -308,7 +309,6 @@ package body Vhdl.Sem_Utils is Set_Parent (Proc, Get_Parent (Decl)); Set_Visible_Flag (Proc, True); Set_Wait_State (Proc, False); - Build_Init (Last_Interface); Inter := Create_Iir (File_Interface_Kind); Set_Identifier (Inter, Std_Names.Name_F); Set_Location (Inter, Loc); @@ -316,31 +316,32 @@ package body Vhdl.Sem_Utils is Set_Name_Staticness (Inter, Locally); Set_Expr_Staticness (Inter, None); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Proc, Inter); Set_Implicit_Definition (Proc, Iir_Predefined_Flush); + Set_Interface_Declaration_Chain (Proc, Inter); Compute_Subprogram_Hash (Proc); -- Add it to the list. Insert_Incr (Last, Proc); end if; + -- Create the implicit function endfile declaration. Func := Create_Iir (Iir_Kind_Function_Declaration); Set_Identifier (Func, Std_Names.Name_Endfile); Set_Location (Func, Loc); Set_Parent (Func, Get_Parent (Decl)); Set_Visible_Flag (Func, True); - Build_Init (Last_Interface); Inter := Create_Iir (File_Interface_Kind); Set_Identifier (Inter, Std_Names.Name_F); Set_Location (Inter, Loc); Set_Type (Inter, Type_Definition); Set_Mode (Inter, Iir_In_Mode); Set_Visible_Flag (Inter, True); - Append (Last_Interface, Func, Inter); Set_Return_Type (Func, Std_Package.Boolean_Type_Definition); Set_Implicit_Definition (Func, Iir_Predefined_Endfile); + Set_Interface_Declaration_Chain (Func, Inter); Compute_Subprogram_Hash (Func); -- Add it to the list. Insert_Incr (Last, Func); + end Create_Implicit_File_Primitives; procedure Create_Implicit_Operations |