Initial support of direct recursive instantiation.

Fix issue #2.

8 files changed, 254 insertions, 144 deletions

diff --git a/src/vhdl/translate/trans-chap1.adb b/src/vhdl/translate/trans-chap1.adb
index b9f00ddee..c54c6aa13 100644
--- a/src/vhdl/translate/trans-chap1.adb
+++ b/src/vhdl/translate/trans-chap1.adb
@@ -27,6 +27,7 @@ with Trans.Chap7;
 with Trans.Chap9;
 with Trans.Rtis;
 with Trans.Helpers2; use Trans.Helpers2;
+with Name_Table;
 
 package body Trans.Chap1 is
    use Trans.Helpers;
@@ -263,6 +264,28 @@ package body Trans.Chap1 is
          Rtis.Generate_Unit (Arch);
       end if;
 
+      --  Default configuration
+      declare
+         Default_Config : constant Iir :=
+           Get_Default_Configuration_Declaration (Arch);
+         Config_Mark : Id_Mark_Type;
+      begin
+         --  In case of direct and recursive instantiation, the default
+         --  configuration may be needed while translating the architecture.
+         --  So translate the declarations of the default configuration before
+         --  translating the architecture.
+         if Default_Config /= Null_Iir
+           and then Get_Configuration_Done_Flag (Default_Config)
+         then
+            Push_Identifier_Prefix
+              (Config_Mark, Name_Table.Get_Identifier ("DEFAULT_CONFIG"));
+            Translate_Configuration_Declaration_Decl
+              (Get_Library_Unit
+                 (Get_Default_Configuration_Declaration (Arch)));
+            Pop_Identifier_Prefix (Config_Mark);
+         end if;
+      end;
+
       if Global_Storage = O_Storage_External then
          return;
       end if;
@@ -384,7 +407,8 @@ package body Trans.Chap1 is
 
       if Block /= Null_Iir then
          Push_Identifier_Prefix (Mark2, "CONFIG");
-         Translate_Configuration_Declaration (Cfg);
+         Translate_Configuration_Declaration_Decl (Cfg);
+         Translate_Configuration_Declaration_Body (Cfg);
          Pop_Identifier_Prefix (Mark2);
          Conf_Override := Cfg;
          Conf_Info := Get_Info (Cfg);
@@ -853,7 +877,7 @@ package body Trans.Chap1 is
       end loop;
    end Translate_Block_Configuration_Calls;
 
-   procedure Translate_Configuration_Declaration (Config : Iir)
+   procedure Translate_Configuration_Declaration_Decl (Config : Iir)
    is
       Block_Config   : constant Iir_Block_Configuration :=
         Get_Block_Configuration (Config);
@@ -862,27 +886,36 @@ package body Trans.Chap1 is
       Arch_Info      : constant Block_Info_Acc := Get_Info (Arch);
       Interface_List : O_Inter_List;
       Config_Info    : Config_Info_Acc;
-      Instance       : O_Dnode;
-      Num            : Iir_Int32;
-      Final          : Boolean;
    begin
-      if Get_Kind (Config) = Iir_Kind_Configuration_Declaration then
-         Chap4.Translate_Declaration_Chain (Config);
-      end if;
-
       Config_Info := Add_Info (Config, Kind_Config);
 
       --  Configurator.
       Start_Procedure_Decl
         (Interface_List, Create_Identifier, Global_Storage);
-      New_Interface_Decl (Interface_List, Instance, Wki_Instance,
-                          Arch_Info.Block_Decls_Ptr_Type);
+      New_Interface_Decl (Interface_List, Config_Info.Config_Instance,
+                          Wki_Instance, Arch_Info.Block_Decls_Ptr_Type);
       Finish_Subprogram_Decl (Interface_List, Config_Info.Config_Subprg);
+   end Translate_Configuration_Declaration_Decl;
 
+   procedure Translate_Configuration_Declaration_Body (Config : Iir)
+   is
+      Block_Config   : constant Iir_Block_Configuration :=
+        Get_Block_Configuration (Config);
+      Arch           : constant Iir_Architecture_Body :=
+        Strip_Denoting_Name (Get_Block_Specification (Block_Config));
+      Arch_Info      : constant Block_Info_Acc := Get_Info (Arch);
+      Config_Info    : constant Config_Info_Acc := Get_Info (Config);
+      Num            : Iir_Int32;
+      Final          : Boolean;
+   begin
       if Global_Storage = O_Storage_External then
          return;
       end if;
 
