mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 18:57:45 +00:00
Kernel: Rename Range => VirtualRange
...and also RangeAllocator => VirtualRangeAllocator. This clarifies that the ranges we're dealing with are *virtual* memory ranges and not anything else.
This commit is contained in:
parent
93d98d4976
commit
cd5faf4e42
39 changed files with 207 additions and 207 deletions
|
@ -154,12 +154,12 @@ static KResultOr<FlatPtr> make_userspace_context_for_main_thread([[maybe_unused]
|
|||
return new_sp;
|
||||
}
|
||||
|
||||
struct RequiredLoadRange {
|
||||
struct RequiredLoadVirtualRange {
|
||||
FlatPtr start { 0 };
|
||||
FlatPtr end { 0 };
|
||||
};
|
||||
|
||||
static KResultOr<RequiredLoadRange> get_required_load_range(FileDescription& program_description)
|
||||
static KResultOr<RequiredLoadVirtualRange> get_required_load_range(FileDescription& program_description)
|
||||
{
|
||||
auto& inode = *(program_description.inode());
|
||||
auto vmobject = Memory::SharedInodeVMObject::try_create_with_inode(inode);
|
||||
|
@ -181,7 +181,7 @@ static KResultOr<RequiredLoadRange> get_required_load_range(FileDescription& pro
|
|||
return EINVAL;
|
||||
}
|
||||
|
||||
RequiredLoadRange range {};
|
||||
RequiredLoadVirtualRange range {};
|
||||
elf_image.for_each_program_header([&range](const auto& pheader) {
|
||||
if (pheader.type() != PT_LOAD)
|
||||
return;
|
||||
|
@ -221,7 +221,7 @@ static KResultOr<FlatPtr> get_load_offset(const ElfW(Ehdr) & main_program_header
|
|||
|
||||
auto main_program_load_range = main_program_load_range_result.value();
|
||||
|
||||
RequiredLoadRange selected_range {};
|
||||
RequiredLoadVirtualRange selected_range {};
|
||||
|
||||
if (interpreter_description) {
|
||||
auto interpreter_load_range_result = get_required_load_range(*interpreter_description);
|
||||
|
@ -235,8 +235,8 @@ static KResultOr<FlatPtr> get_load_offset(const ElfW(Ehdr) & main_program_header
|
|||
if (main_program_load_range.end < load_range_start || main_program_load_range.start > interpreter_load_range_end)
|
||||
return random_load_offset_in_range(load_range_start, load_range_size);
|
||||
|
||||
RequiredLoadRange first_available_part = { load_range_start, main_program_load_range.start };
|
||||
RequiredLoadRange second_available_part = { main_program_load_range.end, interpreter_load_range_end };
|
||||
RequiredLoadVirtualRange first_available_part = { load_range_start, main_program_load_range.start };
|
||||
RequiredLoadVirtualRange second_available_part = { main_program_load_range.end, interpreter_load_range_end };
|
||||
|
||||
// Select larger part
|
||||
if (first_available_part.end - first_available_part.start > second_available_part.end - second_available_part.start)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue