From ccb0f368a38355cb767caefc77d825a85e2aa659 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sat, 4 Jan 2014 01:51:50 +0100 Subject: [PATCH] Update kernel/{x64,x86}/process.cpp to current coding conventions. --- kernel/x64/process.cpp | 95 +++++++++++++++++++++--------------------- kernel/x86/process.cpp | 73 ++++++++++++++++---------------- 2 files changed, 85 insertions(+), 83 deletions(-) diff --git a/kernel/x64/process.cpp b/kernel/x64/process.cpp index 33a92d1d..b0c4fe40 100644 --- a/kernel/x64/process.cpp +++ b/kernel/x64/process.cpp @@ -32,53 +32,54 @@ #include #include -namespace Sortix +namespace Sortix { + +void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp, + addr_t stackpos, addr_t entry, + CPU::InterruptRegisters* regs) { - void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp, - addr_t stackpos, addr_t entry, - CPU::InterruptRegisters* regs) - { - const uint64_t CS = 0x18; - const uint64_t DS = 0x20; - const uint64_t RPL = 0x3; + const uint64_t CS = 0x18; + const uint64_t DS = 0x20; + const uint64_t RPL = 0x3; - regs->rdi = argc; - regs->rsi = (size_t) argv; - regs->rdx = envc; - regs->rcx = (size_t) envp; - regs->rip = entry; - regs->userrsp = stackpos & ~(15UL); - regs->rbp = regs->userrsp; - regs->cs = CS | RPL; - regs->ds = DS | RPL; - regs->ss = DS | RPL; - regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; - } - - void InitializeThreadRegisters(CPU::InterruptRegisters* regs, - const tforkregs_t* requested) - { - memset(regs, 0, sizeof(*regs)); - regs->rip = requested->rip; - regs->userrsp = requested->rsp; - regs->rax = requested->rax; - regs->rbx = requested->rbx; - regs->rcx = requested->rcx; - regs->rdx = requested->rdx; - regs->rdi = requested->rdi; - regs->rsi = requested->rsi; - regs->rbp = requested->rbp; - regs->r8 = requested->r8; - regs->r9 = requested->r9; - regs->r10 = requested->r10; - regs->r11 = requested->r11; - regs->r12 = requested->r12; - regs->r13 = requested->r13; - regs->r14 = requested->r14; - regs->r15 = requested->r15; - regs->cs = 0x18 | 0x3; - regs->ds = 0x20 | 0x3; - regs->ss = 0x20 | 0x3; - regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; - } + regs->rdi = argc; + regs->rsi = (size_t) argv; + regs->rdx = envc; + regs->rcx = (size_t) envp; + regs->rip = entry; + regs->userrsp = stackpos & ~15UL; + regs->rbp = regs->userrsp; + regs->cs = CS | RPL; + regs->ds = DS | RPL; + regs->ss = DS | RPL; + regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; } + +void InitializeThreadRegisters(CPU::InterruptRegisters* regs, + const tforkregs_t* requested) +{ + memset(regs, 0, sizeof(*regs)); + regs->rip = requested->rip; + regs->userrsp = requested->rsp; + regs->rax = requested->rax; + regs->rbx = requested->rbx; + regs->rcx = requested->rcx; + regs->rdx = requested->rdx; + regs->rdi = requested->rdi; + regs->rsi = requested->rsi; + regs->rbp = requested->rbp; + regs->r8 = requested->r8; + regs->r9 = requested->r9; + regs->r10 = requested->r10; + regs->r11 = requested->r11; + regs->r12 = requested->r12; + regs->r13 = requested->r13; + regs->r14 = requested->r14; + regs->r15 = requested->r15; + regs->cs = 0x18 | 0x3; + regs->ds = 0x20 | 0x3; + regs->ss = 0x20 | 0x3; + regs->rflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; +} + +} // namespace Sortix diff --git a/kernel/x86/process.cpp b/kernel/x86/process.cpp index a945ee03..4c17dd4f 100644 --- a/kernel/x86/process.cpp +++ b/kernel/x86/process.cpp @@ -32,41 +32,42 @@ #include #include -namespace Sortix -{ - void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp, - addr_t stackpos, addr_t entry, - CPU::InterruptRegisters* regs) - { - regs->eax = argc; - regs->ebx = (size_t) argv; - regs->edx = envc; - regs->ecx = (size_t) envp; - regs->eip = entry; - regs->useresp = stackpos & ~(15UL); - regs->ebp = regs->useresp; - regs->cs = UCS | URPL; - regs->ds = UDS | URPL; - regs->ss = UDS | URPL; - regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; - } +namespace Sortix { - void InitializeThreadRegisters(CPU::InterruptRegisters* regs, - const tforkregs_t* requested) - { - memset(regs, 0, sizeof(*regs)); - regs->eip = requested->eip; - regs->useresp = requested->esp; - regs->eax = requested->eax; - regs->ebx = requested->ebx; - regs->ecx = requested->ecx; - regs->edx = requested->edx; - regs->edi = requested->edi; - regs->esi = requested->esi; - regs->ebp = requested->ebp; - regs->cs = UCS | URPL; - regs->ds = UDS | URPL; - regs->ss = UDS | URPL; - regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; - } +void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp, + addr_t stackpos, addr_t entry, + CPU::InterruptRegisters* regs) +{ + regs->eax = argc; + regs->ebx = (size_t) argv; + regs->edx = envc; + regs->ecx = (size_t) envp; + regs->eip = entry; + regs->useresp = stackpos & ~(15UL); + regs->ebp = regs->useresp; + regs->cs = UCS | URPL; + regs->ds = UDS | URPL; + regs->ss = UDS | URPL; + regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; } + +void InitializeThreadRegisters(CPU::InterruptRegisters* regs, + const tforkregs_t* requested) +{ + memset(regs, 0, sizeof(*regs)); + regs->eip = requested->eip; + regs->useresp = requested->esp; + regs->eax = requested->eax; + regs->ebx = requested->ebx; + regs->ecx = requested->ecx; + regs->edx = requested->edx; + regs->edi = requested->edi; + regs->esi = requested->esi; + regs->ebp = requested->ebp; + regs->cs = UCS | URPL; + regs->ds = UDS | URPL; + regs->ss = UDS | URPL; + regs->eflags = FLAGS_RESERVED1 | FLAGS_INTERRUPT | FLAGS_ID; +} + +} // namespace Sortix