+      if Get_Kind (Config) = Iir_Kind_Configuration_Declaration then
+         Chap4.Translate_Declaration_Chain (Config);
+      end if;
+
       --  Declare subprograms for configuration.
       Num := 0;
       Translate_Block_Configuration_Decls (Block_Config, Arch, Arch, Num);
@@ -891,7 +924,7 @@ package body Trans.Chap1 is
       Start_Subprogram_Body (Config_Info.Config_Subprg);
       Push_Local_Factory;
 
-      Push_Architecture_Scope (Arch, Instance);
+      Push_Architecture_Scope (Arch, Config_Info.Config_Instance);
 
       if Get_Kind (Config) = Iir_Kind_Configuration_Declaration then
          Open_Temp;
@@ -907,5 +940,5 @@ package body Trans.Chap1 is
       Pop_Architecture_Scope (Arch);
       Pop_Local_Factory;
       Finish_Subprogram_Body;
-   end Translate_Configuration_Declaration;
+   end Translate_Configuration_Declaration_Body;
 end Trans.Chap1;
diff --git a/src/vhdl/translate/trans-chap1.ads b/src/vhdl/translate/trans-chap1.ads
index 005363a66..eaf3c6ade 100644
--- a/src/vhdl/translate/trans-chap1.ads
+++ b/src/vhdl/translate/trans-chap1.ads
@@ -35,5 +35,6 @@ package Trans.Chap1  is
    --  CONFIG may be one of:
    --  * configuration_declaration
    --  * component_configuration
-   procedure Translate_Configuration_Declaration (Config : Iir);
+   procedure Translate_Configuration_Declaration_Decl (Config : Iir);
+   procedure Translate_Configuration_Declaration_Body (Config : Iir);
 end Trans.Chap1;
diff --git a/src/vhdl/translate/trans-chap2.adb b/src/vhdl/translate/trans-chap2.adb
index 267f3d5ef..fe1ffc7e0 100644
--- a/src/vhdl/translate/trans-chap2.adb
+++ b/src/vhdl/translate/trans-chap2.adb
@@ -1296,23 +1296,23 @@ package body Trans.Chap2 is
 
       Set_Scope_Via_Decl (Pkg_Info.Package_Body_Scope,
                           Get_Var_Label (Info.Package_Instance_Body_Var));
+
       Set_Scope_Via_Field (Pkg_Info.Package_Spec_Scope,
                            Pkg_Info.Package_Spec_Field,
                            Pkg_Info.Package_Body_Scope'Access);
-      Chap5.Elab_Generic_Map_Aspect (Inst);
+      Chap5.Elab_Generic_Map_Aspect (Inst, (Pkg_Info.Package_Body_Scope'Access,
+                                            Pkg_Info.Package_Body_Scope));
       Clear_Scope (Pkg_Info.Package_Spec_Scope);
-      Clear_Scope (Pkg_Info.Package_Body_Scope);
 
       --  Call the elaborator of the generic.  The generic must be
       --  temporary associated with the instance variable.
       Start_Association (Constr, Pkg_Info.Package_Elab_Body_Subprg);
-      Set_Scope_Via_Decl (Pkg_Info.Package_Body_Scope,
-                          Get_Var_Label (Info.Package_Instance_Body_Var));
       Add_Subprg_Instance_Assoc
         (Constr, Pkg_Info.Package_Elab_Body_Instance);
-      Clear_Scope (Pkg_Info.Package_Body_Scope);
       New_Procedure_Call (Constr);
 
+      Clear_Scope (Pkg_Info.Package_Body_Scope);
+
       --  Chap2.Finish_Subprg_Instance_Use
       --    (Info.Package_Instance_Elab_Instance);
       Finish_Subprogram_Body;
diff --git a/src/vhdl/translate/trans-chap5.adb b/src/vhdl/translate/trans-chap5.adb
index a0c90ba6f..c115b84b4 100644
--- a/src/vhdl/translate/trans-chap5.adb
+++ b/src/vhdl/translate/trans-chap5.adb
@@ -30,6 +30,17 @@ with Trans.Foreach_Non_Composite;
 package body Trans.Chap5 is
    use Trans.Helpers;
 
+   procedure Save_Map_Env (Env : out Map_Env; Scope_Ptr : Var_Scope_Acc) is
+   begin
+      Env := (Scope_Ptr => Scope_Ptr,
+              Scope => Scope_Ptr.all);
+   end Save_Map_Env;
+
+   procedure Set_Map_Env (Env : Map_Env) is
+   begin
+      Env.Scope_Ptr.all := Env.Scope;
+   end Set_Map_Env;
+
    procedure Translate_Attribute_Specification
      (Spec : Iir_Attribute_Specification)
    is
@@ -330,7 +341,10 @@ package body Trans.Chap5 is
       Update_Data_Record => Connect_Update_Data_Record,
       Finish_Data_Record => Connect_Finish_Data_Composite);
 
