fix sh*t from git branch conflicts

Author: alexeev-prog

CHANGELOG.md

@@ -1,4 +1,15 @@
-<<<<<<< HEAD
+commit 917716a92eaeeb4a09db3cd7bcc92911e9173f75
+Author: Alexeev Bronislav <[email protected]>
+Date:   Sun Aug 24 22:35:53 2025 +0700
+
+    realize paging memory, add kmalloc aligned; todo: realize kmemdump fully
+
+commit 1c566f731b96839e1c53eab6b755db4cdfc514c6
+Author: Alexeev Bronislav <[email protected]>
+Date:   Sun Aug 24 22:35:01 2025 +0700
+
+    realize paging memory, add kmalloc aligned; todo: realize kmemdump fully
+
 commit f606112b639b04e51fd6449516d295f348cb1cc7
 Author: Alexeev Bronislav <[email protected]>
 Date:   Sun Aug 24 22:24:16 2025 +0700
@@ -29,8 +40,6 @@ 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)
 commit ffe676bbcd462e3e7d7c8bd82ca1683361ba3bf6
 Author: Alexeev Bronislav <[email protected]>
 Date:   Sun Aug 24 04:06:51 2025 +0700

Makefile

@@ -17,23 +17,7 @@ LDFLAGS = -Ttext 0x1000 --oformat binary
 
 KERNEL_ENTRY = $(BIN_DIR)/bootloader/kernel_entry.o
 INTERRUPT_OBJ = $(BIN_DIR)/kernel/cpu/interrupt.o
-<<<<<<< HEAD
-<<<<<<< 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)
-=======
-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/cpu/isr.c

@@ -6,7 +6,6 @@
 #include "timer.h"
 #include "../drivers/lowlevel_io.h"
 #include "../kklibc/stdio.h"
-#include "../kklibc/paging/paging.h"
 
 isr_t interrupt_handlers[256];
 
@@ -118,38 +117,7 @@ char *exception_messages[] = {
     "Reserved"
 };
 
-void page_fault_handler(registers_t r) {
-    u32 fault_addr;
-    asm volatile("mov %%cr2, %0" : "=r" (fault_addr));
-
-    int present = !(r.err_code & 0x1); // Bit 0: 0 if not present
-    int rw = r.err_code & 0x2;         // Bit 1: 1 if write
-    int us = r.err_code & 0x4;         // Bit 2: 1 if user mode
-    int reserved = r.err_code & 0x8;   // Bit 3: 1 if reserved bit overwritten
-
-    kprintf("Page fault at %x: %s %s in %s mode\n",
-            fault_addr,
-            present ? "protection fault" : "not present",
-            rw ? "write" : "read",
-            us ? "user" : "kernel");
-
-    debug_page_fault(fault_addr);
-
-    if (us) {
-        kprintf("Killing process.\n");
-        asm volatile("hlt");
-        return;
-    }
-
-    kprintf("Kernel page fault! Halting.\n");
-    for(;;);
-}
-
 void isr_handler(registers_t r) {
-    if (r.int_no == 14) {
-        page_fault_handler(r);
-    }
-
     kprint("received interrupt: ");
     char s[3];
     int_to_ascii(r.int_no, s);

src/kernel/kernel/kernel.c

@@ -25,19 +25,7 @@ void kmain() {
 	irq_install();
 	kprint("IRQ Installed\n");
 
-<<<<<<< HEAD
-<<<<<<< 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)
-=======
-	register_interrupt_handler(14, page_fault_handler);
->>>>>>> 3fe2ead (realize paging memory, add kmalloc aligned; todo: realize kmemdump fully)
 
     heap_init();
 

src/kernel/kklibc/kklibc.h

@@ -7,6 +7,5 @@
 #include "stdlib.h"
 #include "function.h"
 #include "math.h"
-#include "paging/paging.h"
 
 #endif