fix memory issues

Author: alexeev-prog

CHANGELOG.md

@@ -1,3 +1,9 @@
+commit 5a4b8669db2a956a70c60ea9cd800ad03056739b
+Author: Alexeev Bronislav <[email protected]>
+Date:   Thu Sep 4 20:59:32 2025 +0700
+
+    try fix memory bugs
+
 commit 76a1964f51c14ff66c3d76090ae331b540758049
 Author: Alexeev Bronislav <[email protected]>
 Date:   Thu Sep 4 00:11:38 2025 +0700

src/kernel/kernel/sysinfo.c

@@ -26,7 +26,6 @@ void detect_memory() {
     meminfo_t info = get_meminfo();
     sys_info.total_memory = nframes * PAGE_SIZE;
 
-    // Улучшенный подсчет используемой памяти через фреймы
     u32 used_frames = 0;
     for (u32 i = 0; i < nframes; i++) {
         if (test_frame(i * PAGE_SIZE)) {

src/kernel/kklibc/mem.c

@@ -28,6 +28,10 @@ void heap_init() {
 }
 
 int expand_heap(u32 size) {
+    if (HEAP_START + size > HEAP_START + HEAP_SIZE) {
+        return 0;
+    }
+
     u32 num_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
     u32 expand_size = num_pages * PAGE_SIZE;
 
@@ -56,7 +60,8 @@ int expand_heap(u32 size) {
 }
 
 void* kmalloc(u32 size) {
-    if (size == 0) {
+    if (HEAP_START + size > HEAP_START + HEAP_SIZE) {
+        panic_red_screen("Memory Error", "Heap overflow");
         return NULL;
     }
 
@@ -158,10 +163,13 @@ void kfree(void* ptr) {
     mem_block_t* prev = NULL;
 
     while (current) {
-        if (current->is_free && current->next == block) {
+        if (current->is_free && (u32)current + sizeof(mem_block_t) + current->size == (u32)block) {
             current->size += sizeof(mem_block_t) + block->size;
-            current->next = block->next;
-            break;
+            if (block->next && block->next->is_free) {
+                current->size += sizeof(mem_block_t) + block->next->size;
+                current->next = block->next->next;
+            }
+            return;
         }
         prev = current;
         current = current->next;

src/kernel/kklibc/paging.c

@@ -31,7 +31,7 @@ extern u32 free_mem_addr;
 u32 pkmalloc_internal(u32 sz, int align, u32* phys) {
     if (align == 1 && (free_mem_addr & 0xFFFFF000)) {
         free_mem_addr &= 0xFFFFF000;
-        free_mem_addr += 0x1000;
+        free_mem_addr += PAGE_SIZE;
     }
 
     if (phys) {
@@ -65,23 +65,23 @@ u32 pkmalloc(u32 sz) {
 
 /* Установка бита фрейма как занятого */
 static void set_frame(u32 frame_addr) {
-    u32 frame = frame_addr / 0x1000;
+    u32 frame = frame_addr / PAGE_SIZE;
     u32 idx = INDEX_FROM_BIT(frame);
     u32 off = OFFSET_FROM_BIT(frame);
     frames[idx] |= (0x1 << off);
 }
 
 /* Очистка бита фрейма как свободного */
 static void clear_frame(u32 frame_addr) {
-    u32 frame = frame_addr / 0x1000;
+    u32 frame = frame_addr / PAGE_SIZE;
     u32 idx = INDEX_FROM_BIT(frame);
     u32 off = OFFSET_FROM_BIT(frame);
     frames[idx] &= ~(0x1 << off);
 }
 
 /* Проверка занятости фрейма */
 u32 test_frame(u32 frame_addr) {
-    u32 frame = frame_addr / 0x1000;
+    u32 frame = frame_addr / PAGE_SIZE;
     u32 idx = INDEX_FROM_BIT(frame);
     u32 off = OFFSET_FROM_BIT(frame);
     return (frames[idx] & (0x1 << off));
@@ -169,7 +169,7 @@ void page_fault(registers_t regs) {
 /* Инициализация подсистемы paging */
 void initialise_paging() {
     u32 mem_end_page = 0x1000000;
-    nframes = mem_end_page / 0x1000;
+    nframes = mem_end_page / PAGE_SIZE;
     frames = (u32*)pkmalloc(INDEX_FROM_BIT(nframes) * 4);
     memset(frames, 0, INDEX_FROM_BIT(nframes) * 4);
 
@@ -180,7 +180,7 @@ void initialise_paging() {
     int i = 0;
     while (i < free_mem_addr) {
         alloc_frame(get_page(i, 1, kernel_directory), 0, 0);
-        i += 0x1000;
+        i += PAGE_SIZE;
     }
 
     register_interrupt_handler(14, page_fault);
@@ -199,7 +199,7 @@ void switch_page_directory(page_directory_t* dir) {
 
 /* Получение страницы по адресу */
 page_t* get_page(u32 address, int make, page_directory_t* dir) {
-    address /= 0x1000;
+    address /= PAGE_SIZE;
     u32 table_idx = address / 1024;
 
     if (dir->tables[table_idx]) {