diff options
| author | Tristan Gingold <tgingold@free.fr> | 2020-09-26 12:41:54 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2020-09-28 19:07:51 +0200 |
| commit | 4a26145625d5704d5cdaf4e56e1dddd679d184c6 (patch) | |
| tree | bf953bc90bfb082c887e1e21556d39f8a88b4033 /src | |
| parent | a31ba343ad50d1b7d2261e18649e85540e5e2549 (diff) | |
| download | ghdl-4a26145625d5704d5cdaf4e56e1dddd679d184c6.tar.gz ghdl-4a26145625d5704d5cdaf4e56e1dddd679d184c6.tar.bz2 ghdl-4a26145625d5704d5cdaf4e56e1dddd679d184c6.zip | |
synth_subtype_conversion: check overflow for discrete types.
Diffstat (limited to 'src')
| -rw-r--r-- | src/synth/synth-expr.adb | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/src/synth/synth-expr.adb b/src/synth/synth-expr.adb index 42621d3ec..3cc92cf1d 100644 --- a/src/synth/synth-expr.adb +++ b/src/synth/synth-expr.adb @@ -776,16 +776,16 @@ package body Synth.Expr is return Vt; when Type_Discrete => pragma Assert (Vtype.Kind in Type_All_Discrete); - declare - N : Net; - begin - if Vtype.W /= Dtype.W then - -- Truncate. - -- TODO: check overflow. - case Vt.Val.Kind is - when Value_Net - | Value_Wire - | Value_Alias => + case Vt.Val.Kind is + when Value_Net + | Value_Wire + | Value_Alias => + if Vtype.W /= Dtype.W then + -- Truncate. + -- TODO: check overflow. + declare + N : Net; + begin if Is_Static_Val (Vt.Val) then return Create_Value_Discrete (Get_Static_Discrete (Vt), Dtype); @@ -800,20 +800,27 @@ package body Synth.Expr is (Ctxt, N, Dtype.W, Get_Location (Loc)); end if; return Create_Value_Net (N, Dtype); - when Value_Const => - return Synth_Subtype_Conversion - (Ctxt, (Vt.Typ, Vt.Val.C_Val), Dtype, Bounds, Loc); - when Value_Memory => - return Create_Value_Discrete - (Read_Discrete (Vt), Dtype); - when others => - raise Internal_Error; - end case; - else - -- TODO: check overflow if sign differ. - return Vt; - end if; - end; + end; + else + return Vt; + end if; + when Value_Const => + return Synth_Subtype_Conversion + (Ctxt, (Vt.Typ, Vt.Val.C_Val), Dtype, Bounds, Loc); + when Value_Memory => + -- Check for overflow. + declare + Val : constant Int64 := Read_Discrete (Vt); + begin + if not In_Range (Dtype.Drange, Val) then + Error_Msg_Synth (+Loc, "value out of range"); + return No_Valtyp; + end if; + return Create_Value_Discrete (Val, Dtype); + end; + when others => + raise Internal_Error; + end case; when Type_Float => pragma Assert (Vtype.Kind = Type_Float); -- TODO: check range |