|
|
@ -285,7 +285,6 @@ ResultVal<VAddr> VMManager::HeapAllocate(u64 size) { |
|
|
return mapping_result.Code(); |
|
|
return mapping_result.Code(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
heap_used = size; |
|
|
|
|
|
return MakeResult<VAddr>(heap_region_base); |
|
|
return MakeResult<VAddr>(heap_region_base); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -303,7 +302,6 @@ ResultCode VMManager::HeapFree(VAddr target, u64 size) { |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
heap_used -= size; |
|
|
|
|
|
return RESULT_SUCCESS; |
|
|
return RESULT_SUCCESS; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -596,6 +594,7 @@ void VMManager::InitializeMemoryRegionRanges(FileSys::ProgramAddressSpaceType ty |
|
|
|
|
|
|
|
|
heap_region_base = map_region_end; |
|
|
heap_region_base = map_region_end; |
|
|
heap_region_end = heap_region_base + heap_region_size; |
|
|
heap_region_end = heap_region_base + heap_region_size; |
|
|
|
|
|
heap_end = heap_region_base; |
|
|
|
|
|
|
|
|
new_map_region_base = heap_region_end; |
|
|
new_map_region_base = heap_region_end; |
|
|
new_map_region_end = new_map_region_base + new_map_region_size; |
|
|
new_map_region_end = new_map_region_base + new_map_region_size; |
|
|
@ -690,10 +689,6 @@ u64 VMManager::GetTotalMemoryUsage() const { |
|
|
return 0xF8000000; |
|
|
return 0xF8000000; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
u64 VMManager::GetTotalHeapUsage() const { |
|
|
|
|
|
return heap_used; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
VAddr VMManager::GetAddressSpaceBaseAddress() const { |
|
|
VAddr VMManager::GetAddressSpaceBaseAddress() const { |
|
|
return address_space_base; |
|
|
return address_space_base; |
|
|
} |
|
|
} |
|
|
|