Synchronized Register State Handling

Author: PythonPlumber

include/idt.h

@@ -17,7 +17,7 @@ typedef struct {
 } __attribute__((packed)) idt_ptr_t;
 
 typedef struct {
-    uint32_t ds;
+    uint32_t gs, fs, es, ds;
     uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
     uint32_t int_no, err_code;
     uint32_t eip, cs, eflags, useresp, ss;

src/ai/ai_model.c

@@ -10,6 +10,7 @@
 #include "timer.h"
 #include "types.h"
 #include "util.h"
+#include "vga.h"
 #include "smp_rally.h"
 #include "sched.h"
 

src/cpu/isr.s

@@ -84,6 +84,13 @@ isr_common_stub:
     pusha
     mov ax, ds
     push eax
+    mov ax, es
+    push eax
+    mov ax, fs
+    push eax
+    mov ax, gs
+    push eax
+
     mov ax, 0x10
     mov ds, ax
     mov es, ax
@@ -93,11 +100,16 @@ isr_common_stub:
     call isr_handler
     add esp, 4
     mov esp, eax
+
     pop eax
-    mov ds, ax
-    mov es, ax
-    mov fs, ax
     mov gs, ax
+    pop eax
+    mov fs, ax
+    pop eax
+    mov es, ax
+    pop eax
+    mov ds, ax
+
     popa
     add esp, 8
     sti
@@ -107,6 +119,13 @@ irq_common_stub:
     pusha
     mov ax, ds
     push eax
+    mov ax, es
+    push eax
+    mov ax, fs
+    push eax
+    mov ax, gs
+    push eax
+
     mov ax, 0x10
     mov ds, ax
     mov es, ax
@@ -116,11 +135,16 @@ irq_common_stub:
     call irq_handler
     add esp, 4
     mov esp, eax
+
     pop eax
-    mov ds, ax
-    mov es, ax
-    mov fs, ax
     mov gs, ax
+    pop eax
+    mov fs, ax
+    pop eax
+    mov es, ax
+    pop eax
+    mov ds, ax
+
     popa
     add esp, 8
     sti

src/cpu/syscall.c

@@ -13,6 +13,7 @@
 #include "types.h"
 #include "util.h"
 #include "vfs.h"
+#include "heap.h"
 
 #define SYS_COPY_LIMIT 4096u
 

src/kernel/sched.c

@@ -669,6 +669,9 @@ process_t* switch_task(registers_t* saved_stack, process_t** previous) {
     current->eip = saved_stack->eip;
     current->cs = saved_stack->cs;
     current->ds = saved_stack->ds;
+    current->es = saved_stack->es;
+    current->fs = saved_stack->fs;
+    current->gs = saved_stack->gs;
     current->ss = saved_stack->ss;
 
     if (current->state == PROCESS_RUNNING) {