From f403cb9e542155787b862d726ba334e0d0895c74 Mon Sep 17 00:00:00 2001 From: Parshintsev Anatoly Date: Thu, 29 Dec 2022 15:49:27 +0300 Subject: simplify check_mem_overlap by utilizing get_inclusive_end of mem_cfg_t --- spike_main/spike.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spike_main/spike.cc b/spike_main/spike.cc index 5a3d995..b3cffae 100644 --- a/spike_main/spike.cc +++ b/spike_main/spike.cc @@ -128,10 +128,7 @@ bool sort_mem_region(const mem_cfg_t &a, const mem_cfg_t &b) static bool check_mem_overlap(const mem_cfg_t& L, const mem_cfg_t& R) { - const auto L_end = L.get_base() + L.get_size() - 1; - const auto R_end = R.get_base() + R.get_size() - 1; - - return std::max(L.get_base(), R.get_base()) <= std::min(L_end, R_end); + return std::max(L.get_base(), R.get_base()) <= std::min(L.get_inclusive_end(), R.get_inclusive_end()); } static mem_cfg_t merge_mem_regions(const mem_cfg_t& L, const mem_cfg_t& R) -- cgit v1.1