From 33c75c4c819313575ee20a234658da32e97a9cf1 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sat, 28 Sep 2019 23:16:56 +0200
Subject: synth: add support for mod operator.

---
 src/synth/netlists-builders.adb |  9 +++++++--
 src/synth/netlists-gates.ads    | 42 +++++++++++++++++++++--------------------
 src/synth/synth-oper.adb        |  3 +--
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/synth/netlists-builders.adb b/src/synth/netlists-builders.adb
index e35c34b49..fb54805eb 100644
--- a/src/synth/netlists-builders.adb
+++ b/src/synth/netlists-builders.adb
@@ -417,10 +417,15 @@ package body Netlists.Builders is
                             Get_Identifier ("add"), Id_Add);
       Create_Dyadic_Module (Design, Res.M_Dyadic (Id_Sub),
                             Get_Identifier ("sub"), Id_Sub);
-      Create_Dyadic_Module (Design, Res.M_Dyadic (Id_Smul),
-                            Get_Identifier ("smul"), Id_Smul);
       Create_Dyadic_Module (Design, Res.M_Dyadic (Id_Umul),
                             Get_Identifier ("umul"), Id_Umul);
+      Create_Dyadic_Module (Design, Res.M_Dyadic (Id_Smul),
+                            Get_Identifier ("smul"), Id_Smul);
+      Create_Dyadic_Module (Design, Res.M_Dyadic (Id_Umod),
+                            Get_Identifier ("umod"), Id_Umod);
+      Create_Dyadic_Module (Design, Res.M_Dyadic (Id_Smod),
+                            Get_Identifier ("smod"), Id_Smod);
+
       Create_Dyadic_Module (Design, Res.M_Shift_Rotate (Id_Lsl),
                             Get_Identifier ("lsl"), Id_Lsl);
       Create_Dyadic_Module (Design, Res.M_Shift_Rotate (Id_Lsr),
diff --git a/src/synth/netlists-gates.ads b/src/synth/netlists-gates.ads
index e9c153c97..44afec700 100644
--- a/src/synth/netlists-gates.ads
+++ b/src/synth/netlists-gates.ads
@@ -35,46 +35,48 @@ package Netlists.Gates is
    Id_Sub : constant Module_Id := 10;
    Id_Umul : constant Module_Id := 11;
    Id_Smul : constant Module_Id := 12;
+   Id_Umod : constant Module_Id := 13;
+   Id_Smod : constant Module_Id := 14;
 
-   subtype Dyadic_Module_Id is Module_Id range Id_And .. Id_Smul;
+   subtype Dyadic_Module_Id is Module_Id range Id_And .. Id_Smod;
 
    --  Logical and arithmetic shifts.
    --  FIXME: clarify right operand: width, large values
-   Id_Lsl : constant Module_Id := 13;
-   Id_Lsr : constant Module_Id := 14;
-   Id_Asr : constant Module_Id := 15;
+   Id_Lsl : constant Module_Id := 20;
+   Id_Lsr : constant Module_Id := 21;
+   Id_Asr : constant Module_Id := 22;
 
    subtype Shift_Module_Id is Module_Id range Id_Lsl .. Id_Asr;
 
    --  Rotations.
    --  FIXME: clarify right operand.
-   Id_Rol : constant Module_Id := 16;
-   Id_Ror : constant Module_Id := 17;
+   Id_Rol : constant Module_Id := 23;
+   Id_Ror : constant Module_Id := 24;
 
    subtype Rotate_Module_Id is Module_Id range Id_Lsl .. Id_Asr;
 
    subtype Shift_Rotate_Module_Id is Module_Id range Id_Lsl .. Id_Ror;
 
-   Id_Not : constant Module_Id := 18;
-   Id_Neg : constant Module_Id := 19;
+   Id_Not : constant Module_Id := 25;
+   Id_Neg : constant Module_Id := 26;
 
    subtype Monadic_Module_Id is Module_Id range Id_Not .. Id_Neg;
 
-   Id_Eq  : constant Module_Id := 21;
-   Id_Ne  : constant Module_Id := 22;
-   Id_Ule : constant Module_Id := 23;
-   Id_Sle : constant Module_Id := 24;
-   Id_Ult : constant Module_Id := 25;
-   Id_Slt : constant Module_Id := 26;
-   Id_Uge : constant Module_Id := 27;
-   Id_Sge : constant Module_Id := 28;
-   Id_Ugt : constant Module_Id := 29;
-   Id_Sgt : constant Module_Id := 30;
+   Id_Eq  : constant Module_Id := 27;
+   Id_Ne  : constant Module_Id := 28;
+   Id_Ule : constant Module_Id := 29;
+   Id_Sle : constant Module_Id := 30;
+   Id_Ult : constant Module_Id := 31;
+   Id_Slt : constant Module_Id := 32;
+   Id_Uge : constant Module_Id := 33;
+   Id_Sge : constant Module_Id := 34;
+   Id_Ugt : constant Module_Id := 35;
+   Id_Sgt : constant Module_Id := 36;
 
    subtype Compare_Module_Id is Module_Id range Id_Eq .. Id_Sgt;
 
-   Id_Red_And : constant Module_Id := 31;
-   Id_Red_Or  : constant Module_Id := 32;
+   Id_Red_And : constant Module_Id := 37;
+   Id_Red_Or  : constant Module_Id := 38;
 
    subtype Reduce_Module_Id is Module_Id range Id_Red_And .. Id_Red_Or;
 
diff --git a/src/synth/synth-oper.adb b/src/synth/synth-oper.adb
index a3c76a728..b61b027ff 100644
--- a/src/synth/synth-oper.adb
+++ b/src/synth/synth-oper.adb
@@ -628,8 +628,7 @@ package body Synth.Oper is
                  (Left.Scal mod Right.Scal,
                   Get_Value_Type (Syn_Inst, Get_Type (Expr)));
             else
-               Error_Msg_Synth (+Expr, "non-constant mod not supported");
-               return null;
+               return Synth_Int_Dyadic (Id_Smod);
             end if;
          when Iir_Predefined_Integer_Rem =>
             if Is_Const (Left) and then Is_Const (Right) then
-- 
cgit v1.2.3