Userspace work

CMakeLists.txt

@@ -2,24 +2,58 @@
 #
 # Copyright (c) 2024 Omar Berrow
 
-if (NOT DEFINED OUTPUT_DIR)
-	set (OUTPUT_DIR ${CMAKE_SOURCE_DIR}/out)
-endif()
+cmake_minimum_required(VERSION 3.10)
+
+# Boolean options.
+
+option (OBOS_UP "Make a Uniprocessor-Build of obos.")
+option (OBOS_ENABLE_UBSAN "Enables UBSan.")
+option (OBOS_ENABLE_KASAN "Enables KAsan.")
+option (OBOS_ENABLE_FANALYZER "(Developers only) Enables the compiler's static analyzer")
+option (OBOS_ENABLE_WERROR "(Developers only) Enables the -Werror option")
+option (OBOS_USE_CLANG "Use clang instead of GCC to build.")
+option (OBOS_NVS_SAVE_S3 "Enable compile-time support for saving NVS before S3" ON)
+option (OBOS_ENABLE_LOCK_PROFILING "(Experimental) Enable profiling for locks.")
+option (OBOS_ENABLE_PROFILER "(Experimental) Enable profiling.")
+option (OBOS_LAZY_IRQL "Enables lazy IRQL. Recommended if the main target of the kernel is hypervisors, where writing to cr8 is slooow.")
+
+# String options
+
+# NOTE: Unless we add FORCE to the end, CMake shouldn't override user values.
+set (OUTPUT_DIR ${CMAKE_SOURCE_DIR}/out CACHE STRING "The output directory.")
+set (OBOS_PAGE_REPLACEMENT_ALGORITHM "Aging" CACHE STRING "(Kernel developers only) The page replacement algorithm used by the MM.")
+set (OBOS_DEV_PREFIX "/dev" CACHE STRING "Directory where the kernel places devices.")
+set (OBOS_CLANG_SUFFIX "" CACHE STRING "Some Linux distributions add a suffix to various clang and LLVM commands, such as the version used. Specify that suffix, if needed")
 
 file (TO_CMAKE_PATH "${OUTPUT_DIR}" OUTPUT_DIR)
 file (TO_NATIVE_PATH "${OUTPUT_DIR}" OUTPUT_DIR)
 
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
 
-cmake_minimum_required(VERSION 3.7)
+project(
+	OBOS
+	LANGUAGES C CXX ASM
+	DESCRIPTION "Hybrid Kernel with advanced driver loading."
+	HOMEPAGE_URL https://github.com/OBOS-dev/obos
+	)
 
-project(OBOS C CXX ASM)
 if (OBOS_ARCHITECTURE STREQUAL "x86_64")
 	enable_language(ASM_NASM)
 else()
 	enable_language(ASM-ATT)
 endif()
 
+if (OBOS_USE_CLANG)
+	add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-error=unknown-pragmas>
+						$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unknown-pragmas>
+						$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-error=unknown-attributes>
+						$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-error=c23-extensions>)
+	if (OBOS_ENABLE_KASAN)
+		set (OBOS_ENABLE_KASAN OFF)
+		message (WARNING "OBOS does not support Clang's ASAN implementation. If you really care about this, make a PR, as I don't.")
+	endif()
+endif()
+
 # Download dependencies.
 # NOTE: As dependencies are added, please add them to the .gitignore file.
 # If a dependency cmake file is included, and OBOS_REFRESH_DEPENDENCIES is false, the cmake file shall not download or make any file operations, and only set any cache variables related 
@@ -50,14 +84,44 @@ else()
 	endif()
 endif()
 
-if (DEFINED OBOS_UP)
+if (OBOS_UP)
 	add_compile_definitions(OBOS_UP=1)
 endif()
 
