simul: gather terminals

4 files changed, 74 insertions, 3 deletions

diff --git a/src/simul/simul-vhdl_elab.adb b/src/simul/simul-vhdl_elab.adb
index 8530fb99e..f3ca2ff87 100644
--- a/src/simul/simul-vhdl_elab.adb
+++ b/src/simul/simul-vhdl_elab.adb
@@ -92,6 +92,20 @@ package body Simul.Vhdl_Elab is
       Val.Val.Q := Quantity_Table.Last;
    end Gather_Quantity;
 
+   procedure Gather_Terminal (Inst : Synth_Instance_Acc; Decl : Node)
+   is
+      Val : constant Valtyp := Get_Value (Inst, Decl);
+      Def : constant Node := Get_Nature (Decl);
+      Across_Typ : Type_Acc;
+      Through_Typ : Type_Acc;
+   begin
+      Across_Typ := Get_Subtype_Object (Inst, Get_Across_Type (Def));
+      Through_Typ := Get_Subtype_Object (Inst, Get_Through_Type (Def));
+      pragma Assert (Val.Val.T = No_Terminal_Index);
+      Terminal_Table.Append ((Decl, Inst, Across_Typ, Through_Typ, null));
+      Val.Val.T := Terminal_Table.Last;
+   end Gather_Terminal;
+
    procedure Gather_Processes_Decl (Inst : Synth_Instance_Acc; Decl : Node) is
    begin
       case Get_Kind (Decl) is
@@ -128,8 +142,22 @@ package body Simul.Vhdl_Elab is
          when Iir_Kind_Configuration_Specification =>
             null;
          when Iir_Kind_Free_Quantity_Declaration
+           | Iir_Kinds_Branch_Quantity_Declaration
            | Iir_Kind_Dot_Attribute =>
             Gather_Quantity (Inst, Decl);
+         when Iir_Kind_Terminal_Declaration =>
+            Gather_Terminal (Inst, Decl);
+         when Iir_Kind_Nature_Declaration =>
+            declare
+               Def : constant Node := Get_Nature (Decl);
+               Across_Typ : constant Type_Acc :=
+                 Get_Subtype_Object (Inst, Get_Across_Type (Def));
+               Through_Typ : constant Type_Acc :=
+                 Get_Subtype_Object (Inst, Get_Through_Type (Def));
+            begin
+               Convert_Type_Width (Across_Typ);
+               Convert_Type_Width (Through_Typ);
+            end;
          when Iir_Kind_Attribute_Implicit_Declaration =>
             declare
                Sig : Node;
@@ -146,6 +174,7 @@ package body Simul.Vhdl_Elab is
          when Iir_Kind_Constant_Declaration
            | Iir_Kind_Variable_Declaration
            | Iir_Kind_Object_Alias_Declaration
+           | Iir_Kind_Non_Object_Alias_Declaration
            | Iir_Kind_Attribute_Declaration
            | Iir_Kind_Attribute_Specification
            | Iir_Kind_Type_Declaration
diff --git a/src/simul/simul-vhdl_elab.ads b/src/simul/simul-vhdl_elab.ads
index c8bc54e94..795df7245 100644
--- a/src/simul/simul-vhdl_elab.ads
+++ b/src/simul/simul-vhdl_elab.ads
@@ -197,4 +197,18 @@ package Simul.Vhdl_Elab is
       Table_Index_Type => Quantity_Index_Type,
       Table_Low_Bound => No_Quantity_Index + 1,
       Table_Initial => 128);
+
+   type Terminal_Entry is record
+      Decl : Iir;
+      Inst : Synth_Instance_Acc;
+      Across_Typ : Type_Acc;
+      Through_Typ : Type_Acc;
+      Ref_Val : Memory_Ptr;
+   end record;
+
+   package Terminal_Table is new Tables
+     (Table_Component_Type => Terminal_Entry,
+      Table_Index_Type => Terminal_Index_Type,
+      Table_Low_Bound => No_Terminal_Index + 1,
+      Table_Initial => 32);
 end Simul.Vhdl_Elab;
