Vfs

.gitignore

@@ -9,3 +9,5 @@
 /dependencies/include/
 /dependencies/needs_download.cmake
 /qemu_log.txt
+/tar
+/src/oboskrnl/inc/*

CMakeLists.txt

@@ -106,10 +106,20 @@ add_compile_definitions(
 set_property(GLOBAL PROPERTY C_STANDARD 17
 					PROPERTY C_STANDARD_REQUIRED true)
 
-if (OBOS_ENABLE_WERROR)
+if (DEFINED OBOS_ENABLE_WERROR AND NOT DEFINED OBOS_ENABLE_FANALYZER)
 	add_compile_options("-Werror")
 endif()
+if (DEFINED OBOS_ENABLE_FANALYZER)
+	add_compile_options($<$<COMPILE_LANGUAGE:C>:-fanalyzer>)
+endif()
+if (DEFINED OBOS_ENABLE_FANALYZER AND DEFINED 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()
+configure_file(${CMAKE_SOURCE_DIR}/src/inc/dev_prefix.h.in ${CMAKE_SOURCE_DIR}/src/oboskrnl/inc/dev_prefix.h @ONLY)
 
 # Include the kernel
 add_subdirectory("src/oboskrnl")
@@ -119,9 +129,10 @@ 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/isogen")
+	endif()
+add_subdirectory("src/drivers/generic/initrd")
 add_subdirectory("src/drivers/test_driver")
+add_subdirectory("src/isogen")
 if (OBOS_ARCHITECTURE STREQUAL "m68k")
 	add_subdirectory("src/oboskrnl/arch/m68k/loader")
 endif()

README.md

@@ -18,11 +18,11 @@ git clone https://github.com/OBOS-dev/obos.git
 3. Run cmake to build the OS
 (x86_64)
 ```sh
-mkdir build
-alias rem=eval
-cmake -GNinja -DCMAKE_BUILD_TYPE=Release --toolchain=src/build/x86_64/toolchain.cmake -B build .
-rem chmod +x dependencies/hyper/hyper_install-linux-x86_64
-cmake --build build
+cmake -GNinja -DCMAKE_BUILD_TYPE=Debug --toolchain=src/build/x86_64/toolchain.cmake -B build/x86_64 .
+chmod +x dependencies/hyper/hyper_install-linux-x86_64
+cmake --build build/x86_64
+scripts/generate_initrd-x86_64.sh
+cmake --build build/x86_64
 ```
 4. To run the kernel, run the script under scripts/launch_qemu.\[bat,sh\]
 

config/hyper.cfg

@@ -5,7 +5,7 @@ protocol=ultra
 higher-half-exclusive=true
 kernel-as-module=true
 video-mode=auto
-cmdline=''
+cmdline='-initrd-module=initrd -initrd-driver-module=initrd_driver --root-fs-partid initrd'
 
 binary:
 	path="/obos/oboskrnl"
@@ -22,5 +22,9 @@ module:
 	name="INITIAL_SWAP_BUFFER"
 module:
 	type="file"
-	path="/uart"
-	name="uart_driver"
+	path="/obos/initrd.tar"
+	name="initrd"
+module:
+	type="file"
+	path="/obos/initrd"
+	name="initrd_driver"

scripts/generate_initrd-x86_64.sh

@@ -0,0 +1,14 @@
+export old_pwd=$PWD
+if [[ ! -d tar ]]
+then
+    mkdir tar
+fi
+cd $(git rev-parse --show-toplevel)
+cp out/uart tar
+if [[ ! -d tar/dev ]]
+then
+    mkdir tar/dev
+fi
+cd tar
+tar -H ustar -cf ../config/initrd.tar *
+cd $old_pwd

scripts/launch_qemu-m68k.sh

@@ -11,6 +11,8 @@ qemu-system-m68k \
 -m 512M \
 -d int \
 -D qemu_log.txt \
--serial file:/dev/stdout
+-serial file:/dev/stdout \
+-append "--root-fs-uuid=initrd" \
+-initrd "config/initrd.tar"
 
 cd scripts

src/build/m68k/driver_link.ld

@@ -11,8 +11,8 @@ PHDRS
   interp PT_INTERP ;
   text PT_LOAD FILEHDR PHDRS ;
   data PT_LOAD ;
-  pageable_text PT_LOAD FLAGS(PF_R|PF_X|0x00010000);
-  pageable_data PT_LOAD FLAGS(PF_R|PF_W|0x00010000);
+  pageable_text PT_LOAD FLAGS(PF_X|PF_R|0x00010000);
+  pageable_data PT_LOAD FLAGS(PF_W|PF_R|0x00010000);
   dynamic PT_DYNAMIC ;
 }
 SECTIONS
@@ -194,6 +194,7 @@ SECTIONS
       pad the .data section.  */
    . = ALIGN(. != 0 ? 32 / 8 : 1);
   } :pageable_data
