Merge pull request #19 from dark-tree/fixes

mnurczynski · web-flow · commit 12937229e8bd · 2024-12-20T22:24:50.000+01:00
Skibidi Fixes
diff --git a/disks/files/executable/elf-pic b/disks/files/executable/elf-pic
diff --git a/disks/files/executable/tiny b/disks/files/executable/tiny
diff --git a/disks/files/executable/tiny.asm b/disks/files/executable/tiny.asm
@@ -0,0 +1,45 @@
+global _start
+
+section .data:
+
+	hello: db `Hello World!\n`
+	path: db `./hello.txt`, 0
+
+section .text:
+
+_rip:
+	pop eax
+	mov ecx, eax
+	sub eax, 5
+	sub eax, _start
+	jmp ecx
+
+_start:
+
+	call _rip
+	push eax
+	add eax, path
+	mov ebx, eax
+
+	; sys_open
+	mov eax, 0x05
+	mov ecx, 0x442
+	mov edx, 0x180
+	int 0x80
+
+	; File Descriptor
+	mov ebx, eax
+
+	; Get pointer to "Hello World"
+	pop ecx
+	add ecx, hello
+
+	; sys_write
+	mov eax, 0x04
+	mov edx, 13
+	int 0x80
+
+	; sys_exit
+	mov eax, 0x01
+	mov ebx, 0
+	int 0x80
diff --git a/src/kernel/entry.c b/src/kernel/entry.c
@@ -37,7 +37,7 @@ void start() {
 	cur_enable();
 
 	// Init memory system and make room for the kernel
-	mem_init(0xFFFFF + 1 /* TODO: remove when fix is merged */);
+	mem_init(0xFFFFF);
 
     ginit();
 
@@ -55,7 +55,6 @@ void start() {
 
 	vfs_init();
 
-	// for now mount /proc at /
 	FilesystemDriver procfs;
     procfs_load(&procfs);
     vfs_mount("/proc/", &procfs);
@@ -70,7 +69,7 @@ void start() {
 
     vRef root = vfs_root();
     vRef elf;
-    vfs_open(&elf, &root, "/executable/elf-pic", 0);
+    vfs_open(&elf, &root, "/executable/tiny", 0);
 
     scheduler_init();
 
diff --git a/src/kernel/fatfs.c b/src/kernel/fatfs.c
@@ -84,7 +84,7 @@ int fatfs_open(vRef* vref, const char* basename, uint32_t flags) {
 		// TODO: report ENOTDIR if the file is not a directory and open failed
 	}
 	else {
-		const char* mode = (flags & OPEN_APPEND) ? "a" : (flags & OPEN_CREAT) ? "w" : "r";
+		const char* mode = (flags & OPEN_APPEND) ? "a" : ((flags & OPEN_CREAT) ? "w" : "r");
 		if (fat_fopen(&state->file, &parent_dir, basename, mode)) {
 			state->is_dir = false;
 			FATFS_DEBUG_LOG("fatfs: fopen success\n");
diff --git a/src/kernel/gdt.c b/src/kernel/gdt.c
@@ -2,6 +2,7 @@
 #include "types.h"
 #include "tables.h"
 #include "config.h"
+#include "kmalloc.h"
 
 #define EMPTY_GDT_ENTRY 0x000000000040F300
 #define EMPTY_CODE 0x000000000040FB00
@@ -92,6 +93,6 @@ void gad(int i, uint32_t offset, uint32_t size)
      code = code | mask;
      data = data | mask;
 
-     gdt[i] = code;
-     gdt[i+1] = data;
+     gdt[i] = 0x0000FFFF00CF9B00;//code;
+     gdt[i+1] = 0x0000FFFF00CF9300;//data;
 }
diff --git a/src/kernel/interrupt.c b/src/kernel/interrupt.c
@@ -22,7 +22,8 @@ static void int_debug_handle(int number, int error, int* eax, int ecx, int edx,
 	kprintf(" * EAX=%#x, EBX=%#x\n", *eax, ebx);
 	kprintf(" * ECX=%#x, EDX=%#x\n", ecx, edx);
 	kprintf(" * ESI=%#x, EDI=%#x\n", esi, edi);
-    halt();
+
+	panic("Unregistered interrupt!");
 }
 
 // Forward syscalls to the syscall system
diff --git a/src/kernel/rivendell.c b/src/kernel/rivendell.c
@@ -137,7 +137,7 @@ static int elf_segcpy(vRef* vref, void* image, uint32_t mount, ImageSegment* seg
 		return ELF_READ_ERROR;
 	}
 
-	memset(image + address, 0, segment->mem_size);
+	memset(image + address, 0, padding);
 	return ELF_SUCCESS;
 }
 
diff --git a/src/kernel/routine.asm b/src/kernel/routine.asm
@@ -217,6 +217,7 @@ isr_stub_stack:
 
 	; Mimic what pusha does
 	mov edx, esp
+	add edx, [ebp+24]
 
 	; First half of the 'pusha' block
 	push dword 'SOEN' ; EAX
diff --git a/src/kernel/routine.h b/src/kernel/routine.h
@@ -39,7 +39,7 @@ extern void isr_register(int interrupt, interrupt_hander handler);
 extern const char* isr_name(int interrupt);
 
 
-extern void* isr_stub_stack(void* stack, void* eip, uint32_t data_gdt_index, uint32_t code_gdt_index);
+extern void* isr_stub_stack(void* stack, void* eip, uint32_t data_gdt_index, uint32_t code_gdt_index, int virtual_offset);
 
 
 extern void isr_into_stack(void* stack);
diff --git a/src/kernel/scheduler.c b/src/kernel/scheduler.c
@@ -157,6 +157,9 @@ int scheduler_kill_process(int pid)
 
 int scheduler_create_process(int parent_pid, vRef* processFile)
 {
+
+	__asm volatile ("cli");
+
 	if(parent_pid!=(-1) && scheduler_pid_invalid(parent_pid))
 	{
 		return 1;
@@ -165,16 +168,32 @@ int scheduler_create_process(int parent_pid, vRef* processFile)
     image.prefix = 0;
 	image.sufix = INITIAL_STACK_SIZE;
 	int errorCode = elf_load(processFile, &image, true);
+
+	image.entry -= image.mount;
+	image.mount = 0; // FIXME
+
 	if(errorCode)
 	{
 		return 1;
 	}
+
+	// Size of the entire process memory
 	uint32_t size = kmsz(image.image);
+
+	// Pointer to the top of the physical stack (end of memory block)
 	void* stack = image.image + size;
-    int virtualStack = ((stack - image.image) - image.prefix)+image.mount;
-    int processSegmentIndex = gput(image.image, size);
-    stack = isr_stub_stack(stack, image.entry, processSegmentIndex+1, processSegmentIndex);
-    scheduler_new_entry(parent_pid, virtualStack, image.image, processFile, image.mount, processSegmentIndex);
+
+	uint32_t entrypoint = image.image + image.entry + image.prefix;
+	int segment = 1;// gput(0, 0xFFFFFFFF);
+
+	stack = isr_stub_stack(stack, entrypoint, segment + 1, segment, 0);
+
+	scheduler_new_entry(parent_pid, stack, image.image, processFile, image.mount, segment);
+
+	kprintf("New process at: %0.8x, entry: %0.8x\n", image.image, entrypoint);
+
+	__asm volatile ("sti");
+
 	return 0;
 }
 
@@ -185,8 +204,14 @@ int scheduler_context_switch(void* old_stack)
 		return (int) old_stack;
 	}
 
+//	kprintf("context switch:\n");
+//	kprintf(" * stack: %d\n", general_process_table[process_running].stack);
+//	kprintf(" * from: %d\n", process_running);
+//	kprintf(" * old_stack: %d\n", old_stack);
+
 	general_process_table[process_running].stack = old_stack;
 	process_running++;
+
 	while(general_process_table[process_running].exists==false)
 	{
 		process_running++;
@@ -195,6 +220,10 @@ int scheduler_context_switch(void* old_stack)
 	{
 		process_running=0;
 	}
+
+//	kprintf(" * to: %d\n", process_running);
+//	kprintf(" * stack: %d\n", general_process_table[process_running].stack);
+
 	return (int) general_process_table[process_running].stack;
 }
 
diff --git a/src/kernel/syscall.c b/src/kernel/syscall.c
@@ -361,6 +361,14 @@ struct new_utsname {
 
 static int sys_write(int fd, char* buffer, int bytes) {
 
+//	if (fd == 0 || fd == 1 || fd == 2) {
+//		for (int i = 0; i < bytes; i ++) {
+//			con_write(buffer[i]);
+//		}
+//
+//		return 0;
+//	}
+
 	vRef* vref = fd_resolve(fd);
 
 	if (!vref) {
@@ -377,7 +385,6 @@ static int sys_read(int fd, char* buffer, int bytes) {
 	if (!vref) {
 		return -LINUX_EBADF;
 	}
-
 	return vfs_read(vref, buffer, bytes);
 }
 
diff --git a/src/kernel/vfs.h b/src/kernel/vfs.h
@@ -15,14 +15,14 @@
  * @brief driver open flags
  * @note taken from glibc
  */
-#define OPEN_WRONLY    0x000001 /* Open in write-only mode */
-#define OPEN_RDWR      0x000002 /* Open in read-write mode */
-#define OPEN_APPEND    0x000008 /* Open in append mode */
-#define OPEN_CREAT     0x000200 /* Create if missing */
-#define OPEN_EXCL      0x000800 /* Require creation, fail if present */
-#define OPEN_DIRECTORY 0x200000 /* Require target file to be a directory */
-#define OPEN_NOFOLLOW  0x000100 /* Don't follow links in path */
-#define OPEN_TRUNC     0x000200 /* Clear (truncate) the file */
+#define OPEN_WRONLY    0x00001 /* Open in write-only mode */
+#define OPEN_RDWR      0x00002 /* Open in read-write mode */
+#define OPEN_APPEND    0x00400 /* Open in append mode */
+#define OPEN_CREAT     0x00040 /* Create if missing */
+#define OPEN_EXCL      0x00080 /* Require creation, fail if present */
+#define OPEN_DIRECTORY 0x10000 /* Require target file to be a directory */
+#define OPEN_NOFOLLOW  0x20000 /* Don't follow links in path */
+#define OPEN_TRUNC     0x00200 /* Clear (truncate) the file */
 
 /*
  * Describes the type of the file

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ int fatfs_open(vRef* vref, const char* basename, uint32_t flags) {`
`84`	`84`	`// TODO: report ENOTDIR if the file is not a directory and open failed`
`85`	`85`	`}`
`86`	`86`	`else {`
`87`		`- const char* mode = (flags & OPEN_APPEND) ? "a" : (flags & OPEN_CREAT) ? "w" : "r";`
	`87`	`+ const char* mode = (flags & OPEN_APPEND) ? "a" : ((flags & OPEN_CREAT) ? "w" : "r");`
`88`	`88`	`if (fat_fopen(&state->file, &parent_dir, basename, mode)) {`
`89`	`89`	`state->is_dir = false;`
`90`	`90`	`FATFS_DEBUG_LOG("fatfs: fopen success\n");`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ static void int_debug_handle(int number, int error, int* eax, int ecx, int edx,`
`22`	`22`	`kprintf(" * EAX=%#x, EBX=%#x\n", *eax, ebx);`
`23`	`23`	`kprintf(" * ECX=%#x, EDX=%#x\n", ecx, edx);`
`24`	`24`	`kprintf(" * ESI=%#x, EDI=%#x\n", esi, edi);`
`25`		`- halt();`
	`25`	`+`
	`26`	`+ panic("Unregistered interrupt!");`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`// Forward syscalls to the syscall system`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ static int elf_segcpy(vRef* vref, void* image, uint32_t mount, ImageSegment* seg`
`137`	`137`	`return ELF_READ_ERROR;`
`138`	`138`	`}`
`139`	`139`
`140`		`- memset(image + address, 0, segment->mem_size);`
	`140`	`+ memset(image + address, 0, padding);`
`141`	`141`	`return ELF_SUCCESS;`
`142`	`142`	`}`
`143`	`143`