Dev-Main Sync

CMakeLists.txt

@@ -21,6 +21,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(ValidationHelpers)
 include(SourceHelpers)
 include(RuntimeHelpers)
+include(BashConfigHelpers)
+include(MiscHelpers)
 
 add_library(alkos.target.properties.interface INTERFACE) # Populated by the toolchain file
 
@@ -30,6 +32,9 @@ set(CMAKE_ROOT_DIR ${CMAKE_SOURCE_DIR})
 #                                   Conf file                                  #
 ################################################################################
 
+set(BASH_CONF_FILE "${CMAKE_ROOT_DIR}/config/conf.generated.bash")
+alkos_init_bash_config()
+
 set(CMAKE_CONF_FILE "${CMAKE_ROOT_DIR}/config/conf.generated.cmake")
 
 # Check if configuration was done
@@ -90,9 +95,11 @@ file(MAKE_DIRECTORY ${CMAKE_SYSROOT}/boot/grub)
 
 set(SYSTEM_LIB_TYPE k)
 
-add_subdirectory(libs)
+alkos_add_subdirs(libs)
 add_subdirectory(generated)
 add_subdirectory(kernel)
+add_subdirectory(userspace)
+add_subdirectory(rootfs)
 
 ################################################################################
 #                                   Aliases                                    #

cmake/BashConfigHelpers.cmake

@@ -0,0 +1,64 @@
+#
+# This module provides a function for working with bash config files
+#
+
+#============================================================================
+# alkos_init_bash_config
+#============================================================================
+function(alkos_init_bash_config)
+    file(WRITE "${BASH_CONF_FILE}" "#!/bin/bash\n")
+    file(APPEND "${BASH_CONF_FILE}" "# Autogenerated config for ${ARCH}\n")
+    file(APPEND "${BASH_CONF_FILE}" "# Do not try to edit this by hand!\n")
+    file(APPEND "${BASH_CONF_FILE}" "\n")
+endfunction()
+
+#===============================================================================
+# alkos_add_to_bash_config
+#===============================================================================
+function(alkos_add_to_bash_config VARIABLE_NAME VARIABLE_VALUE)
+    if(NOT EXISTS "${BASH_CONF_FILE}")
+        message(FATAL_ERROR "Bash config file ${BASH_CONF_FILE} does not exist. Please call alkos_init_bash_config first.")
+    endif()
+
+    # Update existing variable if it exists, otherwise append at the end
+    file(READ "${BASH_CONF_FILE}" BASH_CONF_CONTENTS)
+    if(BASH_CONF_CONTENTS MATCHES "export ${VARIABLE_NAME}=")
+        string(REGEX REPLACE "export ${VARIABLE_NAME}=\"[^\"]*\"" "export ${VARIABLE_NAME}=\"${VARIABLE_VALUE}\"" UPDATED_BASH_CONF_CONTENTS "${BASH_CONF_CONTENTS}")
+        file(WRITE "${BASH_CONF_FILE}" "${UPDATED_BASH_CONF_CONTENTS}\n")
+    else()
+        file(APPEND "${BASH_CONF_FILE}" "export ${VARIABLE_NAME}=\"${VARIABLE_VALUE}\"\n")
+    endif()
+endfunction()
+
+#===============================================================================
+# alkos_bash_config_append_to_list
+#===============================================================================
+function(alkos_bash_config_append_to_list VARIABLE_NAME VALUES_TO_APPEND)
+    if(NOT EXISTS "${BASH_CONF_FILE}")
+        message(FATAL_ERROR "Bash config file ${BASH_CONF_FILE} does not exist. Please call alkos_init_bash_config first.")
+    endif()
+
+    # This is how you pass list arguments to a bash script from CMake
+    string(REPLACE ";" " " VALUES_TO_APPEND "${VALUES_TO_APPEND}")
+
+    # Read the current value of the variable from the bash config
+    file(READ "${BASH_CONF_FILE}" BASH_CONF_CONTENTS)
+    if(BASH_CONF_CONTENTS MATCHES "export ${VARIABLE_NAME}=\"[^\"]*\"")
+        string(REGEX MATCH "export ${VARIABLE_NAME}=\"([^\"]*)\"" "\\1" _ "${BASH_CONF_CONTENTS}")
+
+        # Append the new value to the existing list
+        set(CURRENT_VALUE "${CMAKE_MATCH_1}")
+        if(CURRENT_VALUE STREQUAL "")
+            set(CURRENT_VALUE "${VALUES_TO_APPEND}")
+        else()
+            set(CURRENT_VALUE "${CURRENT_VALUE} ${VALUES_TO_APPEND}")
+        endif()
+
+        # Update the variable in the bash config
+        string(REGEX REPLACE "export ${VARIABLE_NAME}=\"[^\"]*\"" "export ${VARIABLE_NAME}=\"${CURRENT_VALUE}\"" UPDATED_BASH_CONF_CONTENTS "${BASH_CONF_CONTENTS}")
+        file(WRITE "${BASH_CONF_FILE}" "${UPDATED_BASH_CONF_CONTENTS}\n")
+    else()
+        # Variable does not exist, create it
+        alkos_add_to_bash_config("${VARIABLE_NAME}" "${VALUES_TO_APPEND}")
+    endif()
+endfunction()

cmake/MiscHelpers.cmake

@@ -0,0 +1,28 @@
+#
+# Miscellaneous CMake helper functions
+#
+
+#===============================================================================
+# alkos_add_subdirs
+#===============================================================================
+# Recursively adds all subdirectories in the given BASE_DIR.
+## Parameters:
+#   BASE_DIR          The base directory to search for subdirectories.
+## Example:
+#   alkos_add_subdirs(modules)
+#   alkos_add_subdirs(${CMAKE_CURRENT_SOURCE_DIR}/modules)
+#
+function(alkos_add_subdirs BASE_DIR)
+    if(IS_ABSOLUTE "${BASE_DIR}")
+        set(base_dir "${BASE_DIR}")
+    else()
+        set(base_dir "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_DIR}")
+    endif()
+
+    file(GLOB subdirs RELATIVE "${base_dir}" "${base_dir}/*")
+    foreach(subdir ${subdirs})
+        if(IS_DIRECTORY "${base_dir}/${subdir}")
+            add_subdirectory("${base_dir}/${subdir}")
+        endif()
+    endforeach()
+endfunction()

cmake/RuntimeHelpers.cmake

@@ -4,6 +4,7 @@
 #
 
 include(ValidationHelpers)
+include(BashConfigHelpers)
 
 #===============================================================================
 # alkos_register_runtime_environment
@@ -61,29 +62,19 @@ function(alkos_register_runtime_environment)
         PATHS ${MAKE_ISO_SCRIPT_PATH} ${RUN_ALKOS_SCRIPT_PATH} ${RUN_TESTS_SCRIPT_PATH}
     )
 
