improve architecture (change libc name to kklibc), improve libc structure

alexeev-prog · alexeev-prog · commit 2a4c59d5f13c · 2025-08-23T20:20:31.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+commit fd042d366b38bcfa6f6490dee6b93bbc7c98949d
+Author: Alexeev Bronislav <alexeev.dev@mail.ru>
+Date:   Sat Aug 23 19:58:30 2025 +0700
+
+    fix issues with makefile and shell.nix, fix backspace bug
+
 commit 20bb0ee3f10fb3038fe786707da6aaac09273f3d
 Author: Alexeev Bronislav <alexeev.dev@mail.ru>
 Date:   Sat Aug 23 05:14:12 2025 +0700
diff --git a/src/kernel/cpu/idt.h b/src/kernel/cpu/idt.h
@@ -1,7 +1,7 @@
 #ifndef IDT_H
 #define IDT_H
 
-#include "type.h"
+#include "../kklibc/ctypes.h"
 
 /* Селекторы сегментов */
 #define KERNEL_CS 0x08
diff --git a/src/kernel/cpu/isr.h b/src/kernel/cpu/isr.h
@@ -1,7 +1,7 @@
 #ifndef ISR_H
 #define ISR_H
 
-#include "type.h"
+#include "../kklibc/ctypes.h"
 
 /* ISR зарезервированы для исключений процессора */
 extern void isr0();
diff --git a/src/kernel/cpu/ports.h b/src/kernel/cpu/ports.h
@@ -1,7 +1,7 @@
 #ifndef PORTS_H
 #define PORTS_H
 
-#include "../cpu/type.h"
+#include "../kklibc/ctypes.h"
 
 // unsigned char port_byte_in (u16 port);
 // void port_byte_out (u16 port, u8 data);
diff --git a/src/kernel/drivers/keyboard.c b/src/kernel/drivers/keyboard.c
@@ -10,10 +10,9 @@
 #include "lowlevel_io.h"
 #include "../cpu/isr.h"
 #include "screen.h"
-#include "../libc/string.h"
-#include "../libc/function.h"
+#include "../kklibc/stdlib.h"
+#include "../kklibc/function.h"
 #include "../kernel/kernel.h"
-#include "../libc/stdio.h"
 
 #define BACKSPACE 0x0E
 #define ENTER 0x1C
diff --git a/src/kernel/drivers/keyboard.h b/src/kernel/drivers/keyboard.h
@@ -5,6 +5,6 @@
 *	Description: null
 * ----------------------------------------------------------------------------*/
 
-#include "../cpu/type.h"
+#include "../kklibc/ctypes.h"
 
 void init_keyboard();
diff --git a/src/kernel/drivers/screen.c b/src/kernel/drivers/screen.c
@@ -9,11 +9,10 @@
 *	Description: null
 * ----------------------------------------------------------------------------*/
 
+#include "../kklibc/ctypes.h"
 #include "screen.h"
-#include "../cpu/ports.h"
-#include "../libc/mem.h"
 #include "lowlevel_io.h"
-#include "../libc/string.h"
+#include "../kklibc/stdlib.h"
 
 /* Декларирования частных функций */
 void set_cursor_offset(int offset);
diff --git a/src/kernel/drivers/screen.h b/src/kernel/drivers/screen.h
@@ -35,7 +35,7 @@
 #define SCREEN_H
 
 // Подключаем типы из CPU
-#include "../cpu/type.h"
+#include "../kklibc/ctypes.h"
 
 #define VIDEO_ADDRESS 0xb8000					// Видео-адрес
 #define MAX_ROWS 25								// Максимальное кол-во линий
diff --git a/src/kernel/kernel/kernel.c b/src/kernel/kernel/kernel.c
@@ -6,14 +6,11 @@
 * ----------------------------------------------------------------------------*/
 
 
-#include "../libc/mem.h"
 #include "../cpu/isr.h"
 #include "../drivers/screen.h"
 #include "kernel.h"
 #include "utils.h"
-#include "../libc/stdio.h"
-#include "../libc/mem.h"
-#include "../libc/string.h"
+#include "../kklibc/kklibc.h"
 
 int shell_cursor_offset = 0;
 int shell_prompt_offset = 0;
diff --git a/src/kernel/kernel/utils.c b/src/kernel/kernel/utils.c
@@ -7,10 +7,8 @@
 
 #include "utils.h"
 #include "../drivers/screen.h"
