diff options
| author | Tristan Gingold <tgingold@free.fr> | 2020-03-09 20:46:22 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2020-03-09 20:46:22 +0100 |
| commit | 13fbca25179ba68285a00d2527a417ccd93a39f4 (patch) | |
| tree | ae1cbf6ca7bc3590a1ae2b47bb518bd911fdb519 /src/synth | |
| parent | 1712663b4188780ed2fd774d4d348fcc52b8f009 (diff) | |
| download | ghdl-13fbca25179ba68285a00d2527a417ccd93a39f4.tar.gz ghdl-13fbca25179ba68285a00d2527a417ccd93a39f4.tar.bz2 ghdl-13fbca25179ba68285a00d2527a417ccd93a39f4.zip | |
synth-static_oper: handle and, or.
Diffstat (limited to 'src/synth')
| -rw-r--r-- | src/synth/synth-static_oper.adb | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/synth/synth-static_oper.adb b/src/synth/synth-static_oper.adb index 04be4d246..93a542351 100644 --- a/src/synth/synth-static_oper.adb +++ b/src/synth/synth-static_oper.adb @@ -304,6 +304,11 @@ package body Synth.Static_Oper is return To_Value_Acc (Arr, Val.Typ.Vec_El); end Synth_Shift; + function Get_Static_Ulogic (Op : Value_Acc) return Std_Ulogic is + begin + return Std_Ulogic'Val (Get_Static_Discrete (Op)); + end Get_Static_Ulogic; + function Synth_Static_Dyadic_Predefined (Syn_Inst : Synth_Instance_Acc; Imp : Node; Left : Value_Acc; @@ -538,10 +543,22 @@ package body Synth.Static_Oper is | Iir_Predefined_Ieee_Numeric_Std_Xor_Sgn_Sgn => return Synth_Vector_Dyadic (Left, Right, Xor_Table, Expr); + when Iir_Predefined_Ieee_1164_Scalar_Or => + return Create_Value_Discrete + (Std_Ulogic'Pos (Or_Table (Get_Static_Ulogic (Left), + Get_Static_Ulogic (Right))), + Res_Typ); + + when Iir_Predefined_Ieee_1164_Scalar_And => + return Create_Value_Discrete + (Std_Ulogic'Pos (And_Table (Get_Static_Ulogic (Left), + Get_Static_Ulogic (Right))), + Res_Typ); + when Iir_Predefined_Ieee_1164_Scalar_Xor => return Create_Value_Discrete - (Std_Ulogic'Pos (Xor_Table (Std_Ulogic'Val (Left.Scal), - Std_Ulogic'Val (Right.Scal))), + (Std_Ulogic'Pos (Xor_Table (Get_Static_Ulogic (Left), + Get_Static_Ulogic (Right))), Res_Typ); when Iir_Predefined_Ieee_Numeric_Std_Add_Uns_Uns => |