Moved test to app

4 files changed, 6 insertions, 103 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index a907986..07f985a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,6 +1,7 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = drivers/interrupts.o \
+COBJS = main.o \
+	drivers/interrupts.o \
 	drivers/interrupts_asm.o \
 	drivers/keyboard.o \
 	drivers/mouse.o \
@@ -25,7 +26,6 @@ CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builti
 ASFLAGS = -f elf32
 
 all: compile bootloader
-test: compile_test bootloader
 
 %.o: %.c
 	@$(CC) -c $(CFLAGS) $< -o $@
@@ -37,15 +37,7 @@ bootloader:
 	@mkdir -p ../build/
 	@$(AS) -f bin entry.asm -o ../build/boot.bin
 
-compile: main.o $(COBJS)
+compile: $(COBJS)
 	@mkdir -p ../build/
 	@$(LD) -N -ekernel_main -Ttext 0x00050000 -o ../build/kernel.bin -L../build/ $+ -lk --oformat binary
 	@$(CC) $(CFLAGS) -o ../build/debug.o -L../build/ $+ -lk
-
-compile_test: CFLAGS += -Dtest -Wl,-etest_all
-compile_test: test.o $(COBJS)
-	@mkdir -p ../build/
-	@$(LD) -N -etest_all -Ttext 0x00050000 -o ../build/kernel.bin -L../build/ $+ -lk --oformat binary
-	@$(CC) $(CFLAGS) -o ../build/debug.o -L../build/ $+ -lk
-
-.PHONY: test compile_test
diff --git a/kernel/features/load.c b/kernel/features/load.c
index d5dd839..2cbe2e7 100644
--- a/kernel/features/load.c
+++ b/kernel/features/load.c
@@ -12,8 +12,6 @@
 int bin_load(char *path, struct proc *proc)
 {
 	char *data = read_file(path);
-	if (!data)
-		return 1;
 
 	u32 stack = (u32)malloc(0x2000) + 0x1000;
 
@@ -21,7 +19,8 @@ int bin_load(char *path, struct proc *proc)
 	proc->regs.useresp = (u32)stack;
 	proc->regs.eip = (u32)data;
 	strcpy(proc->name, path + 1);
-	return 0;
+
+	return data ? 0 : 1;
 }
 
 int elf_verify(struct elf_header *h)
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 5915d9d..25770a4 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -18,7 +18,7 @@ void syscall_handler(struct regs *r)
 	r->eax = 0;
 
 	if (num != SYS_RECEIVE && num != SYS_YIELD && num != SYS_TIME)
-		printf("[SYSCALL] %d: ", num);
+		printf("[SYSCALL] %d from %s: ", num, proc_current()->name);
 
 	switch (num) {
 	case SYS_LOOP: {
diff --git a/kernel/test.c b/kernel/test.c
deleted file mode 100644
index 1960a5a..0000000
--- a/kernel/test.c
+++ /dev/null
@@ -1,88 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <boot.h>
-#include <conv.h>
-#include <cpu.h>
-#include <math.h>
-#include <mem.h>
-#include <serial.h>
-#include <str.h>
-#include <test.h>
-
-void pass_or_fail(const char *file_name, int line_num, const char *func, const char *first,
-		  const char *second, int success)
-{
-	printf("\x1B[%s\x1B[0m %s:%d: %s: %s == %s\n", success ? "32m[PASS]" : "31m[FAIL]",
-	       file_name, line_num, func, first, second);
-}
-
-void test_malloc()
-{
-	heap_init(0x00f00000);
-	u32 *a = malloc(a_mag);
-	u32 *b = malloc(b_mag);
-	equals(a[-1], a_mag);
-	equals(a[a_mag], b_mag);
-	equals(b[-1], b_mag);
-}
-
-void test_math()
-{
-	equals(pow(2, 3), 8);
-	equals(pow(0, 3), 0);
-	equals(pow(0, 0), 1);
-}
-
-void test_conv()
-{
-	char buf1[1] = { 0 };
-	char buf2[7] = { 0 };
-	char buf3[5] = { 0 };
-	char buf4[3] = { 0 };
-	equals(atoi("42"), 42);
-	equals_str(htoa(0x42), "42");
-	equals(htoi("42"), 0x42);
-	equals_str(itoa(42), "42");
-	equals_str(conv_base(42, buf1, 0, 0), "");
-	equals_str(conv_base(42, buf2, 2, 0), "101010");
-	equals_str(conv_base(424242, buf3, 36, 0), "93ci");
-	equals_str(conv_base(0xffffffff, buf4, 10, 1), "-1");
-}
-
-void test_mem()
-{
-	char *str0 = "";
-	char *str1 = "";
-	char *str2 = "12345";
-	char *str3 = "12345";
-	char *str4 = "12354";
-	equals(memcmp(str4, str2, strlen(str2)), 1);
-	equals(memcmp(str2, str4, strlen(str2)), -1);
-	equals(memcmp(str2, str3, strlen(str2)), 0);
-	equals(memcmp(str0, str1, strlen(str0)), 0);
-	equals(memcmp(NULL, NULL, 0), 0);
-
-	char buf[6];
-	equals_str(memcpy(buf, "hallo", 5), "hallo");
-
-	char buf2[6];
-	equals_str(memset(buf2, 'x', 5), "xxxxx");
-}
-
-// TODO: Move to other file (top!)
-void test_all(struct vid_info *vid_info)
-{
-	// Serial connection
-	serial_install();
-	serial_print("\nConnected testing.\n");
-
-	// Boot passed
-	check(vid_info && vid_info->mode && vid_info->vbe);
-
-	test_malloc();
-	test_math();
-	test_conv();
-	test_mem();
-
-	idle();
-}