summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/hle/kernel/vm_manager.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 40cea1e7c..21ab01240 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -330,7 +330,7 @@ ResultCode VMManager::MapPhysicalMemory(VAddr target, u64 size) {
330 cur_addr = target; 330 cur_addr = target;
331 331
332 auto iter = FindVMA(target); 332 auto iter = FindVMA(target);
333 ASSERT_MSG(iter != vma_map.end(), "MapPhysicalMemory iter != end"); 333 ASSERT(iter != vma_map.end());
334 334
335 while (true) { 335 while (true) {
336 const auto& vma = iter->second; 336 const auto& vma = iter->second;
@@ -360,7 +360,7 @@ ResultCode VMManager::MapPhysicalMemory(VAddr target, u64 size) {
360 // Advance to the next block. 360 // Advance to the next block.
361 cur_addr = vma_end; 361 cur_addr = vma_end;
362 iter = FindVMA(cur_addr); 362 iter = FindVMA(cur_addr);
363 ASSERT_MSG(iter != vma_map.end(), "MapPhysicalMemory iter != end"); 363 ASSERT(iter != vma_map.end());
364 } 364 }
365 } 365 }
366 366
@@ -368,7 +368,7 @@ ResultCode VMManager::MapPhysicalMemory(VAddr target, u64 size) {
368 if (result.IsError()) { 368 if (result.IsError()) {
369 for (const auto [unmap_address, unmap_size] : mapped_regions) { 369 for (const auto [unmap_address, unmap_size] : mapped_regions) {
370 ASSERT_MSG(UnmapRange(unmap_address, unmap_size).IsSuccess(), 370 ASSERT_MSG(UnmapRange(unmap_address, unmap_size).IsSuccess(),
371 "MapPhysicalMemory un-map on error"); 371 "Failed to unmap memory range.");
372 } 372 }
373 373
374 return result; 374 return result;
@@ -407,7 +407,7 @@ ResultCode VMManager::UnmapPhysicalMemory(VAddr target, u64 size) {
407 cur_addr = target; 407 cur_addr = target;
408 408
409 auto iter = FindVMA(target); 409 auto iter = FindVMA(target);
410 ASSERT_MSG(iter != vma_map.end(), "UnmapPhysicalMemory iter != end"); 410 ASSERT(iter != vma_map.end());
411 411
412 while (true) { 412 while (true) {
413 const auto& vma = iter->second; 413 const auto& vma = iter->second;
@@ -434,7 +434,7 @@ ResultCode VMManager::UnmapPhysicalMemory(VAddr target, u64 size) {
434 // Advance to the next block. 434 // Advance to the next block.
435 cur_addr = vma_end; 435 cur_addr = vma_end;
436 iter = FindVMA(cur_addr); 436 iter = FindVMA(cur_addr);
437 ASSERT_MSG(iter != vma_map.end(), "UnmapPhysicalMemory iter != end"); 437 ASSERT(iter != vma_map.end());
438 } 438 }
439 } 439 }
440 440
@@ -445,7 +445,7 @@ ResultCode VMManager::UnmapPhysicalMemory(VAddr target, u64 size) {
445 const auto remap_res = 445 const auto remap_res =
446 MapMemoryBlock(map_address, std::make_shared<PhysicalMemory>(map_size, 0), 0, 446 MapMemoryBlock(map_address, std::make_shared<PhysicalMemory>(map_size, 0), 0,
447 map_size, MemoryState::Heap, VMAPermission::None); 447 map_size, MemoryState::Heap, VMAPermission::None);
448 ASSERT_MSG(remap_res.Succeeded(), "UnmapPhysicalMemory re-map on error"); 448 ASSERT_MSG(remap_res.Succeeded(), "Failed to remap a memory block.");
449 } 449 }
450 } 450 }
451 451
@@ -965,7 +965,7 @@ ResultVal<std::size_t> VMManager::SizeOfAllocatedVMAsInRange(VAddr address,
965 965
966 VAddr cur_addr = address; 966 VAddr cur_addr = address;
967 auto iter = FindVMA(cur_addr); 967 auto iter = FindVMA(cur_addr);
968 ASSERT_MSG(iter != vma_map.end(), "SizeOfAllocatedVMAsInRange iter != end"); 968 ASSERT(iter != vma_map.end());
969 969
970 while (true) { 970 while (true) {
971 const auto& vma = iter->second; 971 const auto& vma = iter->second;
@@ -986,7 +986,7 @@ ResultVal<std::size_t> VMManager::SizeOfAllocatedVMAsInRange(VAddr address,
986 // Advance to the next block. 986 // Advance to the next block.
987 cur_addr = vma_end; 987 cur_addr = vma_end;
988 iter = std::next(iter); 988 iter = std::next(iter);
989 ASSERT_MSG(iter != vma_map.end(), "SizeOfAllocatedVMAsInRange iter != end"); 989 ASSERT(iter != vma_map.end());
990 } 990 }
991 991
992 return MakeResult(mapped_size); 992 return MakeResult(mapped_size);
@@ -1000,7 +1000,7 @@ ResultVal<std::size_t> VMManager::SizeOfUnmappablePhysicalMemoryInRange(VAddr ad
1000 1000
1001 VAddr cur_addr = address; 1001 VAddr cur_addr = address;
1002 auto iter = FindVMA(cur_addr); 1002 auto iter = FindVMA(cur_addr);
1003 ASSERT_MSG(iter != vma_map.end(), "SizeOfUnmappablePhysicalMemoryInRange iter != end"); 1003 ASSERT(iter != vma_map.end());
1004 1004
1005 while (true) { 1005 while (true) {
1006 const auto& vma = iter->second; 1006 const auto& vma = iter->second;
@@ -1029,7 +1029,7 @@ ResultVal<std::size_t> VMManager::SizeOfUnmappablePhysicalMemoryInRange(VAddr ad
1029 // Advance to the next block. 1029 // Advance to the next block.
1030 cur_addr = vma_end; 1030 cur_addr = vma_end;
1031 iter = std::next(iter); 1031 iter = std::next(iter);
1032 ASSERT_MSG(iter != vma_map.end(), "SizeOfUnmappablePhysicalMemoryInRange iter != end"); 1032 ASSERT(iter != vma_map.end());
1033 } 1033 }
1034 1034
1035 return MakeResult(mapped_size); 1035 return MakeResult(mapped_size);