1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-11 18:20:43 +09:00

Kernel: Apply changes to use LibBareMetal definitions

This commit is contained in:
Liav A 2020-02-09 16:47:15 +02:00 committed by Andreas Kling
parent 7c507c27bf
commit e559af2008
Notes: sideshowbarker 2024-07-19 09:30:34 +09:00
43 changed files with 84 additions and 892 deletions

View file

@ -27,9 +27,9 @@
#include <AK/BinarySearch.h>
#include <AK/QuickSort.h>
#include <Kernel/Random.h>
#include <Kernel/VM/RangeAllocator.h>
#include <Kernel/kstdio.h>
#include <Kernel/Thread.h>
#include <Kernel/VM/RangeAllocator.h>
#include <LibBareMetal/Output/kstdio.h>
//#define VRA_DEBUG
#define VM_GUARD_PAGES
@ -162,18 +162,22 @@ void RangeAllocator::deallocate(Range range)
ASSERT(!m_available_ranges.is_empty());
int nearby_index = 0;
auto* existing_range = binary_search(m_available_ranges.data(), m_available_ranges.size(), range, [](auto& a, auto& b) {
return a.base().get() - b.end().get();
}, &nearby_index);
auto* existing_range = binary_search(
m_available_ranges.data(), m_available_ranges.size(), range, [](auto& a, auto& b) {
return a.base().get() - b.end().get();
},
&nearby_index);
int inserted_index = 0;
if (existing_range) {
existing_range->m_size += range.size();
inserted_index = nearby_index;
} else {
m_available_ranges.insert_before_matching(Range(range), [&](auto& entry) {
return entry.base() >= range.end();
}, nearby_index, &inserted_index);
m_available_ranges.insert_before_matching(
Range(range), [&](auto& entry) {
return entry.base() >= range.end();
},
nearby_index, &inserted_index);
}
if (inserted_index < (m_available_ranges.size() - 1)) {