tidy up kernel.c

Author: braindigitalis

asm/loader.S

@@ -46,7 +46,7 @@ exception_gate_loop:
 	dec %rcx
 	jnz exception_gate_loop
 
-	mov $(51-32), %rcx
+	mov $(64-32), %rcx
 interrupt_gate_loop:
 	mov (%r10), %rax		// Get the gate jump-table address in r10 again
 	add $8, %r10
@@ -139,58 +139,71 @@ interrupt_gate_loop:
 	pop %r15
 .endm
 
-
-ISR_NOERR 0
-ISR_NOERR 1
-ISR_NOERR 2
-ISR_NOERR 3
-ISR_NOERR 4
-ISR_NOERR 5
-ISR_NOERR 6
-ISR_NOERR 7
-ISR_ERR 8
-ISR_NOERR 9
-ISR_ERR 10 
-ISR_ERR 11
-ISR_ERR 12
-ISR_ERR 13
-ISR_ERR 14
-ISR_NOERR 15
-ISR_NOERR 16
-ISR_NOERR 17
-ISR_NOERR 18
-ISR_NOERR 19
-ISR_NOERR 20
-ISR_NOERR 21
-ISR_NOERR 22
-ISR_NOERR 23
-ISR_NOERR 24
-ISR_NOERR 25
-ISR_NOERR 26
-ISR_NOERR 27
-ISR_NOERR 28
-ISR_NOERR 29
-ISR_NOERR 30
-ISR_NOERR 31
-IRQ 0, 32
-IRQ 1, 33
-IRQ 2, 34
-IRQ 3, 35
-IRQ 4, 36
-IRQ 5, 37
-IRQ 6, 38
-IRQ 7, 39
-IRQ 8, 40
-IRQ 9, 41
-IRQ 10, 42
-IRQ 11, 43
-IRQ 12, 44
-IRQ 13, 45
-IRQ 14, 46
-IRQ 15, 47
-ISR_NOERR 48
-ISR_NOERR 49
-IRQ 16, 50
+isrs:
+	ISR_NOERR 0
+	ISR_NOERR 1
+	ISR_NOERR 2
+	ISR_NOERR 3
+	ISR_NOERR 4
+	ISR_NOERR 5
+	ISR_NOERR 6
+	ISR_NOERR 7
+	ISR_ERR 8
+	ISR_NOERR 9
+	ISR_ERR 10 
+	ISR_ERR 11
+	ISR_ERR 12
+	ISR_ERR 13
+	ISR_ERR 14
+	ISR_NOERR 15
+	ISR_NOERR 16
+	ISR_NOERR 17
+	ISR_NOERR 18
+	ISR_NOERR 19
+	ISR_NOERR 20
+	ISR_NOERR 21
+	ISR_NOERR 22
+	ISR_NOERR 23
+	ISR_NOERR 24
+	ISR_NOERR 25
+	ISR_NOERR 26
+	ISR_NOERR 27
+	ISR_NOERR 28
+	ISR_NOERR 29
+	ISR_NOERR 30
+	ISR_NOERR 31
+	IRQ 0, 32
+	IRQ 1, 33
+	IRQ 2, 34
+	IRQ 3, 35
+	IRQ 4, 36
+	IRQ 5, 37
+	IRQ 6, 38
+	IRQ 7, 39
+	IRQ 8, 40
+	IRQ 9, 41
+	IRQ 10, 42
+	IRQ 11, 43
+	IRQ 12, 44
+	IRQ 13, 45
+	IRQ 14, 46
+	IRQ 15, 47
+	ISR_NOERR 48
+	ISR_NOERR 49
+	IRQ 16, 50
+	IRQ 17, 51
+	IRQ 18, 52
+	IRQ 19, 53
+	IRQ 20, 54
+	IRQ 21, 55
+	IRQ 22, 56
+	IRQ 23, 57
+	IRQ 24, 58
+	IRQ 25, 59
+	IRQ 26, 60
+	IRQ 27, 61
+	IRQ 28, 62
+	IRQ 29, 63
 
 irq_stub:
 	call IRQ