-   procedure Elab_Port_Map_Aspect_Assoc (Assoc : Iir; By_Copy : Boolean)
+   procedure Elab_Port_Map_Aspect_Assoc (Assoc : Iir;
+                                         By_Copy : Boolean;
+                                         Formal_Env : Map_Env;
+                                         Actual_Env : Map_Env)
    is
       Formal      : constant Iir := Get_Formal (Assoc);
       Actual      : constant Iir := Get_Actual (Assoc);
@@ -341,6 +355,7 @@ package body Trans.Chap5 is
       Formal_Val  : Mnode;
       Actual_Sig  : Mnode;
       Actual_Val  : Mnode;
+      Actual_En   : O_Enode;
       Data        : Connect_Data;
       Mode        : Connect_Mode;
    begin
@@ -384,13 +399,11 @@ package body Trans.Chap5 is
                   raise Internal_Error;
             end case;
 
-            --  translate actual (abort if not a signal).
-            Chap6.Translate_Signal_Name (Formal, Formal_Sig, Formal_Val);
-            Actual_Sig := Chap6.Translate_Name (Actual, Mode_Signal);
-
             if By_Copy then
-               Chap6.Translate_Signal_Name (Formal, Formal_Sig, Formal_Val);
+               Set_Map_Env (Actual_Env);
                Chap6.Translate_Signal_Name (Actual, Actual_Sig, Actual_Val);
+               Set_Map_Env (Formal_Env);
+               Chap6.Translate_Signal_Name (Formal, Formal_Sig, Formal_Val);
 
                --  Copy pointer to the values.
                if Get_Info (Formal_Type).Type_Mode in Type_Mode_Arrays then
@@ -401,15 +414,18 @@ package body Trans.Chap5 is
                   New_Assign_Stmt (M2Lp (Formal_Val), M2Addr (Actual_Val));
                end if;
             else
-               Formal_Sig := Chap6.Translate_Name (Formal, Mode_Signal);
+               Set_Map_Env (Actual_Env);
                Actual_Sig := Chap6.Translate_Name (Actual, Mode_Signal);
+               Set_Map_Env (Formal_Env);
+               Formal_Sig := Chap6.Translate_Name (Formal, Mode_Signal);
             end if;
 
          else
+            Set_Map_Env (Actual_Env);
+            Actual_En := Chap7.Translate_Expression (Actual, Formal_Type);
+            Set_Map_Env (Formal_Env);
+            Actual_Sig := E2M (Actual_En, Get_Info (Formal_Type), Mode_Value);
             Chap6.Translate_Signal_Name (Formal, Formal_Sig, Formal_Val);
-            Actual_Sig :=
-              E2M (Chap7.Translate_Expression (Actual, Formal_Type),
-                   Get_Info (Formal_Type), Mode_Value);
             Mode := Connect_Value;
 --            raise Internal_Error;
          end if;
@@ -431,7 +447,9 @@ package body Trans.Chap5 is
       else
          if Get_In_Conversion (Assoc) /= Null_Iir then
             Chap4.Elab_In_Conversion (Assoc, Actual_Sig);
+            Set_Map_Env (Formal_Env);
             Formal_Sig := Chap6.Translate_Name (Formal, Mode_Signal);
