Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix stack align

Browse Source
This commit is contained in:
EnderIce2 2024-03-05 00:47:08 +02:00
parent 2633e8ed76
commit 7c4adccf8d
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/task.hpp
View File

@ -282,15 +282,18 @@ namespace Tasking
void SetupUserStack_x86_64(const char **argv, void SetupUserStack_x86_64(const char **argv,
const char **envp, const char **envp,
const std::vector<AuxiliaryVector> &auxv); const std::vector<AuxiliaryVector> &auxv,
TaskCompatibility Compatibility);
void SetupUserStack_x86_32(const char **argv, void SetupUserStack_x86_32(const char **argv,
const char **envp, const char **envp,
const std::vector<AuxiliaryVector> &auxv); const std::vector<AuxiliaryVector> &auxv,
TaskCompatibility Compatibility);
void SetupUserStack_aarch64(const char **argv, void SetupUserStack_aarch64(const char **argv,
const char **envp, const char **envp,
const std::vector<AuxiliaryVector> &auxv); const std::vector<AuxiliaryVector> &auxv,
TaskCompatibility Compatibility);
/** /**
* This function should be called after * This function should be called after
@ -545,7 +548,7 @@ namespace Tasking
PCB *GetProcessByID(PID ID); PCB *GetProcessByID(PID ID);
TCB *GetThreadByID(TID ID, PCB* Parent); TCB *GetThreadByID(TID ID, PCB *Parent);
/** Wait for process to terminate */ /** Wait for process to terminate */
void WaitForProcess(PCB *pcb); void WaitForProcess(PCB *pcb);

42
tasking/thread.cpp
View File

@ -182,7 +182,8 @@ namespace Tasking
__no_sanitize("undefined") void TCB::SetupUserStack_x86_64(const char **argv, __no_sanitize("undefined") void TCB::SetupUserStack_x86_64(const char **argv,
const char **envp, const char **envp,
const std::vector<AuxiliaryVector> &auxv) const std::vector<AuxiliaryVector> &auxv,
TaskCompatibility Compatibility)
{ {
size_t argvLen = 0; size_t argvLen = 0;
if (argv) if (argv)
@ -247,6 +248,12 @@ namespace Tasking
(argvLen + envpLen) % 2, (argvLen + envpLen) % 2,
stackStr, pStack); stackStr, pStack);
/* Ensure StackPointerReg is aligned to the closest lower 16 bytes boundary */
uintptr_t lower16Align = (uintptr_t)pStack;
lower16Align &= ~0xF;
debug("before: %#lx ; after: %#lx", pStack, lower16Align);
pStack = (char *)lower16Align;
/* We need 8 bit pointers for the stack from here */ /* We need 8 bit pointers for the stack from here */
uintptr_t *Stack64 = (uintptr_t *)pStack; uintptr_t *Stack64 = (uintptr_t *)pStack;
assert(Stack64 != nullptr); assert(Stack64 != nullptr);
@ -300,11 +307,6 @@ namespace Tasking
/* Set "pStack" to the new stack pointer */ /* Set "pStack" to the new stack pointer */
pStack = (char *)Stack64; pStack = (char *)Stack64;
/* Ensure StackPointerReg is aligned to the closest lower 16 bytes boundary */
uintptr_t lower16Align = (uintptr_t)pStack;
lower16Align &= ~0xF;
pStack = (char *)lower16Align;
/* We need the virtual address but because we are in the kernel we can't use the process page table. /* We need the virtual address but because we are in the kernel we can't use the process page table.
So we modify the physical address and store how much we need to subtract to get the virtual address for RSP. */ So we modify the physical address and store how much we need to subtract to get the virtual address for RSP. */
uintptr_t SubtractStack = (uintptr_t)this->Stack->GetStackPhysicalTop() - (uintptr_t)pStack; uintptr_t SubtractStack = (uintptr_t)this->Stack->GetStackPhysicalTop() - (uintptr_t)pStack;
@ -332,18 +334,40 @@ namespace Tasking
(void *)((uintptr_t)this->Stack->GetStackPhysicalTop() - (uintptr_t)SubtractStack), (void *)((uintptr_t)this->Stack->GetStackPhysicalTop() - (uintptr_t)SubtractStack),
SubtractStack); SubtractStack);
#endif #endif
if (Compatibility != Native)
return;
#if defined(a64)
this->Registers.rdi = (uintptr_t)argvLen; // argc
this->Registers.rsi = (uintptr_t)(this->Registers.rsp + 8); // argv
this->Registers.rcx = (uintptr_t)envpLen; // envc
this->Registers.rdx = (uintptr_t)(this->Registers.rsp + 8 + (8 * argvLen) + 8); // envp
#elif defined(a32)
this->Registers.eax = (uintptr_t)argvLen; // argc
this->Registers.ebx = (uintptr_t)(this->Registers.esp + 4); // argv
this->Registers.ecx = (uintptr_t)envpLen; // envc
this->Registers.edx = (uintptr_t)(this->Registers.esp + 4 + (4 * argvLen) + 4); // envp
#elif defined(aa64)
this->Registers.x0 = (uintptr_t)argvLen; // argc
this->Registers.x1 = (uintptr_t)(this->Registers.sp + 8); // argv
this->Registers.x2 = (uintptr_t)envpLen; // envc
this->Registers.x3 = (uintptr_t)(this->Registers.sp + 8 + (8 * argvLen) + 8); // envp
#endif
} }
void TCB::SetupUserStack_x86_32(const char **argv, void TCB::SetupUserStack_x86_32(const char **argv,
const char **envp, const char **envp,
const std::vector<AuxiliaryVector> &auxv) const std::vector<AuxiliaryVector> &auxv,
TaskCompatibility Compatibility)
{ {
fixme("Not implemented"); fixme("Not implemented");
} }
void TCB::SetupUserStack_aarch64(const char **argv, void TCB::SetupUserStack_aarch64(const char **argv,
const char **envp, const char **envp,
const std::vector<AuxiliaryVector> &auxv) const std::vector<AuxiliaryVector> &auxv,
TaskCompatibility Compatibility)
{ {
fixme("Not implemented"); fixme("Not implemented");
} }
@ -508,7 +532,7 @@ namespace Tasking
is exited or we are going to get is exited or we are going to get
an exception. */ an exception. */
this->SetupUserStack_x86_64(argv, envp, auxv); this->SetupUserStack_x86_64(argv, envp, auxv, Compatibility);
#elif defined(a32) #elif defined(a32)
this->Registers.cs = GDT_USER_CODE; this->Registers.cs = GDT_USER_CODE;
this->Registers.r3_ss = GDT_USER_DATA; this->Registers.r3_ss = GDT_USER_DATA;