diff options
Diffstat (limited to 'src/vhdl')
| -rw-r--r-- | src/vhdl/iirs.adb | 14 | ||||
| -rw-r--r-- | src/vhdl/iirs.ads | 28 | ||||
| -rw-r--r-- | src/vhdl/nodes_meta.adb | 6 |
3 files changed, 25 insertions, 23 deletions
diff --git a/src/vhdl/iirs.adb b/src/vhdl/iirs.adb index fc99f74..37f73c6 100644 --- a/src/vhdl/iirs.adb +++ b/src/vhdl/iirs.adb @@ -298,6 +298,7 @@ package body Iirs is | Iir_Kind_Package_Body | Iir_Kind_Configuration_Declaration | Iir_Kind_Unit_Declaration + | Iir_Kind_Library_Declaration | Iir_Kind_Attribute_Declaration | Iir_Kind_Group_Template_Declaration | Iir_Kind_Group_Declaration @@ -450,7 +451,6 @@ package body Iirs is | Iir_Kind_Entity_Declaration | Iir_Kind_Architecture_Body | Iir_Kind_Package_Header - | Iir_Kind_Library_Declaration | Iir_Kind_Component_Declaration | Iir_Kind_Psl_Declaration | Iir_Kind_Across_Quantity_Declaration @@ -648,28 +648,28 @@ package body Iirs is begin pragma Assert (Library /= Null_Iir); pragma Assert (Has_Library_Directory (Get_Kind (Library))); - return Name_Id'Val (Get_Field11 (Library)); + return Name_Id'Val (Get_Field5 (Library)); end Get_Library_Directory; procedure Set_Library_Directory (Library : Iir; Dir : Name_Id) is begin pragma Assert (Library /= Null_Iir); pragma Assert (Has_Library_Directory (Get_Kind (Library))); - Set_Field11 (Library, Name_Id'Pos (Dir)); + Set_Field5 (Library, Name_Id'Pos (Dir)); end Set_Library_Directory; function Get_Date (Target : Iir) return Date_Type is begin pragma Assert (Target /= Null_Iir); pragma Assert (Has_Date (Get_Kind (Target))); - return Date_Type'Val (Get_Field10 (Target)); + return Date_Type'Val (Get_Field4 (Target)); end Get_Date; procedure Set_Date (Target : Iir; Date : Date_Type) is begin pragma Assert (Target /= Null_Iir); pragma Assert (Has_Date (Get_Kind (Target))); - Set_Field10 (Target, Date_Type'Pos (Date)); + Set_Field4 (Target, Date_Type'Pos (Date)); end Set_Date; function Get_Context_Items (Design_Unit : Iir) return Iir is @@ -777,7 +777,7 @@ package body Iirs is begin pragma Assert (Design_Unit /= Null_Iir); pragma Assert (Has_Design_Unit_Source_Pos (Get_Kind (Design_Unit))); - return Iir_To_Source_Ptr (Get_Field4 (Design_Unit)); + return Iir_To_Source_Ptr (Get_Field10 (Design_Unit)); end Get_Design_Unit_Source_Pos; procedure Set_Design_Unit_Source_Pos (Design_Unit : Iir; Pos : Source_Ptr) @@ -785,7 +785,7 @@ package body Iirs is begin pragma Assert (Design_Unit /= Null_Iir); pragma Assert (Has_Design_Unit_Source_Pos (Get_Kind (Design_Unit))); - Set_Field4 (Design_Unit, Source_Ptr_To_Iir (Pos)); + Set_Field10 (Design_Unit, Source_Ptr_To_Iir (Pos)); end Set_Design_Unit_Source_Pos; function Get_Design_Unit_Source_Line (Design_Unit : Iir) return Int32 is diff --git a/src/vhdl/iirs.ads b/src/vhdl/iirs.ads index 207dab7..79b003e 100644 --- a/src/vhdl/iirs.ads +++ b/src/vhdl/iirs.ads @@ -201,6 +201,10 @@ package Iirs is -- -- Get/Set_Identifier (Field3) -- + -- This is a symbolic date, only used as a order of analysis of design + -- units. + -- Get/Set_Date (Field4) + -- -- Get/Set the library unit, which can be an entity, an architecture, -- a package, a package body or a configuration. -- Get/Set_Library_Unit (Field5) @@ -218,14 +222,10 @@ package Iirs is -- when the units have been analyzed. -- Get/Set_Analysis_Checks_List (Field9) -- - -- This is a symbolic date, only used as a order of analysis of design - -- units. - -- Get/Set_Date (Field10) - -- -- Set the line and the offset in the line, only for the library manager. -- This is valid until the file is really loaded in memory. On loading, -- location will contain all this informations. - -- Get/Set_Design_Unit_Source_Pos (Field4) + -- Get/Set_Design_Unit_Source_Pos (Field10) -- -- Get/Set_Design_Unit_Source_Line (Field11) -- @@ -861,7 +861,7 @@ package Iirs is -- -- Get/Set_End_Has_Identifier (Flag9) - -- Iir_Kind_Library_Declaration (Medium) + -- Iir_Kind_Library_Declaration (Short) -- -- Design files in the library. -- Get/Set_Design_File_Chain (Field1) @@ -872,9 +872,10 @@ package Iirs is -- Name (identifier) of the library. -- Get/Set_Identifier (Field3) -- - -- Get/Set_Date (Field10) + -- Most recent date in this library. + -- Get/Set_Date (Field4) -- - -- Get/Set_Library_Directory (Field11) + -- Get/Set_Library_Directory (Field5) -- -- Get/Set_Visible_Flag (Flag4) @@ -4559,10 +4560,11 @@ package Iirs is -- A date is used for analysis order. All design units from a library -- are ordered according to the date. type Date_Type is new Nat32; - -- The unit is obseleted (ie replaced) by a more recently analyzed design + + -- The unit is obsoleted (ie replaced) by a more recently analyzed design -- unit.another design unit. -- If another design unit depends (directly or not) on an obseleted design - -- unit, it is also obselete, and cannot be defined. + -- unit, it is also obsolete, and cannot be defined. Date_Obsolete : constant Date_Type := 0; -- The unit was not analyzed. Date_Not_Analyzed : constant Date_Type := 1; @@ -4937,12 +4939,12 @@ package Iirs is procedure Set_Design_File_Chain (Library : Iir; Chain : Iir); -- System directory where the library is stored. - -- Field: Field11 (pos) + -- Field: Field5 (pos) function Get_Library_Directory (Library : Iir) return Name_Id; procedure Set_Library_Directory (Library : Iir; Dir : Name_Id); -- Symbolic date, used to order design units in a library. - -- Field: Field10 (pos) + -- Field: Field4 (pos) function Get_Date (Target : Iir) return Date_Type; procedure Set_Date (Target : Iir; Date : Date_Type); @@ -4998,7 +5000,7 @@ package Iirs is -- Set the line and the offset in the line, only for the library manager. -- This is valid until the file is really loaded in memory. On loading, -- location will contain all this informations. - -- Field: Field4 (uc) + -- Field: Field10 (uc) function Get_Design_Unit_Source_Pos (Design_Unit : Iir) return Source_Ptr; procedure Set_Design_Unit_Source_Pos (Design_Unit : Iir; Pos : Source_Ptr); diff --git a/src/vhdl/nodes_meta.adb b/src/vhdl/nodes_meta.adb index 10c27e2..9d8b878 100644 --- a/src/vhdl/nodes_meta.adb +++ b/src/vhdl/nodes_meta.adb @@ -1974,11 +1974,11 @@ package body Nodes_Meta is Field_Library, Field_Last_Design_Unit, -- Iir_Kind_Design_Unit - Field_Date, + Field_Design_Unit_Source_Pos, Field_Design_Unit_Source_Line, Field_Design_Unit_Source_Col, Field_Identifier, - Field_Design_Unit_Source_Pos, + Field_Date, Field_End_Location, Field_Elab_Flag, Field_Date_State, @@ -2534,9 +2534,9 @@ package body Nodes_Meta is Field_Parent, Field_Type, -- Iir_Kind_Library_Declaration + Field_Identifier, Field_Date, Field_Library_Directory, - Field_Identifier, Field_Visible_Flag, Field_Design_File_Chain, Field_Chain, |