@@ -254,7 +267,19 @@ exception_handlers:
         .quad isr48
         .quad isr49
         .quad irq16
-
+	.quad irq17
+	.quad irq18
+	.quad irq19
+	.quad irq20
+	.quad irq21
+	.quad irq22
+	.quad irq23
+	.quad irq24
+	.quad irq25
+	.quad irq26
+	.quad irq27
+	.quad irq28
+	.quad irq29
 
 .data
 

asm/sse.asm

@@ -3,19 +3,30 @@ bits 64
 section .text
 
 global enable_sse
+global enable_fpu
+
+
+enable_fpu:
+	mov rax, cr0
+	bts rax, 1
+	btr rax, 2
+	bts rax, 5
+	btr rax, 3
+	mov cr0, rax
+	fninit
+	ret
+
+
 
 enable_sse:
 	mov eax, 0x1
 	cpuid
 	test edx, 1<<25
 	jz no_sse
 	;SSE is available
-	mov rax, cr0
-	and ax, 0xFFFB		;clear coprocessor emulation CR0.EM
-	or ax, 0x2		;set coprocessor monitoring  CR0.MP
-	mov cr0, rax
 	mov rax, cr4
-	or ax, 3 << 9		;set CR4.OSFXSR and CR4.OSXMMEXCPT at the same time
+	bts rax, 9
+	bts rax, 10
 	mov cr4, rax
 no_sse:
 	ret

include/fpu.h

@@ -5,10 +5,7 @@
 /**
  * @brief Enable floating point operations
  */
-static inline void fninit()
-{
-	asm volatile("fninit");
-}
+extern void enable_fpu();
 
 /**
  * @brief Enable SSE

include/limine-requests.h

@@ -0,0 +1,14 @@
+#pragma once 
+#include <limine.h>
+
+volatile struct limine_stack_size_request stack_size_request = {
+    .id = LIMINE_STACK_SIZE_REQUEST,
+    .revision = 0,
+    .stack_size = (1024 * 1024 * 32),
+};
+
+volatile struct limine_hhdm_request hhdm_request = {
+    .id = LIMINE_HHDM_REQUEST,
+    .revision = 0,
+};
+

include/net.h

@@ -106,3 +106,7 @@ uint16_t ntohs(uint16_t netshort);
  * @return uint32_t host order
  */
 uint32_t ntohl(uint32_t netlong);
+
+void network_up();
+
+void network_down();

include/taskswitch.h

@@ -1,5 +1,4 @@
-#ifndef __TASKSWITCH_H__
-#define __TASKSWITCH_H__
+#pragma once
 
 #define PROC_RUNNING	0
 #define PROC_IDLE	1
@@ -70,4 +69,5 @@ uint32_t proc_id(int64_t index);
  */
 void proc_register_idle(proc_idle_timer_t handler, idle_type_t type);
 
-#endif
+void proc_init();
+

include/video.h

@@ -59,7 +59,7 @@ void dputstring(char* message);
 void put(console* c, const char n);
 void dput(const char n);
 
-void initconsole(console* c);
+void initconsole();
 
 void setbackground(console* c, unsigned char background);
 

src/ap.c

@@ -0,0 +1,6 @@
+#include <kernel.h>
+
+void kmain_ap()
+{
+	wait_forever();
+}

src/clock.c

@@ -120,4 +120,5 @@ const char* get_datetime_str() {
 
 void clock_init() {
 	rtc_read_datetime();
+	kprintf("System boot time: %s\n", get_datetime_str());
 }

src/errorhandler.c

@@ -33,7 +33,7 @@ void error_handler(uint8_t int_no, uint64_t errorcode, uint64_t irq_no)
 		"Alignment check exception",
 		"Machine check exception",
 	};
