From 0f54f0de1004c6e9a455c295dc76879ac37a408f Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 29 Apr 2020 21:16:56 +0200
Subject: Fixed several warnings, errors and dumb bugs

---
 src/kernel/boot.asm                 |  6 +-----
 src/kernel/fs/ata.c                 |  2 +-
 src/kernel/lib/memory.c             |  6 +++---
 src/kernel/linker.ld                |  5 +----
 src/kernel/memory/alloc.c           | 10 ++++++----
 src/kernel/memory/paging.c          |  2 +-
 src/kernel/system.h                 |  5 -----
 src/userspace/libc/stdio/puts.c     |  2 +-
 src/userspace/libc/stdlib.h         |  2 +-
 src/userspace/libc/stdlib/atoi.c    |  6 +++---
 src/userspace/libc/stdlib/htoi.c    |  4 ++--
 src/userspace/libc/stdlib/itoa.c    |  2 +-
 src/userspace/libc/stdlib/malloc.c  |  2 +-
 src/userspace/libc/string.h         |  2 +-
 src/userspace/libc/string/strcat.c  |  6 +++---
 src/userspace/libc/string/strcati.c |  4 ++--
 src/userspace/libc/string/strcmp.c  |  2 +-
 src/userspace/libc/string/strcpy.c  |  4 ++--
 src/userspace/libc/string/strdisp.c |  2 +-
 src/userspace/libc/string/strdup.c  |  2 +-
 src/userspace/libc/string/strinv.c  |  2 +-
 src/userspace/libc/string/strlen.c  |  4 ++--
 src/userspace/programs/init.c       | 10 ++++++++--
 23 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index cc9c674..22d66ad 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -44,8 +44,4 @@ section .text
 		cli
 		call kernel_main
 		; cli