+            Set_Map_Env (Actual_Env);
             Data := (Actual_Sig => Actual_Sig,
                      Actual_Type => Formal_Type,
                      Mode => Connect_Effective,
@@ -441,11 +459,13 @@ package body Trans.Chap5 is
          if Get_Out_Conversion (Assoc) /= Null_Iir then
             --  flow: FORMAL to ACTUAL
             Chap4.Elab_Out_Conversion (Assoc, Formal_Sig);
+            Set_Map_Env (Actual_Env);
             Actual_Sig := Chap6.Translate_Name (Actual, Mode_Signal);
             Data := (Actual_Sig => Actual_Sig,
                      Actual_Type => Actual_Type,
                      Mode => Connect_Source,
                      By_Copy => False);
+            Set_Map_Env (Formal_Env);
             Connect (Formal_Sig, Actual_Type, Data);
          end if;
       end if;
@@ -453,102 +473,7 @@ package body Trans.Chap5 is
       Close_Temp;
    end Elab_Port_Map_Aspect_Assoc;
 
-   procedure Elab_Generic_Map_Aspect (Mapping : Iir)
-   is
-      Assoc  : Iir;
-      Formal : Iir;
-   begin
-      --  Elab generics, and associate.
-      Assoc := Get_Generic_Map_Aspect_Chain (Mapping);
-      while Assoc /= Null_Iir loop
-         Open_Temp;
-         Formal := Strip_Denoting_Name (Get_Formal (Assoc));
-         case Get_Kind (Assoc) is
-            when Iir_Kind_Association_Element_By_Expression =>
-               declare
-                  Targ : Mnode;
-               begin
-                  if Get_Whole_Association_Flag (Assoc) then
-                     Chap4.Elab_Object_Storage (Formal);
-                     Targ := Chap6.Translate_Name (Formal, Mode_Value);
-                     Chap4.Elab_Object_Init
-                       (Targ, Formal, Get_Actual (Assoc));
-                  else
-                     Targ := Chap6.Translate_Name (Formal, Mode_Value);
-                     Chap7.Translate_Assign
-                       (Targ, Get_Actual (Assoc), Get_Type (Formal));
-                  end if;
-               end;
-            when Iir_Kind_Association_Element_Open =>
-               declare
-                  Value : constant Iir := Get_Default_Value (Formal);
-               begin
-                  Chap4.Elab_Object_Value (Formal, Value);
-                  Chap9.Destroy_Types (Value);
-               end;
-            when Iir_Kind_Association_Element_By_Individual =>
-               --  Create the object.
-               declare
-                  Formal_Type : constant Iir := Get_Type (Formal);
-                  Obj_Info    : constant Object_Info_Acc := Get_Info (Formal);
-                  Obj_Type    : constant Iir := Get_Actual_Type (Assoc);
-                  Formal_Node : Mnode;
-                  Type_Info   : Type_Info_Acc;
-                  Bounds      : Mnode;
-               begin
-                  Chap3.Elab_Object_Subtype (Formal_Type);
-                  Type_Info := Get_Info (Formal_Type);
-                  Formal_Node := Get_Var
-                    (Obj_Info.Object_Var, Type_Info, Mode_Value);
-                  Stabilize (Formal_Node);
-                  if Obj_Type = Null_Iir then
-                     Chap4.Allocate_Complex_Object
-                       (Formal_Type, Alloc_System, Formal_Node);
-                  else
-                     Chap3.Create_Array_Subtype (Obj_Type);
-                     Bounds := Chap3.Get_Array_Type_Bounds (Obj_Type);
-                     Chap3.Translate_Object_Allocation
-                       (Formal_Node, Alloc_System, Formal_Type, Bounds);
-                  end if;
-               end;
-            when Iir_Kind_Association_Element_Package =>
-               pragma Assert (Get_Kind (Formal) =
-                                Iir_Kind_Interface_Package_Declaration);
-               declare
-                  Uninst_Pkg  : constant Iir := Get_Named_Entity
-                    (Get_Uninstantiated_Package_Name (Formal));
-                  Uninst_Info : constant Ortho_Info_Acc :=
-                    Get_Info (Uninst_Pkg);
-                  Formal_Info : constant Ortho_Info_Acc :=
-                    Get_Info (Formal);
-                  Actual      : constant Iir := Get_Named_Entity
-                    (Get_Actual (Assoc));
-                  Actual_Info : constant Ortho_Info_Acc :=
-                    Get_Info (Actual);
-               begin
-                  New_Assign_Stmt
-                    (Get_Var (Formal_Info.Package_Instance_Spec_Var),
-                     New_Address
-                       (Get_Instance_Ref
-                            (Actual_Info.Package_Instance_Spec_Scope),
-                        Uninst_Info.Package_Spec_Ptr_Type));
-                  New_Assign_Stmt
-                    (Get_Var (Formal_Info.Package_Instance_Body_Var),
-                     New_Address
-                       (Get_Instance_Ref
-                            (Actual_Info.Package_Instance_Body_Scope),
-                        Uninst_Info.Package_Body_Ptr_Type));
-               end;
-            when others =>
-               Error_Kind ("elab_generic_map_aspect(1)", Assoc);
-         end case;
-         Close_Temp;
-         Assoc := Get_Chain (Assoc);
-      end loop;
-   end Elab_Generic_Map_Aspect;
-
-   function Alloc_Bounds (Atype : Iir; Alloc : Allocation_Kind)
-                        return Mnode
+   function Alloc_Bounds (Atype : Iir; Alloc : Allocation_Kind) return Mnode
    is
       Tinfo : constant Type_Info_Acc := Get_Info (Atype);
       Var : O_Dnode;
@@ -663,9 +588,7 @@ package body Trans.Chap5 is
       Open_Temp;
       case Iir_Kinds_Association_Element (Get_Kind (Assoc)) is
          when Iir_Kind_Association_Element_By_Expression =>
-            if not Get_Whole_Association_Flag (Assoc) then
-               return;
-            end if;
+            pragma Assert (Get_Whole_Association_Flag (Assoc));
             Bounds := Get_Unconstrained_Port_Bounds (Assoc);
          when Iir_Kind_Association_Element_Open =>
             declare
@@ -697,10 +620,14 @@ package body Trans.Chap5 is
       Close_Temp;
    end Elab_Unconstrained_Port_Bounds;
 
-   procedure Elab_Port_Map_Aspect (Mapping : Iir; Block_Parent : Iir)
+   procedure Elab_Port_Map_Aspect
+     (Mapping : Iir; Block_Parent : Iir; Formal_Env : Map_Env)
    is
+      Actual_Env : Map_Env;
       Assoc : Iir;
    begin
+      Save_Map_Env (Actual_Env, Formal_Env.Scope_Ptr);
+
       --  Ports.
       Assoc := Get_Port_Map_Aspect_Chain (Mapping);
       while Assoc /= Null_Iir loop
@@ -710,6 +637,7 @@ package body Trans.Chap5 is
             Fb_Type : constant Iir := Get_Type (Formal_Base);
             Fbt_Info : constant Type_Info_Acc := Get_Info (Fb_Type);
          begin
+            Set_Map_Env (Formal_Env);
             --  Set bounds of unconstrained ports.
             if Fbt_Info.Type_Mode = Type_Mode_Fat_Array then
                Open_Temp;
@@ -739,20 +667,23 @@ package body Trans.Chap5 is
                   if Get_Whole_Association_Flag (Assoc) then
                      if Get_Collapse_Signal_Flag (Assoc) then
                         --  For collapsed association, copy signals.
-                        Elab_Port_Map_Aspect_Assoc (Assoc, True);
+                        Elab_Port_Map_Aspect_Assoc
+                          (Assoc, True, Formal_Env, Actual_Env);
                      else
                         --  Create non-collapsed signals.
                         Chap4.Elab_Signal_Declaration_Object
                           (Formal, Block_Parent, False);
                         --  And associate.
-                        Elab_Port_Map_Aspect_Assoc (Assoc, False);
+                        Elab_Port_Map_Aspect_Assoc
+                          (Assoc, False, Formal_Env, Actual_Env);
                      end if;
                   else
                      --  By sub-element.
                      --  Either the whole signal is collapsed or it was already
                      --  created.
                      --  And associate.
-                     Elab_Port_Map_Aspect_Assoc (Assoc, False);
+                     Elab_Port_Map_Aspect_Assoc
+                       (Assoc, False, Formal_Env, Actual_Env);
                   end if;
                when Iir_Kind_Association_Element_Open
                  | Iir_Kind_Association_Element_By_Individual =>
@@ -765,14 +696,127 @@ package body Trans.Chap5 is
          end;
          Assoc := Get_Chain (Assoc);
       end loop;
+      Set_Map_Env (Actual_Env);
    end Elab_Port_Map_Aspect;
 
-   procedure Elab_Map_Aspect (Mapping : Iir; Block_Parent : Iir) is
+   procedure Elab_Generic_Map_Aspect (Mapping : Iir; Formal_Env : Map_Env)
+   is
+      Actual_Env : Map_Env;
+      Assoc  : Iir;
+      Formal : Iir;
+   begin
+      Save_Map_Env (Actual_Env, Formal_Env.Scope_Ptr);
+
+      --  Elab generics, and associate.
+      Assoc := Get_Generic_Map_Aspect_Chain (Mapping);
+      while Assoc /= Null_Iir loop
+         Open_Temp;
+         Formal := Strip_Denoting_Name (Get_Formal (Assoc));
+         case Get_Kind (Assoc) is
+            when Iir_Kind_Association_Element_By_Expression =>
+               declare
+                  Targ : Mnode;
+               begin
+                  if Get_Whole_Association_Flag (Assoc) then
+                     Set_Map_Env (Formal_Env);
+                     Chap4.Elab_Object_Storage (Formal);
+                     Targ := Chap6.Translate_Name (Formal, Mode_Value);
+                     Set_Map_Env (Actual_Env);
+                     Chap4.Elab_Object_Init
+                       (Targ, Formal, Get_Actual (Assoc));
+                  else
+                     Set_Map_Env (Formal_Env);
+                     Targ := Chap6.Translate_Name (Formal, Mode_Value);
+                     Set_Map_Env (Actual_Env);
+                     Chap7.Translate_Assign
+                       (Targ, Get_Actual (Assoc), Get_Type (Formal));
+                  end if;
+               end;
+            when Iir_Kind_Association_Element_Open =>
+               declare
+                  Value : constant Iir := Get_Default_Value (Formal);
+               begin
+                  Set_Map_Env (Formal_Env);
+                  Chap4.Elab_Object_Value (Formal, Value);
+                  Chap9.Destroy_Types (Value);
+                  Set_Map_Env (Actual_Env);
+               end;
+            when Iir_Kind_Association_Element_By_Individual =>
+               --  Create the object.
+               declare
+                  Formal_Type : constant Iir := Get_Type (Formal);
+                  Obj_Info    : constant Object_Info_Acc := Get_Info (Formal);
+                  Obj_Type    : constant Iir := Get_Actual_Type (Assoc);
+                  Formal_Node : Mnode;
+                  Type_Info   : Type_Info_Acc;
+                  Bounds      : Mnode;
+               begin
+                  Set_Map_Env (Formal_Env);
+                  Chap3.Elab_Object_Subtype (Formal_Type);
+                  Type_Info := Get_Info (Formal_Type);
+                  Formal_Node := Get_Var
+                    (Obj_Info.Object_Var, Type_Info, Mode_Value);
+                  Stabilize (Formal_Node);
+                  if Obj_Type = Null_Iir then
+                     Chap4.Allocate_Complex_Object
+                       (Formal_Type, Alloc_System, Formal_Node);
+                  else
+                     Chap3.Create_Array_Subtype (Obj_Type);
+                     Bounds := Chap3.Get_Array_Type_Bounds (Obj_Type);
+                     Chap3.Translate_Object_Allocation
+                       (Formal_Node, Alloc_System, Formal_Type, Bounds);
+                  end if;
+                  Set_Map_Env (Actual_Env);
+               end;
+            when Iir_Kind_Association_Element_Package =>
+               pragma Assert (Get_Kind (Formal) =
+                                Iir_Kind_Interface_Package_Declaration);
+               declare
+                  Uninst_Pkg  : constant Iir := Get_Named_Entity
+                    (Get_Uninstantiated_Package_Name (Formal));
+                  Uninst_Info : constant Ortho_Info_Acc :=
+                    Get_Info (Uninst_Pkg);
+                  Formal_Info : constant Ortho_Info_Acc :=
+                    Get_Info (Formal);
+                  Actual      : constant Iir := Get_Named_Entity
+                    (Get_Actual (Assoc));
+                  Actual_Info : constant Ortho_Info_Acc :=
+                    Get_Info (Actual);
+               begin
+                  New_Assign_Stmt
+                    (Get_Var (Formal_Info.Package_Instance_Spec_Var),
+                     New_Address
+                       (Get_Instance_Ref
+                            (Actual_Info.Package_Instance_Spec_Scope),
+                        Uninst_Info.Package_Spec_Ptr_Type));
+                  New_Assign_Stmt
+                    (Get_Var (Formal_Info.Package_Instance_Body_Var),
+                     New_Address
+                       (Get_Instance_Ref
+                            (Actual_Info.Package_Instance_Body_Scope),
+                        Uninst_Info.Package_Body_Ptr_Type));
+               end;
+            when others =>
+               Error_Kind ("elab_generic_map_aspect(1)", Assoc);
+         end case;
+         Close_Temp;
+         Assoc := Get_Chain (Assoc);
+      end loop;
+   end Elab_Generic_Map_Aspect;
+
+   procedure Elab_Map_Aspect
+     (Mapping : Iir; Block_Parent : Iir; Formal_Env : Map_Env) is
    begin
+      --  The use of FORMAL_ENV (and then later ACTUAL_ENV) is rather fragile
+      --  as in some cases both the formal and the actual are referenced in the
+      --  same time (like Check_Array_Match).  But the env are different only
+      --  in case of direct recursive instantation (rare).  To stay on the safe
+      --  side, FORMAL_ENV must be active/set.
+
       --  The generic map must be done before the elaboration of
       --  the ports, since a port subtype may depend on a generic.
-      Elab_Generic_Map_Aspect (Mapping);
+      Elab_Generic_Map_Aspect (Mapping, Formal_Env);
 
-      Elab_Port_Map_Aspect (Mapping, Block_Parent);
+      Elab_Port_Map_Aspect (Mapping, Block_Parent, Formal_Env);
    end Elab_Map_Aspect;
 end Trans.Chap5;
diff --git a/src/vhdl/translate/trans-chap5.ads b/src/vhdl/translate/trans-chap5.ads
index 4912dc224..6902d3b3b 100644
--- a/src/vhdl/translate/trans-chap5.ads
+++ b/src/vhdl/translate/trans-chap5.ads
@@ -30,7 +30,22 @@ package Trans.Chap5 is
    --  Elab an unconstrained port.
    procedure Elab_Unconstrained_Port_Bounds (Port : Iir; Assoc : Iir);
 
-   procedure Elab_Generic_Map_Aspect (Mapping : Iir);
+   --  Describe how to set the environment to access to formal in a map.  This
+   --  is really useful only for recursive instantiation where the formal is
+   --  the same as the actual, but their environment differs.
+   type Map_Env is record
+      --  The scope that has to be modified.
+      Scope_Ptr : Var_Scope_Acc;
+
+      --  The value for the scope.
+      Scope : Var_Scope_Type;
+   end record;
+
+   --  Save and restore the map environment defined by ENV.
+   procedure Save_Map_Env (Env : out Map_Env; Scope_Ptr : Var_Scope_Acc);
+   procedure Set_Map_Env (Env : Map_Env);
+
+   procedure Elab_Generic_Map_Aspect (Mapping : Iir; Formal_Env : Map_Env);
 
    --  There are 4 cases of generic/port map:
    --  1) component instantiation
