summaryrefslogtreecommitdiff
path: root/src/common/address_space.h
diff options
context:
space:
mode:
authorGravatar Morph2022-06-29 20:36:39 -0400
committerGravatar Fernando Sahmkow2022-10-06 21:00:54 +0200
commit11e1cbbdbde8269e7cdb0e150f25639223bdd3e6 (patch)
treec3e1c99cb4502c2c5f02af7eb601de6a358d7177 /src/common/address_space.h
parentaddress_space: Address feedback (diff)
downloadyuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.gz
yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.xz
yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.zip
address_space: Rename va_start to virt_start
Avoids conflicting with the va_start macro
Diffstat (limited to 'src/common/address_space.h')
-rw-r--r--src/common/address_space.h6
1 files changed, 3 insertions, 3 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:
116 using Base = FlatAddressSpaceMap<VaType, UnmappedVa, bool, false, false, AddressSpaceBits>; 116 using Base = FlatAddressSpaceMap<VaType, UnmappedVa, bool, false, false, AddressSpaceBits>;
117 117
118public: 118public:
119 explicit FlatAllocator(VaType va_start, VaType va_limit = Base::VaMaximum); 119 explicit FlatAllocator(VaType virt_start, VaType va_limit = Base::VaMaximum);
120 120
121 /** 121 /**
122 * @brief Allocates a region in the AS of the given size and returns its address 122 * @brief Allocates a region in the AS of the given size and returns its address
@@ -134,12 +134,12 @@ public:
134 void Free(VaType virt, VaType size); 134 void Free(VaType virt, VaType size);
135 135
136 VaType GetVAStart() const { 136 VaType GetVAStart() const {
137 return va_start; 137 return virt_start;
138 } 138 }
139 139
140private: 140private:
141 /// The base VA of the allocator, no allocations will be below this 141 /// The base VA of the allocator, no allocations will be below this
142 VaType va_start; 142 VaType virt_start;
143 143
144 /** 144 /**
145 * The end address for the initial linear allocation pass 145 * The end address for the initial linear allocation pass