summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-06-30 02:36:39 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2022-10-06 21:00:54 +0200
commit11e1cbbdbde8269e7cdb0e150f25639223bdd3e6 (patch)
treec3e1c99cb4502c2c5f02af7eb601de6a358d7177 /src
parentaddress_space: Address feedback (diff)
downloadyuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar
yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.gz
yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.bz2
yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.lz
yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.xz
yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.zst
yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.zip
Diffstat (limited to 'src')
-rw-r--r--src/common/address_space.h6
-rw-r--r--src/common/address_space.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common/address_space.h b/src/common/address_space.h
index bf649018c..9222b2fdc 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 pass
diff --git a/src/common/address_space.inc b/src/common/address_space.inc
index 3661b298e..9f957c81d 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);