@@ -40,5 +55,7 @@ package Trans.Chap5 is
    --  4) direct (entity + architecture or configuration) instantiation
    --
    --  MAPPING is the node containing the generic/port map aspects.
-   procedure Elab_Map_Aspect (Mapping : Iir; Block_Parent : Iir);
+
+   procedure Elab_Map_Aspect
+     (Mapping : Iir; Block_Parent : Iir; Formal_Env : Map_Env);
 end Trans.Chap5;
diff --git a/src/vhdl/translate/trans-chap9.adb b/src/vhdl/translate/trans-chap9.adb
index 8cfaf6a3c..9500bbd88 100644
--- a/src/vhdl/translate/trans-chap9.adb
+++ b/src/vhdl/translate/trans-chap9.adb
@@ -905,7 +905,8 @@ package body Trans.Chap9 is
          --  instantiation statement.
          Set_Component_Link (Comp_Info.Comp_Scope, Comp_Info.Comp_Link);
 
-         Chap5.Elab_Map_Aspect (Stmt, Comp);
+         Chap5.Elab_Map_Aspect (Stmt, Comp, (Comp_Info.Comp_Scope'Access,
+                                             Comp_Info.Comp_Scope));
 
          Clear_Scope (Comp_Info.Comp_Scope);
       end if;
