evaluation: weaken error for out of bound static value.

2 files changed, 10 insertions, 8 deletions

diff --git a/src/vhdl/translate/trans-chap3.adb b/src/vhdl/translate/trans-chap3.adb
index 5583ee7b9..a0b6bd302 100644
--- a/src/vhdl/translate/trans-chap3.adb
+++ b/src/vhdl/translate/trans-chap3.adb
@@ -2065,13 +2065,13 @@ package body Trans.Chap3 is
             end;
          when Type_Mode_I32 =>
             declare
-               V : Iir_Int32;
+               V : Int64;
             begin
-               V := Iir_Int32 (Get_Value (Lit));
+               V := Get_Value (Lit);
                if Is_Hi then
-                  return V = Iir_Int32'Last;
+                  return V = Int64 (Iir_Int32'Last);
                else
-                  return V = Iir_Int32'First;
+                  return V = Int64 (Iir_Int32'First);
                end if;
             end;
          when Type_Mode_P32 =>
diff --git a/src/vhdl/translate/trans-chap6.adb b/src/vhdl/translate/trans-chap6.adb
index ec632c815..7a272ed99 100644
--- a/src/vhdl/translate/trans-chap6.adb
+++ b/src/vhdl/translate/trans-chap6.adb
@@ -588,14 +588,16 @@ package body Trans.Chap6 is
                      Off := Prefix_Left - Slice_Left;
                end case;
                if Off < 0 then
-                  --  Must have been caught by sem.
-                  raise Internal_Error;
+                  Gen_Bound_Error (Index_Range);
+                  Off := 0;
+                  Slice_Length := 0;
                end if;
                if Off + Slice_Length
                  > Eval_Discrete_Range_Length (Index_Range)
                then
-                  --  Must have been caught by sem.
-                  raise Internal_Error;
+                  Gen_Bound_Error (Index_Range);
+                  Off := 0;
+                  Slice_Length := 0;
                end if;
             end if;
             Data.Off := Unsigned_64 (Off);