Flanterm can write to fb but page fault before process creation. (BEFORE KHEAP UPDATE)

src/config.h

@@ -30,7 +30,7 @@
 #define KERNEL_STACK_SIZE 65536
 
 /* heap */
-#define KHEAP_SIZE (16*1024*1024)
+#define KHEAP_SIZE (32*1024*1024)
 
 /* term */
 #define TERM_HISTORY_MAX_LINES 256

src/idt/idt.c

@@ -203,9 +203,6 @@ struct cpu_status_t* interrupt_dispatch(struct cpu_status_t* context)
             if (ticks % SCHEDULER_QUANTUM == 0)
             {
                 return scheduler_schedule(context);
-                //struct cpu_status_t* current_ctx = scheduler_schedule(context);
-                //process_switch(current_ctx->iret_rsp, current_ctx->iret_rip);
-                //SET_INTERRUPTS;
             }
 
             break;

src/io/serial/serial.c

@@ -42,7 +42,7 @@ int serial_init()
     // Set normal operation mode
     outb(PORT + 4, 0x0F);
 
-    DEBUG("serial initialized");
+    DEBUG("*** Welcome to PepperOS! ***");
     return 0;
 }
 

src/mem/heap/kheap.c

@@ -56,7 +56,7 @@ void kheap_init()
     head->size = PAGE_SIZE - sizeof(struct heap_block_t);
     head->free = true;
     head->next = NULL;
-    DEBUG("kheap initialized, head=0x%p, size=%u", head, head->size);
+    DEBUG("kernel heap initialized, head=0x%p, max_size=%u bytes", head, KHEAP_SIZE);
 }
 
 void* kmalloc(size_t size)

src/mem/paging/vmm.c

@@ -68,5 +68,6 @@ void vmm_setup_pt_root()
 
 void vmm_init()
 {
-    vmm_setup_pt_root();
+    // NO U
+    //vmm_setup_pt_root();
 }

src/sched/process.c

@@ -13,6 +13,9 @@
 #include "config.h"
 #include "io/serial/serial.h"
 
+#include "io/term/flanterm.h"
+extern struct flanterm_context* ft_ctx;
+
 struct process_t* processes_list;
 struct process_t* current_process;
 
@@ -139,23 +142,6 @@ struct process_t* process_get_next(struct process_t* process)
     return process->next;
 }
 
-// (from gdt) This will switch tasks ONLY in ring 0
-// KERNEL CS = 0x08
-// KERNEL SS = 0x10
-__attribute__((naked, noreturn))
-void process_switch(uint64_t stack_addr, uint64_t code_addr)
-{
-    asm volatile(" \
-        push $0x10 \n\
-        push %0 \n\
-        push $0x202 \n\
-        push $0x08 \n\
-        push %1 \n\
-        iretq \n\
-        " :: "r"(stack_addr), "r"(code_addr));
-}
-
-
 // Will be used to clean up resources (if any, when we implement it)
 // Just mark as DEAD then idle. Scheduler will delete process at next timer interrupt % quantum.
 void process_exit()

src/sched/process.h

@@ -34,7 +34,6 @@ struct process_t* process_create(char* name, void(*function)(void*), void* arg);
 void process_add(struct process_t** processes_list, struct process_t* process);
 void process_delete(struct process_t** processes_list, struct process_t* process);
 struct process_t* process_get_next(struct process_t* process);
-void process_switch(uint64_t stack_addr, uint64_t code_addr);
 void process_exit();
 
 void process_display_list(struct process_t* processes_list);