Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken task switching. [...]

Browse Source 
We failed to inform the compiler of which registers we were clobbering
in performing that bit of assembly, so it did a wonderfully fun thing
and move esp into %ecx, eip into something, that something into %ecx,
then tried to load %ecx into %esp. Oops. *boom*.
This commit is contained in:
Kevin Lange 2011-10-21 12:28:39 -05:00
parent cef5e1f7a7
commit 202d5af168
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/core/task.c
View File

@ -180,14 +180,15 @@ switch_task() {
ebp = current_task->ebp;
__asm__ __volatile__ (
"cli\n"
"mov %0, %%ecx\n"
"mov %0, %%ebx\n"
"mov %1, %%esp\n"
"mov %2, %%ebp\n"
"mov %3, %%cr3\n"
"mov $0x10000, %%eax\n"
"sti\n"
"jmp *%%ecx"
: : "r" (eip), "r" (esp), "r" (ebp), "r" (current_directory->physical_address));
"jmp *%%ebx"
: : "r" (eip), "r" (esp), "r" (ebp), "r" (current_directory->physical_address)
: "%ebx", "%esp", "%ebp", "%eax");
switch_page_directory(current_task->page_directory);
}
@ -212,7 +213,7 @@ enter_user_jmp(uintptr_t location, int argc, char ** argv, uintptr_t stack) {
"pushl %2\n"
"pushl %1\n"
"call *%0\n"
: : "m"(location), "m"(argc), "m"(argv), "r"(stack));
: : "m"(location), "m"(argc), "m"(argv), "r"(stack) : "%ax", "%esp", "%eax");
}
void task_exit(int retval) {