-		jmp $
-
-section .end_section
-	global ASM_KERNEL_END
-	ASM_KERNEL_END:
\ No newline at end of file
+		jmp $
\ No newline at end of file
diff --git a/src/kernel/fs/ata.c b/src/kernel/fs/ata.c
index d5c758c..2146822 100644
--- a/src/kernel/fs/ata.c
+++ b/src/kernel/fs/ata.c
@@ -81,7 +81,7 @@ void ata_init()
 	if (sel_base_port == 0)
 		log("No drives attached! What's going on?");
 	else {
-		log("Found a drive!\nSelected drive is the %s on the %s bus",
+		log("Found drive: Selecting %s on the %s bus",
 		    sel_master_or_slave == SEL_MASTER ? "master" : "slave",
 		    sel_base_port == PRIMARY_BASE ? "primary" : "secondary");
 		log("Max LBA value is %d", max_sector);
diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c
index 819a70f..bda3c1b 100644
--- a/src/kernel/lib/memory.c
+++ b/src/kernel/lib/memory.c
@@ -57,11 +57,11 @@ uint32_t memory_get_free()
 
 void memory_print()
 {
-	if (meminfo != NULL) {
-		// TODO: Fix multiboot mem lower/upper
+	// TODO: Fix multiboot mem lower/upper
+	/*if (meminfo != NULL) {
 		info("Mem lower: 0x%x", meminfo->mem_lower);
 		info("Mem upper: 0x%x", meminfo->mem_upper);
-	}
+	}*/
 	info("Total memory found: %dMiB", (memory_get_all() >> 10) + 1);
 	info("Total free memory: %dMiB", (memory_get_free() >> 10) + 1);
 }
diff --git a/src/kernel/linker.ld b/src/kernel/linker.ld
index eda4b85..00ffb20 100644
--- a/src/kernel/linker.ld
+++ b/src/kernel/linker.ld
@@ -27,8 +27,5 @@ SECTIONS
 		*(.bss)
 	}
 
-	.end_section BLOCK(4K) : ALIGN(4K)
-	{
-		*(.end_section)
-	}
+	end = .; _end = .; __end = .;
 }
\ No newline at end of file
diff --git a/src/kernel/memory/alloc.c b/src/kernel/memory/alloc.c
index f03c0f5..098eb75 100644
--- a/src/kernel/memory/alloc.c
+++ b/src/kernel/memory/alloc.c
@@ -5,6 +5,7 @@
 #include <kernel/system.h>
 #include <kernel/lib/lib.h>
 
+extern uint32_t end;
 uint32_t placement_address;
 
 struct heap_header *kheap = NULL;
@@ -12,7 +13,8 @@ struct heap_header *uheap = NULL;
 
 void kheap_init()
 {
-	placement_address = &ASM_KERNEL_END;
+	end = &end;
+	placement_address = end;
 	kheap = (struct heap_header *)fmalloc(KHEAP_SIZE);
 	init_heap(kheap, KHEAP_SIZE);
 
@@ -24,7 +26,7 @@ void kheap_init()
 
 void *fmalloc(uint32_t size)
 {
-	//assert(placement_address + size < MEM_END);
+	assert(placement_address + size < MEM_END);
 	uint32_t hold = placement_address;
 	memset((void *)hold, 0, size);
 	placement_address += size;
@@ -33,7 +35,7 @@ void *fmalloc(uint32_t size)
 
 void *kmalloc_a(uint32_t size)
 {
-	//assert(((placement_address & 0xFFFFF000) + 0x1000) + size < MEM_END);
+	assert(((placement_address & 0xFFFFF000) + 0x1000) + size < MEM_END);
 	placement_address &= 0xFFFFF000;
 	placement_address += 0x1000;
 
@@ -94,7 +96,7 @@ void free_internal(struct heap_header *heap, void *address)
 {
 	struct heap_header *head = (struct heap_header *)((uint32_t)address - HEAP_S);
 	if (head == heap) {
-		warn("Can't collapse top of heap");
+		//warn("Can't collapse top of heap"); // TODO: Fix "can't collapse top of heap" at start
 		head->free = true;
 		return;
 	}
diff --git a/src/kernel/memory/paging.c b/src/kernel/memory/paging.c
index ed06004..19ec11d 100644
--- a/src/kernel/memory/paging.c
+++ b/src/kernel/memory/paging.c
@@ -126,7 +126,7 @@ void paging_install()
 	info("Installed paging");
 
 	// Test mallocing
-	uintptr_t a = (uintptr_t)kmalloc(4096); // TODO: Fix "can't collapse top of heap"
+	uintptr_t a = (uintptr_t)kmalloc(4096);
 	uintptr_t b = (uintptr_t)kmalloc(4096);
 	kfree((void *)b);
 	kfree((void *)a);
diff --git a/src/kernel/system.h b/src/kernel/system.h
index 06a2378..2e4786d 100644
--- a/src/kernel/system.h
+++ b/src/kernel/system.h
@@ -5,11 +5,6 @@
 #include <stddef.h>
 #include <kernel/multiboot.h>
 
-/**
- * The kernel end
- */
-extern void ASM_KERNEL_END();
-
 /**
  * The ASM registers as packed structure
  */
diff --git a/src/userspace/libc/stdio/puts.c b/src/userspace/libc/stdio/puts.c
index a4fd3ea..979dd0a 100644
--- a/src/userspace/libc/stdio/puts.c
+++ b/src/userspace/libc/stdio/puts.c
@@ -4,6 +4,6 @@
 
 void puts(char *data)
 {
-	for (u8 i = 0; i < strlen(data); i++)
+	for (u32 i = 0; i < strlen(data); i++)
 		putch(data[i]);
 }
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib.h b/src/userspace/libc/stdlib.h
index 4140c4c..583df15 100644
--- a/src/userspace/libc/stdlib.h
+++ b/src/userspace/libc/stdlib.h
@@ -12,7 +12,7 @@ int htoi(char *str);
 // Exit functions
 
 // Memory management
-void *malloc(u8 size);
+void *malloc(u32 size);
 void free(void *addr);
 
 #endif
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib/atoi.c b/src/userspace/libc/stdlib/atoi.c
index 21b6c25..dbfe0cb 100644
--- a/src/userspace/libc/stdlib/atoi.c
+++ b/src/userspace/libc/stdlib/atoi.c
@@ -5,15 +5,15 @@
 
 int atoi(char *str)
 {
-	u8 s_str = strlen(str);
+	u32 s_str = strlen(str);
 	if (!s_str)
 		return 0;
 
-	u8 negative = 0;
+	u32 negative = 0;
 	if (str[0] == '-')
 		negative = 1;
 
-	u8 i = 0;
+	u32 i = 0;
 	if (negative)
 		i++;
 
diff --git a/src/userspace/libc/stdlib/htoi.c b/src/userspace/libc/stdlib/htoi.c
index cf79b7a..8897d20 100644
--- a/src/userspace/libc/stdlib/htoi.c
+++ b/src/userspace/libc/stdlib/htoi.c
@@ -5,9 +5,9 @@
 
 int htoi(char *str)
 {
-	u8 s_str = strlen(str);
+	u32 s_str = strlen(str);
 
-	u8 i = 0;
+	u32 i = 0;
 	int ret = 0;
 	for (; i < s_str; i++) {
 		char c = str[i];
diff --git a/src/userspace/libc/stdlib/itoa.c b/src/userspace/libc/stdlib/itoa.c
index 8311ad1..b8aa73e 100644
--- a/src/userspace/libc/stdlib/itoa.c
+++ b/src/userspace/libc/stdlib/itoa.c
@@ -13,7 +13,7 @@ char *itoa(int n)
 		ret[1] = 0;
 		return ret;
 	}
-	u8 negative = (u8)(n < 0);
+	u32 negative = (u32)(n < 0);
 	if (negative)
 		n *= -1;
 
diff --git a/src/userspace/libc/stdlib/malloc.c b/src/userspace/libc/stdlib/malloc.c
index b738eed..5eb3caa 100644
--- a/src/userspace/libc/stdlib/malloc.c
+++ b/src/userspace/libc/stdlib/malloc.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <syscall.h>
 
-void *malloc(u8 size)
+void *malloc(u32 size)
 {
 	return (void *)syscall_malloc(size);
 }
\ No newline at end of file
diff --git a/src/userspace/libc/string.h b/src/userspace/libc/string.h
index 10b7688..2eb2fb6 100644
--- a/src/userspace/libc/string.h
+++ b/src/userspace/libc/string.h
@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-u8 strlen(char *str);
+u32 strlen(char *str);
 
 void strcpy(char *dest, char *orig);
 
diff --git a/src/userspace/libc/string/strcat.c b/src/userspace/libc/string/strcat.c
index f62d6e2..bb8f09b 100644
--- a/src/userspace/libc/string/strcat.c
+++ b/src/userspace/libc/string/strcat.c
@@ -3,10 +3,10 @@
 
 void strcat(char *dest, char *orig)
 {
-	u8 s_dest = strlen(dest);
-	u8 s_orig = strlen(orig);
+	u32 s_dest = strlen(dest);
+	u32 s_orig = strlen(orig);
 
-	for (u8 i = 0; i < s_orig; i++)
+	for (u32 i = 0; i < s_orig; i++)
 		dest[s_dest + i] = orig[i];
 	dest[s_dest + s_orig] = 0;
 }
\ No newline at end of file
diff --git a/src/userspace/libc/string/strcati.c b/src/userspace/libc/string/strcati.c
index 5da986d..d82fbfc 100644
--- a/src/userspace/libc/string/strcati.c
+++ b/src/userspace/libc/string/strcati.c
@@ -3,8 +3,8 @@
 
 void strcati(char *dest, char *orig)
 {
-	u8 s_orig = strlen(orig);
+	u32 s_orig = strlen(orig);
 	strdisp(dest, (int)s_orig);
-	for (u8 i = 0; i < s_orig; i++)
+	for (u32 i = 0; i < s_orig; i++)
 		dest[i] = orig[i];
 }
\ No newline at end of file
diff --git a/src/userspace/libc/string/strcmp.c b/src/userspace/libc/string/strcmp.c
index 4282520..932877d 100644
--- a/src/userspace/libc/string/strcmp.c
+++ b/src/userspace/libc/string/strcmp.c
@@ -6,7 +6,7 @@ char strcmp(char *a, char *b)
 	if (strlen(a) != strlen(b))
 		return 1;
 
-	for (u8 i = 0; i < strlen(a); i++)
+	for (u32 i = 0; i < strlen(a); i++)
 		if (a[i] != b[i])
 			return 1;
 
diff --git a/src/userspace/libc/string/strcpy.c b/src/userspace/libc/string/strcpy.c
index 733f7ba..a12d3e0 100644
--- a/src/userspace/libc/string/strcpy.c
+++ b/src/userspace/libc/string/strcpy.c
@@ -3,9 +3,9 @@
 
 void strcpy(char *dest, char *orig)
 {
-	u8 s_orig = strlen(orig);
+	u32 s_orig = strlen(orig);
 
-	for (u8 i = 0; i < s_orig; i++)
+	for (u32 i = 0; i < s_orig; i++)
 		dest[i] = orig[i];
 	dest[s_orig] = 0;
 }
\ No newline at end of file
diff --git a/src/userspace/libc/string/strdisp.c b/src/userspace/libc/string/strdisp.c
index 7e8c05a..88815ef 100644
--- a/src/userspace/libc/string/strdisp.c
+++ b/src/userspace/libc/string/strdisp.c
@@ -3,7 +3,7 @@
 
 void strdisponce(char *str)
 {
-	for (u8 i = sizeof(str) + 2; i > 0; i--)
+	for (u32 i = sizeof(str) + 2; i > 0; i--)
 		str[i] = str[i - 1];
 	str[0] = 0;
 }
diff --git a/src/userspace/libc/string/strdup.c b/src/userspace/libc/string/strdup.c
index f2a7c35..a42b02d 100644
--- a/src/userspace/libc/string/strdup.c
+++ b/src/userspace/libc/string/strdup.c
@@ -5,7 +5,7 @@
 
 char *strdup(char *orig)
 {
-	u8 s_orig = strlen(orig);
+	u32 s_orig = strlen(orig);
 	char *ret = (char *)malloc(s_orig + 1);
 	strcpy(ret, orig);
 	return ret;
diff --git a/src/userspace/libc/string/strinv.c b/src/userspace/libc/string/strinv.c
index 38f0b78..261e57e 100644
--- a/src/userspace/libc/string/strinv.c
+++ b/src/userspace/libc/string/strinv.c
@@ -3,7 +3,7 @@
 
 void strinv(char *str)
 {
-	u8 s_str = strlen(str);
+	u32 s_str = strlen(str);
 
 	int iterations = (int)s_str / 2;
 	for (int i = 0; i < iterations; i++) {
diff --git a/src/userspace/libc/string/strlen.c b/src/userspace/libc/string/strlen.c
index cc8b804..cb04675 100644
--- a/src/userspace/libc/string/strlen.c
+++ b/src/userspace/libc/string/strlen.c
@@ -1,8 +1,8 @@
 #include <stdint.h>
 
-u8 strlen(char *str)
+u32 strlen(char *str)
 {
-	u8 len = 0;
+	u32 len = 0;
 	while (str[len])
 		len++;
 	return len;
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index af4f5f1..a669249 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -1,12 +1,18 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <syscall.h>
 #include <gui.h>
 
 void main()
 {
-	printf("Initializing userspace...\n");
+	u32 *buf = malloc(4096);
+	for (int i = 0; i < 4; i++)
+		buf[i] = 42;
+	syscall_halt();
+
+	//printf("Initializing userspace...\n");
 	//gui_init();
-	syscall_exec("/bin/sh");
+	//syscall_exec("/bin/sh");
 
 	while (1) {
 	};
-- 
cgit v1.2.3