add arguments in shell, improve alloc usage, improve libc

Author: alexeev-prog

CHANGELOG.md

@@ -1,3 +1,9 @@
+commit 54f9099f8dbb07eb13ec7c19189144df53bb044f
+Author: Alexeev Bronislav <alexeev.dev@mail.ru>
+Date:   Fri Aug 22 21:18:22 2025 +0700
+
+    update makefile
+
 commit eb0a7cf5f301e5d63a14cc1afe73ec84fe2653e5
 Author: Alexeev Bronislav <alexeev.dev@mail.ru>
 Date:   Fri Aug 22 07:06:26 2025 +0700

src/kernel/kernel/kernel.c

@@ -12,6 +12,7 @@
 #include "kernel.h"
 #include "utils.h"
 #include "../libc/stdio.h"
+#include "../libc/mem.h"
 #include "../libc/string.h"
 
 void kmain() {
@@ -30,33 +31,52 @@ void kmain() {
 	kprint("Copyright (C) alexeev-prog\nRepository: https://github.com/alexeev-prog/KintsugiOS\n");
 
 	// Уведомление о старте оболочки командной строки
-	kprint("\nKeramika Busybox v0.1.0 "
+	kprint("\nKeramika Shell v0.1.0 "
 	        "Type END to halt the CPU\n"
 	        "Type HELP to view commands\n\n!#> ");
 }
 
+char** get_args(char *input) {
+	char *token = strtok(input, " ");
+	char** args;
+	int arg_counter = 0;
+
+    while(token) {
+        token = strtok(NULL, " ");
+
+		args[arg_counter] = token;
+		arg_counter++;
+    }
+
+	kfree(token);
+
+	return args;
+}
+
 void user_input(char *input) {
 	// Массив структур команд, состоящий из самой команды, подсказки и указателя до void-функции
-	struct { char *text, *hint; void (*command)(); } commands[] = {
+	struct { char *text, *hint; void (*command)(char**); } commands[] = {
 		//   Команда            		Подсказка для команды                   Указатель до функции
-		{.text="END",		   		.hint="HALT CPU", 						.command=&halt_cpu},
-		{.text="CLEAR", 	   		.hint="Clear screen",					.command=&clear_screen},
-		{.text="KMALLOC", 		   	.hint="Kernel Page Malloc",				.command=&malloc_command_shell},
-		{.text="QEMUSHUTDOWN",		.hint="Shutdown QEMU",					.command=&shutdown_qemu},
-		{.text="INFO",				.hint="Get info",						.command=&info_command_shell},
-		{.text="FREEMEMADDR",		.hint="Get free mem addr",				.command=&print_freememaddr},
-		{.text="TESTMEM", 			.hint="Test memory",					.command=&test_mem_command},
-		{.text="KMEMDUMP", 			.hint="Dump memory",					.command=&mem_dump}
+		{.text="END",		   		.hint="HALT CPU", 											.command=&halt_cpu},
+		{.text="CLEAR", 	   		.hint="Clear screen",										.command=&clear_screen_command},
+		{.text="AMALLOC", 		   	.hint="Kernel Arena Malloc. Usage: AMALLOC <size>",			.command=&arena_malloc_command_shell},
+		{.text="QEMUSHUTDOWN",		.hint="Shutdown QEMU",										.command=&shutdown_qemu},
+		{.text="INFO",				.hint="Get info",											.command=&info_command_shell},
+		{.text="FREEMEMADDR",		.hint="Get free mem addr",									.command=&print_freememaddr},
+		{.text="TESTMEM", 			.hint="Test memory",										.command=&test_mem_command},
+		{.text="KMEMDUMP", 			.hint="Dump memory",										.command=&mem_dump},
+		{.text="KMALLOC",			.hint="Alloc memory. Usage: KMALLOC <size>",				.command=&kmalloc_command}
 	};
-	// TODO: добавить поддержку аргументов
 
 	int executed = 0;
 
+	char** args = get_args(input);
+
 	const int commands_length = sizeof(commands) / sizeof(commands[0]);
 
 	for (int i = 0; i < commands_length; ++i) {
 		if (strcmp(input, commands[i].text) == 0) {
-			commands[i].command();
+			commands[i].command(args);
 			executed = 1;
 			break;
 		}

src/kernel/kernel/utils.c

@@ -10,12 +10,21 @@
 #include "../libc/mem.h"
 #include "../libc/string.h"
 #include "../cpu/ports.h"
+#include "../libc/stdio.h"
 
-void shutdown_qemu() {
+void print_freememaddr(char** args) {
+	get_freememaddr();
+}
+
+void clear_screen_command(char** args) {
+	clear_screen();
+}
+
+void shutdown_qemu(char** args) {
 	outports(0x604, 0x2000);
 }
 
-void halt_cpu() {
+void halt_cpu(char** args) {
     halted_cpu_screen_clear();
 	kprint_colored("Kintsugi  OS 0.1.0\n\n", BLUE_ON_WHITE_CLR_CODE);
 	kprint_colored("Halted CPU Blue Screen\n", BLUE_ON_WHITE_CLR_CODE);
@@ -25,38 +34,55 @@ void halt_cpu() {
 	asm volatile("hlt");
 }
 
-void help_command_shell() {
+void help_command_shell(char** args) {
 	kprint("END - stopping the CPU\n"
 	    	"INFO - info about OS\n"
 	    	"PAGE - to request a kmalloc()\n"
 	    	"CLEAR - clear the screen\n"
 	    	"SHUTDOWN - shutdown QEMU\n");
 }
 
-void info_command_shell() {
+void info_command_shell(char** args) {
 	kprint("Kintsugi OS 0.1.0 by alexeev-prog\n");
 }
 
-void malloc_command_shell() {
+void arena_malloc_command_shell(char** args) {
+	if (args[0] == NULL) {
+		kprint("AMALLOC usage: AMALLOC <page size>");
+		return;
+	}
+
 	u32 phys_addr;
-	u32 page = kmalloc(16, 1, &phys_addr);
+	u32 page = kmalloc(strtoint(args[0]), 1, &phys_addr);
 	char page_str[16] = "";
 	hex_to_ascii(page, page_str);
 	char phys_str[16] = "";
 	hex_to_ascii(phys_addr, phys_str);
 
-	kprint("Page address: ");
-	kprint(page_str);
-	kprint("\nPhysical address: ");
-	kprint(phys_str);
-	kprint("\n");
+	kprintf("ARENA MALLOC %d bytes\n", strtoint(args[0]));
+	kprintf("Page address: %s\nPhysical address: %s\n", page_str, phys_str);
 }
 
-void mem_dump() {
+void mem_dump(char** args) {
 	kmemdump();
 }
 
-void test_mem_command() {
+void kmalloc_command(char** args) {
+	if (args[0] == NULL) {
+		kprint("KMALLOC usage: KMALLOC <bytes>");
+		return;
+	}
+
+	int size = strtoint(args[0]);
+	void* ptr = kmalloc_new(size);
+
+	char buf1[32] = "";
+	hex_to_ascii((int)ptr, buf1);
+
+	kprintf("Allocate %d bytes.\nPointer: %s\n", size, buf1);
+}
+
+void test_mem_command(char** args) {
     void* ptr1 = kmalloc_new(64);
     void* ptr2 = kmalloc_new(128);
     void* ptr3 = kmalloc_new(256);

src/kernel/kernel/utils.h

@@ -2,12 +2,15 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-void shutdown_qemu();
-void halt_cpu();
-void help_command_shell();
-void info_command_shell();
-void malloc_command_shell();
-void test_mem_command();
-void mem_dump();
+void print_freememaddr(char** args);
+void shutdown_qemu(char** args);
+void halt_cpu(char** args);
+void help_command_shell(char** args);
+void info_command_shell(char** args);
+void arena_malloc_command_shell(char** args);
+void test_mem_command(char** args);
+void mem_dump(char** args);
+void clear_screen_command(char** args);
+void kmalloc_command(char** args);
 
 #endif

src/kernel/libc/mem.c

@@ -167,15 +167,15 @@ u32 kmalloc(u32 size, int align, u32 *phys_addr) {
     hex_to_ascii(size, size_str);
     kprint(size_str);
     kprint(" bytes at ");
-    print_freememaddr();
+    get_freememaddr();
     kprint("\n");
 
     u32 ret = free_mem_addr;
     free_mem_addr += size;
     return ret;
 }
 
-void print_freememaddr() {
+void get_freememaddr() {
     char free_mem_addr_str[16] = "";
 	hex_to_ascii(free_mem_addr, free_mem_addr_str);
 

src/kernel/libc/mem.h

@@ -22,7 +22,7 @@ typedef struct mem_block {
 
 void memory_copy(u8 *source, u8 *dest, int nbytes);
 void memory_set(u8 *dest, u8 val, u32 len);
-void print_freememaddr();
+void get_freememaddr();
 u32 kmalloc(u32 size, int align, u32 *phys_addr);
 
 // Новые функции

src/kernel/libc/string.c

@@ -18,6 +18,19 @@ void int_to_ascii(int n, char str[]) {
     reverse(str);
 }
 
+int strtoint(char* str) {
+    int rc = 0;
+    unsigned i = 0;
+    // C guarantees that '0'-'9' have consecutive values
+    while (str[i] >= '0' && str[i] <= '9') {
+        rc *= 10;
+        rc += str[i] - '0';
+        ++i;
+    }
+
+    return rc;
+}
+
 void hex_to_ascii(int n, char str[]) {
     append(str, '0');
     append(str, 'x');
@@ -83,3 +96,57 @@ int strcmp(char s1[], char s2[]) {
     }
     return s1[i] - s2[i];
 }
+
+unsigned int is_delim(char c, char *delim) {
+    while(*delim != '\0') {
+        if(c == *delim)
+            return 1;
+
+        delim++;
+    }
+    return 0;
+}
+
+char *strtok(char *src_str, char *delim) {
+    static char *backup_string; // бекап строки
+
+    if(!src_str) {
+        src_str = backup_string;
+    }
+
+    if(!src_str) {
+        return NULL;
+    }
+
+    while(1) {
+        if(is_delim(*src_str, delim)) {
+            src_str++;
+            continue;
+        }
+
+        if(*src_str == '\0') {
+            // конец строки
+            return NULL;
+        }
+
+        break;
+    }
+    char *ret = src_str;
+
+    while(1) {
+        if(*src_str == '\0') {
+            /*конец входной строки
+            и следующее выполнение возвратит NULL*/
+            backup_string = src_str;
+            return ret;
+        }
+
+        if(is_delim(*src_str, delim)) {
+            *src_str = '\0';
+            backup_string = src_str + 1;
+            return ret;
+        }
+
+        src_str++;
+    }
+}

src/kernel/libc/string.h

@@ -3,11 +3,14 @@
 
 void int_to_ascii(int n, char str[]);
 void hex_to_ascii(int n, char str[]);
+int strtoint(char* str);
 void reverse(char s[]);
 int strlen(char s[]);
 void backspace(char s[]);
 void append(char s[], char n);
 int strcmp(char s1[], char s2[]);
 void strcpy(char *dest, char *src);
+unsigned int is_delim(char c, char *delim);
+char *strtok(char *src_str, char *delim);
 
 #endif