i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/vm: Clean up logic in vm_allocate_early_physical_page.

Browse Source 
Use local addr_range& variables instead of array accesses.
Functionally equivalent but much nicer to read.
This commit is contained in:
Augustin Cavalier
2024-10-12 12:40:47 -04:00
parent 23cf326b86
commit bb7ace43c2
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+15 -15
View File
@@ -4324,9 +4324,8 @@ is_page_in_physical_memory_range(kernel_args* args, phys_addr_t address)
// TODO: horrible brute-force method of determining if the page can be // TODO: horrible brute-force method of determining if the page can be
// allocated // allocated
for (uint32 i = 0; i < args->num_physical_memory_ranges; i++) { for (uint32 i = 0; i < args->num_physical_memory_ranges; i++) {
if (address >= args->physical_memory_range[i].start const addr_range& range = args->physical_memory_range[i];
&& address < (args->physical_memory_range[i].start if (address >= range.start && address < (range.start + range.size))
+ args->physical_memory_range[i].size))
return true; return true;
} }
return false; return false;
@@ -4343,38 +4342,39 @@ vm_allocate_early_physical_page(kernel_args* args)
// Try expanding the existing physical ranges upwards. // Try expanding the existing physical ranges upwards.
for (uint32 i = 0; i < args->num_physical_allocated_ranges; i++) { for (uint32 i = 0; i < args->num_physical_allocated_ranges; i++) {
phys_addr_t nextPage = args->physical_allocated_range[i].start addr_range& range = args->physical_allocated_range[i];
+ args->physical_allocated_range[i].size; phys_addr_t nextPage = range.start + range.size;
// make sure the next page does not collide with the next allocated range // make sure the next page does not collide with the next allocated range
if ((i + 1) < args->num_physical_allocated_ranges if ((i + 1) < args->num_physical_allocated_ranges) {
&& args->physical_allocated_range[i + 1].size != 0) { addr_range& nextRange = args->physical_allocated_range[i + 1];
if (nextPage >= args->physical_allocated_range[i + 1].start) if (nextRange.size != 0 && nextPage >= nextRange.start)
continue; continue;
} }
// see if the next page fits in the memory block // see if the next page fits in the memory block
if (is_page_in_physical_memory_range(args, nextPage)) { if (is_page_in_physical_memory_range(args, nextPage)) {
// we got one! // we got one!
args->physical_allocated_range[i].size += B_PAGE_SIZE; range.size += B_PAGE_SIZE;
return nextPage / B_PAGE_SIZE; return nextPage / B_PAGE_SIZE;
} }
} }
// Expanding upwards didn't work, try going downwards. // Expanding upwards didn't work, try going downwards.
for (uint32 i = 0; i < args->num_physical_allocated_ranges; i++) { for (uint32 i = 0; i < args->num_physical_allocated_ranges; i++) {
phys_addr_t nextPage = args->physical_allocated_range[i].start - B_PAGE_SIZE; addr_range& range = args->physical_allocated_range[i];
phys_addr_t nextPage = range.start - B_PAGE_SIZE;
// make sure the next page does not collide with the previous allocated range // make sure the next page does not collide with the previous allocated range
if ((i > 0) && args->physical_allocated_range[i - 1].size != 0) { if (i > 0) {
if (nextPage < args->physical_allocated_range[i - 1].start addr_range& previousRange = args->physical_allocated_range[i - 1];
+ args->physical_allocated_range[i - 1].size) if (previousRange.size != 0 && nextPage < (previousRange.start + previousRange.size))
continue; continue;
} }
// see if the next physical page fits in the memory block // see if the next physical page fits in the memory block
if (is_page_in_physical_memory_range(args, nextPage)) { if (is_page_in_physical_memory_range(args, nextPage)) {
// we got one! // we got one!
args->physical_allocated_range[i].start -= B_PAGE_SIZE; range.start -= B_PAGE_SIZE;
args->physical_allocated_range[i].size += B_PAGE_SIZE; range.size += B_PAGE_SIZE;
return nextPage / B_PAGE_SIZE; return nextPage / B_PAGE_SIZE;
} }
} }