1 files changed, 16 insertions, 18 deletions
diff --git a/src/synth/synth-ieee-numeric_std.ads b/src/synth/synth-ieee-numeric_std.ads
index 280be3da5..c9324f7ea 100644
--- a/src/synth/synth-ieee-numeric_std.ads
+++ b/src/synth/synth-ieee-numeric_std.ads
@@ -20,6 +20,8 @@
 
 with Types; use Types;
 
+with Synth.Objtypes; use Synth.Objtypes;
+with Synth.Source; use Synth.Source;
 with Synth.Ieee.Std_Logic_1164; use Synth.Ieee.Std_Logic_1164;
 
 package Synth.Ieee.Numeric_Std is
@@ -28,27 +30,23 @@ package Synth.Ieee.Numeric_Std is
    function Neg_Sgn (V : Std_Logic_Vector) return Std_Logic_Vector;
 
    --  "+"
-   function Add_Uns_Uns (L, R : Std_Logic_Vector) return Std_Logic_Vector;
-   function Add_Sgn_Int (L : Std_Logic_Vector; R : Int64)
-                        return Std_Logic_Vector;
-   function Add_Uns_Nat (L : Std_Logic_Vector; R : Uns64)
-                        return Std_Logic_Vector;
-   function Add_Sgn_Sgn (L, R : Std_Logic_Vector) return Std_Logic_Vector;
+   function Add_Uns_Uns (L, R : Memtyp; Loc : Syn_Src) return Memtyp;
+   function Add_Sgn_Sgn (L, R : Memtyp; Loc : Syn_Src) return Memtyp;
+   function Add_Sgn_Int (L : Memtyp; R : Int64; Loc : Syn_Src) return Memtyp;
+   function Add_Uns_Nat (L : Memtyp; R : Uns64; Loc : Syn_Src) return Memtyp;
 
    --  "-"
-   function Sub_Uns_Uns (L, R : Std_Logic_Vector) return Std_Logic_Vector;
-   function Sub_Sgn_Int (L : Std_Logic_Vector; R : Int64)
-                        return Std_Logic_Vector;
-   function Sub_Uns_Nat (L : Std_Logic_Vector; R : Uns64)
-                         return Std_Logic_Vector;
-   function Sub_Sgn_Sgn (L, R : Std_Logic_Vector) return Std_Logic_Vector;
+   function Sub_Uns_Uns (L, R : Memtyp; Loc : Syn_Src) return Memtyp;
+   function Sub_Sgn_Sgn (L, R : Memtyp; Loc : Syn_Src) return Memtyp;
+   function Sub_Sgn_Int (L : Memtyp; R : Int64; Loc : Syn_Src) return Memtyp;
+   function Sub_Uns_Nat (L : Memtyp; R : Uns64; Loc : Syn_Src) return Memtyp;
 
    --  "*"
-   function Mul_Uns_Uns (L, R : Std_Logic_Vector) return Std_Logic_Vector;
-   function Mul_Nat_Uns (L : Uns64; R : Std_Logic_Vector)
-                        return Std_Logic_Vector;
-   function Mul_Uns_Nat (L : Std_Logic_Vector; R : Uns64)
-                        return Std_Logic_Vector;
+   function Mul_Uns_Uns (L, R : Memtyp; Loc : Syn_Src) return Memtyp;
+   function Mul_Nat_Uns (L : Uns64; R : Memtyp; Loc : Syn_Src) return Memtyp;
+   function Mul_Uns_Nat (L : Memtyp; R : Uns64; Loc : Syn_Src) return Memtyp;
 
-   function Mul_Sgn_Sgn (L, R : Std_Logic_Vector) return Std_Logic_Vector;
+   function Mul_Sgn_Sgn (L, R : Memtyp; Loc : Syn_Src) return Memtyp;
+   function Mul_Int_Sgn (L : Int64; R : Memtyp; Loc : Syn_Src) return Memtyp;
+   function Mul_Sgn_Int (L : Memtyp; R : Int64; Loc : Syn_Src) return Memtyp;
 end Synth.Ieee.Numeric_Std;