Merge pull request #166 from assembler-0/Development

Development

Author: assembler-0

.github/workflows/main.yaml

@@ -42,7 +42,6 @@ jobs:
             cmake .. -G Ninja \
               -DCMAKE_BUILD_TYPE=Release \
               -DVF_SCHEDULER=EEVDF \
-              -DVF_CONFIG_HEAP_LANG=RUST \
               -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/linux-x64.cmake \
               -DCMAKE_ASM_NASM_COMPILER=$(which nasm)
             cd ..

CMakeLists.txt

@@ -42,6 +42,11 @@ else()
     message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
 endif()
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
+    message(WARNING "CMAKE_BUILD_TYPE not set. Defaulting to Release.")
+endif()
+
 if(CMAKE_GENERATOR STREQUAL "Ninja")
     message(STATUS "CMake: Generator: ${CMAKE_GENERATOR}")
 else()
@@ -63,7 +68,6 @@ message(STATUS "CMake Current Binary Directory: ${CMAKE_CURRENT_BINARY_DIR}")
 message(STATUS "CMake Host System Name: ${CMAKE_HOST_SYSTEM_NAME}")
 message(STATUS "CMake Host System Processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
 message(STATUS "VoidFrame Scheduler: ${VF_SCHEDULER}")
-message(STATUS "VoidFrame Heap Management Language: ${VF_CONFIG_HEAP_LANG}")
 message(STATUS "CMake sources configured.")
 
 # ============================================================================

README.md

@@ -62,8 +62,7 @@ cd build
 cmake .. -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/<linux/windows/macos>-x64.cmake \
     -G Ninja \
-    -DVF_SCHEDULER=<MLFQ/EEVDF> \
-    -DVF_CONFIG_HEAP_LANG=<C/RUST>
+    -DVF_SCHEDULER=<MLFQ/EEVDF>
 ccmake . # Optinal, tune as needed
 ninja -j$(nproc)
 ninja run

cmake/cache.cmake

@@ -3,6 +3,3 @@
 # ============================================================================
 set(VF_SCHEDULER "EEVDF" CACHE STRING "Scheduler type: MLFQ or EEVDF")
 set_property(CACHE VF_SCHEDULER PROPERTY STRINGS MLFQ EEVDF)
-
-set(VF_CONFIG_HEAP_LANG "C" CACHE STRING "Heap language: RUST or C")
-set_property(CACHE VF_CONFIG_HEAP_LANG PROPERTY STRINGS RUST C)

cmake/features.cmake

@@ -14,7 +14,6 @@ add_compile_definitions(
         VF_CONFIG_ENABLE_NVME
         VF_CONFIG_ENABLE_GENERIC_SOUND
         VF_CONFIG_RTC_CENTURY
-        VF_CONFIG_LOAD_MB_MODULES
         VF_CONFIG_ENFORCE_MEMORY_PROTECTION
         VF_CONFIG_VM_HOST
         VF_CONFIG_SNOOZE_ON_BOOT
@@ -34,6 +33,7 @@ add_compile_definitions(
         #    VF_CONFIG_CERBERUS_THREAT_REPORTING
         #    VF_CONFIG_PROCINFO_AUTO_CLEANUP
         #    VF_CONFIG_PANIC_OVERRIDE
+        #    VF_CONFIG_LOAD_MB_MODULES
 )
 
 if(EXCLUDE_EXTRA_OBJECTS)
@@ -50,12 +50,4 @@ elseif(VF_SCHEDULER STREQUAL "EEVDF")
     add_compile_definitions(VF_CONFIG_SCHED_EEVDF)
 else()
     message(FATAL_ERROR "Invalid scheduler: ${VF_SCHEDULER}. Did you pass: -DVF_SCHEDULER=<MLFQ/EEVDF>?")
-endif()
-
-if(VF_CONFIG_HEAP_LANG STREQUAL "RUST")
-    add_compile_definitions(VF_CONFIG_HEAP_RUST)
-elseif(VF_CONFIG_HEAP_LANG STREQUAL "C")
-    add_compile_definitions(VF_CONFIG_HEAP_C)
-else()
-    message(FATAL_ERROR "Invalid heap language: ${VF_CONFIG_HEAP_LANG}. Did you pass: -DVF_CONFIG_HEAP_LANG=<RUST/C>?")
-endif()
+endif()

cmake/source.cmake

@@ -17,10 +17,14 @@ set(ASM_SOURCES
 set(KERNEL_CORE_SOURCES
         kernel/core/Kernel.c
         kernel/core/Panic.c
-        vfcompositor/Compositor.c
         kernel/core/InitRD.c
 )
 
+set(VFC_SOURCES
+        vfcompositor/Compositor.c
+        vfcompositor/app/GUIShell.c
+)
+
 set(SCHED_SOURCES
         kernel/sched/MLFQ.c
         kernel/sched/EEVDF.c
@@ -57,6 +61,7 @@ set(MM_SOURCES
         mm/MemPool.c
         mm/trace/StackTrace.c
         mm/security/Cerberus.c
+        mm/dynamic/c/Magazine.c
         mm/PageFaultHandler.c
 )
 
@@ -128,7 +133,6 @@ set(OBJ_SOURCES)
 # ============================================================================
 include_directories(
         .
-        vfcompositor
         include
         kernel/atomic
         kernel/core
@@ -175,16 +179,13 @@ include_directories(
         arch/x86_64/idt
         arch/x86_64/interrupts
         arch/x86_64/syscall
+        vfcompositor
+        vfcompositor/app
 )
 
 # ============================================================================
 # Sources Configuration
 # ============================================================================
-if (VF_CONFIG_HEAP_LANG STREQUAL "C")
-    list(APPEND MM_SOURCES
-            mm/dynamic/c/Magazine.c
-    )
-endif()
 
 if(NOT EXCLUDE_EXTRA_OBJECTS)
     set(OBJ_SOURCES
@@ -207,4 +208,5 @@ set(C_SOURCES
         ${DRIVER_SOURCES}
         ${ARCH_SOURCES}
         ${INCLUDE_SOURCES}
+        ${VFC_SOURCES}
 )

docs/DEVELOPMENT.md

@@ -29,7 +29,9 @@ Here are the commands to install the required dependencies on various platforms.
 
 ```bash
 # Update package list and install dependencies
-sudo pacman -Syu cmake ninja clang nasm qemu-full dosfstools e2fsprogs grub xorriso mtools
+sudo pacman -Syu cmake ninja clang nasm qemu-full dosfstools e2fsprogs grub xorriso mtools rustup
+rustup target add x86_64-unknown-none
+rustup toolchain install nightly
 ```
 
 </details>
@@ -41,6 +43,10 @@ sudo pacman -Syu cmake ninja clang nasm qemu-full dosfstools e2fsprogs grub xorr
 # Update package list and install dependencies
 sudo apt update
 sudo apt install -y cmake ninja-build clang nasm qemu-system-x86 dosfstools e2fsprogs grub-pc-bin xorriso mtools
+curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y
+source ~/.cargo/env
+rustup toolchain install nightly
+rustup target add x86_64-unknown-none
 ```
 
 </details>
@@ -51,6 +57,10 @@ sudo apt install -y cmake ninja-build clang nasm qemu-system-x86 dosfstools e2fs
 ```bash
 # Install dependencies
 sudo dnf install -y cmake ninja-build clang nasm qemu-system-x86 dosfstools e2fsprogs grub2-tools-extra xorriso mtools
+curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y
+source ~/.cargo/env
+rustup toolchain install nightly
+rustup target add x86_64-unknown-none
 ```
 
 </details>

include/Scheduler.h

@@ -2,6 +2,7 @@
 ///@brief Unified wrapper for multiple scheduler implementations
 #ifndef VOIDFRAME_SCHEDULER_H
 #define VOIDFRAME_SCHEDULER_H
+#include "MLFQ.h"
 
 #if defined(VF_CONFIG_SCHED_MLFQ)
 #include "MLFQ.h"
@@ -39,6 +40,16 @@ static inline __attribute__((always_inline)) uint32_t CreateProcess(const char *
 #endif
 }
 
+static inline __attribute__((always_inline)) uint32_t CreateSecureProcess(const char * name, void (*entry_point)(), uint8_t priv, uint8_t flag) {
+#if defined(VF_CONFIG_SCHED_MLFQ)
+    return MLFQCreateSecureProcess(name, entry_point, priv, flag);
+#elif defined(VF_CONFIG_SCHED_EEVDF)
+    return EEVDFCreateSecureProcess(name, entry_point, priv, flag);
+#elif defined(VF_CONFIG_SCHED_CFS)
+    return 0; // not implemented
+#endif
+}
+
 static inline __attribute__((always_inline)) CurrentProcessControlBlock* GetCurrentProcess() {
 #if defined(VF_CONFIG_SCHED_MLFQ)
     return MLFQGetCurrentProcess();

include/Window.h

@@ -31,6 +31,7 @@ struct Window {
 
     // Window state
     bool minimized;
+    uint32_t owner_pid; // PID of the process that created this window
 };
 
 #endif // WINDOW_H

kernel/core/InitRD.c

@@ -2,9 +2,6 @@
 #include "Multiboot2.h"
 #include "Console.h"
 #include "VFS.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-
 extern uint32_t g_multiboot_info_addr;
 
 void InitRDLoad(void) {