Some workarounds but now it boots to shell

vlang · Dec 18, 2023 · 4b95f3f · 4b95f3f
1 parent b46f915
commit 4b95f3f
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/kernel/main.v b/kernel/main.v
@@ -110,7 +110,7 @@ pub fn kmain() {
 
 	sched.initialise()
 
-	go kmain_thread()
+	spawn kmain_thread()
 
 	sched.await()
 }
diff --git a/kernel/modules/katomic/katomic.v b/kernel/modules/katomic/katomic.v
@@ -43,7 +43,7 @@ pub fn cas<T>(_here &T, _ifthis T, writethis T) bool {
 			lock
 			cmpxchg here, writethis
 			; +a (ifthis)
-			  +m (here[0]) as here
+			  +m (*here) as here
 			  =@ccz (ret)
 			; r (writethis)
 			; memory

diff --git a/kernel/modules/klock/klock.v b/kernel/modules/klock/klock.v
@@ -44,7 +44,7 @@ pub fn (mut l Lock) release() {
 pub fn (mut l Lock) test_and_acquire() bool {
 	caller := u64(C.__builtin_return_address(0))
 
-	ret := katomic.cas(l.l, false, true)
+	ret := katomic.cas(&l.l, false, true)
 	if ret == true {
 		l.caller = caller
 	}

diff --git a/kernel/modules/memory/mmap/mmap.v b/kernel/modules/memory/mmap/mmap.v
@@ -67,6 +67,7 @@ fn addr2range(pagemap &memory.Pagemap, addr u64) ?(&MmapRangeLocal, u64, u64) {
 }
 
 pub fn delete_pagemap(_pagemap &memory.Pagemap) ? {
+	/*
 	mut pagemap := unsafe { _pagemap }
 
 	pagemap.l.acquire()
@@ -78,6 +79,7 @@ pub fn delete_pagemap(_pagemap &memory.Pagemap) ? {
 	}
 
 	unsafe { free(pagemap) }
+	*/
 }
 
 pub fn fork_pagemap(_old_pagemap &memory.Pagemap) ?&memory.Pagemap {

diff --git a/kernel/modules/proc/proc.v b/kernel/modules/proc/proc.v
@@ -93,7 +93,7 @@ __global (
 
 pub fn allocate_pid(process &Process) ?int {
 	for i := int(1); i < 65536; i++ {
-		if katomic.cas(voidptr(&processes[i]), u64(0), u64(process)) {
+		if katomic.cas(voidptr(&processes[i]), voidptr(0), voidptr(process)) {
 			return i
 		}
 	}

diff --git a/kernel/modules/sched/sched.v b/kernel/modules/sched/sched.v
@@ -142,7 +142,7 @@ fn scheduler_isr(_ u32, gpr_state &cpulocal.GPRState) {
 	new_gpr_state := &current_thread.gpr_state
 
 	if new_gpr_state.cs == user_code_seg {
-		C.userland__dispatch_a_signal(new_gpr_state)
+		//C.userland__dispatch_a_signal(new_gpr_state)
 	}
 
 	asm volatile amd64 {
@@ -186,7 +186,7 @@ pub fn enqueue_thread(_thread &proc.Thread, by_signal bool) bool {
 	katomic.store(t.enqueued_by_signal, by_signal)
 
 	for i := u64(0); i < scheduler_running_queue.len; i++ {
-		if katomic.cas(voidptr(&scheduler_running_queue[i]), u64(0), u64(t)) {
+		if katomic.cas(voidptr(&scheduler_running_queue[i]), voidptr(0), voidptr(t)) {
 			t.is_in_queue = true
 
 			// Check if any CPU is idle and wake it up
@@ -212,7 +212,7 @@ pub fn dequeue_thread(_thread &proc.Thread) bool {
 	}
 
 	for i := u64(0); i < scheduler_running_queue.len; i++ {
-		if katomic.cas(voidptr(&scheduler_running_queue[i]), u64(t), u64(0)) {
+		if katomic.cas(voidptr(&scheduler_running_queue[i]), voidptr(t), voidptr(0)) {
 			t.is_in_queue = false
 			return true
 		}

diff --git a/kernel/modules/syscall/syscall.v b/kernel/modules/syscall/syscall.v
@@ -12,7 +12,7 @@ fn leave(context &cpulocal.GPRState) {
 		cli
 	}
 
-	userland.dispatch_a_signal(context)
+	//userland.dispatch_a_signal(context)
 }
 
 @[_naked]

diff --git a/kernel/modules/x86/cpu/initialisation/initialisation.v b/kernel/modules/x86/cpu/initialisation/initialisation.v
@@ -132,10 +132,6 @@ pub fn initialise(smp_info &limine.LimineSMPInfo) {
 
 	apic.lapic_enable(0xff)
 
-	asm volatile amd64 {
-		sti
-	}
-
 	apic.lapic_timer_calibrate(mut cpu_local)
 
 	print('smp: CPU $cpu_local.cpu_number online!\n')

diff --git a/kernel/modules/x86/isr/isr.v b/kernel/modules/x86/isr/isr.v
@@ -85,7 +85,7 @@ fn exception_handler(num u32, gpr_state &cpulocal.GPRState) {
 		}
 
 		userland.sendsig(proc.current_thread(), signal)
-		userland.dispatch_a_signal(gpr_state)
+		//userland.dispatch_a_signal(gpr_state)
 		userland.syscall_exit(voidptr(0), 128 + signal)
 	} else {
 		lib.kpanic(gpr_state, isr.exception_names[num])