diff --git a/src/synth/elab-vhdl_decls.adb b/src/synth/elab-vhdl_decls.adb
index afeb344aa..44faae846 100644
--- a/src/synth/elab-vhdl_decls.adb
+++ b/src/synth/elab-vhdl_decls.adb
@@ -191,6 +191,28 @@ package body Elab.Vhdl_Decls is
       Create_Object (Syn_Inst, Decl, Res);
    end Elab_Implicit_Quantity_Declaration;
 
+   procedure Elab_Terminal_Declaration
+     (Syn_Inst : Synth_Instance_Acc; Decl : Node)
+   is
+      Res : Valtyp;
+   begin
+      Res := Create_Value_Terminal (null, No_Terminal_Index);
+      Create_Object (Syn_Inst, Decl, Res);
+   end Elab_Terminal_Declaration;
+
+   procedure Elab_Nature_Definition
+     (Syn_Inst : Synth_Instance_Acc; Def : Node)
+   is
+      pragma Unreferenced (Syn_Inst);
+   begin
+      case Get_Kind (Def) is
+         when Iir_Kind_Scalar_Nature_Definition =>
+            null;
+         when others =>
+            Error_Kind ("elab_nature_definition", Def);
+      end case;
+   end Elab_Nature_Definition;
+
    procedure Elab_Attribute_Specification
      (Syn_Inst : Synth_Instance_Acc; Spec : Node)
    is
@@ -323,12 +345,18 @@ package body Elab.Vhdl_Decls is
                   El := Get_Attr_Chain (El);
                end loop;
             end;
+         when Iir_Kind_Nature_Declaration =>
+            Elab_Nature_Definition (Syn_Inst, Get_Nature (Decl));
          when Iir_Kind_Free_Quantity_Declaration =>
             Elab_Free_Quantity_Declaration (Syn_Inst, Decl);
+         when Iir_Kinds_Branch_Quantity_Declaration =>
+            Elab_Implicit_Quantity_Declaration (Syn_Inst, Decl);
          when Iir_Kind_Above_Attribute =>
             Elab_Implicit_Signal_Declaration (Syn_Inst, Decl);
          when Iir_Kind_Dot_Attribute =>
             Elab_Implicit_Quantity_Declaration (Syn_Inst, Decl);
+         when Iir_Kind_Terminal_Declaration =>
+            Elab_Terminal_Declaration (Syn_Inst, Decl);
          when Iir_Kinds_Signal_Attribute =>
             --  Not supported by synthesis.
             null;
diff --git a/src/vhdl/vhdl-annotations.adb b/src/vhdl/vhdl-annotations.adb
index 7a2487278..fb8603c56 100644
--- a/src/vhdl/vhdl-annotations.adb
+++ b/src/vhdl/vhdl-annotations.adb
@@ -765,10 +765,11 @@ package body Vhdl.Annotations is
 
          when Iir_Kind_Terminal_Declaration =>
             Add_Terminal_Info (Block_Info, Decl);
-         when Iir_Kinds_Branch_Quantity_Declaration
-            | Iir_Kind_Free_Quantity_Declaration =>
+         when Iir_Kind_Free_Quantity_Declaration =>
             Annotate_Declaration_Type (Block_Info, Decl);
             Add_Quantity_Info (Block_Info, Decl);
+         when Iir_Kinds_Branch_Quantity_Declaration =>
+            Add_Quantity_Info (Block_Info, Decl);
 
          when Iir_Kind_Type_Declaration
            | Iir_Kind_Anonymous_Type_Declaration =>
@@ -848,7 +849,6 @@ package body Vhdl.Annotations is
 
          when Iir_Kind_Nature_Declaration =>
             null;
-
          when Iir_Kind_Psl_Default_Clock =>
             null;