diff options
| author | Tristan Gingold <tgingold@free.fr> | 2021-06-23 20:23:37 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2021-06-23 20:24:20 +0200 |
| commit | 8a50921d62a51cffb0514949548eaec82b4b422f (patch) | |
| tree | c61b030b0747aab447039428f5936bd30f8f41b2 | |
| parent | 5ae06c44dbfa64291d83ebb2d9cd323c713315b4 (diff) | |
| download | ghdl-8a50921d62a51cffb0514949548eaec82b4b422f.tar.gz ghdl-8a50921d62a51cffb0514949548eaec82b4b422f.tar.bz2 ghdl-8a50921d62a51cffb0514949548eaec82b4b422f.zip | |
synth-vhdl_context.adb(Is_Full): consider fractional words.
| -rw-r--r-- | src/synth/synth-vhdl_context.adb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/synth/synth-vhdl_context.adb b/src/synth/synth-vhdl_context.adb index bb3d7b98c..a17786e7c 100644 --- a/src/synth/synth-vhdl_context.adb +++ b/src/synth/synth-vhdl_context.adb @@ -401,13 +401,17 @@ package body Synth.Vhdl_Context is -- Set Is_0 to True iff VEC is 000... -- Set Is_X to True iff VEC is XXX... procedure Is_Full (Vec : Logvec_Array; + W : Width; Is_0 : out Boolean; Is_X : out Boolean; Is_Z : out Boolean) is Val : Uns32; Zx : Uns32; + Mask : Uns32; begin + -- Check the first word. + pragma Assert (W >= 32); Val := Vec (0).Val; Zx := Vec (0).Zx; Is_0 := False; @@ -427,7 +431,7 @@ package body Synth.Vhdl_Context is return; end if; - for I in 1 .. Vec'Last loop + for I in 1 .. Vec'Last - 1 loop if Vec (I).Val /= Val or else Vec (I).Zx /= Zx then -- Clear flags. Is_0 := False; @@ -436,6 +440,16 @@ package body Synth.Vhdl_Context is return; end if; end loop; + + pragma Assert (Vec'Last = Digit_Index ((W - 1) / 32)); + Mask := Shift_Right (not 0, 32 - Natural (W mod 32)); + if (Vec (Vec'Last).Val and Mask) /= (Val and Mask) + or else (Vec (Vec'Last).Zx and Mask) /= (Zx and Mask) + then + Is_0 := False; + Is_X := False; + Is_Z := False; + end if; end Is_Full; procedure Value2net (Ctxt : Context_Acc; @@ -472,7 +486,7 @@ package body Synth.Vhdl_Context is end if; return; else - Is_Full (Vec, Is_0, Is_X, Is_Z); + Is_Full (Vec, W, Is_0, Is_X, Is_Z); if Is_0 then Res := Build_Const_UB32 (Ctxt, 0, W); elsif Is_X then |