diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/std_names.adb | 4 | ||||
-rw-r--r-- | src/std_names.ads | 26 | ||||
-rw-r--r-- | src/synth/synth-oper.adb | 3 | ||||
-rw-r--r-- | src/vhdl/vhdl-ieee-std_logic_1164.adb | 43 | ||||
-rw-r--r-- | src/vhdl/vhdl-nodes.ads | 6 |
5 files changed, 70 insertions, 12 deletions
diff --git a/src/std_names.adb b/src/std_names.adb index d8d71b29b..aaad7ab51 100644 --- a/src/std_names.adb +++ b/src/std_names.adb @@ -643,7 +643,11 @@ package body Std_Names is Def ("shift_right", Name_Shift_Right); Def ("rotate_left", Name_Rotate_Left); Def ("rotate_right", Name_Rotate_Right); + Def ("to_bit", Name_To_Bit); Def ("to_bitvector", Name_To_Bitvector); + Def ("to_stdulogic", Name_To_Stdulogic); + Def ("to_stdlogicvector", Name_To_Stdlogicvector); + Def ("to_stdulogicvector", Name_To_Stdulogicvector); Def ("is_x", Name_Is_X); Def ("conv_signed", Name_Conv_Signed); Def ("conv_unsigned", Name_Conv_Unsigned); diff --git a/src/std_names.ads b/src/std_names.ads index efb0ba919..eb24904a6 100644 --- a/src/std_names.ads +++ b/src/std_names.ads @@ -724,17 +724,21 @@ package Std_Names is Name_Shift_Right : constant Name_Id := Name_First_Ieee + 025; Name_Rotate_Left : constant Name_Id := Name_First_Ieee + 026; Name_Rotate_Right : constant Name_Id := Name_First_Ieee + 027; - Name_To_Bitvector : constant Name_Id := Name_First_Ieee + 028; - Name_Is_X : constant Name_Id := Name_First_Ieee + 029; - Name_Conv_Signed : constant Name_Id := Name_First_Ieee + 030; - Name_Conv_Unsigned : constant Name_Id := Name_First_Ieee + 031; - Name_Conv_Integer : constant Name_Id := Name_First_Ieee + 032; - Name_Math_Real : constant Name_Id := Name_First_Ieee + 033; - Name_Ceil : constant Name_Id := Name_First_Ieee + 034; - Name_Round : constant Name_Id := Name_First_Ieee + 035; - Name_Log2 : constant Name_Id := Name_First_Ieee + 036; - Name_Sin : constant Name_Id := Name_First_Ieee + 037; - Name_Cos : constant Name_Id := Name_First_Ieee + 038; + Name_To_Bit : constant Name_Id := Name_First_Ieee + 028; + Name_To_Bitvector : constant Name_Id := Name_First_Ieee + 029; + Name_To_Stdulogic : constant Name_Id := Name_First_Ieee + 030; + Name_To_Stdlogicvector : constant Name_Id := Name_First_Ieee + 031; + Name_To_Stdulogicvector : constant Name_Id := Name_First_Ieee + 032; + Name_Is_X : constant Name_Id := Name_First_Ieee + 033; + Name_Conv_Signed : constant Name_Id := Name_First_Ieee + 034; + Name_Conv_Unsigned : constant Name_Id := Name_First_Ieee + 035; + Name_Conv_Integer : constant Name_Id := Name_First_Ieee + 036; + Name_Math_Real : constant Name_Id := Name_First_Ieee + 037; + Name_Ceil : constant Name_Id := Name_First_Ieee + 038; + Name_Round : constant Name_Id := Name_First_Ieee + 039; + Name_Log2 : constant Name_Id := Name_First_Ieee + 040; + Name_Sin : constant Name_Id := Name_First_Ieee + 041; + Name_Cos : constant Name_Id := Name_First_Ieee + 042; Name_Last_Ieee : constant Name_Id := Name_Cos; Name_First_Synthesis : constant Name_Id := Name_Last_Ieee + 1; diff --git a/src/synth/synth-oper.adb b/src/synth/synth-oper.adb index ec32aa1f0..a185eef17 100644 --- a/src/synth/synth-oper.adb +++ b/src/synth/synth-oper.adb @@ -1270,7 +1270,8 @@ package body Synth.Oper is end if; return Create_Value_Net (Get_Net (L), Create_Res_Bound (L)); end; - when Iir_Predefined_Ieee_1164_To_Stdlogicvector => + when Iir_Predefined_Ieee_1164_To_Stdlogicvector_Suv + | Iir_Predefined_Ieee_1164_To_Stdlogicvector_Bv => declare L : constant Value_Acc := Get_Value (Subprg_Inst, Param1); begin diff --git a/src/vhdl/vhdl-ieee-std_logic_1164.adb b/src/vhdl/vhdl-ieee-std_logic_1164.adb index be78f6afc..6947cb612 100644 --- a/src/vhdl/vhdl-ieee-std_logic_1164.adb +++ b/src/vhdl/vhdl-ieee-std_logic_1164.adb @@ -35,6 +35,13 @@ package body Vhdl.Ieee.Std_Logic_1164 is or Base_Type = Std_Logic_Vector_Type; end Is_Vector_Parameter; + function Is_Bitvec_Parameter (Inter : Iir) return Boolean + is + Base_Type : constant Iir := Get_Base_Type (Get_Type (Inter)); + begin + return Base_Type = Std_Package.Bit_Vector_Type_Definition; + end Is_Bitvec_Parameter; + function Is_Integer_Parameter (Inter : Iir) return Boolean is begin return (Get_Base_Type (Get_Type (Inter)) @@ -147,6 +154,24 @@ package body Vhdl.Ieee.Std_Logic_1164 is return True; end Is_Vector_Function; + -- Return True iff the profile of FUNC is: (l : bit_vector) + function Is_Bitvec_Function (Func : Iir) return Boolean + is + Inter : constant Iir := Get_Interface_Declaration_Chain (Func); + begin + if Get_Implicit_Definition (Func) /= Iir_Predefined_None then + return False; + end if; + if Inter = Null_Iir or else not Is_Bitvec_Parameter (Inter) then + return False; + end if; + if Get_Chain (Inter) /= Null_Iir then + return False; + end if; + + return True; + end Is_Bitvec_Function; + procedure Extract_Declarations (Pkg : Iir_Package_Declaration) is Error : exception; @@ -277,6 +302,24 @@ package body Vhdl.Ieee.Std_Logic_1164 is (Get_Interface_Declaration_Chain (Decl), False); when Name_To_Bitvector => Predefined := Iir_Predefined_Ieee_1164_To_Bitvector; + when Name_To_Stdulogic => + Predefined := Iir_Predefined_Ieee_1164_To_Stdulogic; + when Name_To_Stdlogicvector => + if Is_Vector_Function (Decl) then + Predefined := + Iir_Predefined_Ieee_1164_To_Stdlogicvector_Suv; + elsif Is_Bitvec_Function (Decl) then + Predefined := + Iir_Predefined_Ieee_1164_To_Stdlogicvector_Bv; + end if; + when Name_To_Stdulogicvector => + if Is_Vector_Function (Decl) then + Predefined := + Iir_Predefined_Ieee_1164_To_Stdulogicvector_Slv; + elsif Is_Bitvec_Function (Decl) then + Predefined := + Iir_Predefined_Ieee_1164_To_Stdulogicvector_Bv; + end if; when others => if Is_Scalar_Scalar_Function (Decl) then case Get_Identifier (Decl) is diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads index 44618964c..104cf529a 100644 --- a/src/vhdl/vhdl-nodes.ads +++ b/src/vhdl/vhdl-nodes.ads @@ -5444,7 +5444,13 @@ package Vhdl.Nodes is Iir_Predefined_Ieee_1164_Vector_Xnor, Iir_Predefined_Ieee_1164_Vector_Not, + Iir_Predefined_Ieee_1164_To_Bit, Iir_Predefined_Ieee_1164_To_Bitvector, + Iir_Predefined_Ieee_1164_To_Stdulogic, + Iir_Predefined_Ieee_1164_To_Stdlogicvector_Bv, + Iir_Predefined_Ieee_1164_To_Stdlogicvector_Suv, + Iir_Predefined_Ieee_1164_To_Stdulogicvector_Bv, + Iir_Predefined_Ieee_1164_To_Stdulogicvector_Slv, Iir_Predefined_Ieee_1164_Vector_Is_X, Iir_Predefined_Ieee_1164_Scalar_Is_X, |