diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/address_space.h | 6 | ||||
| -rw-r--r-- | src/common/address_space.inc | 4 |
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: | |||
| 116 | using Base = FlatAddressSpaceMap<VaType, UnmappedVa, bool, false, false, AddressSpaceBits>; | 116 | using Base = FlatAddressSpaceMap<VaType, UnmappedVa, bool, false, false, AddressSpaceBits>; |
| 117 | 117 | ||
| 118 | public: | 118 | public: |
| 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 | ||
| 140 | private: | 140 | private: |
| 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 |
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) { | |||
| 284 | unmap_callback(virt, size); | 284 | unmap_callback(virt, size); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | ALLOC_MEMBER_CONST()::FlatAllocator(VaType va_start_, VaType va_limit_) | 287 | ALLOC_MEMBER_CONST()::FlatAllocator(VaType virt_start_, VaType va_limit_) |
| 288 | : Base{va_limit_}, va_start{va_start_}, current_linear_alloc_end{va_start_} {} | 288 | : Base{va_limit_}, virt_start{virt_start_}, current_linear_alloc_end{virt_start_} {} |
| 289 | 289 | ||
| 290 | ALLOC_MEMBER(VaType)::Allocate(VaType size) { | 290 | ALLOC_MEMBER(VaType)::Allocate(VaType size) { |
| 291 | std::scoped_lock lock(this->block_mutex); | 291 | std::scoped_lock lock(this->block_mutex); |