system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 18:46:18 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Kernel: Add ThreadRegisters::set_exec_state and use it in execve.cpp

Browse source 
Using this abstraction it is possible to compile this file for aarch64.
This commit is contained in:
Timon Kruiper 2023-01-25 17:11:48 +01:00 committed by Linus Groh
parent 171a8ca478
commit 1fbf562e7e
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Arch/aarch64/ThreadRegisters.h
View file

@ -33,6 +33,14 @@ struct ThreadRegisters {
set_ip(entry_ip);
x[0] = entry_data;
}
void set_exec_state(FlatPtr entry_ip, FlatPtr userspace_sp, Memory::AddressSpace& space)
{
(void)entry_ip;
(void)userspace_sp;
(void)space;
TODO_AARCH64();
}
};
}

8
Kernel/Arch/x86_64/ThreadRegisters.h
View file

@ -79,6 +79,14 @@ struct ThreadRegisters {
set_ip(entry_ip);
rdi = entry_data; // entry function argument is expected to be in regs.rdi
}
void set_exec_state(FlatPtr entry_ip, FlatPtr userspace_sp, Memory::AddressSpace& space)
{
cs = GDT_SELECTOR_CODE3 | 3;
rip = entry_ip;
rsp = userspace_sp;
cr3 = space.page_directory().cr3();
}
};
}

7
Kernel/Syscalls/execve.cpp
View file

@ -685,10 +685,9 @@ ErrorOr<void> Process::do_exec(NonnullLockRefPtr<OpenFileDescription> main_progr
new_main_thread->reset_fpu_state();
auto& regs = new_main_thread->m_regs;
regs.cs = GDT_SELECTOR_CODE3 | 3;
regs.rip = load_result.entry_eip;
regs.rsp = new_userspace_sp;
regs.cr3 = address_space().with([](auto& space) { return space->page_directory().cr3(); });
address_space().with([&](auto& space) {
regs.set_exec_state(load_result.entry_eip, new_userspace_sp, *space);
});
{
TemporaryChange profiling_disabler(m_profiling, was_profiling);