Relearn

.clang-format

@@ -1,5 +1,6 @@
 BasedOnStyle: Google
 AccessModifierOffset: -4
+AlignArrayOfStructures: Left
 AlignConsecutiveAssignments: Consecutive
 AlignConsecutiveBitFields: AcrossEmptyLines
 AlignConsecutiveDeclarations: Consecutive

.github/workflows/ci.yml

@@ -34,13 +34,14 @@ jobs:
       - name: Build
         run: cmake --build ${BUILD_DIR}
 
-      # - name: Test
-      #   working-directory: build
-      #   run: ctest -V
-
-      - name: Test with Coverage
+      - name: Test
         working-directory: build
-        run: cmake --build ${BUILD_DIR} --target os_test_coverage
+        run: ctest -V
+
+      # TODO re-enable this once coverage is complete
+      # - name: Test with Coverage
+      #   working-directory: build
+      #   run: cmake --build ${BUILD_DIR} --target os_test_coverage
 
   lint:
     runs-on: ubuntu-latest

.gitignore

@@ -1,9 +1,9 @@
 *.bin
 *.o
 *.elf
+*.log
 
 build/
-drive/
 drive.img
 drive.tar
 qemu_log.txt

.vscode/c_cpp_properties.json

@@ -5,7 +5,8 @@
             "includePath": [
                 "${workspaceFolder}/src/**",
                 "${workspaceFolder}/tests/src/**",
-                "${workspaceFolder}/tests/build/_deps/fff-src"
+                "${workspaceFolder}/tests/build/_deps/fff-src",
+                "${workspaceFolder}/tests/build/_deps/googletest-src/googletest/include"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/gcc",

.vscode/launch.json

@@ -13,7 +13,9 @@
             "remote": true,
             "cwd": "${workspaceRoot}",
             "debugger_args": [
-                "-nx"
+                "-nx",
+                "-ex",
+                "add-symbol-file ${workspaceFolder}/build/src/apps/shell/shell.elf 0x400000"
             ],
             "valuesFormatting": "parseText",
             "preLaunchTask": "Run QEMU",

CMakeLists.txt

@@ -28,11 +28,15 @@ if(CMAKE_ASM_NASM_COMPILER_LOADED)
 endif()
 
 # Create config.h with project version numbers
-configure_File(cmake/config.h.in include/config.h)
+string(LENGTH "${PROJECT_SOURCE_DIR}/src/" FILE_PREFIX_LENGTH)
+configure_file(cmake/config.h.in include/config.h)
 include_directories(PRIVATE ${CMAKE_BINARY_DIR}/include)
 
 include(cmake/targets.cmake)
 
+# set KERNEL macro for build time
+add_compile_options(-DKERNEL)
+
 add_subdirectory(src)
 
 # ------------------------------------------------------------------------------

Makefile

@@ -10,16 +10,22 @@ QEMU = qemu-system-i386 -boot order=a
 
 # QEMUFLAGS = -m 4G -drive format=qcow2,file=drive.img -d int,cpu_reset -D qemu_log.txt -no-reboot
 # QEMUFLAGS = -m 1G -drive format=raw,file=drive.tar -d int,mmu -D qemu_log.txt -no-reboot -no-shutdown
-QEMUFLAGS = -m 1G -drive format=raw,file=build/os-image.bin,index=0,if=floppy -drive format=raw,file=build/apps.tar -d int,mmu -D qemu_log.txt -no-reboot -no-shutdown
+QEMUFLAGS = -m 1G \
+	-drive format=raw,file=build/os-image.bin,index=0,if=floppy \
+	-drive format=raw,file=build/apps.tar \
+	-d int,mmu \
+	-D qemu_log.txt \
+	-no-reboot -no-shutdown \
+	-chardev stdio,id=char0,logfile=kernel.log,signal=off -serial chardev:char0
 
 # ===============
 #  LAUNCH & UTIL
 # ===============
 setup:
-	cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
+	cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Debug
 
 build:
-	cmake --build build
+	cmake --build build -j
 
 run:
 	$(QEMU) $(QEMUFLAGS)
@@ -32,7 +38,7 @@ run-debug:
 
 debug:
 	$(QEMU) -s -S $(QEMUFLAGS) &
-	$(GDB) -ex "target remote localhost:1234" -ex "symbol-file build/src/kernel/kernel.elf" -ex "b kernel_main" -ex "b isr_handler"
+	$(GDB) -ex "target remote localhost:1234" -ex "symbol-file build/src/kernel/kernel.elf" -ex "add-symbol-file build/src/apps/foo/foo.elf" -ex "b kernel_main" -ex "b isr_handler"
 
 boot-debug:
 	$(QEMU) -s -S $(QEMUFLAGS) &

README.md

@@ -6,10 +6,11 @@ Active and planned work is tracked in [notes.md](notes.md)
 
 For current specs see
 
-- [memory.md](design/memory.md)
 - [boot.md](design/boot.md)
-- [system_call.md](design/system_call.md)
 - ~~[filesystem.md](design/filesystem.md)~~
+- [memory.md](design/memory.md)
+- [process.md](design/process.md)
+- [system_call.md](design/system_call.md)
 
 ## Goals
 
@@ -55,7 +56,7 @@ achieve these goals.
   - [x] Kernel Service Calls
 - [ ] Date and Time
 - [ ] Optional don't disable interrupts during interrupt (nested interrupts)
-- [ ] Better key event buffer (with mods) (maybe in addition to char buffer)
+- [x] Better key event buffer (with mods) (maybe in addition to char buffer)
 - [x] Change stdlib names with k prefix for namespace during testing
 - [ ] Optimize disk read to check if area already in buffer
 
@@ -85,8 +86,14 @@ there is enough support for their development.
 
 ## Setup
 
+You will need to install the gcc i386 elf cross compiler. This project expects
+this to be under `~/.local/opt/cross` but this can be changed by editing the
+root `CMakeLists.txt`. For instructions of how to build the i386 elf compiler
+from source, follow the instructions on the OS-Dev Wiki
+[GCC_Cross-Compiler](https://wiki.osdev.org/GCC_Cross-Compiler)
+
 ```sh
-git clone git@github.com:twh2898/os.git
+git clone git@github.com:automas-dev/os.git
 cd os
 make setup
 ```
@@ -119,38 +126,3 @@ make test_cov DARK_MODE=ON
 make lint
 make format
 ```
-
-### Format drive.img
-
-After creating the drive image with `make drive.img` you can format and mount it
-using the following.
-
-Setup file as drive
-
-```sh
-modprobe nbd max_part=63
-qemu-nbd -c /dev/nbd0 drive.img
-```
-
-Format drive
-
-```sh
-fdisk /dev/nbd0
-mkfs.fat -F32 /dev/nbd0p1
-```
-
-Fdisk commands should be `onp1  w`
-
-Mount the drive
-
-```sh
-mount /dev/nbd0p1 drive
-```
-
-Unmount the drive
-
-```sh
-umount drive
-qemu-nbd -d /dev/nbd0
-rmmod nbd
-```

archlinux/.gitignore

@@ -0,0 +1,2 @@
+*/*
+!*/PKGBUILD

archlinux/i386-elf-binutils/PKGBUILD

@@ -0,0 +1,49 @@
+# Maintainer: c0repwn3r <core@coredoes.dev>
+pkgname=i386-elf-binutils-local
+pkgver=2.40
+pkgrel=1
+epoch=
+pkgdesc="GNU binutils for the i386- toolchain"
+arch=(x86_64)
+url="https://www.gnu.org/software/binutils"
+license=('GPL')
+groups=(i386-elf-toolchain)
+makedepends=(gcc)
+depends=(xz)
+source=("http://ftpmirror.gnu.org/binutils/binutils-$pkgver.tar.xz")
+sha256sums=(0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1)
+
+build() {
+    PREFIX="$HOME/.local/opt/cross"
+    # Create temporary build dir
+    mkdir -p "i386-binutils-$pkgver-build"
+    cd "i386-binutils-$pkgver-build"
+
+    # Configure, we are building in seperate directory to cleanly seperate the binaries from the source
+    ../binutils-$pkgver/configure \
+    --prefix="$PREFIX" \
+    --target=i386-elf \
+    --with-sysroot \
+    --disable-nls \
+    --disable-werror \
+    --disable-multilib \
+    --enable-interwork
+
+    # Build
+    make
+}
+
+check() {
+    cd "i386-binutils-$pkgver-build"
+    make --keep-going check
+}
+
+package() {
+    PREFIX="$HOME/.local/opt/cross"
+    cd "i386-binutils-$pkgver-build"
+    #make install DESTDIR=$pkgdir
+    make install
+    # Remove conflicting files
+    rm -rf $pkgdir/usr/share/info
+    rm -rf $pkgdir/usr/lib/bfd-plugins
+}

archlinux/i386-elf-gcc/PKGBUILD

@@ -0,0 +1,55 @@
+# Maintainer: c0repwn3r <core@coredoes.dev>
+pkgname=i386-elf-gcc-local
+pkgver=12.2.0
+pkgrel=1
+epoch=
+pkgdesc="GNU gcc for the i386- toolchain"
+arch=(x86_64)
+url="https://www.gnu.org/software/gcc"
+license=('GPL')
+groups=(i386-elf-toolchain)
+makedepends=(gmp mpfr gcc)
+depends=(xz libmpc i386-elf-binutils-local)
+source=(
+    "http://ftpmirror.gnu.org/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz"
+)
+sha256sums=(
+    e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+)
+
+build() {
+    PREFIX="$HOME/.local/opt/cross"
+    # GCC build fails with format-security.
+    CFLAGS=${CFLAGS/-Werror=format-security/}
+    CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
+    # Create temporary build dir
+    mkdir -p "i386-gcc-$pkgver-build"
+    cd "i386-gcc-$pkgver-build"
+    # Configure, we are building in seperate directory to cleanly seperate the binaries from the source
+    ../gcc-$pkgver/configure \
+	--prefix="$PREFIX" \
+	--target=i386-elf \
+	--disable-nls \
+	--disable-werror \
+	--disable-multilib \
+	--without-headers \
+	--enable-languages=c,c++
+
+    # Build
+    make all-gcc
+    make all-target-libgcc
+}
+
+package() {
+    PREFIX="$HOME/.local/opt/cross"
+    cd "i386-gcc-$pkgver-build"
+    #make install-gcc DESTDIR=$pkgdir
+    #make install-target-libgcc DESTDIR=$pkgdir
+    #make install-gcc DESTDIR="$PREFIX"
+    #make install-target-libgcc DESTDIR="$PREFIX"
+    make install-gcc
+    make install-target-libgcc
+    # Remove conflicting files
+    rm -rf "$PREFIX/usr/share/info"
+    rm -rf "$PREFIX/usr/share/man/man7"
+}

archlinux/i386-elf-gdb/PKGBUILD

@@ -0,0 +1,41 @@
+# Maintainer: c0repwn3r <core@coredoes.dev>
+pkgname=i386-elf-gdb-local
+pkgver=11.1
+pkgrel=4
+epoch=
+pkgdesc="GNU debugger crosscompiled for i386 development"
+arch=(x86_64)
+url="https://www.gnu.org/software/gdb"
+license=('GPL')
+groups=(i386-elf-toolchain)
+makedepends=(gmp mpfr)
+depends=(xz libmpc i386-elf-gcc gdb) # GDB is included to prevent conflicts with it - otherwise this package won't function
+source=(
+    "http://ftpmirror.gnu.org/gdb/gdb-$pkgver.tar.xz"
+)
+sha256sums=(
+    cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+)
+OPTIONS=(!strip)
+
+build() {
+    PREFIX="$HOME/.local/opt/cross"
+    mkdir -p "i386-gdb-$pkgver-build"
+    cd "i386-gdb-$pkgver-build"
+    # Configure, we are building in seperate directory to cleanly seperate the binaries from the source
+    ../gdb-$pkgver/configure --target=i386-elf --prefix="$PREFIX" --program-prefix=i386-elf-
+
+    # Build
+    make
+}
+
+package() {
+    cd "i386-gdb-$pkgver-build"
+    #make install DESTDIR=$pkgdir
+    make install
+    # Remove conflicting files
+    rm -rf $pkgdir/usr/share/locale/
+    rm -rf $pkgdir/usr/share/gdb
+    rm -rf $pkgdir/usr/include/gdb
+    rm -rf $pkgdir/usr/share/info/dir
+}

cmake/config.h.in

@@ -5,3 +5,5 @@
 #define PROJECT_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@"
 #define PROJECT_VERSION_MINOR "@PROJECT_VERSION_MINOR@"
 #define PROJECT_VERSION_PATCH "@PROJECT_VERSION_PATCH@"
+#define SOME_ARBITRARY_VAR "@SOME_ARBITRARY_VAR@"
+#define FILE_PREFIX_LENGTH @FILE_PREFIX_LENGTH@

cmake/targets.cmake

@@ -24,8 +24,8 @@ function(cross_target_binary target)
         "-T${CMAKE_CURRENT_SOURCE_DIR}/link.ld"
         --oformat binary
         -o "${CMAKE_CURRENT_BINARY_DIR}/${target}.bin"
-        $<TARGET_FILE:${target}>
         --start-group
+        $<TARGET_FILE:${target}>
         ${TARGET_LINK_FILES}
         --end-group
         -nostdlib
@@ -39,8 +39,8 @@ function(cross_target_binary target)
         COMMAND ${CMAKE_LINKER}
         "-T${CMAKE_CURRENT_SOURCE_DIR}/link.ld"
         -o "${CMAKE_CURRENT_BINARY_DIR}/${target}.elf"
-        $<TARGET_FILE:${target}>
         --start-group
+        $<TARGET_FILE:${target}>
         ${TARGET_LINK_FILES}
         --end-group
         -nostdlib