diff options
Diffstat (limited to 'src/synth/netlists-utils.adb')
| -rw-r--r-- | src/synth/netlists-utils.adb | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/src/synth/netlists-utils.adb b/src/synth/netlists-utils.adb index 3f9a9fd46..5e6a5c269 100644 --- a/src/synth/netlists-utils.adb +++ b/src/synth/netlists-utils.adb @@ -242,10 +242,7 @@ package body Netlists.Utils is Free_Instance (Inst); end Disconnect_And_Free; - function Same_Net (L, R : Net) return Boolean - is - Linst : Instance; - Rinst : Instance; + function Same_Net (L, R : Net) return Boolean is begin if L = R then -- Obvious case. @@ -257,17 +254,29 @@ package body Netlists.Utils is return False; end if; - -- Handle extract. - Linst := Get_Net_Parent (L); - if Get_Id (Linst) /= Id_Extract then - return False; - end if; - Rinst := Get_Net_Parent (R); - if Get_Id (Rinst) /= Id_Extract then - return False; - end if; - return Get_Input_Net (Linst, 0) = Get_Input_Net (Rinst, 0) - and then Get_Param_Uns32 (Linst, 0) = Get_Param_Uns32 (Rinst, 0); + declare + Linst : constant Instance := Get_Net_Parent (L); + Rinst : constant Instance := Get_Net_Parent (R); + begin + if Get_Id (Linst) /= Get_Id (Rinst) then + return False; + end if; + case Get_Id (Linst) is + when Id_Uextend => + -- When index is extended from a subtype. + return Same_Net (Get_Input_Net (Linst, 0), + Get_Input_Net (Rinst, 0)); + when Id_Extract => + -- When index is extracted from a record. + if Get_Param_Uns32 (Linst, 0) /= Get_Param_Uns32 (Rinst, 0) then + return False; + end if; + return Same_Net (Get_Input_Net (Linst, 0), + Get_Input_Net (Rinst, 0)); + when others => + return False; + end case; + end; end Same_Net; function Clog2 (W : Width) return Width is |