diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-07-23 07:34:05 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-07-23 07:34:05 +0200 |
| commit | e073f75229d0abf04c8c40fc67391fbd8ea4a9a1 (patch) | |
| tree | e1e4247464386e017461a639d7fbae173e147071 | |
| parent | ed01a04ef4d9c0627ec1412f09a6a38ec82a419f (diff) | |
| download | ghdl-e073f75229d0abf04c8c40fc67391fbd8ea4a9a1.tar.gz ghdl-e073f75229d0abf04c8c40fc67391fbd8ea4a9a1.tar.bz2 ghdl-e073f75229d0abf04c8c40fc67391fbd8ea4a9a1.zip | |
synth: fix slice/indexed assignment that partially override previous assign.
| -rw-r--r-- | src/synth/synth-stmts.adb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/synth/synth-stmts.adb b/src/synth/synth-stmts.adb index 494d16773..d4a677f63 100644 --- a/src/synth/synth-stmts.adb +++ b/src/synth/synth-stmts.adb @@ -130,6 +130,7 @@ package body Synth.Stmts is Indexes : constant Node_Flist := Get_Index_List (Target); N_Idx : Node; Idx : Value_Acc; + Targ_Net : Net; V : Net; begin if Get_Nbr_Elements (Indexes) /= 1 @@ -143,8 +144,9 @@ package body Synth.Stmts is (Syn_Inst, N_Idx, Get_Type (N_Idx)); if Is_Const (Idx) then -- FIXME: check index. + Targ_Net := Get_Last_Assigned_Value (Targ.W); V := Build_Insert (Build_Context, - Get_Net (Targ, Get_Type (Pfx)), + Targ_Net, Get_Net (Val, Get_Type (Target)), Index_To_Offset (Targ, Idx.Scal, Target)); else @@ -158,11 +160,11 @@ package body Synth.Stmts is Targ : constant Value_Acc := Get_Value (Syn_Inst, Get_Base_Name (Pfx)); Res_Bnd : Value_Bound_Acc; + Targ_Net : Net; Inp : Net; Step : Uns32; Off : Int32; Wd : Uns32; - I : Net; V : Net; Res : Net; begin @@ -172,13 +174,14 @@ package body Synth.Stmts is end if; Synth_Slice_Suffix (Syn_Inst, Target, Extract_Bound (Targ), Res_Bnd, Inp, Step, Off, Wd); - I := Get_Net (Targ, Get_Type (Pfx)); + Targ_Net := Get_Last_Assigned_Value (Targ.W); V := Get_Net (Val, Get_Type (Target)); if Inp /= No_Net then Res := Build_Dyn_Insert - (Build_Context, I, V, Inp, Step, Off); + (Build_Context, Targ_Net, V, Inp, Step, Off); else - Res := Build_Insert (Build_Context, I, V, Uns32 (Off)); + Res := Build_Insert + (Build_Context, Targ_Net, V, Uns32 (Off)); end if; Synth_Assign (Targ, Create_Value_Net (Res, Res_Bnd), Get_Type (Pfx)); |