-#include "../libc/mem.h"
-#include "../libc/string.h"
+#include "../kklibc/kklibc.h"
 #include "../cpu/ports.h"
-#include "../libc/stdio.h"
 
 void print_freememaddr(char** args) {
 	get_freememaddr();
diff --git a/src/kernel/kklibc/ctypes.h b/src/kernel/kklibc/ctypes.h
@@ -1,8 +1,6 @@
-#ifndef TYPE_H
-#define TYPE_H
+#ifndef CTYPES_H
+#define CTYPES_H
 
-/* Instead of using 'chars' to allocate non-character bytes,
- * we will use these new type with no semantic meaning */
 typedef unsigned int   u32;
 typedef          int   s32;
 typedef unsigned short u16;
diff --git a/src/kernel/kklibc/function.h b/src/kernel/kklibc/function.h
diff --git a/src/kernel/kklibc/kklibc.h b/src/kernel/kklibc/kklibc.h
@@ -0,0 +1,10 @@
+#ifndef KKLIBC_H
+#define KKLIBC_H
+
+#include "ctypes.h"
+#include "mem.h"
+#include "stdio.h"
+#include "stdlib.h"
+#include "function.h"
+
+#endif
diff --git a/src/kernel/kklibc/mem.c b/src/kernel/kklibc/mem.c
@@ -6,22 +6,11 @@
 * ----------------------------------------------------------------------------*/
 
 
+#include "ctypes.h"
 #include "mem.h"
+#include "stdlib.h"
+#include "stdio.h"
 #include "../drivers/screen.h"
-#include "../libc/string.h"
-#include "../libc/stdio.h"
-
-void memory_copy(u8 *source, u8 *dest, int nbytes) {
-    int i;
-    for (i = 0; i < nbytes; i++) {
-        *(dest + i) = *(source + i);
-    }
-}
-
-void memory_set(u8 *dest, u8 val, u32 len) {
-    u8 *temp = (u8 *)dest;
-    for ( ; len != 0; len--) *temp++ = val;
-}
 
 u32 free_mem_addr_guard1 = 0xDEADBEEF;
 static u32 free_mem_addr = HEAP_START;
diff --git a/src/kernel/kklibc/mem.h b/src/kernel/kklibc/mem.h
@@ -8,7 +8,7 @@
 #ifndef MEM_H
 #define MEM_H
 
-#include "../cpu/type.h"
+#include "ctypes.h"
 
 #define HEAP_START 0x100000  // Начинаем кучу с 1 МБ (выше ядра)
 #define HEAP_SIZE  0x100000  // Размер кучи: 1 МБ
@@ -32,8 +32,6 @@ typedef struct meminfo {
 
 void *get_physaddr(void *virtualaddr);
 meminfo_t get_meminfo();
-void memory_copy(u8 *source, u8 *dest, int nbytes);
-void memory_set(u8 *dest, u8 val, u32 len);
 void get_freememaddr();
 
 // Новые функции
diff --git a/src/kernel/kklibc/stdio.c b/src/kernel/kklibc/stdio.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include "stdlib.h"
 #include "stdio.h"
 #include "../drivers/screen.h"
 
diff --git a/src/kernel/kklibc/stdio.h b/src/kernel/kklibc/stdio.h
diff --git a/src/kernel/kklibc/stdlib.c b/src/kernel/kklibc/stdlib.c
@@ -1,5 +1,17 @@
-#include "string.h"
-#include "../cpu/type.h"
+#include "ctypes.h"
+#include "stdlib.h"
+
+void memory_copy(u8 *source, u8 *dest, int nbytes) {
+    int i;
+    for (i = 0; i < nbytes; i++) {
+        *(dest + i) = *(source + i);
+    }
+}
+
+void memory_set(u8 *dest, u8 val, u32 len) {
+    u8 *temp = (u8 *)dest;
+    for ( ; len != 0; len--) *temp++ = val;
+}
 
 /**
  * K&R Реализация
diff --git a/src/kernel/kklibc/stdlib.h b/src/kernel/kklibc/stdlib.h
@@ -1,6 +1,10 @@
 #ifndef STRINGS_H
 #define STRINGS_H
 
+#include "ctypes.h"
+
+void memory_copy(u8 *source, u8 *dest, int nbytes);
+void memory_set(u8 *dest, u8 val, u32 len);
 void int_to_ascii(int n, char str[]);
 void hex_to_ascii(int n, char str[]);
 int strtoint(char* str);