@@ -1654,9 +1655,15 @@ package body Trans.Chap9 is
       end;
 
       --  Elab map aspects.
-      Set_Scope_Via_Param_Ptr (Entity_Info.Block_Scope, Var_Sub);
-      Chap5.Elab_Map_Aspect (Mapping, Entity);
-      Clear_Scope (Entity_Info.Block_Scope);
+      declare
+         use Chap5;
+         Entity_Map : Map_Env;
+      begin
+         Entity_Map.Scope_Ptr := Entity_Info.Block_Scope'Access;
+         Set_Scope_Via_Param_Ptr (Entity_Map.Scope, Var_Sub);
+         Chap5.Elab_Map_Aspect (Mapping, Entity, Entity_Map);
+         Clear_Scope (Entity_Map.Scope);
+      end;
 
       --  3) Elab instance.
       declare
@@ -2200,6 +2207,8 @@ package body Trans.Chap9 is
                Header : constant Iir_Block_Header :=
                  Get_Block_Header (Block);
                Guard  : constant Iir := Get_Guard_Decl (Block);
+               Block_Env : Chap5.Map_Env;
+               Block_Info : Block_Info_Acc;
             begin
                if Guard /= Null_Iir then
                   New_Debug_Line_Stmt (Get_Line_Number (Guard));