+if (OBOS_NVS_SAVE_S3)
+	set (OBOS_NVS_SAVE_S3 "1")
+else()
+	set (OBOS_NVS_SAVE_S3 "0")
+endif()
+add_compile_definitions(OBOS_NVS_SAVE_S3=${OBOS_NVS_SAVE_S3})
+
+if (OBOS_LAZY_IRQL)
+	set (OBOS_LAZY_IRQL "1")
+else()
+	set (OBOS_LAZY_IRQL "0")
+endif()
+add_compile_definitions(OBOS_LAZY_IRQL=${OBOS_LAZY_IRQL})
+
+if (OBOS_ENABLE_LOCK_PROFILING)
+	set (OBOS_ENABLE_LOCK_PROFILING "1")
+else()
+	set (OBOS_ENABLE_LOCK_PROFILING "0")
+endif()
+add_compile_definitions(OBOS_ENABLE_LOCK_PROFILING=${OBOS_ENABLE_LOCK_PROFILING})
+
+if (OBOS_ENABLE_PROFILER)
+	set (OBOS_ENABLE_PROFILER "1")
+else()
+	set (OBOS_ENABLE_PROFILER "0")
+endif()
+add_compile_definitions(OBOS_ENABLE_PROFILING=${OBOS_ENABLE_PROFILER})
+
 add_compile_definitions(OBOS_BINARY_DIRECTORY="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 
 add_compile_definitions(OBOS_ARCHITECTURE_BITS=${OBOS_ARCHITECTURE_BITS})
 
+#add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-fno-strict-aliasing>)
+
 execute_process(COMMAND
   "${GIT_EXECUTABLE}" describe --match=NeVeRmAtCh --always --abbrev=40 --dirty
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
@@ -74,24 +138,25 @@ execute_process(COMMAND
 add_compile_definitions (GIT_SHA1="${GIT_SHA1}" GIT_DATE="${GIT_DATE}")
 add_compile_definitions (OBOS_ARCHITECTURE_ENDIANNESS="${OBOS_ARCHITECTURE_ENDIANNESS}")
 
-if (DEFINED OBOS_ENABLE_UBSAN)
-	list (APPEND oboskrnl_sources "sanitizers/ubsan.c")
+#list (APPEND oboskrnl_sources "sanitizers/ubsan.c")
+if (OBOS_ENABLE_UBSAN)
 	add_compile_options(
 		$<$<COMPILE_LANGUAGE:C>:-fsanitize=undefined>
 	)
-	set(OBOS_ENABLE_UBSAN "1")
+	set (OBOS_ENABLE_UBSAN "1")
 else()
-	set(OBOS_ENABLE_UBSAN "0")
+	set (OBOS_ENABLE_UBSAN "0")
 endif()
 add_compile_definitions(OBOS_UBSAN_ENABLED=${OBOS_ENABLE_UBSAN})
-if (DEFINED OBOS_ENABLE_KASAN)
-	list (APPEND oboskrnl_sources "sanitizers/asan.c")
+
+#list (APPEND oboskrnl_sources "sanitizers/asan.c")
+if (OBOS_ENABLE_KASAN)
 	add_compile_options(
 		$<$<COMPILE_LANGUAGE:C>:-fsanitize=kernel-address>
 	)
-	set(OBOS_ENABLE_KASAN "1")
+	set (OBOS_ENABLE_KASAN "1")
 else()
-	set(OBOS_ENABLE_KASAN "0")
+	set (OBOS_ENABLE_KASAN "0")
 endif()
 add_compile_definitions(OBOS_KASAN_ENABLED=${OBOS_ENABLE_KASAN})
 add_compile_definitions(OBOS_IRQL_COUNT=${OBOS_IRQL_COUNT})
@@ -103,23 +168,32 @@ add_compile_definitions(
 	$<$<CONFIG:MinSizeRel>:OBOS_RELEASE>
 )
 
+string(TOUPPER "${OBOS_PAGE_REPLACEMENT_ALGORITHM}" OBOS_PAGE_REPLACEMENT_ALGORITHM)
+set(OBOS_PAGE_REPLACEMENT_ALGORITHM_DEFINE "OBOS_PAGE_REPLACEMENT_")
+string(APPEND OBOS_PAGE_REPLACEMENT_ALGORITHM_DEFINE "${OBOS_PAGE_REPLACEMENT_ALGORITHM}")
+add_compile_definitions(${OBOS_PAGE_REPLACEMENT_ALGORITHM_DEFINE}=1)
+string(APPEND OBOS_PAGE_REPLACEMENT_ALGORITHM "\"")
+string(PREPEND OBOS_PAGE_REPLACEMENT_ALGORITHM "\"")
+add_compile_definitions(OBOS_PAGE_REPLACEMENT_ALGORITHM=${OBOS_PAGE_REPLACEMENT_ALGORITHM})
+
 set_property(GLOBAL PROPERTY C_STANDARD 17
 					PROPERTY C_STANDARD_REQUIRED true
 					PROPERTY C_EXTENSIONS On)
 
-if (DEFINED OBOS_ENABLE_WERROR AND NOT DEFINED OBOS_ENABLE_FANALYZER)
-	add_compile_options("-Werror")
+if (OBOS_ENABLE_WERROR AND NOT OBOS_ENABLE_FANALYZER)
+	add_compile_options("-Werror" $<$<COMPILE_LANGUAGE:C>:-Wno-error=unused-function> $<$<COMPILE_LANGUAGE:C>:-Wno-error=unused-parameter>)
 endif()
-if (DEFINED OBOS_ENABLE_FANALYZER)
+if (OBOS_ENABLE_FANALYZER)
 	add_compile_options($<$<COMPILE_LANGUAGE:C>:-fanalyzer>)
 endif()
-if (DEFINED OBOS_ENABLE_FANALYZER AND DEFINED OBOS_ENABLE_WERROR)
+if (OBOS_ENABLE_FANALYZER AND OBOS_ENABLE_WERROR)
 	message(WARNING "OBOS_ENABLE_FANALYZER and OBOS_ENABLE_WERROR are mutually exclusive. Preferring OBOS_ENABLE_FANALYZER.")
 endif()
 
-if (NOT DEFINED OBOS_DEV_PREFIX)
-	set(OBOS_DEV_PREFIX "/dev/")
-endif()
+# Now done somewhere else.
+# if (NOT DEFINED OBOS_DEV_PREFIX)
+# 	set(OBOS_DEV_PREFIX "/dev/")
+# endif()
 configure_file(${CMAKE_SOURCE_DIR}/src/inc/dev_prefix.h.in ${CMAKE_SOURCE_DIR}/src/oboskrnl/inc/dev_prefix.h @ONLY)
 
 add_compile_definitions(
@@ -129,18 +203,21 @@ add_compile_definitions(
 
 # Include the kernel
 add_subdirectory("src/oboskrnl")
+if (OBOS_ARCHITECTURE STREQUAL "m68k")
+	add_subdirectory("src/oboskrnl/arch/m68k/loader")
+endif()
 add_subdirectory("src/uACPI")
+add_subdirectory("src/sanitizers")
 # Include drivers
 get_target_property(uacpi_INCLUDES uacpi INCLUDE_DIRECTORIES)
 include_directories(${uacpi_INCLUDES})
 if (OBOS_ARCHITECTURE STREQUAL "x86_64")
-	add_subdirectory("src/drivers/x86_64/uart")
-	endif()
+	add_subdirectory("src/drivers/x86/bochs_vbe")
+	add_subdirectory("src/drivers/x86/uart")
+endif()
 add_subdirectory("src/drivers/generic/initrd")
-add_subdirectory("src/drivers/generic/ahci")
 add_subdirectory("src/drivers/generic/slowfat")
 add_subdirectory("src/drivers/test_driver")
+add_subdirectory("src/drivers/generic/ahci")
+add_subdirectory("src/init")
 add_subdirectory("src/isogen")
-if (OBOS_ARCHITECTURE STREQUAL "m68k")
-	add_subdirectory("src/oboskrnl/arch/m68k/loader")
-endif()

README.md

@@ -1,5 +1,5 @@
 # OBOS
-OBOS uses ***✨ state of the art technology ✨*** to do ***✨  absolutely nothing ✨*** 
+OBOS uses ***✨ state of the art technology ✨*** to do ***✨  almost nothing ✨*** 
 ## Building
 ### Prerequisites
 - NASM

config/hyper.cfg

@@ -5,7 +5,7 @@ protocol=ultra
 higher-half-exclusive=true
 kernel-as-module=true
 video-mode=auto
-cmdline='-initrd-module=initrd -initrd-driver-module=initrd_driver --root-fs-partid initrd --working-set-cap=8388608 --load-modules=/slowfat'
+cmdline='-initrd-module=initrd -initrd-driver-module=initrd_driver --root-fs-partid initrd --working-set-cap=8388608 --load-modules=/slowfat --initial-swap-size=67108864 --log-level=1 --no-smp --init-path=/bash'
 
 binary:
 	path="/obos/oboskrnl"
@@ -16,15 +16,11 @@ page-table:
 	constraint=exactly
 	null-guard=true
 
-module:
-	type="memory"
-	size=67108864
-	name="INITIAL_SWAP_BUFFER"
 module:
 	type="file"
 	path="/obos/initrd.tar"
 	name="initrd"
 module:
 	type="file"
 	path="/obos/initrd"
-	name="initrd_driver"
+	name="initrd_driver"

dependencies/uacpi.cmake

@@ -7,7 +7,7 @@ if (OBOS_REFRESH_DEPENDENCIES)
 
 	FetchContent_Declare(uACPI
 		GIT_REPOSITORY https://github.com/UltraOS/uACPI.git
-        GIT_TAG eda7c1b24e7b320d72313063d60bee2b3ef88510
+		GIT_TAG c0a82c02d90269625f9ba383aab9720163c1fa90
 		SOURCE_DIR ${CMAKE_SOURCE_DIR}/dependencies/uACPI
 	)
 	FetchContent_MakeAvailable(uACPI)

scripts/find_addr.sh

@@ -1,5 +1,3 @@
-clear
-
 cd ..
 export address=$1
 export exe=$2

scripts/find_addr_m68k.sh

@@ -1,5 +1,3 @@
-clear
-
 cd ..
 export address=$1
 export exe=$2

scripts/generate_initrd-x86_64.sh

@@ -5,8 +5,11 @@ then
     mkdir tar
 fi
 cp out/uart tar
-cp out/ahci tar
+# cp out/ahci tar
+rm tar/ahci
 cp out/slowfat tar
+cp out/bochs_vbe tar
+#cp out/init tar
 if [[ ! -d tar/dev ]]
 then
     mkdir tar/dev

scripts/launch_qemu.sh

@@ -2,20 +2,21 @@ cd ../
 
 rm qemu_log.txt
 
+echo $@
 qemu-system-x86_64 \
--drive id=disk2,file=out/obos.iso,if=none,format=raw \
--device ahci,id=ahci \
--device ide-hd,drive=disk2,bus=ahci.0,bootindex=1 \
--drive file=disk.img,format=raw \
--m 1G \
+-drive file=out/obos.iso,format=raw \
+-m 256M \
 -gdb tcp:0.0.0.0:1234 -S \
 -boot d \
 -M q35 \
 -cpu host \
 -accel kvm \
 -debugcon file:/dev/stdout \
 -monitor stdio \
+-smp cores=1,threads=1,sockets=1 \
 -serial tcp:0.0.0.0:1534,server,nowait \
+-d int \
+-D qemu_log.txt "$@"
 -smp cores=$(nproc),threads=1,sockets=1 \
 -M smm=off \
 -D qemu_log.txt

scripts/make_bp.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+out="for (volatile bool b = ($1); b; );"
+which -s xsel
+if [ $? -eq 0 ]
+then
+    echo $out | xsel -ibo
+else
+    echo $out
+fi

src/build/m68k/toolchain.cmake

@@ -6,6 +6,10 @@ if (NOT HAS_CROSS_COMPILER)
 	message(FATAL_ERROR "No m68k-obos cross compiler in the PATH!")
 endif()
 
+if (OBOS_USE_CLANG)
+	message(WARNING "OBOS does not support m68k clang")
+endif()
+
 set(CMAKE_C_COMPILER "m68k-obos-gcc")
 set(CMAKE_CXX_COMPILER "m68k-obos-g++")
 set(CMAKE_ASM-ATT_COMPILER ${CMAKE_C_COMPILER})
@@ -45,10 +49,10 @@ endif()
 add_compile_options("-mcpu=68040")
 
 list (APPEND oboskrnl_sources 
-	"arch/m68k/entry.c" "arch/m68k/memmanip.c" "arch/m68k/asm_helpers.S" "arch/m68k/irql.c"
+	"arch/m68k/entry.c" "arch/m68k/asm_helpers.S" "arch/m68k/irql.c" "arch/m68k/driver_loader.c"
 	"arch/m68k/irq.c" "arch/m68k/isr.S" "arch/m68k/thread_ctx.S" "arch/m68k/thread_ctx.c"
-	"arch/m68k/mmu.c" "arch/m68k/pmm.c" "arch/m68k/exception_handlers.c" "arch/m68k/initial_swap.c"
-	"arch/m68k/goldfish_pic.c" "arch/m68k/goldfish_rtc.c" "arch/m68k/driver_loader.c"
+	"arch/m68k/mmu.c" "arch/m68k/pmm.c" "arch/m68k/exception_handlers.c" "arch/m68k/goldfish_rtc.c"
+	"arch/m68k/goldfish_pic.c"
 )
 
 add_compile_definitions(
@@ -71,4 +75,4 @@ set (DRIVER_LINKER_SCRIPT "${CMAKE_SOURCE_DIR}/src/build/m68k/driver_link.ld")
 set (OBOS_ARCHITECTURE_HAS_ACPI 0)
 set (OBOS_ARCHITECTURE_HAS_PCI 0)
 set (OBOS_IRQL_COUNT 8)
-set (OBOS_UP 1) # The m68k doesn't support SMP, so we disable it as a [POSSIBLE] optimization
+set (OBOS_UP 1) # The m68k doesn't support SMP, so we disable it as a [POSSIBLE] optimization

src/build/x86_64/driver_link.ld

@@ -18,6 +18,7 @@ PHDRS
     dynamic PT_DYNAMIC;
 }
 
+
 SECTIONS
 {
     Drv_Base = .;
@@ -37,6 +38,7 @@ SECTIONS
 
     .data : {
         *(.data .data.*)
+        *(.driverheader)
     } :data
 
     .bss : {
@@ -79,4 +81,5 @@ SECTIONS
         *(.dynamic)
     } :data :dynamic
 
-}
+    Drv_Top = .;
+}