realize paging memory, add kmalloc aligned; todo: realize kmemdump fully

Author: alexeev-prog

CHANGELOG.md

@@ -1,15 +1,33 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
+commit f606112b639b04e51fd6449516d295f348cb1cc7
+Author: Alexeev Bronislav <[email protected]>
+Date:   Sun Aug 24 22:24:16 2025 +0700
+
+    realize paging memory, add kmalloc aligned; todo: realize kmemdump fully
+
+commit 4f3b9d7ea973f1106a9afb68682d8abf371640e8
+Author: Alexeev Bronislav <[email protected]>
+Date:   Sun Aug 24 22:22:55 2025 +0700
+
+    realize paging memory, add kmalloc aligned; todo: realize kmemdump fully
+
+commit a4deb10c546b41616b0a8ffb9a58a27016704d22
+Author: Alexeev Bronislav <[email protected]>
+Date:   Sun Aug 24 21:23:39 2025 +0700
+
+    replace paging
+
+commit 87ef6daf677ce9a7451a29a1ad1a51858e8034cf
+Author: Alexeev Bronislav <[email protected]>
+Date:   Sun Aug 24 06:23:40 2025 +0700
+
+    try fix paging; TODO: FIX PAGING AND FRAME ALLOC
+
 commit 5c5167c783467a1441565edfd12b130a741e999c
 Author: Alexeev Bronislav <[email protected]>
 Date:   Sun Aug 24 06:05:27 2025 +0700
 
     feat: realize paging, add page, frame allocator and change kfree, kmalloc, krealloc
 
-=======
->>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
-=======
->>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 commit ffe676bbcd462e3e7d7c8bd82ca1683361ba3bf6
 Author: Alexeev Bronislav <[email protected]>
 Date:   Sun Aug 24 04:06:51 2025 +0700

Makefile

@@ -19,13 +19,17 @@ KERNEL_ENTRY = $(BIN_DIR)/bootloader/kernel_entry.o
 INTERRUPT_OBJ = $(BIN_DIR)/kernel/cpu/interrupt.o
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 PAGING_OBJ = $(BIN_DIR)/bootloader/paging.o
 =======
 PAGING_OBJ = $(BIN_DIR)/kernel/paging_asm.o
 >>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 =======
 PAGING_OBJ = $(BIN_DIR)/kernel/paging_asm.o
 >>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
+=======
+PAGING_OBJ = $(BIN_DIR)/kernel/paging_asm.o
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 
 C_SOURCES = $(shell find $(SRC_DIR) -name '*.c')
 C_OBJS = $(C_SOURCES:$(SRC_DIR)/%.c=$(BIN_DIR)/%.o)

src/kernel/kernel/kernel.c

@@ -25,8 +25,12 @@ void kmain() {
 	irq_install();
 	kprint("IRQ Installed\n");
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 	init_paging();
+=======
+	register_interrupt_handler(14, page_fault_handler);
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 =======
 	register_interrupt_handler(14, page_fault_handler);
 >>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)

src/kernel/kklibc/mem.c

@@ -39,22 +39,31 @@ void heap_init() {
     free_blocks->page = NULL;
 
     kprint("Heap initialized at virtual: ");
+<<<<<<< HEAD
     kprint("Heap initialized at virtual: ");
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
     char buf[32] = "";
     hex_to_ascii(HEAP_VIRTUAL_START, buf);
     kprint(buf);
     kprint(", physical: ");
     hex_to_ascii(heap_physical_start, buf);
+<<<<<<< HEAD
     hex_to_ascii(HEAP_VIRTUAL_START, buf);
     kprint(buf);
     kprint(", physical: ");
     hex_to_ascii(heap_physical_start, buf);
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
     kprint(buf);
     kprint("\n");
 }
 
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 // TODO: Paging is not implemented
 void *get_physaddr(void *virtualaddr) {
     return get_physical_address(virtualaddr);
@@ -86,6 +95,7 @@ void *kmalloc_a(u32 size) {
     }
 
     return virtual_addr;
+<<<<<<< HEAD
     return get_physical_address(virtualaddr);
 }
 
