From be1cda652b00ebfe4a9b4ca4e3cda2106586e739 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Sat, 19 Jul 2014 12:28:29 +0200 Subject: Replace architecture_declaration by architecture_body to follow lrm. --- canon.adb | 4 +-- canon.ads | 2 +- configuration.adb | 6 ++--- disp_tree.adb | 6 ++--- disp_vhdl.adb | 12 ++++----- errorout.adb | 2 +- evaluation.adb | 2 +- ieee-vital_timing.adb | 7 +++--- iirs.adb | 24 +++++++++--------- iirs.ads | 14 +++++------ iirs_utils.adb | 8 +++--- libraries.adb | 34 ++++++++++++-------------- libraries.ads | 2 +- parse.adb | 6 ++--- sem.adb | 12 ++++----- sem_decls.adb | 4 +-- sem_expr.adb | 2 +- sem_names.adb | 8 +++--- sem_scopes.adb | 2 +- sem_specs.adb | 6 ++--- simulate/annotations.adb | 5 ++-- simulate/debugger.adb | 22 ++++++++--------- simulate/elaboration.adb | 12 ++++----- simulate/execution.adb | 2 +- simulate/sim_be.adb | 2 +- translate/ghdldrv/ghdllocal.adb | 8 +++--- translate/ghdldrv/ghdlprint.adb | 6 ++--- translate/trans_be.adb | 4 +-- translate/translation.adb | 54 ++++++++++++++++++++--------------------- 29 files changed, 138 insertions(+), 140 deletions(-) diff --git a/canon.adb b/canon.adb index 8c757e45c..9309a703c 100644 --- a/canon.adb +++ b/canon.adb @@ -2607,7 +2607,7 @@ package body Canon is Canon_Interface_List (Get_Port_Chain (El)); Canon_Declarations (Unit, El, El); Canon_Concurrent_Stmts (Unit, El); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Canon_Declarations (Unit, El, El); Canon_Concurrent_Stmts (Unit, El); when Iir_Kind_Package_Declaration => @@ -2679,7 +2679,7 @@ package body Canon is -- Create a default configuration declaration for architecture ARCH. function Create_Default_Configuration_Declaration - (Arch : Iir_Architecture_Declaration) + (Arch : Iir_Architecture_Body) return Iir_Design_Unit is Loc : constant Location_Type := Get_Location (Arch); diff --git a/canon.ads b/canon.ads index 0678e62ed..574a31824 100644 --- a/canon.ads +++ b/canon.ads @@ -49,7 +49,7 @@ package Canon is -- Create a default configuration declaration for architecture ARCH. function Create_Default_Configuration_Declaration - (Arch : Iir_Architecture_Declaration) + (Arch : Iir_Architecture_Body) return Iir_Design_Unit; -- Canonicalize a subprogram call. diff --git a/configuration.adb b/configuration.adb index 9cd95b157..4cf51ef89 100644 --- a/configuration.adb +++ b/configuration.adb @@ -139,7 +139,7 @@ package body Configuration is Current_Configuration := Prev_Configuration; Add_Design_Unit (Get_Design_Unit (Arch), Unit); end; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => -- Add entity -- find all entity/architecture/configuration instantiation Add_Design_Unit (Get_Design_Unit (Get_Entity (Lib_Unit)), Unit); @@ -267,7 +267,7 @@ package body Configuration is else Set_Architecture (Aspect, Get_Library_Unit (Arch)); end if; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Arch := Get_Design_Unit (Arch); when others => Error_Kind ("add_design_aspect", Arch); @@ -538,7 +538,7 @@ package body Configuration is end if; else declare - Arch_Unit : Iir_Architecture_Declaration; + Arch_Unit : Iir_Architecture_Body; begin Arch_Unit := Get_Latest_Architecture (Lib_Unit); if Arch_Unit = Null_Iir then diff --git a/disp_tree.adb b/disp_tree.adb index c02951977..460bd17b4 100644 --- a/disp_tree.adb +++ b/disp_tree.adb @@ -207,8 +207,8 @@ package body Disp_Tree is when Iir_Kind_Entity_Declaration => Put ("entity_declaration"); Disp_Identifier (Tree); - when Iir_Kind_Architecture_Declaration => - Put ("architecture_declaration"); + when Iir_Kind_Architecture_Body => + Put ("architecture_body"); Disp_Identifier (Tree); when Iir_Kind_Configuration_Declaration => Put ("configuration_declaration"); @@ -704,7 +704,7 @@ package body Disp_Tree is Disp_Tree_Chain (Get_Generic_Chain (Tree), Ntab); Header ("generic map aspect chain:"); Disp_Tree_Chain (Get_Generic_Map_Aspect_Chain (Tree), Ntab); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => if Flat_Decl then return; end if; diff --git a/disp_vhdl.adb b/disp_vhdl.adb index 94aba076b..844bb7afb 100644 --- a/disp_vhdl.adb +++ b/disp_vhdl.adb @@ -125,7 +125,7 @@ package body Disp_Vhdl is case Get_Kind (Decl) is when Iir_Kind_Component_Declaration | Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Constant_Interface_Declaration | Iir_Kind_Signal_Interface_Declaration | Iir_Kind_Variable_Interface_Declaration @@ -935,7 +935,7 @@ package body Disp_Vhdl is end loop; end Disp_Concurrent_Statement_Chain; - procedure Disp_Architecture_Declaration (Arch: Iir_Architecture_Declaration) + procedure Disp_Architecture_Body (Arch: Iir_Architecture_Body) is Start: Count; begin @@ -951,7 +951,7 @@ package body Disp_Vhdl is Disp_Concurrent_Statement_Chain (Arch, Start + Indentation); Set_Col (Start); Put_Line ("end;"); - end Disp_Architecture_Declaration; + end Disp_Architecture_Body; procedure Disp_Object_Alias_Declaration (Decl: Iir_Object_Alias_Declaration) is @@ -2469,7 +2469,7 @@ package body Disp_Vhdl is case Get_Kind (Spec) is when Iir_Kind_Block_Statement | Iir_Kind_Generate_Statement - | Iir_Kind_Architecture_Declaration => + | Iir_Kind_Architecture_Body => Disp_Name_Of (Spec); when Iir_Kind_Indexed_Name => Disp_Name_Of (Get_Prefix (Spec)); @@ -2538,8 +2538,8 @@ package body Disp_Vhdl is case Get_Kind (Decl) is when Iir_Kind_Entity_Declaration => Disp_Entity_Declaration (Decl); - when Iir_Kind_Architecture_Declaration => - Disp_Architecture_Declaration (Decl); + when Iir_Kind_Architecture_Body => + Disp_Architecture_Body (Decl); when Iir_Kind_Package_Declaration => Disp_Package_Declaration (Decl); when Iir_Kind_Package_Body => diff --git a/errorout.adb b/errorout.adb index e6a9a94a3..88b78b22f 100644 --- a/errorout.adb +++ b/errorout.adb @@ -588,7 +588,7 @@ package body Errorout is return Disp_Identifier (Node, "package body"); when Iir_Kind_Entity_Declaration => return Disp_Identifier (Node, "entity"); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => return Disp_Identifier (Node, "architecture") & " of" & Disp_Identifier (Get_Entity (Node), ""); when Iir_Kind_Configuration_Declaration => diff --git a/evaluation.adb b/evaluation.adb index d6ce74555..0e5557a8b 100644 --- a/evaluation.adb +++ b/evaluation.adb @@ -2733,7 +2733,7 @@ package body Evaluation is Path_Add (":"); when Iir_Kind_Entity_Declaration => Path_Instance := El; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Path_Instance := El; when Iir_Kind_Design_Unit => Path_Add_Element (Get_Library_Unit (El), Is_Instance); diff --git a/ieee-vital_timing.adb b/ieee-vital_timing.adb index 64a03e1b9..20315556b 100644 --- a/ieee-vital_timing.adb +++ b/ieee-vital_timing.adb @@ -1321,8 +1321,7 @@ package body Ieee.Vital_Timing is return False; end Is_Vital_Level0; - procedure Check_Vital_Level0_Architecture - (Arch : Iir_Architecture_Declaration) + procedure Check_Vital_Level0_Architecture (Arch : Iir_Architecture_Body) is Decl : Iir; begin @@ -1349,7 +1348,7 @@ package body Ieee.Vital_Timing is case Get_Kind (Lib_Unit) is when Iir_Kind_Entity_Declaration => Check_Vital_Level0_Entity (Lib_Unit); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Check_Vital_Level0_Architecture (Lib_Unit); when others => Error_Vital @@ -1362,7 +1361,7 @@ package body Ieee.Vital_Timing is Arch : Iir; begin Arch := Get_Library_Unit (Unit); - if Get_Kind (Arch) /= Iir_Kind_Architecture_Declaration then + if Get_Kind (Arch) /= Iir_Kind_Architecture_Body then Error_Vital ("only architecture can be VITAL_Level1", Arch); return; end if; diff --git a/iirs.adb b/iirs.adb index b28392fb6..0e8e07598 100644 --- a/iirs.adb +++ b/iirs.adb @@ -515,7 +515,7 @@ package body Iirs is | Iir_Kind_Subtype_Definition | Iir_Kind_Scalar_Nature_Definition | Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Package_Instantiation_Declaration | Iir_Kind_Package_Header | Iir_Kind_Unit_Declaration @@ -1863,7 +1863,7 @@ package body Iirs is | Iir_Kind_Configuration_Declaration | Iir_Kind_Entity_Declaration | Iir_Kind_Package_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Unit_Declaration | Iir_Kind_Component_Declaration | Iir_Kind_Group_Declaration @@ -1978,7 +1978,7 @@ package body Iirs is case Get_Kind (Target) is when Iir_Kind_Entity_Aspect_Entity | Iir_Kind_Configuration_Declaration - | Iir_Kind_Architecture_Declaration => + | Iir_Kind_Architecture_Body => null; when others => Failed ("Entity", Target); @@ -2091,7 +2091,7 @@ package body Iirs is begin case Get_Kind (Target) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Block_Statement | Iir_Kind_Generate_Statement => null; @@ -2995,7 +2995,7 @@ package body Iirs is | Iir_Kind_Entity_Declaration | Iir_Kind_Package_Declaration | Iir_Kind_Package_Body - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Package_Instantiation_Declaration => null; when others => @@ -3071,7 +3071,7 @@ package body Iirs is | Iir_Kind_Entity_Declaration | Iir_Kind_Package_Declaration | Iir_Kind_Package_Body - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Function_Body | Iir_Kind_Procedure_Body | Iir_Kind_Sensitized_Process_Statement @@ -3458,7 +3458,7 @@ package body Iirs is | Iir_Kind_Entity_Declaration | Iir_Kind_Package_Declaration | Iir_Kind_Package_Body - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Package_Instantiation_Declaration | Iir_Kind_Unit_Declaration | Iir_Kind_Library_Declaration @@ -3594,7 +3594,7 @@ package body Iirs is | Iir_Kind_Configuration_Declaration | Iir_Kind_Entity_Declaration | Iir_Kind_Package_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Package_Instantiation_Declaration | Iir_Kind_Unit_Declaration | Iir_Kind_Library_Declaration @@ -4671,7 +4671,7 @@ package body Iirs is procedure Check_Kind_For_Foreign_Flag (Target : Iir) is begin case Get_Kind (Target) is - when Iir_Kind_Architecture_Declaration + when Iir_Kind_Architecture_Body | Iir_Kind_Function_Declaration | Iir_Kind_Procedure_Declaration => null; @@ -5115,7 +5115,7 @@ package body Iirs is procedure Check_Kind_For_Default_Configuration_Declaration (Target : Iir) is begin case Get_Kind (Target) is - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => null; when others => Failed ("Default_Configuration_Declaration", Target); @@ -5534,7 +5534,7 @@ package body Iirs is | Iir_Kind_Entity_Declaration | Iir_Kind_Package_Declaration | Iir_Kind_Package_Body - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Package_Instantiation_Declaration | Iir_Kind_Component_Declaration | Iir_Kind_Attribute_Declaration @@ -7038,7 +7038,7 @@ package body Iirs is begin case Get_Kind (Target) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Enumeration_Literal | Iir_Kind_Function_Declaration | Iir_Kind_Implicit_Function_Declaration diff --git a/iirs.ads b/iirs.ads index 1f30135f7..028fa9e75 100644 --- a/iirs.ads +++ b/iirs.ads @@ -52,7 +52,7 @@ package Iirs is -- +-- design_unit -- | +-- entity_declaration -- +-- design_unit - -- +-- architecture_declaration + -- +-- architecture_body -- ... -- Since the tree can represent all the libraries and their contents, it @@ -624,7 +624,7 @@ package Iirs is -- -- Get/Set_Is_Within_Flag (Flag5) - -- Iir_Kind_Architecture_Declaration (Medium) + -- Iir_Kind_Architecture_Body (Medium) -- -- Get/Set_Parent (Field0) -- Get/Set_Design_Unit (Alias Field0) @@ -2857,7 +2857,7 @@ package Iirs is Iir_Kind_Entity_Declaration, -- Library_Unit Iir_Kind_Package_Declaration, -- Library_Unit Iir_Kind_Package_Body, -- Library_Unit - Iir_Kind_Architecture_Declaration, -- Library_Unit + Iir_Kind_Architecture_Body, -- Library_Unit Iir_Kind_Package_Instantiation_Declaration, Iir_Kind_Package_Header, Iir_Kind_Unit_Declaration, @@ -3454,7 +3454,7 @@ package Iirs is --Iir_Kind_Entity_Declaration --Iir_Kind_Package_Declaration --Iir_Kind_Package_Body - --Iir_Kind_Architecture_Declaration + --Iir_Kind_Architecture_Body Iir_Kind_Package_Instantiation_Declaration; -- Note: does not include iir_kind_enumeration_literal since it is @@ -3827,7 +3827,7 @@ package Iirs is --Iir_Kind_Entity_Declaration --Iir_Kind_Package_Declaration --Iir_Kind_Package_Body - --Iir_Kind_Architecture_Declaration + --Iir_Kind_Architecture_Body --Iir_Kind_Package_Instantiation_Declaration --Iir_Kind_Package_Header --Iir_Kind_Unit_Declaration @@ -4103,9 +4103,9 @@ package Iirs is -- Declaration and children. subtype Iir_Entity_Declaration is Iir; - subtype Iir_Signal_Interface_Declaration is Iir; + subtype Iir_Architecture_Body is Iir; - subtype Iir_Architecture_Declaration is Iir; + subtype Iir_Signal_Interface_Declaration is Iir; subtype Iir_Configuration_Declaration is Iir; diff --git a/iirs_utils.adb b/iirs_utils.adb index 178f90ef3..e62596419 100644 --- a/iirs_utils.adb +++ b/iirs_utils.adb @@ -424,7 +424,7 @@ package body Iirs_Utils is when Iir_Kind_Library_Declaration | Iir_Kind_Package_Declaration | Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Design_Unit | Iir_Kinds_Concurrent_Statement | Iir_Kinds_Sequential_Statement => @@ -490,7 +490,7 @@ package body Iirs_Utils is | Iir_Kind_Enumeration_Subtype_Definition | Iir_Kind_Physical_Subtype_Definition => return; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Free_Recursive (Get_Entity (N)); when Iir_Kind_Proxy => null; @@ -634,12 +634,12 @@ package body Iirs_Utils is case Get_Kind (Block_Spec) is when Iir_Kind_Design_Unit => Res := Get_Library_Unit (Block_Spec); - if Get_Kind (Res) /= Iir_Kind_Architecture_Declaration then + if Get_Kind (Res) /= Iir_Kind_Architecture_Body then raise Internal_Error; end if; return Res; when Iir_Kind_Block_Statement - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Generate_Statement => return Block_Spec; when Iir_Kind_Indexed_Name diff --git a/libraries.adb b/libraries.adb index a9efb0a2e..2976464a3 100644 --- a/libraries.adb +++ b/libraries.adb @@ -145,7 +145,7 @@ package body Libraries is | Iir_Kind_Package_Body | Iir_Kind_Package_Instantiation_Declaration => Id := Get_Identifier (Lib_Unit); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => -- Architectures are put with the entity identifier. Id := Get_Identifier (Get_Entity (Lib_Unit)); when others => @@ -463,8 +463,7 @@ package body Libraries is Library_Unit := Create_Iir (Iir_Kind_Entity_Declaration); Scan; when Tok_Architecture => - Library_Unit := - Create_Iir (Iir_Kind_Architecture_Declaration); + Library_Unit := Create_Iir (Iir_Kind_Architecture_Body); Scan; when Tok_Configuration => Library_Unit := @@ -481,8 +480,7 @@ package body Libraries is when Tok_With => if Library_Unit = Null_Iir or else - Get_Kind (Library_Unit) - /= Iir_Kind_Architecture_Declaration + Get_Kind (Library_Unit) /= Iir_Kind_Architecture_Body then Put_Line ("load_library: invalid use of 'with'"); raise Internal_Error; @@ -505,7 +503,7 @@ package body Libraries is Set_Identifier (Library_Unit, Current_Identifier); Set_Identifier (Design_Unit, Current_Identifier); - if Get_Kind (Library_Unit) = Iir_Kind_Architecture_Declaration then + if Get_Kind (Library_Unit) = Iir_Kind_Architecture_Body then Scan_Expect (Tok_Of); Scan_Expect (Tok_Identifier); Set_Entity (Library_Unit, Current_Text); @@ -790,8 +788,8 @@ package body Libraries is -- Two architecture declarations are identical only if they also have -- the same entity name. - if Unit_Kind = Iir_Kind_Architecture_Declaration - and then Library_Unit_Kind = Iir_Kind_Architecture_Declaration + if Unit_Kind = Iir_Kind_Architecture_Body + and then Library_Unit_Kind = Iir_Kind_Architecture_Body then Entity_Name1 := Get_Identifier (Get_Entity (Unit)); Entity_Name2 := Get_Identifier (Get_Entity (Library_Unit)); @@ -802,11 +800,11 @@ package body Libraries is -- An architecture declaration never conflits with a library unit that -- is not an architecture declaration. - if (Unit_Kind = Iir_Kind_Architecture_Declaration - and then Library_Unit_Kind /= Iir_Kind_Architecture_Declaration) + if (Unit_Kind = Iir_Kind_Architecture_Body + and then Library_Unit_Kind /= Iir_Kind_Architecture_Body) or else - (Unit_Kind /= Iir_Kind_Architecture_Declaration - and then Library_Unit_Kind = Iir_Kind_Architecture_Declaration) + (Unit_Kind /= Iir_Kind_Architecture_Body + and then Library_Unit_Kind = Iir_Kind_Architecture_Body) then return False; end if; @@ -840,7 +838,7 @@ package body Libraries is Destroy_Iir_List (Dep_List); Lib := Get_Library_Unit (Design_Unit); if Lib /= Null_Iir - and then Get_Kind (Lib) = Iir_Kind_Architecture_Declaration + and then Get_Kind (Lib) = Iir_Kind_Architecture_Body then Unit := Get_Default_Configuration_Declaration (Lib); if Unit /= Null_Iir then @@ -1221,7 +1219,7 @@ package body Libraries is when Iir_Kind_Entity_Declaration => WR ("entity "); WR (Image_Identifier (Library_Unit)); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => WR ("architecture "); WR (Image_Identifier (Library_Unit)); WR (" of "); @@ -1309,7 +1307,7 @@ package body Libraries is -- Return the name of the latest architecture analysed for an entity. function Get_Latest_Architecture (Entity: Iir_Entity_Declaration) - return Iir_Architecture_Declaration + return Iir_Architecture_Body is Entity_Id : Name_Id; Lib : Iir_Library_Declaration; @@ -1328,7 +1326,7 @@ package body Libraries is while Design_Unit /= Null_Iir loop Library_Unit := Get_Library_Unit (Design_Unit); - if Get_Kind (Library_Unit) = Iir_Kind_Architecture_Declaration + if Get_Kind (Library_Unit) = Iir_Kind_Architecture_Body and then Get_Identifier (Get_Entity (Library_Unit)) = Entity_Id then if Res = Null_Iir then @@ -1584,7 +1582,7 @@ package body Libraries is -- Only return a primary unit. return Unit; when Iir_Kind_Package_Body - | Iir_Kind_Architecture_Declaration => + | Iir_Kind_Architecture_Body => null; when others => raise Internal_Error; @@ -1632,7 +1630,7 @@ package body Libraries is -- Set design_unit to null iff this is not the correct -- design unit. case Get_Kind (Library_Unit) is - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => -- The entity field can be either an identifier (if the -- library unit was not loaded) or an access to the entity -- unit. diff --git a/libraries.ads b/libraries.ads index 7d53b9895..852a4ef6a 100644 --- a/libraries.ads +++ b/libraries.ads @@ -159,7 +159,7 @@ package Libraries is -- Return the latest architecture analysed for entity ENTITY. function Get_Latest_Architecture (Entity: Iir_Entity_Declaration) - return Iir_Architecture_Declaration; + return Iir_Architecture_Body; -- Return the design unit (stubed if not loaded) from UNIT. -- UNIT may be either a design unit, in this case UNIT is returned, diff --git a/parse.adb b/parse.adb index d5df876c7..39e1e6678 100644 --- a/parse.adb +++ b/parse.adb @@ -3250,7 +3250,7 @@ package body Parse is -- FIXME: remove this message (already checked during sem). case Get_Kind (Parent) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Block_Statement | Iir_Kind_Package_Declaration | Iir_Kind_Package_Body => @@ -5954,10 +5954,10 @@ package body Parse is -- END [ ARCHITECTURE ] [ ARCHITECTURE_simple_name ] ; procedure Parse_Architecture (Unit : Iir_Design_Unit) is - Res: Iir_Architecture_Declaration; + Res: Iir_Architecture_Body; begin Expect (Tok_Architecture); - Res := Create_Iir (Iir_Kind_Architecture_Declaration); + Res := Create_Iir (Iir_Kind_Architecture_Body); -- Get identifier. Scan_Expect (Tok_Identifier); diff --git a/sem.adb b/sem.adb index 955259dbd..d483ba8bd 100644 --- a/sem.adb +++ b/sem.adb @@ -139,7 +139,7 @@ package body Sem is end Sem_Entity_Name; -- LRM 1.2 Architecture bodies. - procedure Sem_Architecture_Declaration (Arch: Iir_Architecture_Declaration) + procedure Sem_Architecture_Body (Arch: Iir_Architecture_Body) is Entity_Unit : Iir_Design_Unit; Entity_Library : Iir_Entity_Declaration; @@ -202,7 +202,7 @@ package body Sem is Close_Declarative_Region; Set_Is_Within_Flag (Arch, False); Set_Is_Within_Flag (Entity_Library, False); - end Sem_Architecture_Declaration; + end Sem_Architecture_Body; -- Return the real resolver used for (sub) object OBJ. -- Return NULL_IIR if none. @@ -656,7 +656,7 @@ package body Sem is -- entity name of the enclosing configuration declaration. declare Block_Spec : Iir; - Arch : Iir_Architecture_Declaration; + Arch : Iir_Architecture_Body; Design: Iir_Design_Unit; begin Block_Spec := Get_Block_Specification (Block_Conf); @@ -698,7 +698,7 @@ package body Sem is -- that to which the corresponding components are bound. declare Block_Spec : Iir; - Arch : Iir_Architecture_Declaration; + Arch : Iir_Architecture_Body; Design: Iir_Design_Unit; Entity_Aspect : Iir; Comp_Arch : Iir; @@ -2571,8 +2571,8 @@ package body Sem is case Get_Kind (El) is when Iir_Kind_Entity_Declaration => Sem_Entity_Declaration (El); - when Iir_Kind_Architecture_Declaration => - Sem_Architecture_Declaration (El); + when Iir_Kind_Architecture_Body => + Sem_Architecture_Body (El); when Iir_Kind_Package_Declaration => Sem_Package_Declaration (El); when Iir_Kind_Package_Body => diff --git a/sem_decls.adb b/sem_decls.adb index afdcdaafd..6b299f59a 100644 --- a/sem_decls.adb +++ b/sem_decls.adb @@ -1663,7 +1663,7 @@ package body Sem_Decls is -- shared data. case Get_Kind (Parent) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Package_Declaration | Iir_Kind_Package_Body | Iir_Kind_Block_Statement @@ -2825,7 +2825,7 @@ package body Sem_Decls is when Iir_Kind_Entity_Declaration => -- May be used in architecture. null; - when Iir_Kind_Architecture_Declaration + when Iir_Kind_Architecture_Body | Iir_Kind_Block_Statement | Iir_Kind_Generate_Statement => -- Might be used in a configuration. diff --git a/sem_expr.adb b/sem_expr.adb index ce8d7f2f6..11caf3545 100644 --- a/sem_expr.adb +++ b/sem_expr.adb @@ -312,7 +312,7 @@ package body Sem_Expr is | Iir_Kind_Subtype_Declaration | Iir_Kinds_Subtype_Definition | Iir_Kind_Design_Unit - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Entity_Declaration | Iir_Kinds_Concurrent_Statement | Iir_Kinds_Sequential_Statement diff --git a/sem_names.adb b/sem_names.adb index 960868f4f..93ff0175b 100644 --- a/sem_names.adb +++ b/sem_names.adb @@ -302,7 +302,7 @@ package body Sem_Names is when Iir_Kind_Entity_Declaration => Iterator_Decl_Chain (Get_Generic_Chain (Decl), Id); Iterator_Decl_Chain (Get_Port_Chain (Decl), Id); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => null; when Iir_Kind_Generate_Statement => null; @@ -335,7 +335,7 @@ package body Sem_Names is (Get_Declaration_Chain (Decl_Body), Id); Iterator_Decl_Chain (Get_Sequential_Statement_Chain (Decl_Body), Id); - when Iir_Kind_Architecture_Declaration + when Iir_Kind_Architecture_Body | Iir_Kind_Entity_Declaration | Iir_Kind_Generate_Statement | Iir_Kind_Block_Statement => @@ -1196,7 +1196,7 @@ package body Sem_Names is case Get_Kind (Parent) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Package_Declaration | Iir_Kind_Package_Body | Iir_Kind_Block_Statement @@ -1625,7 +1625,7 @@ package body Sem_Names is when Iir_Kind_Process_Statement | Iir_Kind_Procedure_Declaration | Iir_Kind_Sensitized_Process_Statement - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Entity_Declaration | Iir_Kind_Package_Declaration | Iir_Kind_Generate_Statement diff --git a/sem_scopes.adb b/sem_scopes.adb index 8028258d8..e1f266d2b 100644 --- a/sem_scopes.adb +++ b/sem_scopes.adb @@ -1207,7 +1207,7 @@ package body Sem_Scopes is procedure Extend_Scope_Of_Block_Declarations (Decl : Iir) is begin case Get_Kind (Decl) is - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Add_Context_Clauses (Get_Design_Unit (Decl)); when Iir_Kind_Block_Statement | Iir_Kind_Generate_Statement => diff --git a/sem_specs.adb b/sem_specs.adb index 0e28161c3..cf4d8353c 100644 --- a/sem_specs.adb +++ b/sem_specs.adb @@ -64,7 +64,7 @@ package body Sem_Specs is case Get_Kind (Decl) is when Iir_Kind_Entity_Declaration => return Tok_Entity; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => return Tok_Architecture; when Iir_Kind_Configuration_Declaration => return Tok_Configuration; @@ -511,7 +511,7 @@ package body Sem_Specs is -- of that design unit. case Get_Kind (Scope) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Configuration_Declaration | Iir_Kind_Package_Declaration => Sem_Named_Entity (Scope); @@ -553,7 +553,7 @@ package body Sem_Specs is case Get_Kind (Scope) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Generate_Statement => Sem_Named_Entity_Chain (Get_Declaration_Chain (Scope)); Sem_Named_Entity_Chain (Get_Concurrent_Statement_Chain (Scope)); diff --git a/simulate/annotations.adb b/simulate/annotations.adb index 00c8f715b..b447ba374 100644 --- a/simulate/annotations.adb +++ b/simulate/annotations.adb @@ -954,7 +954,8 @@ package body Annotations is (Entity_Info, Get_Concurrent_Statement_Chain (Decl)); end Annotate_Entity; - procedure Annotate_Architecture (Decl: Iir_Architecture_Declaration) is + procedure Annotate_Architecture (Decl: Iir_Architecture_Body) + is Entity_Info: Sim_Info_Acc; Arch_Info: Sim_Info_Acc; begin @@ -1107,7 +1108,7 @@ package body Annotations is case Get_Kind (El) is when Iir_Kind_Entity_Declaration => Annotate_Entity (El); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Annotate_Architecture (El); when Iir_Kind_Package_Declaration => Annotate_Package (El); diff --git a/simulate/debugger.adb b/simulate/debugger.adb index 37419bb1e..072fba6cb 100644 --- a/simulate/debugger.adb +++ b/simulate/debugger.adb @@ -154,7 +154,7 @@ package body Debugger is & Execute_Image_Attribute (Instance.Objects (Get_Info (Name).Slot), Get_Type (Name)) & ')'; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => if Short then return Image_Identifier (Get_Entity (Name)); else @@ -212,7 +212,7 @@ package body Debugger is Put ("[component]"); when Iir_Kinds_Process_Statement => Put ("[process]"); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Put ("[entity]"); when others => Error_Kind ("disp_instances_tree1", Inst.Label); @@ -372,7 +372,7 @@ package body Debugger is Child: Block_Instance_Acc; begin case Get_Kind (Blk) is - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => declare Ent : constant Iir := Get_Entity (Blk); begin @@ -508,7 +508,7 @@ package body Debugger is Disp_Declaration_Objects (Instance, Get_Declaration_Chain (Get_Subprogram_Body (Decl))); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => declare Entity : constant Iir_Entity_Declaration := Get_Entity (Decl); begin @@ -766,7 +766,7 @@ package body Debugger is then return Walk_Abort; end if; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => if (Walk_Decl_Chain (Get_Declaration_Chain (Unit)) = Walk_Abort) or else (Walk_Conc_Chain @@ -1066,7 +1066,7 @@ package body Debugger is when Iir_Kind_Entity_Declaration => Put ("entity "); Put_Line (Name_Table.Image (Get_Identifier (El))); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Put ("architecture "); Put (Name_Table.Image (Get_Identifier (El))); Put (" of "); @@ -1166,7 +1166,7 @@ package body Debugger is when Iir_Kind_Sensitized_Process_Statement | Iir_Kind_Process_Statement => Disp_Declared_Signals (Get_Parent (Decl), Instance); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Disp_Declared_Signals (Get_Entity (Decl), Instance); when Iir_Kind_Entity_Declaration => null; @@ -1179,7 +1179,7 @@ package body Debugger is | Iir_Kind_Process_Statement => -- No signal declaration in a process (FIXME: implicit signals) null; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Put_Line ("Signals of architecture " & Name_Table.Image (Get_Identifier (Decl)) & ':'); Disp_Declared_Signals_Chain @@ -1211,7 +1211,7 @@ package body Debugger is | Iir_Kind_Sensitized_Process_Statement => Foreach_Scopes (Get_Parent (N), Handler); Handler.all (N); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Foreach_Scopes (Get_Entity (N), Handler); Handler.all (N); @@ -1265,7 +1265,7 @@ package body Debugger is -- Add_Name (Unit, Get_Identifier (N), False); Add_Entity_Declarations (N); end; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Open_Declarative_Region; Add_Context_Clauses (Get_Design_Unit (N)); Add_Declarations (Get_Declaration_Chain (N), False); @@ -1333,7 +1333,7 @@ package body Debugger is case Get_Kind (N) is when Iir_Kind_Entity_Declaration => null; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Close_Declarative_Region; when Iir_Kind_Process_Statement | Iir_Kind_Sensitized_Process_Statement diff --git a/simulate/elaboration.adb b/simulate/elaboration.adb index ec2442acd..d968389f7 100644 --- a/simulate/elaboration.adb +++ b/simulate/elaboration.adb @@ -49,7 +49,7 @@ package body Elaboration is return Iir_Value_Literal_Acc; -- CONF is the block_configuration for components of ARCH. - function Elaborate_Architecture (Arch : Iir_Architecture_Declaration; + function Elaborate_Architecture (Arch : Iir_Architecture_Body; Conf : Iir_Block_Configuration; Parent_Instance : Block_Instance_Acc; Stmt : Iir; @@ -355,7 +355,7 @@ package body Elaboration is end; when Iir_Kind_Entity_Declaration | Iir_Kind_Configuration_Declaration - | Iir_Kind_Architecture_Declaration => + | Iir_Kind_Architecture_Body => Elaborate_Dependence (Design); when others => Error_Kind ("elaborate_dependence", Library_Unit); @@ -1680,7 +1680,7 @@ package body Elaboration is Entity : Iir_Entity_Declaration; Arch_Name : Name_Id; Arch_Design : Iir_Design_Unit; - Arch : Iir_Architecture_Declaration; + Arch : Iir_Architecture_Body; Arch_Frame : Block_Instance_Acc; pragma Unreferenced (Arch_Frame); Generic_Map_Aspect_Chain : Iir; @@ -2447,7 +2447,7 @@ package body Elaboration is end loop; end Elaborate_Declarative_Part; - function Elaborate_Architecture (Arch : Iir_Architecture_Declaration; + function Elaborate_Architecture (Arch : Iir_Architecture_Body; Conf : Iir_Block_Configuration; Parent_Instance : Block_Instance_Acc; Stmt : Iir; @@ -2506,7 +2506,7 @@ package body Elaboration is Conf_Unit : Iir_Design_Unit; Conf : Iir_Block_Configuration; Arch_Unit : Iir_Design_Unit; - Arch : Iir_Architecture_Declaration; + Arch : Iir_Architecture_Body; Entity : Iir_Entity_Declaration; Generic_Map : Iir; Port_Map : Iir; @@ -2519,7 +2519,7 @@ package body Elaboration is -- Find architecture and configuration for the top unit case Get_Kind (Unit) is - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Arch := Unit; Conf_Unit := Get_Default_Configuration_Declaration (Unit); when Iir_Kind_Configuration_Declaration => diff --git a/simulate/execution.adb b/simulate/execution.adb index 18407ed2a..a8a73b13a 100644 --- a/simulate/execution.adb +++ b/simulate/execution.adb @@ -2748,7 +2748,7 @@ package body Execution is Prepend (Rstr, Image (Get_Identifier (Instance.Label))); exit; end if; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => if Is_Instance then Prepend (Rstr, ')'); Prepend (Rstr, Image (Get_Identifier (Instance.Label))); diff --git a/simulate/sim_be.adb b/simulate/sim_be.adb index 6474831be..49a146879 100644 --- a/simulate/sim_be.adb +++ b/simulate/sim_be.adb @@ -78,7 +78,7 @@ package body Sim_Be is end if; if Flags.Flag_Elaborate then - if Get_Kind (Lib_Unit) = Iir_Kind_Architecture_Declaration then + if Get_Kind (Lib_Unit) = Iir_Kind_Architecture_Body then declare Config : Iir_Design_Unit; begin diff --git a/translate/ghdldrv/ghdllocal.adb b/translate/ghdldrv/ghdllocal.adb index 0341142a4..7169fa32a 100644 --- a/translate/ghdldrv/ghdllocal.adb +++ b/translate/ghdldrv/ghdllocal.adb @@ -90,7 +90,7 @@ package body Ghdllocal is if Flag_Create_Default_Config then Lib := Get_Library_Unit (Unit); - if Get_Kind (Lib) = Iir_Kind_Architecture_Declaration then + if Get_Kind (Lib) = Iir_Kind_Architecture_Body then Config := Canon.Create_Default_Configuration_Declaration (Lib); Set_Default_Configuration_Declaration (Lib, Config); end if; @@ -256,7 +256,7 @@ package body Ghdllocal is case Get_Kind (Unit) is when Iir_Kind_Entity_Declaration => Put ("entity "); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Put ("architecture "); when Iir_Kind_Configuration_Declaration => Put ("configuration "); @@ -271,7 +271,7 @@ package body Ghdllocal is Image (Id); Put (Name_Buffer (1 .. Name_Length)); case Get_Kind (Unit) is - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Put (" of "); Image (Get_Identifier (Get_Entity (Unit))); Put (Name_Buffer (1 .. Name_Length)); @@ -721,7 +721,7 @@ package body Ghdllocal is when Iir_Kind_Entity_Declaration | Iir_Kind_Configuration_Declaration => Delete_Top_Unit (Image (Get_Identifier (Lib_Unit))); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Ent_Unit := Get_Entity (Lib_Unit); Delete_Top_Unit (Image (Get_Identifier (Ent_Unit)) & '-' diff --git a/translate/ghdldrv/ghdlprint.adb b/translate/ghdldrv/ghdlprint.adb index 3850ce40c..0b775760e 100644 --- a/translate/ghdldrv/ghdlprint.adb +++ b/translate/ghdldrv/ghdlprint.adb @@ -565,7 +565,7 @@ package body Ghdlprint is null; when Iir_Kind_Package_Body => Len := Len + 1 + 4; -- add -body - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Id1 := Get_Identifier (Get_Entity (Lib)); Len := Len + 1 + Get_Name_Length (Id1); when others => @@ -598,7 +598,7 @@ package body Ghdlprint is Image (Id); Append (Name_Buffer (1 .. Name_Length)); Append ("-body"); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Image (Get_Identifier (Get_Entity (Lib))); Append (Name_Buffer (1 .. Name_Length)); Append ("-"); @@ -1469,7 +1469,7 @@ package body Ghdlprint is C := 't'; when Iir_Kind_Entity_Declaration => C := 'E'; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => C := 'A'; when Iir_Kind_Library_Declaration => C := 'L'; diff --git a/translate/trans_be.adb b/translate/trans_be.adb index af14402eb..dd1b6c338 100644 --- a/translate/trans_be.adb +++ b/translate/trans_be.adb @@ -93,7 +93,7 @@ package body Trans_Be is end if; if Flags.Flag_Elaborate then - if Get_Kind (Lib) = Iir_Kind_Architecture_Declaration then + if Get_Kind (Lib) = Iir_Kind_Architecture_Body then declare Config : Iir_Design_Unit; begin @@ -135,7 +135,7 @@ package body Trans_Be is pragma Unreferenced (Fi); begin case Get_Kind (Decl) is - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Error_Msg_Sem ("FOREIGN architectures are not yet handled", Decl); when Iir_Kind_Procedure_Declaration | Iir_Kind_Function_Declaration => diff --git a/translate/translation.adb b/translate/translation.adb index a949692ca..270c707cd 100644 --- a/translate/translation.adb +++ b/translate/translation.adb @@ -418,7 +418,7 @@ package body Translation is -- This is used when ENTITY is at the top of a design hierarchy. procedure Translate_Entity_Init (Entity : Iir); - procedure Translate_Architecture_Declaration (Arch : Iir); + procedure Translate_Architecture_Body (Arch : Iir); -- CONFIG may be one of: -- * configuration_declaration @@ -4145,7 +4145,7 @@ package body Translation is Pop_Scope (Arch_Info.Block_Decls_Type); end Pop_Architecture_Scope; - procedure Translate_Architecture_Declaration (Arch : Iir) + procedure Translate_Architecture_Body (Arch : Iir) is Info : Block_Info_Acc; Entity : Iir; @@ -4255,7 +4255,7 @@ package body Translation is Pop_Local_Factory; Finish_Subprogram_Body; - end Translate_Architecture_Declaration; + end Translate_Architecture_Body; procedure Translate_Component_Configuration_Decl (Cfg : Iir; Blk : Iir; Base_Block : Iir; Num : in out Iir_Int32) @@ -4336,7 +4336,7 @@ package body Translation is Start_Subprogram_Body (Info.Config_Subprg); Push_Local_Factory; - if Get_Kind (Base_Block) = Iir_Kind_Architecture_Declaration then + if Get_Kind (Base_Block) = Iir_Kind_Architecture_Body then Push_Architecture_Scope (Base_Block, Base_Instance); else Push_Scope (Base_Info.Block_Decls_Type, Base_Instance); @@ -4357,7 +4357,7 @@ package body Translation is Pop_Scope (Comp_Info.Comp_Type); - if Get_Kind (Base_Block) = Iir_Kind_Architecture_Declaration then + if Get_Kind (Base_Block) = Iir_Kind_Architecture_Body then Pop_Architecture_Scope (Base_Block); else Pop_Scope (Base_Info.Block_Decls_Type); @@ -4756,7 +4756,7 @@ package body Translation is is Interface_List : O_Inter_List; Block_Config : Iir_Block_Configuration; - Arch : Iir_Architecture_Declaration; + Arch : Iir_Architecture_Body; Arch_Info : Block_Info_Acc; Config_Info : Config_Info_Acc; Instance : O_Dnode; @@ -5694,7 +5694,7 @@ package body Translation is null; when Iir_Kind_Configuration_Declaration => null; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => null; when others => Error_Kind ("elab_dependence", Library_Unit); @@ -23011,7 +23011,7 @@ package body Translation is if Arch /= Null_Iir then Arch_Info := Get_Info (Arch); if Config = Null_Iir - and then Get_Kind (Arch) = Iir_Kind_Architecture_Declaration + and then Get_Kind (Arch) = Iir_Kind_Architecture_Body then Config := Get_Default_Configuration_Declaration (Arch); if Config /= Null_Iir then @@ -23571,7 +23571,7 @@ package body Translation is case Get_Kind (Block) is when Iir_Kind_Entity_Declaration => Merge_Signals_Rti_Of_Port_Chain (Get_Port_Chain (Block)); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => null; when Iir_Kind_Block_Statement => declare @@ -27587,7 +27587,7 @@ package body Translation is Kind := Ghdl_Rtik_Package_Body; -- Required at least for 'image Generate_Declaration_Chain (Get_Declaration_Chain (Blk)); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Kind := Ghdl_Rtik_Architecture; Generate_Declaration_Chain (Get_Declaration_Chain (Blk)); Generate_Concurrent_Statement_Chain @@ -27708,7 +27708,7 @@ package body Translation is -- Store the RTI. case Get_Kind (Blk) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Block_Statement | Iir_Kind_Generate_Statement => Info.Block_Rti_Const := Rti; @@ -27782,7 +27782,7 @@ package body Translation is case Get_Kind (Lib_Unit) is when Iir_Kind_Configuration_Declaration => return; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => if Info.Block_Rti_Const /= O_Dnode_Null then return; end if; @@ -27812,7 +27812,7 @@ package body Translation is end case; case Get_Kind (Lib_Unit) is when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration => + | Iir_Kind_Architecture_Body => Info.Block_Rti_Const := Rti; when Iir_Kind_Package_Declaration => Info.Package_Rti_Const := Rti; @@ -27837,7 +27837,7 @@ package body Translation is end; when Iir_Kind_Package_Body => Rti := Get_Info (Get_Package (Lib_Unit)).Package_Rti_Const; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Rti := Get_Info (Get_Entity (Lib_Unit)).Block_Rti_Const; when others => raise Internal_Error; @@ -27893,7 +27893,7 @@ package body Translation is when Iir_Kind_Component_Instantiation_Statement => Rti_Const := Node_Info.Block_Rti_Const; when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Block_Statement | Iir_Kind_Generate_Statement => Rti_Const := Node_Info.Block_Rti_Const; @@ -27924,7 +27924,7 @@ package body Translation is when Iir_Kind_Component_Declaration => Block_Type := Node_Info.Comp_Type; when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Block_Statement | Iir_Kind_Generate_Statement => Block_Type := Node_Info.Block_Decls_Type; @@ -28022,7 +28022,7 @@ package body Translation is end if; Push_Identifier_Prefix (Lib_Mark, Id); - if Get_Kind (El) = Iir_Kind_Architecture_Declaration then + if Get_Kind (El) = Iir_Kind_Architecture_Body then -- Put 'ARCH' between the entity name and the architecture name, to -- avoid a name clash with names from entity (eg an entity port with -- the same name as an architecture). @@ -28061,10 +28061,10 @@ package body Translation is New_Debug_Comment_Decl ("entity " & Image_Identifier (El)); --Set_Global_Storage (O_Storage_Private); Chap1.Translate_Entity_Declaration (El); - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => New_Debug_Comment_Decl ("architecture " & Image_Identifier (El)); --Set_Global_Storage (O_Storage_Private); - Chap1.Translate_Architecture_Declaration (El); + Chap1.Translate_Architecture_Body (El); when Iir_Kind_Configuration_Declaration => New_Debug_Comment_Decl ("configuration " & Image_Identifier (El)); if Id = Null_Identifier then @@ -28105,7 +28105,7 @@ package body Translation is if Id /= Null_Identifier then Pop_Identifier_Prefix (Unit_Mark); end if; - if Get_Kind (El) = Iir_Kind_Architecture_Declaration then + if Get_Kind (El) = Iir_Kind_Architecture_Body then Pop_Identifier_Prefix (Sep_Mark); Pop_Identifier_Prefix (Ent_Mark); end if; @@ -29651,7 +29651,7 @@ package body Translation is package body Chap12 is -- Create __ghdl_ELABORATE procedure Gen_Main (Entity : Iir_Entity_Declaration; - Arch : Iir_Architecture_Declaration; + Arch : Iir_Architecture_Body; Config_Subprg : O_Dnode; Nbr_Pkgs : Natural) is @@ -29785,7 +29785,7 @@ package body Translation is is Entity_Info : Block_Info_Acc; - Arch : Iir_Architecture_Declaration; + Arch : Iir_Architecture_Body; Arch_Info : Block_Info_Acc; Lib : Iir_Library_Declaration; @@ -29867,7 +29867,7 @@ package body Translation is Pop_Identifier_Prefix (Lib_Mark); end Gen_Last_Arch; - procedure Gen_Dummy_Default_Config (Arch : Iir_Architecture_Declaration) + procedure Gen_Dummy_Default_Config (Arch : Iir_Architecture_Body) is Entity : Iir_Entity_Declaration; Lib : Iir_Library_Declaration; @@ -30005,7 +30005,7 @@ package body Translation is Gen_Dummy_Package_Declaration (Unit); end if; end; - when Iir_Kind_Architecture_Declaration => + when Iir_Kind_Architecture_Body => Gen_Dummy_Default_Config (Lib_Unit); when others => null; @@ -30109,7 +30109,7 @@ package body Translation is Config : Iir_Design_Unit; Config_Lib : Iir_Configuration_Declaration; Entity : Iir_Entity_Declaration; - Arch : Iir_Architecture_Declaration; + Arch : Iir_Architecture_Body; Conf_Info : Config_Info_Acc; Last_Design_Unit : Natural; Nbr_Pkgs : Natural; @@ -30193,7 +30193,7 @@ package body Translation is -- and elaboration. Translate (Unit, True); when Iir_Kind_Entity_Declaration - | Iir_Kind_Architecture_Declaration + | Iir_Kind_Architecture_Body | Iir_Kind_Package_Declaration => Set_Elab_Flag (Unit, False); Translate (Unit, Whole); @@ -30222,7 +30222,7 @@ package body Translation is end if; when Iir_Kind_Entity_Declaration => Gen_Last_Arch (Lib_Unit); - when Iir_Kind_Architecture_Declaration + when Iir_Kind_Architecture_Body | Iir_Kind_Package_Body | Iir_Kind_Configuration_Declaration => null; -- cgit v1.2.3