-    # This is how you pass list arguments to a bash script from CMake
-    string(REPLACE ";" " " KERNEL_MODULES_FORMATTED "${ARG_MODULES}")
-    string(REPLACE ";" " " KERNEL_COMMANDS_FORMATTED "${ARG_MODULE_COMMANDS}")
-
-    # Write a bash config file specific to this architecture
-    set(BASH_CONF_FILE "${CMAKE_ROOT_DIR}/config/conf.generated.bash")
-
-    file(WRITE "${BASH_CONF_FILE}" "#!/bin/bash\n")
-    file(APPEND "${BASH_CONF_FILE}" "# Autogenerated config for ${ARG_ARCH_NAME}\n")
-    file(APPEND "${BASH_CONF_FILE}" "# Do not try to edit this by hand!\n")
-    file(APPEND "${BASH_CONF_FILE}" "\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_ARCH=\"${ARG_ARCH_NAME}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_BUILD_TYPE=\"${CMAKE_BUILD_TYPE}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_SYSROOT=\"${CMAKE_SYSROOT}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_BOOTABLE_KERNEL_EXEC=\"${ARG_BOOTABLE_EXECUTABLE}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_ISO_PATH=\"${ALKOS_ISO_PATH}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_KERNEL_MODULES=\"${KERNEL_MODULES_FORMATTED}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_KERNEL_COMMANDS=\"${KERNEL_COMMANDS_FORMATTED}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_BUILD_DIR=\"${CMAKE_BINARY_DIR}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_TOOL_DIR=\"${TOOL_BINARIES_DIR}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_QEMU_COMMAND=\"${ARG_QEMU_COMMAND}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_QEMU_NORMAL_FLAGS=\"${ARG_QEMU_NORMAL_FLAGS}\"\n")
-    file(APPEND "${BASH_CONF_FILE}" "export CONF_QEMU_TEST_FLAGS=\"${ARG_QEMU_TEST_FLAGS}\"\n")
+    # Add architecture-specific variables to the bash config
+    alkos_add_to_bash_config("CONF_ARCH" "${ARG_ARCH_NAME}")
+    alkos_add_to_bash_config("CONF_BUILD_TYPE" "${CMAKE_BUILD_TYPE}")
+    alkos_add_to_bash_config("CONF_SYSROOT" "${CMAKE_SYSROOT}")
+    alkos_add_to_bash_config("CONF_BOOTABLE_KERNEL_EXEC" "${ARG_BOOTABLE_EXECUTABLE}")
+    alkos_add_to_bash_config("CONF_ISO_PATH" "${ALKOS_ISO_PATH}")
+    alkos_bash_config_append_to_list("CONF_KERNEL_MODULES" "${ARG_MODULES}")
+    alkos_bash_config_append_to_list("CONF_KERNEL_COMMANDS" "${ARG_MODULE_COMMANDS}")
+    alkos_add_to_bash_config("CONF_BUILD_DIR" "${CMAKE_BINARY_DIR}")
+    alkos_add_to_bash_config("CONF_TOOL_DIR" "${TOOL_BINARIES_DIR}")
+    alkos_add_to_bash_config("CONF_QEMU_COMMAND" "${ARG_QEMU_COMMAND}")
+    alkos_add_to_bash_config("CONF_QEMU_NORMAL_FLAGS" "${ARG_QEMU_NORMAL_FLAGS}")
+    alkos_add_to_bash_config("CONF_QEMU_TEST_FLAGS" "${ARG_QEMU_TEST_FLAGS}")
 
     add_custom_target(iso-${ARG_ARCH_NAME}
         COMMAND ${MAKE_ISO_SCRIPT_PATH} -v
@@ -123,3 +114,85 @@ function(alkos_register_runtime_environment)
       )
     endif()
 endfunction()
