xnoe/xnoe-os
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug in idt.cpp where context_switch would clobber eax

Browse Source
This commit is contained in:
Xnoe 2021-11-29 09:15:23 +00:00
parent 5d4454e57a
commit 945bd8c2fa
Signed by: xnoe
GPG Key ID: 45AC398F44F0DAFE
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kernel/idt.cpp
View File

@ -93,6 +93,9 @@ __attribute__((interrupt)) void context_switch(interrupt_frame* frame) {
// Restore registers // Restore registers
asm ("popa"); asm ("popa");
// Restore the initial eax
asm ("mov -0xc(%ebp), %eax");
// Clear the garbage that was on the stack from previous switch_context call. // Clear the garbage that was on the stack from previous switch_context call.
asm ("mov %ebp, %esp"); asm ("mov %ebp, %esp");
@ -173,7 +176,6 @@ void init_idt() {
set_entry(0x20, 0x08, &context_switch, 0x8E); set_entry(0x20, 0x08, &context_switch, 0x8E);
set_entry(0xD, 0x08, &gpf, 0x8E); set_entry(0xD, 0x08, &gpf, 0x8E);
set_entry(0xE, 0x08, &page_fault, 0x8E); set_entry(0xE, 0x08, &page_fault, 0x8E);
set_entry(0x80, 0x08, &context_switch, 0x8E);
set_entry(0x7f, 0x08, &syscall, 0x8E); set_entry(0x7f, 0x08, &syscall, 0x8E);
outb(0x20, 0x11); outb(0x20, 0x11);