refactor/docs: fix shell, update readme

Author: alexeev-prog

CHANGELOG.md

@@ -1,3 +1,9 @@
+commit 915ca27874432db51cd6d1370d4accd7b53d5d12
+Author: Alexeev Bronislav <[email protected]>
+Date:   Mon Aug 25 02:32:46 2025 +0700
+
+    fix paging finally
+
 commit 623dfed03e195ce3de99dda013399f497e936a5f
 Author: Alexeev Bronislav <[email protected]>
 Date:   Mon Aug 25 01:27:39 2025 +0700

Makefile

@@ -17,6 +17,7 @@ LDFLAGS = -Ttext 0x1000 --oformat binary
 
 KERNEL_ENTRY = $(BIN_DIR)/bootloader/kernel_entry.o
 INTERRUPT_OBJ = $(BIN_DIR)/kernel/cpu/interrupt.o
+PAGING_OBJ = $(BIN_DIR)/kernel/paging_asm.o
 
 C_SOURCES = $(shell find $(SRC_DIR) -name '*.c')
 C_OBJS = $(C_SOURCES:$(SRC_DIR)/%.c=$(BIN_DIR)/%.o)
@@ -70,11 +71,11 @@ run_bin: $(BIN_DIR)/kintsugios.bin
 
 run: $(DISKIMG_DIR)/$(DISKIMG_NAME)
 	@printf "$(GREEN)[QEMU] Run img   %-50s$(RESET)\n" "$<"
-	@qemu-system-i386 -fda $< -boot a -m 128
+	@qemu-system-i386 -fda $< -boot a -m 16
 
 debug: $(DISKIMG_DIR)/$(DISKIMG_NAME)
 	@printf "$(GREEN)[QEMU] Debug img %-50s$(RESET)\n" "$<"
-	@qemu-system-i386 -fda $< -boot a -s -S -m 128
+	@qemu-system-i386 -fda $< -boot a -s -S -m 16
 
 clean:
 	@printf "$(RED)[RM]   Clean $(BIN_DIR) and $(DISKIMG_DIR)$(RESET)\n"

README.md

@@ -19,6 +19,7 @@
 - **GDT** (Глобальная таблица дескрипторов)
 - **Управление памятью** с аллокаторами:
   - Аллокатор на основе связанных блоков памяти
+  - Paging
 - **Драйверы**:
   - VGA-экран с поддержкой цветного текста
   - Клавиатура (PS/2)

image.png

@@ -12,20 +12,20 @@
 
 void fibonacci_command(char **args) {
     if (!args[0]) {
-        kprint("FIB usage: FIB <num>\n");
+        kprint("FIB usage: FIB <num>");
         return;
     }
 
     int num = strtoint(args[0]);
 
     u32 fib = fibonacci(num);
 
-    kprintf("fib(%d) = %d\n", num, fib);
+    kprintf("fib(%d) = %d", num, fib);
 }
 
 void binary_pow_command(char **args) {
     if (!args[0] || !args[1]) {
-        kprint("BINPOW usage: BINPOW <base> <exponent>\n");
+        kprint("BINPOW usage: BINPOW <base> <exponent>");
         return;
     }
 
@@ -34,31 +34,31 @@ void binary_pow_command(char **args) {
 
     int powered = binary_pow(b, e);
 
-    kprintf("%d ** %d = %d\n", b, e, powered);
+    kprintf("%d ** %d = %d", b, e, powered);
 }
 
 void rand_comamnd(char **args) {
     if (!args[0]) {
-        kprint("RAND usage: RAND <seed>\n");
+        kprint("RAND usage: RAND <seed>");
         return;
     }
 
     u32 seed = strtoint(args[0]);
 
-    kprintf("%d\n", rand(&seed));
+    kprintf("%d", rand(&seed));
 }
 
 void rand_range_command(char **args) {
     if (!args[0] || !args[1] || !args[2]) {
-        kprint("RANDRANGE usage: RANDRANGE <seed> <min> <max>\n");
+        kprint("RANDRANGE usage: RANDRANGE <seed> <min> <max>");
         return;
     }
 
     u32 seed = strtoint(args[0]);
     u32 min = strtoint(args[1]);
     u32 max = strtoint(args[2]);
 
-    kprintf("%d\n", rand_range(&seed, min, max));
+    kprintf("%d", rand_range(&seed, min, max));
 }
 
 void reboot_command(char** args) {
@@ -67,7 +67,7 @@ void reboot_command(char** args) {
 
 void sleep_command(char** args) {
     if (!args[0]) {
-        kprint("SLEEP usage: SLEEP <ms>\n");
+        kprint("SLEEP usage: SLEEP <ms>");
         return;
     }
 
@@ -108,7 +108,7 @@ void info_command_shell(char** args) {
 	kprintf("HEAP (%d): start at %d, minimal block size %d\n", meminfo.heap_size, meminfo.heap_start, meminfo.block_size);
 	kprintf("Total used: %d\n", meminfo.total_used);
 	kprintf("Total free: %d\n", meminfo.total_free);
-	kprintf("Block count: %d\n", meminfo.block_count);
+	kprintf("Block count: %d", meminfo.block_count);
 }
 
 void mem_dump(char** args) {
@@ -119,12 +119,11 @@ void echo_command(char **args) {
     for (int i = 0; args[i] != NULL; i++) {
         kprintf("%s ", args[i]);
     }
-    kprint("\n");
 }
 
 void free_command(char **args) {
     if (!args[0]) {
-        kprint("FREE usage: FREE <hex_address>\n");
+        kprint("FREE usage: FREE <hex_address>");
         return;
     }
 
@@ -135,7 +134,7 @@ void free_command(char **args) {
 
     u32 addr = hex_strtoint(addr_str);
     kfree((void*)addr);
-    kprintf("Freed memory at %x\n", addr);
+    kprintf("Freed memory at %x", addr);
 }
 
 void kmalloc_command(char** args) {
@@ -150,5 +149,5 @@ void kmalloc_command(char** args) {
 	char buf1[32] = "";
 	hex_to_ascii((int)ptr, buf1);
 
-	kprintf("Allocate %d bytes.\nPointer: %s\n", size, buf1);
+	kprintf("Allocate %d bytes.\nPointer: %s", size, buf1);
 }

src/bootloader/paging.asm

@@ -179,6 +179,8 @@ void initialise_paging() {
 
     // Включаем paging!
     switch_page_directory(kernel_directory);
+
+    kprintf("Paging enabled: nframes=%d, frames=%d, free mem addr: %x\n", nframes, frames, free_mem_addr);
 }
 
 /* Переключение page directory */