From bdb90f2f54f4ccd1c290d872c5bafcb4ba3e1778 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Fri, 29 Apr 2022 12:15:30 +0200
Subject: synth-vhdl_eval: handle all comparisons for enums

---
 src/synth/synth-vhdl_eval.adb | 62 ++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/synth/synth-vhdl_eval.adb b/src/synth/synth-vhdl_eval.adb
index 8c205051d..c6846718d 100644
--- a/src/synth/synth-vhdl_eval.adb
+++ b/src/synth/synth-vhdl_eval.adb
@@ -149,6 +149,11 @@ package body Synth.Vhdl_Eval is
       end case;
    end Check_Integer_Overflow;
 
+   function Create_Memory_Boolean (V : Boolean) return Memtyp is
+   begin
+      return Create_Memory_U8 (Boolean'Pos (V), Boolean_Type);
+   end Create_Memory_Boolean;
+
    function Eval_Static_Dyadic_Predefined (Imp : Node;
                                            Res_Typ : Type_Acc;
                                            Left : Memtyp;
@@ -169,15 +174,6 @@ package body Synth.Vhdl_Eval is
                               xor Boolean'Val (Read_Discrete (Right))),
                Res_Typ);
 
-         when Iir_Predefined_Enum_Equality =>
-            return Create_Memory_U8
-              (Boolean'Pos (Read_Discrete (Left) = Read_Discrete (Right)),
-               Boolean_Type);
-         when Iir_Predefined_Enum_Inequality =>
-            return Create_Memory_U8
-              (Boolean'Pos (Read_Discrete (Left) /= Read_Discrete (Right)),
-               Boolean_Type);
-
          when Iir_Predefined_Integer_Plus
            | Iir_Predefined_Physical_Plus =>
             declare
@@ -250,35 +246,35 @@ package body Synth.Vhdl_Eval is
                Res_Typ);
 
          when Iir_Predefined_Integer_Less_Equal
-           | Iir_Predefined_Physical_Less_Equal =>
-            return Create_Memory_U8
-              (Boolean'Pos (Read_Discrete (Left) <= Read_Discrete (Right)),
-               Boolean_Type);
+            | Iir_Predefined_Physical_Less_Equal
+            | Iir_Predefined_Enum_Less_Equal =>
+            return Create_Memory_Boolean
+              (Read_Discrete (Left) <= Read_Discrete (Right));
          when Iir_Predefined_Integer_Less
-           | Iir_Predefined_Physical_Less =>
-            return Create_Memory_U8
-              (Boolean'Pos (Read_Discrete (Left) < Read_Discrete (Right)),
-               Boolean_Type);
+            | Iir_Predefined_Physical_Less
+            | Iir_Predefined_Enum_Less =>
+            return Create_Memory_Boolean
+              (Read_Discrete (Left) < Read_Discrete (Right));
          when Iir_Predefined_Integer_Greater_Equal
-           | Iir_Predefined_Physical_Greater_Equal =>
-            return Create_Memory_U8
-              (Boolean'Pos (Read_Discrete (Left) >= Read_Discrete (Right)),
-               Boolean_Type);
+            | Iir_Predefined_Physical_Greater_Equal
+            | Iir_Predefined_Enum_Greater_Equal =>
+            return Create_Memory_Boolean
+              (Read_Discrete (Left) >= Read_Discrete (Right));
          when Iir_Predefined_Integer_Greater
-           | Iir_Predefined_Physical_Greater =>
-            return Create_Memory_U8
-              (Boolean'Pos (Read_Discrete (Left) > Read_Discrete (Right)),
-               Boolean_Type);
+            | Iir_Predefined_Physical_Greater
+            | Iir_Predefined_Enum_Greater =>
+            return Create_Memory_Boolean
+              (Read_Discrete (Left) > Read_Discrete (Right));
          when Iir_Predefined_Integer_Equality
-           | Iir_Predefined_Physical_Equality =>
-            return Create_Memory_U8
-              (Boolean'Pos (Read_Discrete (Left) = Read_Discrete (Right)),
-               Boolean_Type);
+            | Iir_Predefined_Physical_Equality
+            | Iir_Predefined_Enum_Equality =>
+            return Create_Memory_Boolean
+              (Read_Discrete (Left) = Read_Discrete (Right));
          when Iir_Predefined_Integer_Inequality
-           | Iir_Predefined_Physical_Inequality =>
-            return Create_Memory_U8
-              (Boolean'Pos (Read_Discrete (Left) /= Read_Discrete (Right)),
-               Boolean_Type);
+            | Iir_Predefined_Physical_Inequality
+            | Iir_Predefined_Enum_Inequality =>
+            return Create_Memory_Boolean
+              (Read_Discrete (Left) /= Read_Discrete (Right));
 
          when Iir_Predefined_Physical_Real_Mul =>
             return Create_Memory_Discrete
-- 
cgit v1.2.3