diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/synth/synth-ieee-numeric_std.adb | 31 | ||||
| -rw-r--r-- | src/synth/synth-ieee-numeric_std.ads | 3 | ||||
| -rw-r--r-- | src/synth/synth-static_oper.adb | 17 |
3 files changed, 51 insertions, 0 deletions
diff --git a/src/synth/synth-ieee-numeric_std.adb b/src/synth/synth-ieee-numeric_std.adb index f308a2cc5..ca0f48362 100644 --- a/src/synth/synth-ieee-numeric_std.adb +++ b/src/synth/synth-ieee-numeric_std.adb @@ -180,6 +180,37 @@ package body Synth.Ieee.Numeric_Std is return Res; end Sub_Uns_Uns; + function Sub_Uns_Nat (L : Std_Logic_Vector; R : Uns64) + return Std_Logic_Vector + is + pragma Assert (L'First = 1); + Res : Std_Logic_Vector (1 .. L'Last); + V : Uns64; + Lb, Rb, Carry : Sl_X01; + begin + if L'Last < 1 then + return Null_Vec; + end if; + V := R; + Carry := '1'; + for I in reverse Res'Range loop + Lb := Sl_To_X01 (L (I)); + Rb := Uns_To_01 (V and 1); + Rb := Not_Table (Rb); + if Lb = 'X' then + --assert NO_WARNING + -- report "NUMERIC_STD.""+"": non logical value detected" + -- severity warning; + Res := (others => 'X'); + exit; + end if; + Res (I) := Compute_Sum (Carry, Rb, Lb); + Carry := Compute_Carry (Carry, Rb, Lb); + V := Shift_Right (V, 1); + end loop; + return Res; + end Sub_Uns_Nat; + function Mul_Uns_Uns (L, R : Std_Logic_Vector) return Std_Logic_Vector is pragma Assert (L'First = 1); diff --git a/src/synth/synth-ieee-numeric_std.ads b/src/synth/synth-ieee-numeric_std.ads index 1490bf9d1..6f5b5f302 100644 --- a/src/synth/synth-ieee-numeric_std.ads +++ b/src/synth/synth-ieee-numeric_std.ads @@ -36,6 +36,9 @@ package Synth.Ieee.Numeric_Std is function Sub_Uns_Uns (L, R : Std_Logic_Vector) return Std_Logic_Vector; + function Sub_Uns_Nat (L : Std_Logic_Vector; R : Uns64) + return Std_Logic_Vector; + function Mul_Uns_Uns (L, R : Std_Logic_Vector) return Std_Logic_Vector; function Mul_Sgn_Sgn (L, R : Std_Logic_Vector) return Std_Logic_Vector; diff --git a/src/synth/synth-static_oper.adb b/src/synth/synth-static_oper.adb index 30169c8a4..251e25693 100644 --- a/src/synth/synth-static_oper.adb +++ b/src/synth/synth-static_oper.adb @@ -294,6 +294,21 @@ package body Synth.Static_Oper is end; end Synth_Sub_Uns_Uns; + function Synth_Sub_Uns_Nat (L, R : Value_Acc; Loc : Syn_Src) + return Value_Acc + is + pragma Unreferenced (Loc); + L_Arr : Std_Logic_Vector (1 .. Natural (L.Arr.Len)); + R_Val : constant Uns64 := Uns64 (R.Scal); + begin + To_Std_Logic_Vector (L, L_Arr); + declare + Res_Arr : constant Std_Logic_Vector := Sub_Uns_Nat (L_Arr, R_Val); + begin + return To_Value_Acc (Res_Arr, L.Typ.Vec_El); + end; + end Synth_Sub_Uns_Nat; + function Synth_Mul_Uns_Uns (L, R : Value_Acc; Loc : Syn_Src) return Value_Acc is @@ -640,6 +655,8 @@ package body Synth.Static_Oper is when Iir_Predefined_Ieee_Numeric_Std_Sub_Uns_Uns => return Synth_Sub_Uns_Uns (Left, Right, Expr); + when Iir_Predefined_Ieee_Numeric_Std_Sub_Uns_Nat => + return Synth_Sub_Uns_Nat (Left, Right, Expr); when Iir_Predefined_Ieee_Numeric_Std_Mul_Uns_Uns => return Synth_Mul_Uns_Uns (Left, Right, Expr); |