@@ -115,6 +125,8 @@ void *kmalloc_a(u32 size) {
     }
 
     return virtual_addr;
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 }
 
 void *kmalloc(u32 size) {
@@ -164,7 +176,10 @@ void *kmalloc(u32 size) {
 
             current->is_free = 0;
             return (void*)((u32)current + sizeof(mem_block_t));
+<<<<<<< HEAD
             return (void*)((u32)current + sizeof(mem_block_t));
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
         }
         prev = current;
         current = current->next;
@@ -284,8 +299,11 @@ meminfo_t get_meminfo() {
 
     meminfo.heap_virtual_start = HEAP_VIRTUAL_START;
     meminfo.heap_physical_start = heap_physical_start;
+<<<<<<< HEAD
     meminfo.heap_virtual_start = HEAP_VIRTUAL_START;
     meminfo.heap_physical_start = heap_physical_start;
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
     meminfo.heap_size = HEAP_SIZE;
     meminfo.block_size = BLOCK_SIZE;
     meminfo.free_blocks = free_blocks;
@@ -299,17 +317,23 @@ meminfo_t get_meminfo() {
     meminfo.used_pages = 256;    // Примерное значение
     meminfo.free_pages = 768;    // Примерное значение
 
+<<<<<<< HEAD
     // Информация о страницах (заглушка)
     meminfo.page_directory_phys = (u32)get_physical_address(get_current_page_directory());
     meminfo.total_pages = 1024;  // Примерное значение
     meminfo.used_pages = 256;    // Примерное значение
     meminfo.free_pages = 768;    // Примерное значение
 
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
     return meminfo;
 }
 
 // Дамп информации о памяти
+<<<<<<< HEAD
 // Дамп информации о памяти
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 void kmemdump() {
     meminfo_t info = get_meminfo();
     mem_block_t *current = info.free_blocks;
@@ -319,27 +343,36 @@ void kmemdump() {
             info.heap_virtual_start + info.heap_size, info.heap_size);
     kprintf("Heap: physical %x - %x\n", info.heap_physical_start,
             info.heap_physical_start + info.heap_size);
+<<<<<<< HEAD
     kprintf("Heap: virtual %x - %x (%d bytes)\n", info.heap_virtual_start,
             info.heap_virtual_start + info.heap_size, info.heap_size);
     kprintf("Heap: physical %x - %x\n", info.heap_physical_start,
             info.heap_physical_start + info.heap_size);
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
     kprintf("Block size: %d bytes\n", info.block_size);
     kprintf("Total: USED=%d bytes, FREE=%d bytes, in %d blocks\n",
             info.total_used, info.total_free, info.block_count);
     kprintf("Pages: TOTAL=%d, USED=%d, FREE=%d\n\n",
             info.total_pages, info.used_pages, info.free_pages);
+<<<<<<< HEAD
     kprintf("Total: USED=%d bytes, FREE=%d bytes, in %d blocks\n",
             info.total_used, info.total_free, info.block_count);
     kprintf("Pages: TOTAL=%d, USED=%d, FREE=%d\n\n",
             info.total_pages, info.used_pages, info.free_pages);
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 
     while (current) {
         kprintf("Block %d: virt=%x, phys=%x, Size=%d, %s\n", counter++,
                 (u32)current, (u32)get_physical_address(current),
                 current->size, current->is_free ? "FREE" : "USED");
+<<<<<<< HEAD
         kprintf("Block %d: virt=%x, phys=%x, Size=%d, %s\n", counter++,
                 (u32)current, (u32)get_physical_address(current),
                 current->size, current->is_free ? "FREE" : "USED");
+=======
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
         current = current->next;
     }
 

src/kernel/kklibc/mem.h

@@ -51,7 +51,11 @@ typedef struct meminfo {
 void *get_physaddr(void *virtualaddr);
 meminfo_t get_meminfo();
 <<<<<<< HEAD
+<<<<<<< HEAD
 
+=======
+void get_freememaddr();
+>>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 =======
 void get_freememaddr();
 >>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)