VERY experimental Nintendo Switch 2 emulator
C++
address_space: Rename va_start to virt_start
Morph6a6b22b67d10
diff --git a/src/common/address_space.h b/src/common/address_space.hindex bf649018c5..9222b2fdc6 100644--- a/src/common/address_space.h+++ b/src/common/address_space.h@@ -116,7 +116,7 @@ private:using Base = FlatAddressSpaceMap<VaType, UnmappedVa, bool, false, false, AddressSpaceBits>;public:- explicit FlatAllocator(VaType va_start, VaType va_limit = Base::VaMaximum);+ explicit FlatAllocator(VaType virt_start, VaType va_limit = Base::VaMaximum);/*** @brief Allocates a region in the AS of the given size and returns its address@@ -134,12 +134,12 @@ public:void Free(VaType virt, VaType size);VaType GetVAStart() const {- return va_start;+ return virt_start;}private:/// The base VA of the allocator, no allocations will be below this- VaType va_start;+ VaType virt_start;/*** The end address for the initial linear allocation passdiff --git a/src/common/address_space.inc b/src/common/address_space.incindex 3661b298ef..9f957c81d9 100644--- a/src/common/address_space.inc+++ b/src/common/address_space.inc@@ -284,8 +284,8 @@ MAP_MEMBER(void)::UnmapLocked(VaType virt, VaType size) {unmap_callback(virt, size);}-ALLOC_MEMBER_CONST()::FlatAllocator(VaType va_start_, VaType va_limit_)- : Base{va_limit_}, va_start{va_start_}, current_linear_alloc_end{va_start_} {}+ALLOC_MEMBER_CONST()::FlatAllocator(VaType virt_start_, VaType va_limit_)+ : Base{va_limit_}, virt_start{virt_start_}, current_linear_alloc_end{virt_start_} {}ALLOC_MEMBER(VaType)::Allocate(VaType size) {std::scoped_lock lock(this->block_mutex);