-	asm volatile("cli");
+	interrupts_off();
 	PANIC_BANNER;
 	setforeground(current_console, COLOUR_LIGHTRED);
 	kprintf("Fatal exception %02X: %s\n", int_no, error_table[int_no]);

src/idt.c

@@ -22,5 +22,5 @@ void idt_setup()
 	}
 
 	/* Now we are safe to enable interrupts */
-	asm volatile("sti");
+	interrupts_on();
 }

src/kernel.c

@@ -1,57 +1,17 @@
 #include <kernel.h>
-
-console first_console;
-console* current_console = NULL;
-uint8_t cpunum = 1;
-
-volatile struct limine_stack_size_request stack_size_request = {
-    .id = LIMINE_STACK_SIZE_REQUEST,
-    .revision = 0,
-    .stack_size = (1024 * 1024 * 32),
-};
-
-volatile struct limine_hhdm_request hhdm_request = {
-    .id = LIMINE_HHDM_REQUEST,
-    .revision = 0,
-};
-
-void kmain_ap()
-{
-	while (1) asm volatile("hlt");
-}
-
-void network_up()
-{
-	arp_init();
-	ip_init();
-	tcp_init();
-	dhcp_discover();
-	init_dns();
-}
-
-void network_down()
-{
-}
+#include <limine-requests.h>
 
 void kmain()
 {
-	current_console = &first_console;
-	initconsole(current_console);
-
-	/* NB: Can't use kmalloc/kfree until heap_init is called.
-	 * This depends upon paging.
-	 */
+	enable_fpu();
+	initconsole();
 	heap_init();
 	detect_cores();
 	idt_setup();
 	init_error_handler();
-	fninit();
 	init_pci();
-
 	clock_init();
 	init_lapic_timer(50);
-
-
 	init_devicenames();
 	init_basic_keyboard();
 	ide_initialise();
@@ -69,19 +29,7 @@ void kmain()
 
 	init_debug();
 
-	//////
-
 	rtl8139_init();
 
-	kprintf("System boot time: %s\n", get_datetime_str());
-	kprintf("Loading initial process...\n");
-
-	struct process* init = proc_load("/programs/init", (struct console*)current_console);
-	if (!init) {
-		kprintf("/programs/init missing!\n");
-	}
-
-	kprintf("Launching /programs/init...\n");
-
-	proc_loop();
+	proc_init();
 }

src/net.c

@@ -89,4 +89,17 @@ uint32_t ntohl(uint32_t netlong) {
 	return netlong;
 }
 
-#endif
+#endif
+
+void network_up()
+{
+	arp_init();
+	ip_init();
+	tcp_init();
+	dhcp_discover();
+	init_dns();
+}
+
+void network_down()
+{
+}

src/pci.c

@@ -445,7 +445,7 @@ bool pci_enable_msi(pci_dev_t device, uint32_t vector, bool edgetrigger, bool de
 		uint32_t next_capability = (config_space & 0xFF00) >> 8;
 		if (id == PCI_CAPABILITY_MSI) {
 			/* MSI capability */
-			asm volatile("cli");
+			interrupts_off();
 			uint32_t new_message_data = (vector & 0xFF) | (edgetrigger ? 0 : PCI_MSI_EDGETRIGGER) | (deassert ? 0 : PCI_MSI_DEASSERT);
 			uint32_t new_message_address = (0xFEE00000 | (cpu_id() << 12));
 			bool bits64cap = (config_space & PCI_MSI_64BIT);
@@ -463,7 +463,7 @@ bool pci_enable_msi(pci_dev_t device, uint32_t vector, bool edgetrigger, bool de
 				pci_write(device, current + 0x08, new_message_data);	
 			}
 			pci_write(device, current + 0x00, config_space | PCI_MSI_ENABLE); // Mask in enable bit
-			asm volatile("sti");
+			interrupts_on();
 			return true;
 		}
 		current = next_capability;