diff options
Diffstat (limited to 'simulate')
| -rw-r--r-- | simulate/annotations.adb | 5 | ||||
| -rw-r--r-- | simulate/debugger.adb | 22 | ||||
| -rw-r--r-- | simulate/elaboration.adb | 12 | ||||
| -rw-r--r-- | simulate/execution.adb | 2 | ||||
| -rw-r--r-- | simulate/sim_be.adb | 2 |
5 files changed, 22 insertions, 21 deletions
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 |