mirror of
https://github.com/RPCSX/rpcsx.git
synced 2024-11-23 03:19:47 +00:00
move memory area util to shared rx library
This commit is contained in:
DH
parent
22c96a09ee
commit
5f91b57482
@ -11,3 +11,4 @@ add_subdirectory(orbis-kernel)
|
||||
add_subdirectory(rpcsx-os)
|
||||
add_subdirectory(rpcsx-gpu)
|
||||
add_subdirectory(hw/amdgpu)
|
||||
add_subdirectory(rx)
|
||||
|
||||
@ -11,6 +11,7 @@ add_subdirectory(lib/libspirv)
|
||||
project(amdgpu)
|
||||
|
||||
add_library(${PROJECT_NAME} INTERFACE)
|
||||
target_link_libraries(${PROJECT_NAME} INTERFACE rx)
|
||||
target_include_directories(${PROJECT_NAME} INTERFACE include)
|
||||
|
||||
add_library(amdgpu::base ALIAS ${PROJECT_NAME})
|
||||
|
||||
@ -1,367 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <rx/MemoryTable.hpp>
|
||||
|
||||
namespace util {
|
||||
struct AreaInfo {
|
||||
std::uint64_t beginAddress;
|
||||
std::uint64_t endAddress;
|
||||
};
|
||||
|
||||
struct NoInvalidationHandle {
|
||||
void handleInvalidation(std::uint64_t) {}
|
||||
};
|
||||
|
||||
struct StdSetInvalidationHandle {
|
||||
std::set<std::uint64_t, std::greater<>> invalidated;
|
||||
|
||||
void handleInvalidation(std::uint64_t address) {
|
||||
invalidated.insert(address);
|
||||
}
|
||||
};
|
||||
|
||||
template <typename InvalidationHandleT = NoInvalidationHandle>
|
||||
class MemoryAreaTable : public InvalidationHandleT {
|
||||
enum class Kind { O, X };
|
||||
std::map<std::uint64_t, Kind> mAreas;
|
||||
|
||||
public:
|
||||
class iterator {
|
||||
using map_iterator = typename std::map<std::uint64_t, Kind>::iterator;
|
||||
map_iterator it;
|
||||
|
||||
public:
|
||||
iterator() = default;
|
||||
iterator(map_iterator it) : it(it) {}
|
||||
|
||||
AreaInfo operator*() const { return {it->first, std::next(it)->first}; }
|
||||
|
||||
iterator &operator++() {
|
||||
++it;
|
||||
++it;
|
||||
return *this;
|
||||
}
|
||||
|
||||
iterator &operator--() {
|
||||
--it;
|
||||
--it;
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool operator==(iterator other) const { return it == other.it; }
|
||||
bool operator!=(iterator other) const { return it != other.it; }
|
||||
};
|
||||
|
||||
iterator begin() { return iterator(mAreas.begin()); }
|
||||
iterator end() { return iterator(mAreas.end()); }
|
||||
|
||||
void clear() { mAreas.clear(); }
|
||||
|
||||
AreaInfo queryArea(std::uint64_t address) const {
|
||||
auto it = mAreas.lower_bound(address);
|
||||
assert(it != mAreas.end());
|
||||
std::uint64_t endAddress = 0;
|
||||
if (it->first != address) {
|
||||
assert(it->second == Kind::X);
|
||||
endAddress = it->first;
|
||||
--it;
|
||||
} else {
|
||||
assert(it->second == Kind::O);
|
||||
endAddress = std::next(it)->first;
|
||||
}
|
||||
|
||||
auto startAddress = std::uint64_t(it->first);
|
||||
|
||||
return {startAddress, endAddress};
|
||||
}
|
||||
|
||||
void map(std::uint64_t beginAddress, std::uint64_t endAddress) {
|
||||
auto [beginIt, beginInserted] = mAreas.emplace(beginAddress, Kind::O);
|
||||
auto [endIt, endInserted] = mAreas.emplace(endAddress, Kind::X);
|
||||
|
||||
if (!beginInserted) {
|
||||
if (beginIt->second == Kind::X) {
|
||||
// it was close, extend to open
|
||||
assert(beginIt != mAreas.begin());
|
||||
--beginIt;
|
||||
}
|
||||
} else if (beginIt != mAreas.begin()) {
|
||||
auto prevRangePointIt = std::prev(beginIt);
|
||||
|
||||
if (prevRangePointIt->second == Kind::O) {
|
||||
// we found range start before inserted one, remove insertion and extend
|
||||
// begin
|
||||
this->handleInvalidation(beginIt->first);
|
||||
mAreas.erase(beginIt);
|
||||
beginIt = prevRangePointIt;
|
||||
}
|
||||
}
|
||||
|
||||
if (!endInserted) {
|
||||
if (endIt->second == Kind::O) {
|
||||
// it was open, extend to close
|
||||
assert(endIt != mAreas.end());
|
||||
++endIt;
|
||||
}
|
||||
} else {
|
||||
auto nextRangePointIt = std::next(endIt);
|
||||
|
||||
if (nextRangePointIt != mAreas.end() &&
|
||||
nextRangePointIt->second == Kind::X) {
|
||||
// we found range end after inserted one, remove insertion and extend
|
||||
// end
|
||||
this->handleInvalidation(std::prev(endIt)->first);
|
||||
mAreas.erase(endIt);
|
||||
endIt = nextRangePointIt;
|
||||
}
|
||||
}
|
||||
|
||||
// eat everything in middle of the range
|
||||
++beginIt;
|
||||
while (beginIt != endIt) {
|
||||
this->handleInvalidation(std::prev(endIt)->first);
|
||||
beginIt = mAreas.erase(beginIt);
|
||||
}
|
||||
}
|
||||
|
||||
void unmap(std::uint64_t beginAddress, std::uint64_t endAddress) {
|
||||
auto beginIt = mAreas.lower_bound(beginAddress);
|
||||
|
||||
if (beginIt == mAreas.end()) {
|
||||
return;
|
||||
}
|
||||
if (beginIt->first >= endAddress) {
|
||||
if (beginIt->second != Kind::X) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto prevEnd = beginIt->first;
|
||||
|
||||
--beginIt;
|
||||
if (beginIt->first >= endAddress) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (beginIt->first < beginAddress) {
|
||||
this->handleInvalidation(beginIt->first);
|
||||
beginIt = mAreas.emplace(beginAddress, Kind::X).first;
|
||||
}
|
||||
|
||||
if (prevEnd > endAddress) {
|
||||
mAreas.emplace(endAddress, Kind::O);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (beginIt->first > beginAddress && beginIt->second == Kind::X) {
|
||||
// we have found end after unmap begin, need to insert new end
|
||||
this->handleInvalidation(std::prev(beginIt)->first);
|
||||
auto newBeginIt = mAreas.emplace_hint(beginIt, beginAddress, Kind::X);
|
||||
mAreas.erase(beginIt);
|
||||
|
||||
if (newBeginIt == mAreas.end()) {
|
||||
return;
|
||||
}
|
||||
|
||||
beginIt = std::next(newBeginIt);
|
||||
} else if (beginIt->second == Kind::X) {
|
||||
beginIt = ++beginIt;
|
||||
}
|
||||
|
||||
Kind lastKind = Kind::X;
|
||||
while (beginIt != mAreas.end() && beginIt->first <= endAddress) {
|
||||
lastKind = beginIt->second;
|
||||
if (lastKind == Kind::O) {
|
||||
this->handleInvalidation(std::prev(beginIt)->first);
|
||||
}
|
||||
beginIt = mAreas.erase(beginIt);
|
||||
}
|
||||
|
||||
if (lastKind != Kind::O) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Last removed was range open, need to insert new one at unmap end
|
||||
mAreas.emplace_hint(beginIt, endAddress, Kind::O);
|
||||
}
|
||||
|
||||
std::size_t totalMemory() const {
|
||||
std::size_t result = 0;
|
||||
|
||||
for (auto it = mAreas.begin(), end = mAreas.end(); it != end; ++it) {
|
||||
auto rangeBegin = it;
|
||||
auto rangeEnd = ++it;
|
||||
|
||||
result += rangeEnd->first - rangeBegin->first;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
template <typename PayloadT> class MemoryTableWithPayload {
|
||||
enum class Kind { O, X, XO };
|
||||
std::map<std::uint64_t, std::pair<Kind, PayloadT>> mAreas;
|
||||
|
||||
public:
|
||||
struct AreaInfo {
|
||||
std::uint64_t beginAddress;
|
||||
std::uint64_t endAddress;
|
||||
PayloadT payload;
|
||||
};
|
||||
|
||||
class iterator {
|
||||
using map_iterator =
|
||||
typename std::map<std::uint64_t, std::pair<Kind, PayloadT>>::iterator;
|
||||
map_iterator it;
|
||||
|
||||
public:
|
||||
iterator() = default;
|
||||
iterator(map_iterator it) : it(it) {}
|
||||
|
||||
AreaInfo operator*() const {
|
||||
return {it->first, std::next(it)->first, it->second.second};
|
||||
}
|
||||
|
||||
iterator &operator++() {
|
||||
++it;
|
||||
|
||||
if (it->second.first != Kind::XO) {
|
||||
++it;
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool operator==(iterator other) const { return it == other.it; }
|
||||
bool operator!=(iterator other) const { return it != other.it; }
|
||||
};
|
||||
|
||||
iterator begin() { return iterator(mAreas.begin()); }
|
||||
iterator end() { return iterator(mAreas.end()); }
|
||||
|
||||
void clear() { mAreas.clear(); }
|
||||
|
||||
iterator queryArea(std::uint64_t address) {
|
||||
auto it = mAreas.lower_bound(address);
|
||||
|
||||
if (it == mAreas.end()) {
|
||||
return it;
|
||||
}
|
||||
|
||||
std::uint64_t endAddress = 0;
|
||||
|
||||
if (it->first == address) {
|
||||
if (it->second.first == Kind::X) {
|
||||
return mAreas.end();
|
||||
}
|
||||
|
||||
endAddress = std::next(it)->first;
|
||||
} else {
|
||||
if (it->second.first == Kind::O) {
|
||||
return mAreas.end();
|
||||
}
|
||||
|
||||
endAddress = it->first;
|
||||
--it;
|
||||
}
|
||||
|
||||
return endAddress < address ? mAreas.end() : it;
|
||||
}
|
||||
|
||||
void map(std::uint64_t beginAddress, std::uint64_t endAddress,
|
||||
PayloadT payload, bool merge = true) {
|
||||
assert(beginAddress < endAddress);
|
||||
auto [beginIt, beginInserted] =
|
||||
mAreas.emplace(beginAddress, std::pair{Kind::O, payload});
|
||||
auto [endIt, endInserted] =
|
||||
mAreas.emplace(endAddress, std::pair{Kind::X, PayloadT{}});
|
||||
|
||||
bool seenOpen = false;
|
||||
bool endCollision = false;
|
||||
bool lastRemovedIsOpen = false;
|
||||
PayloadT lastRemovedOpenPayload;
|
||||
|
||||
if (!beginInserted || !endInserted) {
|
||||
if (!beginInserted) {
|
||||
if (beginIt->second.first == Kind::X) {
|
||||
beginIt->second.first = Kind::XO;
|
||||
} else {
|
||||
seenOpen = true;
|
||||
lastRemovedIsOpen = true;
|
||||
lastRemovedOpenPayload = std::move(beginIt->second.second);
|
||||
}
|
||||
|
||||
beginIt->second.second = std::move(payload);
|
||||
}
|
||||
|
||||
if (!endInserted) {
|
||||
if (endIt->second.first == Kind::O) {
|
||||
endIt->second.first = Kind::XO;
|
||||
} else {
|
||||
endCollision = true;
|
||||
}
|
||||
|
||||
lastRemovedIsOpen = false;
|
||||
}
|
||||
} else if (beginIt != mAreas.begin()) {
|
||||
auto prev = std::prev(beginIt);
|
||||
|
||||
if (prev->second.first != Kind::X) {
|
||||
beginIt->second.first = Kind::XO;
|
||||
seenOpen = true;
|
||||
lastRemovedIsOpen = true;
|
||||
lastRemovedOpenPayload = prev->second.second;
|
||||
}
|
||||
}
|
||||
|
||||
auto origBegin = beginIt;
|
||||
++beginIt;
|
||||
while (beginIt != endIt) {
|
||||
if (beginIt->second.first == Kind::X) {
|
||||
lastRemovedIsOpen = false;
|
||||
if (!seenOpen) {
|
||||
origBegin->second.first = Kind::XO;
|
||||
}
|
||||
} else {
|
||||
if (!seenOpen && beginIt->second.first == Kind::XO) {
|
||||
origBegin->second.first = Kind::XO;
|
||||
}
|
||||
|
||||
seenOpen = true;
|
||||
lastRemovedIsOpen = true;
|
||||
lastRemovedOpenPayload = std::move(beginIt->second.second);
|
||||
}
|
||||
beginIt = mAreas.erase(beginIt);
|
||||
}
|
||||
|
||||
if (endCollision && !seenOpen) {
|
||||
origBegin->second.first = Kind::XO;
|
||||
} else if (lastRemovedIsOpen && !endCollision) {
|
||||
endIt->second.first = Kind::XO;
|
||||
endIt->second.second = std::move(lastRemovedOpenPayload);
|
||||
}
|
||||
|
||||
if (!merge) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (origBegin->second.first == Kind::XO) {
|
||||
auto prevBegin = std::prev(origBegin);
|
||||
|
||||
if (prevBegin->second.second == origBegin->second.second) {
|
||||
mAreas.erase(origBegin);
|
||||
}
|
||||
}
|
||||
|
||||
if (endIt->second.first == Kind::XO) {
|
||||
if (endIt->second.second == origBegin->second.second) {
|
||||
mAreas.erase(endIt);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
using namespace rx;
|
||||
} // namespace util
|
||||
|
||||
4
rx/CMakeLists.txt
Normal file
4
rx/CMakeLists.txt
Normal file
@ -0,0 +1,4 @@
|
||||
project(rx)
|
||||
|
||||
add_library(${PROJECT_NAME} INTERFACE)
|
||||
target_include_directories(${PROJECT_NAME} INTERFACE include)
|
||||
367
rx/include/rx/MemoryTable.hpp
Normal file
367
rx/include/rx/MemoryTable.hpp
Normal file
@ -0,0 +1,367 @@
|
||||
#pragma once
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
#include <set>
|
||||
|
||||
namespace rx {
|
||||
struct AreaInfo {
|
||||
std::uint64_t beginAddress;
|
||||
std::uint64_t endAddress;
|
||||
};
|
||||
|
||||
struct NoInvalidationHandle {
|
||||
void handleInvalidation(std::uint64_t) {}
|
||||
};
|
||||
|
||||
struct StdSetInvalidationHandle {
|
||||
std::set<std::uint64_t, std::greater<>> invalidated;
|
||||
|
||||
void handleInvalidation(std::uint64_t address) {
|
||||
invalidated.insert(address);
|
||||
}
|
||||
};
|
||||
|
||||
template <typename InvalidationHandleT = NoInvalidationHandle>
|
||||
class MemoryAreaTable : public InvalidationHandleT {
|
||||
enum class Kind { O, X };
|
||||
std::map<std::uint64_t, Kind> mAreas;
|
||||
|
||||
public:
|
||||
class iterator {
|
||||
using map_iterator = typename std::map<std::uint64_t, Kind>::iterator;
|
||||
map_iterator it;
|
||||
|
||||
public:
|
||||
iterator() = default;
|
||||
iterator(map_iterator it) : it(it) {}
|
||||
|
||||
AreaInfo operator*() const { return {it->first, std::next(it)->first}; }
|
||||
|
||||
iterator &operator++() {
|
||||
++it;
|
||||
++it;
|
||||
return *this;
|
||||
}
|
||||
|
||||
iterator &operator--() {
|
||||
--it;
|
||||
--it;
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool operator==(iterator other) const { return it == other.it; }
|
||||
bool operator!=(iterator other) const { return it != other.it; }
|
||||
};
|
||||
|
||||
iterator begin() { return iterator(mAreas.begin()); }
|
||||
iterator end() { return iterator(mAreas.end()); }
|
||||
|
||||
void clear() { mAreas.clear(); }
|
||||
|
||||
AreaInfo queryArea(std::uint64_t address) const {
|
||||
auto it = mAreas.lower_bound(address);
|
||||
assert(it != mAreas.end());
|
||||
std::uint64_t endAddress = 0;
|
||||
if (it->first != address) {
|
||||
assert(it->second == Kind::X);
|
||||
endAddress = it->first;
|
||||
--it;
|
||||
} else {
|
||||
assert(it->second == Kind::O);
|
||||
endAddress = std::next(it)->first;
|
||||
}
|
||||
|
||||
auto startAddress = std::uint64_t(it->first);
|
||||
|
||||
return {startAddress, endAddress};
|
||||
}
|
||||
|
||||
void map(std::uint64_t beginAddress, std::uint64_t endAddress) {
|
||||
auto [beginIt, beginInserted] = mAreas.emplace(beginAddress, Kind::O);
|
||||
auto [endIt, endInserted] = mAreas.emplace(endAddress, Kind::X);
|
||||
|
||||
if (!beginInserted) {
|
||||
if (beginIt->second == Kind::X) {
|
||||
// it was close, extend to open
|
||||
assert(beginIt != mAreas.begin());
|
||||
--beginIt;
|
||||
}
|
||||
} else if (beginIt != mAreas.begin()) {
|
||||
auto prevRangePointIt = std::prev(beginIt);
|
||||
|
||||
if (prevRangePointIt->second == Kind::O) {
|
||||
// we found range start before inserted one, remove insertion and extend
|
||||
// begin
|
||||
this->handleInvalidation(beginIt->first);
|
||||
mAreas.erase(beginIt);
|
||||
beginIt = prevRangePointIt;
|
||||
}
|
||||
}
|
||||
|
||||
if (!endInserted) {
|
||||
if (endIt->second == Kind::O) {
|
||||
// it was open, extend to close
|
||||
assert(endIt != mAreas.end());
|
||||
++endIt;
|
||||
}
|
||||
} else {
|
||||
auto nextRangePointIt = std::next(endIt);
|
||||
|
||||
if (nextRangePointIt != mAreas.end() &&
|
||||
nextRangePointIt->second == Kind::X) {
|
||||
// we found range end after inserted one, remove insertion and extend
|
||||
// end
|
||||
this->handleInvalidation(std::prev(endIt)->first);
|
||||
mAreas.erase(endIt);
|
||||
endIt = nextRangePointIt;
|
||||
}
|
||||
}
|
||||
|
||||
// eat everything in middle of the range
|
||||
++beginIt;
|
||||
while (beginIt != endIt) {
|
||||
this->handleInvalidation(std::prev(endIt)->first);
|
||||
beginIt = mAreas.erase(beginIt);
|
||||
}
|
||||
}
|
||||
|
||||
void unmap(std::uint64_t beginAddress, std::uint64_t endAddress) {
|
||||
auto beginIt = mAreas.lower_bound(beginAddress);
|
||||
|
||||
if (beginIt == mAreas.end()) {
|
||||
return;
|
||||
}
|
||||
if (beginIt->first >= endAddress) {
|
||||
if (beginIt->second != Kind::X) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto prevEnd = beginIt->first;
|
||||
|
||||
--beginIt;
|
||||
if (beginIt->first >= endAddress) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (beginIt->first < beginAddress) {
|
||||
this->handleInvalidation(beginIt->first);
|
||||
beginIt = mAreas.emplace(beginAddress, Kind::X).first;
|
||||
}
|
||||
|
||||
if (prevEnd > endAddress) {
|
||||
mAreas.emplace(endAddress, Kind::O);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (beginIt->first > beginAddress && beginIt->second == Kind::X) {
|
||||
// we have found end after unmap begin, need to insert new end
|
||||
this->handleInvalidation(std::prev(beginIt)->first);
|
||||
auto newBeginIt = mAreas.emplace_hint(beginIt, beginAddress, Kind::X);
|
||||
mAreas.erase(beginIt);
|
||||
|
||||
if (newBeginIt == mAreas.end()) {
|
||||
return;
|
||||
}
|
||||
|
||||
beginIt = std::next(newBeginIt);
|
||||
} else if (beginIt->second == Kind::X) {
|
||||
beginIt = ++beginIt;
|
||||
}
|
||||
|
||||
Kind lastKind = Kind::X;
|
||||
while (beginIt != mAreas.end() && beginIt->first <= endAddress) {
|
||||
lastKind = beginIt->second;
|
||||
if (lastKind == Kind::O) {
|
||||
this->handleInvalidation(std::prev(beginIt)->first);
|
||||
}
|
||||
beginIt = mAreas.erase(beginIt);
|
||||
}
|
||||
|
||||
if (lastKind != Kind::O) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Last removed was range open, need to insert new one at unmap end
|
||||
mAreas.emplace_hint(beginIt, endAddress, Kind::O);
|
||||
}
|
||||
|
||||
std::size_t totalMemory() const {
|
||||
std::size_t result = 0;
|
||||
|
||||
for (auto it = mAreas.begin(), end = mAreas.end(); it != end; ++it) {
|
||||
auto rangeBegin = it;
|
||||
auto rangeEnd = ++it;
|
||||
|
||||
result += rangeEnd->first - rangeBegin->first;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
template <typename PayloadT> class MemoryTableWithPayload {
|
||||
enum class Kind { O, X, XO };
|
||||
std::map<std::uint64_t, std::pair<Kind, PayloadT>> mAreas;
|
||||
|
||||
public:
|
||||
struct AreaInfo {
|
||||
std::uint64_t beginAddress;
|
||||
std::uint64_t endAddress;
|
||||
PayloadT payload;
|
||||
};
|
||||
|
||||
class iterator {
|
||||
using map_iterator =
|
||||
typename std::map<std::uint64_t, std::pair<Kind, PayloadT>>::iterator;
|
||||
map_iterator it;
|
||||
|
||||
public:
|
||||
iterator() = default;
|
||||
iterator(map_iterator it) : it(it) {}
|
||||
|
||||
AreaInfo operator*() const {
|
||||
return {it->first, std::next(it)->first, it->second.second};
|
||||
}
|
||||
|
||||
iterator &operator++() {
|
||||
++it;
|
||||
|
||||
if (it->second.first != Kind::XO) {
|
||||
++it;
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool operator==(iterator other) const { return it == other.it; }
|
||||
bool operator!=(iterator other) const { return it != other.it; }
|
||||
};
|
||||
|
||||
iterator begin() { return iterator(mAreas.begin()); }
|
||||
iterator end() { return iterator(mAreas.end()); }
|
||||
|
||||
void clear() { mAreas.clear(); }
|
||||
|
||||
iterator queryArea(std::uint64_t address) {
|
||||
auto it = mAreas.lower_bound(address);
|
||||
|
||||
if (it == mAreas.end()) {
|
||||
return it;
|
||||
}
|
||||
|
||||
std::uint64_t endAddress = 0;
|
||||
|
||||
if (it->first == address) {
|
||||
if (it->second.first == Kind::X) {
|
||||
return mAreas.end();
|
||||
}
|
||||
|
||||
endAddress = std::next(it)->first;
|
||||
} else {
|
||||
if (it->second.first == Kind::O) {
|
||||
return mAreas.end();
|
||||
}
|
||||
|
||||
endAddress = it->first;
|
||||
--it;
|
||||
}
|
||||
|
||||
return endAddress < address ? mAreas.end() : it;
|
||||
}
|
||||
|
||||
void map(std::uint64_t beginAddress, std::uint64_t endAddress,
|
||||
PayloadT payload, bool merge = true) {
|
||||
assert(beginAddress < endAddress);
|
||||
auto [beginIt, beginInserted] =
|
||||
mAreas.emplace(beginAddress, std::pair{Kind::O, payload});
|
||||
auto [endIt, endInserted] =
|
||||
mAreas.emplace(endAddress, std::pair{Kind::X, PayloadT{}});
|
||||
|
||||
bool seenOpen = false;
|
||||
bool endCollision = false;
|
||||
bool lastRemovedIsOpen = false;
|
||||
PayloadT lastRemovedOpenPayload;
|
||||
|
||||
if (!beginInserted || !endInserted) {
|
||||
if (!beginInserted) {
|
||||
if (beginIt->second.first == Kind::X) {
|
||||
beginIt->second.first = Kind::XO;
|
||||
} else {
|
||||
seenOpen = true;
|
||||
lastRemovedIsOpen = true;
|
||||
lastRemovedOpenPayload = std::move(beginIt->second.second);
|
||||
}
|
||||
|
||||
beginIt->second.second = std::move(payload);
|
||||
}
|
||||
|
||||
if (!endInserted) {
|
||||
if (endIt->second.first == Kind::O) {
|
||||
endIt->second.first = Kind::XO;
|
||||
} else {
|
||||
endCollision = true;
|
||||
}
|
||||
|
||||
lastRemovedIsOpen = false;
|
||||
}
|
||||
} else if (beginIt != mAreas.begin()) {
|
||||
auto prev = std::prev(beginIt);
|
||||
|
||||
if (prev->second.first != Kind::X) {
|
||||
beginIt->second.first = Kind::XO;
|
||||
seenOpen = true;
|
||||
lastRemovedIsOpen = true;
|
||||
lastRemovedOpenPayload = prev->second.second;
|
||||
}
|
||||
}
|
||||
|
||||
auto origBegin = beginIt;
|
||||
++beginIt;
|
||||
while (beginIt != endIt) {
|
||||
if (beginIt->second.first == Kind::X) {
|
||||
lastRemovedIsOpen = false;
|
||||
if (!seenOpen) {
|
||||
origBegin->second.first = Kind::XO;
|
||||
}
|
||||
} else {
|
||||
if (!seenOpen && beginIt->second.first == Kind::XO) {
|
||||
origBegin->second.first = Kind::XO;
|
||||
}
|
||||
|
||||
seenOpen = true;
|
||||
lastRemovedIsOpen = true;
|
||||
lastRemovedOpenPayload = std::move(beginIt->second.second);
|
||||
}
|
||||
beginIt = mAreas.erase(beginIt);
|
||||
}
|
||||
|
||||
if (endCollision && !seenOpen) {
|
||||
origBegin->second.first = Kind::XO;
|
||||
} else if (lastRemovedIsOpen && !endCollision) {
|
||||
endIt->second.first = Kind::XO;
|
||||
endIt->second.second = std::move(lastRemovedOpenPayload);
|
||||
}
|
||||
|
||||
if (!merge) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (origBegin->second.first == Kind::XO) {
|
||||
auto prevBegin = std::prev(origBegin);
|
||||
|
||||
if (prevBegin->second.second == origBegin->second.second) {
|
||||
mAreas.erase(origBegin);
|
||||
}
|
||||
}
|
||||
|
||||
if (endIt->second.first == Kind::XO) {
|
||||
if (endIt->second.second == origBegin->second.second) {
|
||||
mAreas.erase(endIt);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
} // namespace rx
|
||||
Loading…
Reference in New Issue
Block a user