@@ -2207,7 +2216,10 @@ package body Trans.Chap9 is
                end if;
                if Header /= Null_Iir then
                   New_Debug_Line_Stmt (Get_Line_Number (Header));
-                  Chap5.Elab_Map_Aspect (Header, Block);
+                  Block_Info := Get_Info (Block);
+                  Block_Env := (Block_Info.Block_Scope'Access,
+                                Block_Info.Block_Scope);
+                  Chap5.Elab_Map_Aspect (Header, Block, Block_Env);
                   Merge_Signals_Rti_Of_Port_Chain (Get_Port_Chain (Header));
                end if;
             end;
diff --git a/src/vhdl/translate/trans.ads b/src/vhdl/translate/trans.ads
index fc53a0cea..1ce061817 100644
--- a/src/vhdl/translate/trans.ads
+++ b/src/vhdl/translate/trans.ads
@@ -1426,6 +1426,7 @@ package Trans is
          when Kind_Config =>
             --  Subprogram that configure the block.
             Config_Subprg : O_Dnode;
+            Config_Instance : O_Dnode;
 
          when Kind_Field =>
             --  Node for a record element declaration.
diff --git a/src/vhdl/translate/translation.adb b/src/vhdl/translate/translation.adb
index 8ed651ab0..79999f78a 100644
--- a/src/vhdl/translate/translation.adb
+++ b/src/vhdl/translate/translation.adb
@@ -298,6 +298,7 @@ package body Translation is
          when Iir_Kind_Configuration_Declaration =>
             New_Debug_Comment_Decl ("configuration " & Image_Identifier (El));
             if Id = Null_Identifier then
+               --  Default configuration.
                declare
                   Mark : Id_Mark_Type;
                   Mark_Entity : Id_Mark_Type;
@@ -315,14 +316,15 @@ package body Translation is
                   Push_Identifier_Prefix (Mark_Arch, Get_Identifier (Arch));
                   Push_Identifier_Prefix
                     (Mark, Name_Table.Get_Identifier ("DEFAULT_CONFIG"));
-                  Chap1.Translate_Configuration_Declaration (El);
+                  Chap1.Translate_Configuration_Declaration_Body (El);
                   Pop_Identifier_Prefix (Mark);
                   Pop_Identifier_Prefix (Mark_Arch);
                   Pop_Identifier_Prefix (Mark_Sep);
                   Pop_Identifier_Prefix (Mark_Entity);
                end;
             else
-               Chap1.Translate_Configuration_Declaration (El);
+               Chap1.Translate_Configuration_Declaration_Decl (El);
+               Chap1.Translate_Configuration_Declaration_Body (El);
             end if;
          when Iir_Kind_Context_Declaration =>
             New_Debug_Comment_Decl ("context " & Image_Identifier (El));