+#-------------------------------------------------------------------------------
+# register_filesystem
+#-------------------------------------------------------------------------------
+# A filesystem registration helper that configures the rootfs
+# generation. It can be used to create either an initrd within the sysroot
+# or a standalone filesystem image within the build binaries folder.
+#
+# Parameters (oneValueArgs):
+#   TYPE                  Either INITRD or IMAGE
+#   ROOTFS_TYPE           Type of rootfs to create (e.g., fat, ext4)
+#   ROOTFS_DIR            Staging directory for building rootfs contents
+#   ROOTFS_TARGET_PATH    Target image path to generate (optional; defaults based on TYPE)
+#   ROOTFS_OVERLAY_DIR    Overlay directory to copy into the rootfs
+#   MODULE                Optional module target name to include in the ISO
+#   MODULE_COMMAND        Optional bootloader command for the module
+#
+#-------------------------------------------------------------------------------
+function(register_filesystem)
+    set(options)
+    set(oneValueArgs
+        TYPE
+        ROOTFS_TYPE
+        ROOTFS_TARGET_PATH
+        ROOTFS_OVERLAY_DIR
+        MODULE
+        MODULE_COMMAND
+    )
+    set(multiValueArgs)
+
+    cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    alkos_ensure_called_once(NAME ${CMAKE_CURRENT_FUNCTION})
+
+    alkos_ensure_defined(
+        VARS ARG_TYPE ARG_ROOTFS_TYPE ARG_ROOTFS_TARGET_PATH ARG_ROOTFS_OVERLAY_DIR
+    )
+
+    # Resolve target defaults and feature flags
+    if(ARG_TYPE STREQUAL "INITRD")
+        alkos_ensure_feature_enabled(
+            FLAG CMAKE_FEATURE_FLAG_RAMDISK
+            MESSAGE "Initial RAM filesystem support is disabled."
+        )
+    elseif(ARG_TYPE NOT STREQUAL "IMAGE")
+        message(FATAL_ERROR "register_filesystem: Unknown TYPE='${ARG_TYPE}'. Expected INITRD or IMAGE.")
+    endif()
+
+    # Export variables for the rootfs maker
+    alkos_add_to_bash_config("CONF_ROOTFS_TARGET_PATH" "${ARG_ROOTFS_TARGET_PATH}")
+    alkos_add_to_bash_config("CONF_ROOTFS_OVERLAY_DIR" "${ARG_ROOTFS_OVERLAY_DIR}")
+
+    if(ARG_TYPE STREQUAL "INITRD")
+        alkos_ensure_defined(VARS ARG_MODULE ARG_MODULE_COMMAND)
+
+        alkos_bash_config_append_to_list("CONF_KERNEL_MODULES" "${ARG_MODULE}")
+        alkos_bash_config_append_to_list("CONF_KERNEL_COMMANDS" "${ARG_MODULE_COMMAND}")
+    endif()
+
+    # Create the targets
+    set(MAKE_ROOTFS_SCRIPT_PATH ${CMAKE_SOURCE_DIR}/scripts/actions/make_rootfs.bash)
+    alkos_ensure_path_exists(PATHS ${MAKE_ROOTFS_SCRIPT_PATH})
+
+    add_custom_target(rootfs
+            # Ensure the staging directory is clean before building the rootfs.
+            # Remove the directory and recreate it so the generator starts from
+            # an empty staging area.
+            COMMAND ${CMAKE_COMMAND} -E rm -rf "${ROOTFS_DIR}"
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${ROOTFS_DIR}"
+            COMMAND ${MAKE_ROOTFS_SCRIPT_PATH} -v -- ${ARG_ROOTFS_TYPE}
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+            COMMENT "Building root filesystem"
+    )
+    add_dependencies(iso-${ARCH} rootfs)
+
+    add_custom_target(mountfs
+            DEPENDS rootfs
+            COMMAND sudo umount /mnt || true
+            COMMAND sudo mount -o loop ${ARG_ROOTFS_TARGET_PATH} /mnt
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+            COMMENT "Mounting root filesystem"
+    )
+endfunction()

cmake/ValidationHelpers.cmake

@@ -168,3 +168,67 @@ function(alkos_ensure_path_exists)
         message(FATAL_ERROR "${error_message}")
     endif()
 endfunction()
