From c0dff5e2039719278e01c1ca277c4c5d4e195e0d Mon Sep 17 00:00:00 2001 From: Bananymous Date: Fri, 22 Mar 2024 12:59:35 +0200 Subject: [PATCH] Kernel: Scheduler/Thread add inline assembly for i386 --- kernel/kernel/Scheduler.cpp | 16 ++++++++++++++++ kernel/kernel/Thread.cpp | 21 +++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/kernel/kernel/Scheduler.cpp b/kernel/kernel/Scheduler.cpp index 2b892ae2..8df08cf8 100644 --- a/kernel/kernel/Scheduler.cpp +++ b/kernel/kernel/Scheduler.cpp @@ -19,7 +19,13 @@ namespace Kernel ALWAYS_INLINE static void load_temp_stack() { +#if ARCH(x86_64) asm volatile("movq %0, %%rsp" :: "rm"(Processor::current_stack_top())); +#elif ARCH(i386) + asm volatile("movl %0, %%esp" :: "rm"(Processor::current_stack_top())); +#else + #error +#endif } BAN::ErrorOr Scheduler::initialize() @@ -209,11 +215,21 @@ namespace Kernel #if __enable_sse if (current != Thread::sse_thread()) { +#if ARCH(x86_64) asm volatile( "movq %cr0, %rax;" "orq $(1 << 3), %rax;" "movq %rax, %cr0" ); +#elif ARCH(i386) + asm volatile( + "movl %cr0, %eax;" + "orl $(1 << 3), %eax;" + "movl %eax, %cr0" + ); +#else + #error +#endif } #endif diff --git a/kernel/kernel/Thread.cpp b/kernel/kernel/Thread.cpp index 7e44db5e..3552088b 100644 --- a/kernel/kernel/Thread.cpp +++ b/kernel/kernel/Thread.cpp @@ -99,16 +99,33 @@ namespace Kernel : m_tid(tid), m_process(process) { #if __enable_sse + #if ARCH(x86_64) uintptr_t cr0; asm volatile( "movq %%cr0, %%rax;" - "movq %%rax, %%rbx;" + "movq %%rax, %[cr0];" "andq $~(1 << 3), %%rax;" "movq %%rax, %%cr0;" - : "=b"(cr0) + : [cr0]"=r"(cr0) + :: "rax" ); save_sse(); asm volatile("movq %0, %%cr0" :: "r"(cr0)); + #elif ARCH(i386) + uintptr_t cr0; + asm volatile( + "movl %%cr0, %%eax;" + "movl %%eax, %[cr0];" + "andl $~(1 << 3), %%eax;" + "movl %%eax, %%cr0;" + : [cr0]"=r"(cr0) + :: "eax" + ); + save_sse(); + asm volatile("movl %0, %%cr0" :: "r"(cr0)); + #else + #error + #endif #endif }