From 5fc08034ea071119c5407898c81d0aa012512430 Mon Sep 17 00:00:00 2001 From: Brian Potchik Date: Thu, 18 Jul 2024 23:06:19 -0400 Subject: MemoryMap update with new segment model. --- examples/triage/byte.cpp | 37 +------------------------------------ examples/triage/byte.h | 1 - 2 files changed, 1 insertion(+), 37 deletions(-) (limited to 'examples') diff --git a/examples/triage/byte.cpp b/examples/triage/byte.cpp index 79e3bd50..3acab281 100644 --- a/examples/triage/byte.cpp +++ b/examples/triage/byte.cpp @@ -160,48 +160,13 @@ void ByteView::setSelectionOffsets(BNAddressRange range) void ByteView::updateRanges() { - m_ranges = m_data->GetAllocatedRanges(); - // Remove regions not backed by the file - for (auto& i : m_data->GetSegments()) - if (i->GetDataLength() < i->GetLength()) - removeRange(i->GetStart() + i->GetDataLength(), i->GetEnd()); + m_ranges = m_data->GetBackedAddressRanges(); m_allocatedLength = 0; for (auto& i : m_ranges) m_allocatedLength += i.end - i.start; } -void ByteView::removeRange(uint64_t begin, uint64_t end) -{ - std::vector newRanges; - for (auto& i : m_ranges) - { - if ((end <= i.start) || (begin >= i.end)) - { - newRanges.push_back(i); - } - else if ((begin <= i.start) && (end >= i.end)) - { - continue; - } - else if ((begin <= i.start) && (end < i.end)) - { - newRanges.push_back(BNAddressRange {end, i.end}); - } - else if ((begin > i.start) && (end >= i.end)) - { - newRanges.push_back(BNAddressRange {i.start, begin}); - } - else - { - newRanges.push_back(BNAddressRange {i.start, begin}); - newRanges.push_back(BNAddressRange {end, i.end}); - } - } - m_ranges = newRanges; -} - - void ByteView::setTopToAddress(uint64_t addr) { for (auto& i : m_ranges) diff --git a/examples/triage/byte.h b/examples/triage/byte.h index 1c8c20f8..53a037e7 100644 --- a/examples/triage/byte.h +++ b/examples/triage/byte.h @@ -40,7 +40,6 @@ class ByteView : public QAbstractScrollArea, public View QTimer* m_cursorTimer; void updateRanges(); - void removeRange(uint64_t begin, uint64_t end); void setTopToAddress(uint64_t addr); -- cgit v1.3.1