+
+#===============================================================================
+# alkos_ensure_feature_flag_enabled
+#===============================================================================
+#
+# Checks if a specified feature flag is enabled and halts with a
+# fatal error if it is not.
+#
+# Parameters:
+#   FLAG <flag>            The name of the feature flag variable to check.
+#   MESSAGE <message>      (Optional) A supplementary message to append to the
+#                          standard error output. This is useful for providing
+#                          additional context or instructions to the user.
+#
+# Example:
+#   # Assume CMAKE_FEATURE_FLAG_DEBUG_OUTPUT must be enabled.
+#   alkos_ensure_feature_flag_enabled(
+#       FLAG CMAKE_FEATURE_FLAG_DEBUG_OUTPUT
+#       MESSAGE "Debug output must be enabled for this build."
+#   )
+#
+function(alkos_ensure_feature_enabled)
+    set(options)
+    set(oneValueArgs FLAG MESSAGE)
+    set(multiValueArgs)
+
+    cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT ARG_FLAG)
+        message(FATAL_ERROR "alkos_ensure_feature_enabled() called without a feature to check.")
+    endif()
+
+    if(NOT DEFINED ${ARG_FLAG} OR NOT ${ARG_FLAG})
+        set(error_message "The feature flag '${ARG_FLAG}' must be enabled.")
+
+        if(ARG_MESSAGE)
+            string(APPEND error_message "\n${ARG_MESSAGE}")
+        endif()
+
+        message(FATAL_ERROR "${error_message}")
+    endif()
+endfunction()
+
+#===============================================================================
+# alkos_ensure_called_once
+#===============================================================================
+function(alkos_ensure_called_once)
+    set(options)
+    set(oneValueArgs NAME)
+    set(multiValueArgs)
+
+    cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT ARG_NAME)
+        message(FATAL_ERROR "alkos_ensure_called_once() called without a NAME to check.")
+    endif()
+
+    get_property(already_called GLOBAL PROPERTY ALKOS_CALLED_${ARG_NAME})
+    if(already_called)
+        message(FATAL_ERROR "The function '${ARG_NAME}' has already been called. It can only be called once.")
+    endif()
+
+    set_property(GLOBAL PROPERTY ALKOS_CALLED_${ARG_NAME} TRUE)
+endfunction()

generated/.gitignore

@@ -0,0 +1 @@
+include/autogen/*

kernel/CMakeLists.txt

@@ -68,6 +68,17 @@ target_link_libraries(cpp PUBLIC
 target_compile_definitions(c PRIVATE __ALKOS_KERNEL_LIBC__)
 target_compile_definitions(cpp PRIVATE __ALKOS_KERNEL_LIBCPP__)
 
+########################### Graphics Library #################################
+
+add_library(kernel.libgraphics STATIC ${LIBGRAPHICS_SOURCES})
+
+target_link_libraries(kernel.libgraphics PUBLIC
+    alkos.libgraphics.interface
+    alkos.target.properties.interface
+)
+
+target_compile_definitions(kernel.libgraphics PRIVATE __ALKOS_KERNEL_LIBGRAPHICS__)
+
 ########################## Configure for given Arch ##########################
 
 add_subdirectory(arch/${ARCH})
@@ -89,6 +100,7 @@ target_link_libraries(alkos.kernel PRIVATE
     alkos.autogen.interface
     c
     cpp
+    kernel.libgraphics
 )
 
 ############## Linker Configuration for CXX Global Constructors ##############

kernel/arch/x86_64/CMakeLists.txt

@@ -58,9 +58,9 @@ alkos_register_runtime_environment(
     QEMU_COMMAND
         "qemu-system-x86_64"
     QEMU_NORMAL_FLAGS
-        "-serial stdio -enable-kvm -cpu max -display default,show-cursor=on -m 4G -smp sockets=1,cores=4,threads=1"
+        "-serial stdio -enable-kvm -cpu max,+invtsc,migratable=off -machine type=q35,accel=kvm -display default,show-cursor=on -k en-us -m 4G -smp sockets=1,cores=4,threads=1 -no-reboot"
     QEMU_TEST_FLAGS
-        "-serial stdio -enable-kvm -cpu max -display none -m 4G -smp sockets=1,cores=4,threads=1"
+        "-serial stdio -enable-kvm -cpu max,+invtsc,migratable=off -machine type=q35,accel=kvm -display none -m 4G -smp sockets=1,cores=4,threads=1 -no-reboot"
     MODULES
         alkos.boot.loader.64
         alkos.kernel