+  . = ALIGN(32 / 8);
   _end = .; PROVIDE (end = .);
   . = DATA_SEGMENT_END (.);
   /* Stabs debugging sections.  */

src/build/m68k/toolchain.cmake

@@ -59,6 +59,7 @@ add_compile_definitions(
 	OBOS_USER_ADDRESS_SPACE_BASE=0x1000 OBOS_USER_ADDRESS_SPACE_LIMIT=0x80000000
 	OBOS_TIMER_IS_DEADLINE=
 	OBOS_ARCH_USES_SOFT_FLOAT=1
+	OBOS_ARCH_EMULATED_IRQL=1
 )
 add_compile_options($<$<CONFIG:Debug>:-g>)
 

src/build/x86_64/toolchain.cmake

@@ -72,6 +72,7 @@ add_compile_definitions(
 	OBOS_KERNEL_ADDRESS_SPACE_BASE=0xffffff0000000000 OBOS_KERNEL_ADDRESS_SPACE_LIMIT=0xfffffffffffff000 
 	OBOS_USER_ADDRESS_SPACE_BASE=0x1000 OBOS_USER_ADDRESS_SPACE_LIMIT=0x7FFFFFFFFFFF
 	OBOS_ARCH_USES_SOFT_FLOAT=0
+	OBOS_ARCH_EMULATED_IRQL=0
 )
 add_compile_options($<$<CONFIG:Debug>:-g>)
 

src/drivers/generic/initrd/CMakeLists.txt

@@ -0,0 +1,32 @@
+# drivers/generic/initrd/CMakeLists.txt
+# 
+# Copyright (c) 2024 Omar Berrow
+
+add_executable(initrd "main.c" "parse.c")
+
+target_compile_options(initrd
+	PRIVATE $<$<COMPILE_LANGUAGE:C>:${TARGET_DRIVER_COMPILE_OPTIONS_C}>
+	PRIVATE $<$<COMPILE_LANGUAGE:C>:-ffreestanding>
+	PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wall>
+	PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wextra>
+	PRIVATE $<$<COMPILE_LANGUAGE:C>:-fstack-protector-all>
+	PRIVATE $<$<COMPILE_LANGUAGE:C>:-fno-builtin-memset>
+	PRIVATE $<$<COMPILE_LANGUAGE:C>:-fvisibility=hidden>
+	PRIVATE $<$<COMPILE_LANGUAGE:C>:-fPIC>
+)
+
+set_property(TARGET initrd PROPERTY link_depends ${DRIVER_LINKER_SCRIPT})
+
+target_include_directories(initrd 
+	PRIVATE "${CMAKE_SOURCE_DIR}/src/oboskrnl"
+	PRIVATE ${OBOSKRNL_EXTERNAL_INCLUDES})
+
+target_link_options(initrd
+	PRIVATE "-nostdlib"
+	PRIVATE "-Wl,-pic"
+	PRIVATE "-T${DRIVER_LINKER_SCRIPT}"
+	PRIVATE "-Wl,-shared"
+#	PRIVATE "-Wl,--allow-shlib-undefined"
+	PRIVATE ${TARGET_DRIVER_LINKER_OPTIONS}
+)
+target_compile_definitions(initrd PRIVATE OBOS_DRIVER=1)