Merge branch 'master' of https://github.com/EnderIce2/Fennix

[skip ci]

Signed-off-by: EnderIce2 <enderice2@protonmail.com>

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
-ko_fi: EnderIce2 # Replace with a single Ko-fi username
+ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

.github/workflows/codeql.yml

@@ -0,0 +1,86 @@
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '27 20 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      packages: read
+      actions: read
+      contents: read
+
+    defaults:
+      run:
+        shell: bash
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: c-cpp
+          build-mode: manual
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Check for cache
+      id: check-cache
+      run: |
+        if [ -z "${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}" ]; then
+          echo "No cache found, cancelling job."
+          exit 1
+        fi
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 0
+
+    - name: Install Packages
+      run: |
+        sudo apt update
+        sudo apt -y install rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo
+        make --quiet -C tools do_limine
+        make --quiet -C Drivers prepare
+        make --quiet -C Userspace prepare
+        make --quiet -C Kernel prepare
+
+    - name: Cache cross
+      id: cache-cross
+      uses: actions/cache@v3
+      with:
+        path: tools/cross
+        key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
+
+    - name: Build OS
+      run: |
+        make build_userspace
+        make build_drivers
+        make build_kernel
+        make build_userspace
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/docs.yml

@@ -0,0 +1,34 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  deploydoc:
+    name: Deploy Documentation to GitHub Pages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Update System
+        run: sudo apt update
+
+      - name: Install Doxygen
+        run: sudo apt -y install doxygen make
+
+      - name: Generate Documentation
+        run: make doxygen
+
+      - name: Copy GitHub Pages Website
+        run: cp -r tools/website/* doxygen-doc/
+
+      - name: Deploy documentation
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: doxygen-doc

.github/workflows/makefile.yml

@@ -7,218 +7,114 @@ on:
     branches: [ master ]
 
 jobs:
-  deploydoc:
-    name: Deploy Documentation to GitHub Pages
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install Doxygen
-        run: sudo apt-get install doxygen make -y
-
-      - name: Generate Documentation
-        run: make doxygen
-
-      - name: Copy GitHub Pages Website
-        run: cp -r tools/website/* doxygen-doc/
-
-      - name: Deploy documentation
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          folder: doxygen-doc
-
   buildcompiler:
     name: Build Cross-Compiler & Toolchain
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Cache cross Folder
       id: cache-cross
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: tools/cross
         key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
 
     - name: Update System
       if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: sudo apt-get update
+      run: sudo apt update
 
     - name: Install GCC Dependencies
       if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: sudo apt install build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo libzstd-dev libisl-dev autoconf m4 automake gettext gperf dejagnu guile-3.0 guile-3.0-dev expect tcl autogen tex-common sphinx-common git ssh diffutils patch -y
+      run: sudo apt -y install build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo libzstd-dev libisl-dev m4 automake gettext gperf dejagnu guile-3.0 guile-3.0-dev expect tcl autogen tex-common sphinx-common git ssh diffutils patch autoconf2.69 libtool wget dpkg
+
+    - name: Check autoconf
+      if: steps.cache-cross.outputs.cache-hit != 'true'
+      run: |
+        if [ "$(autoconf --version | head -n 1 | awk '{print $NF}')" != "2.69" ]; then
+          echo "Autoconf version is not 2.69, performing additional steps..."
+          wget https://launchpad.net/ubuntu/+archive/primary/+files/autoconf_2.69-11.1_all.deb
+          sudo dpkg --force-all -i ./autoconf_2.69-11.1_all.deb
+        fi
+
+    - name: Check automake
+      if: steps.cache-cross.outputs.cache-hit != 'true'
+      run: |
+        if [ "$(automake --version | head -n 1 | awk '{print $NF}')" != "1.15.1" ]; then
+          echo "Automake version is not 1.15.1, performing additional steps..."
+          wget https://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.gz
+          tar -xzf automake-1.15.1.tar.gz
+          cd automake-1.15.1
+          ./configure
+          make
+          sudo make install
+        fi
 
     - name: Clone All
       if: steps.cache-cross.outputs.cache-hit != 'true'
       run: make --quiet -C tools __clone_all_no_qemu
 
-    - name: Compile Binutils amd64
+    - name: Compile Binutils
       if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: make --quiet -C tools do_binutils_64
+      run: make --quiet -C tools do_binutils
 
-    - name: Compile Binutils i386
+    - name: Compile GCC
       if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: make --quiet -C tools do_binutils_32
+      run: make --quiet -C tools do_gcc
-
-    - name: Compile GCC amd64
-      if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: make --quiet -C tools do_gcc_64
-
-    - name: Compile GCC i386
-      if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: make --quiet -C tools do_gcc_32
 
     - name: Clean Up
       if: steps.cache-cross.outputs.cache-hit != 'true'
       run: |
         cd tools
-        rm -rf binutils-gdb gcc build-binutils64 build-gcc64 build-binutils32 build-gcc32
+        rm -rf binutils-gdb gcc
-
-  compilegnuefi:
-    name: Build GNU-EFI
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Cache gnu-efi Folder
-      id: cache-gnuefi
-      uses: actions/cache@v3
-      with:
-        path: Lynx/gnu-efi
-        key: ${{ runner.os }}-gnuefi-${{ hashFiles('Lynx/Makefile') }}
-
-    - name: Update System
-      if: steps.cache-gnuefi.outputs.cache-hit != 'true'
-      run: sudo apt-get update
-
-    - name: Install MinGW compiler
-      if: steps.cache-gnuefi.outputs.cache-hit != 'true'
-      run: sudo apt-get install make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y
-
-    - name: Get GNU-EFI source code and compile it
-      if: steps.cache-gnuefi.outputs.cache-hit != 'true'
-      run: make --quiet -C Lynx prepare
-
-  analyze:
-    name: Analyze with CodeQL
-    runs-on: ubuntu-latest
-    needs: [buildcompiler, compilegnuefi]
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-
-    - name: Install Packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo -y
-        make --quiet -C tools do_limine
-        make --quiet -C Drivers prepare
-        make --quiet -C Userspace prepare
-        make --quiet -C Lynx prepare
-        make --quiet -C Kernel prepare
-
-    - name: Cache cross
-      id: cache-cross
-      uses: actions/cache@v3
-      with:
-        path: tools/cross
-        key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
-
-    - name: Cache gnuefi
-      id: cache-gnuefi
-      uses: actions/cache@v3
-      with:
-        path: Lynx/gnu-efi
-        key: ${{ runner.os }}-gnuefi-${{ hashFiles('Lynx/Makefile') }}
-
-    - name: Build OS
-      run: |
-        make build_lynx
-        make build_userspace
-        make build_drivers
-        make build_kernel
-        make build_userspace
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
 
   compile64:
     name: Build amd64
     runs-on: ubuntu-latest
-    needs: [buildcompiler, compilegnuefi]
+    needs: [buildcompiler]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Update & Install Required Packages
       run: |
-        sudo apt-get update
+        sudo apt update
-        sudo apt-get install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y
+        sudo apt install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y
         make --quiet -C tools do_limine
         make --quiet -C Drivers prepare
         make --quiet -C Userspace prepare
-        make --quiet -C Lynx prepare
         make --quiet -C Kernel prepare
 
     - name: Cache cross Folder
       id: cache-cross
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: tools/cross
         key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
 
-    - name: Cache gnu-efi Folder
+    - name: Configure config.mk
-      id: cache-gnuefi
+      run: sed -i 's/.*OSARCH = .*/OSARCH = amd64/' ./config.mk && cat config.mk | grep OSARCH
-      uses: actions/cache@v3
-      with:
-        path: Lynx/gnu-efi
-        key: ${{ runner.os }}-gnuefi-${{ hashFiles('Lynx/Makefile') }}
-
-    - name: Configure Makefile.conf
-      run: sed -i 's/.*OSARCH = .*/OSARCH = amd64/' ./Makefile.conf && cat Makefile.conf | grep OSARCH
 
     - name: Compile Debug and Release ISO
       run: |
         make build
         mv Fennix.iso Fennix-debug.iso
         make clean
-        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./Makefile.conf && cat Makefile.conf | grep DEBUG
+        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
         make build
         mv Fennix.iso Fennix-release.iso
 
     - name: Upload Artifact (Fennix-debug.iso)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Fennix-amd64-debug
         path: Fennix-debug.iso
 
     - name: Upload Artifact (Fennix-release.iso)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Fennix-amd64-release
         path: Fennix-release.iso
@@ -226,114 +122,97 @@ jobs:
   compile32:
     name: Build i386
     runs-on: ubuntu-latest
-    needs: [buildcompiler, compilegnuefi]
+    needs: [buildcompiler]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Update & Install Required Packages
       run: |
-        sudo apt-get update
+        sudo apt update
-        sudo apt-get install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y
+        sudo apt install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y
         make --quiet -C tools do_limine
         make --quiet -C Drivers prepare
         make --quiet -C Userspace prepare
-        make --quiet -C Lynx prepare
         make --quiet -C Kernel prepare
 
     - name: Cache cross Folder
       id: cache-cross
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: tools/cross
         key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
 
-    - name: Cache gnu-efi Folder
+    - name: Configure config.mk
-      id: cache-gnuefi
+      run: sed -i 's/.*OSARCH = .*/OSARCH = i386/' ./config.mk && cat config.mk | grep OSARCH
-      uses: actions/cache@v3
-      with:
-        path: Lynx/gnu-efi
-        key: ${{ runner.os }}-gnuefi-${{ hashFiles('Lynx/Makefile') }}
-
-    - name: Configure Makefile.conf
-      run: sed -i 's/.*OSARCH = .*/OSARCH = i386/' ./Makefile.conf && cat Makefile.conf | grep OSARCH
 
     - name: Compile Debug and Release ISO
       run: |
         make build
         mv Fennix.iso Fennix-debug.iso
         make clean
-        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./Makefile.conf && cat Makefile.conf | grep DEBUG
+        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
         make build
         mv Fennix.iso Fennix-release.iso
 
     - name: Upload Artifact (Fennix-debug.iso)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Fennix-i386-debug
         path: Fennix-debug.iso
 
     - name: Upload Artifact (Fennix-release.iso)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Fennix-i386-release
         path: Fennix-release.iso
 
   compilearm64:
-    if: ${{ false }} # Disabled until we can get it to work
     name: Build aarch64
     runs-on: ubuntu-latest
-    needs: [buildcompiler, compilegnuefi]
+    needs: [buildcompiler]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Update & Install Required Packages
       run: |
-        sudo apt-get update
+        sudo apt update
-        sudo apt-get install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y
+        sudo apt install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y
         make --quiet -C tools do_limine
         make --quiet -C Drivers prepare
         make --quiet -C Userspace prepare
-        make --quiet -C Lynx prepare
         make --quiet -C Kernel prepare
 
     - name: Cache cross Folder
       id: cache-cross
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: tools/cross
         key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
 
-    - name: Cache gnu-efi Folder
+    - name: Configure config.mk
-      id: cache-gnuefi
+      run: sed -i 's/.*OSARCH = .*/OSARCH = aarch64/' ./config.mk && cat config.mk | grep OSARCH
-      uses: actions/cache@v3
-      with:
-        path: Lynx/gnu-efi
-        key: ${{ runner.os }}-gnuefi-${{ hashFiles('Lynx/Makefile') }}
-
-    - name: Configure Makefile.conf
-      run: sed -i 's/.*OSARCH = .*/OSARCH = aarch64/' ./Makefile.conf && cat Makefile.conf | grep OSARCH
 
     - name: Compile Debug and Release ISO
       run: |
         make build
         mv Fennix.iso Fennix-debug.iso
         make clean
-        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./Makefile.conf && cat Makefile.conf | grep DEBUG
+        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
         make build
         mv Fennix.iso Fennix-release.iso
 
     - name: Upload Artifact (Fennix-debug.iso)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Fennix-aarch64-debug
         path: Fennix-debug.iso
 
     - name: Upload Artifact (Fennix-release.iso)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Fennix-aarch64-release
         path: Fennix-release.iso

.github/workflows/sonarcloud.yml

@@ -0,0 +1,67 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# This workflow helps you trigger a SonarCloud analysis of your code and populates
+# GitHub Code Scanning alerts with the vulnerabilities found.
+# Free for open source project.
+
+# 1. Login to SonarCloud.io using your GitHub account
+
+# 2. Import your project on SonarCloud
+#     * Add your GitHub organization first, then add your repository as a new project.
+#     * Please note that many languages are eligible for automatic analysis,
+#       which means that the analysis will start automatically without the need to set up GitHub Actions.
+#     * This behavior can be changed in Administration > Analysis Method.
+#
+# 3. Follow the SonarCloud in-product tutorial
+#     * a. Copy/paste the Project Key and the Organization Key into the args parameter below
+#          (You'll find this information in SonarCloud. Click on "Information" at the bottom left)
+#
+#     * b. Generate a new token and add it to your Github repository's secrets using the name SONAR_TOKEN
+#          (On SonarCloud, click on your avatar on top-right > My account > Security
+#           or go directly to https://sonarcloud.io/account/security/)
+
+# Feel free to take a look at our documentation (https://docs.sonarcloud.io/getting-started/github/)
+# or reach out to our community forum if you need some help (https://community.sonarsource.com/c/help/sc/9)
+
+name: SonarCloud analysis
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  workflow_dispatch:
+
+permissions:
+  pull-requests: read # allows SonarCloud to decorate PRs with analysis results
+
+jobs:
+  Analysis:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Analyze with SonarCloud
+
+        # You can pin the exact commit or the version.
+        # uses: SonarSource/sonarcloud-github-action@v2.2.0
+        uses: SonarSource/sonarcloud-github-action@4006f663ecaf1f8093e8e4abb9227f6041f52216
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}   # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret)
+        with:
+          # Additional arguments for the SonarScanner CLI
+          args:
+            # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu)
+            # mandatory
+            -Dsonar.projectKey=EnderIce2_Fennix
+            -Dsonar.organization=enderice2
+            # Comma-separated paths to directories containing main source files.
+            #-Dsonar.sources= # optional, default is project base directory
+            # Comma-separated paths to directories containing test source files.
+            #-Dsonar.tests= # optional. For more info about Code Coverage, please refer to https://docs.sonarcloud.io/enriching/test-coverage/overview/
+            # Adds more detail to both client and server-side analysis logs, activating DEBUG mode for the scanner, and adding client-side environment variables and system properties to the server-side log of analysis report processing.
+            #-Dsonar.verbose= # optional, default is false
+          # When you need the analysis to take place in a directory other than the one from which it was launched, default is .
+          projectBaseDir: .

.gitignore

@@ -6,14 +6,16 @@ tools/*
 !tools/ExtMemDbg
 !tools/stage2_eltorito
 !tools/*.md
-!tools/*.css
 !tools/README.md
 !tools/website
 !tools/Makefile
 !tools/*.c
+!tools/*.patch
 !tools/*.cpp
 !tools/*.cfg
-!tools/SSDT1.dat
+!tools/acpi
+!tools/doxygen
+!tools/.gdbinit
 doxygen-doc
 initrd.tar
 .dccache
@@ -28,3 +30,4 @@ initrd.tar
 *.so
 *.o
 *.dmp
+*.pcap

.gitlab-ci.yml

@@ -87,11 +87,11 @@ build64:
     - make --quiet -C Userspace prepare
     - make --quiet -C Lynx prepare
     - make --quiet -C Kernel prepare
-    - sed -i 's/.*OSARCH = .*/OSARCH = amd64/' ./Makefile.conf && cat Makefile.conf | grep OSARCH
+    - sed -i 's/.*OSARCH = .*/OSARCH = amd64/' ./config.mk && cat config.mk | grep OSARCH
     - make build
     - mv Fennix.iso Fennix-debug.iso
     - make clean
-    - sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./Makefile.conf && cat Makefile.conf | grep DEBUG
+    - sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
     - make build
     - mv Fennix.iso Fennix-release.iso
   artifacts:
@@ -111,11 +111,11 @@ build32:
     - make --quiet -C Userspace prepare
     - make --quiet -C Lynx prepare
     - make --quiet -C Kernel prepare
-    - sed -i 's/.*OSARCH = .*/OSARCH = i386/' ./Makefile.conf && cat Makefile.conf | grep OSARCH
+    - sed -i 's/.*OSARCH = .*/OSARCH = i386/' ./config.mk && cat config.mk | grep OSARCH
     - make build
     - mv Fennix.iso Fennix-debug.iso
     - make clean
-    - sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./Makefile.conf && cat Makefile.conf | grep DEBUG
+    - sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
     - make build
     - mv Fennix.iso Fennix-release.iso
   artifacts:
@@ -134,11 +134,11 @@ buildarm64:
     - make --quiet -C Userspace prepare
     - make --quiet -C Lynx prepare
     - make --quiet -C Kernel prepare
-    - sed -i 's/.*OSARCH = .*/OSARCH = arm64/' ./Makefile.conf && cat Makefile.conf | grep OSARCH
+    - sed -i 's/.*OSARCH = .*/OSARCH = arm64/' ./config.mk && cat config.mk | grep OSARCH
     - make build
     - mv Fennix.iso Fennix-debug.iso
     - make clean
-    - sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./Makefile.conf && cat Makefile.conf | grep DEBUG
+    - sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
     - make build
     - mv Fennix.iso Fennix-release.iso
   artifacts:

.vscode/c_boilerplates.code-snippets

@@ -1,20 +0,0 @@
-{
-	"Fennix Kernel Header": {
-		"scope": "c",
-		"prefix": [
-			"head",
-		],
-		"body": [
-			"#ifndef __FENNIX_KERNEL_${2:header}_H__",
-			"#define __FENNIX_KERNEL_${2:header}_H__",
-			"",
-			"#include <types.h>",
-			"",
-			"$0",
-			"",
-			"#endif // !__FENNIX_KERNEL_${2:header}_H__",
-			""
-		],
-		"description": "Create kernel header."
-	}
-}

.vscode/launch.json

@@ -0,0 +1,69 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Launch QEMU & debug the kernel",
+			"type": "cppdbg",
+			"request": "launch",
+			"program": "${workspaceFolder}/../Kernel/fennix.elf",
+			"cwd": "${workspaceFolder}",
+			"args": [],
+			"targetArchitecture": "x64",
+			"MIMode": "gdb",
+			"miDebuggerServerAddress": "/tmp/gdb-fennix",
+			"miDebuggerPath": "${workspaceFolder}/../tools/cross/bin/x86_64-fennix-gdb",
+			"miDebuggerArgs": "",
+			"externalConsole": false,
+			"additionalSOLibSearchPath": "${workspaceFolder}",
+			"internalConsoleOptions": "neverOpen",
+			"customLaunchSetupCommands": [
+				// {
+				// 	"text": "target remote localhost:1234",
+				// 	"description": "Connect to QEMU remote debugger"
+				// }
+			],
+			"setupCommands": [
+				{
+					"description": "Enable pretty-printing for gdb",
+					"text": "-enable-pretty-printing",
+					"ignoreFailures": true
+				},
+				{
+					"text": "set breakpoint pending on",
+					"description": "Make breakpoint pending on future shared library load."
+				},
+				{
+					"text": "file ${workspaceFolder}/../Kernel/fennix.elf",
+					"description": "Load binary"
+				},
+				{
+					"text": "add-symbol-file ${workspaceFolder}/../initrd_tmp_data/bin/utest",
+					"description": "Load /bin/utest",
+					"ignoreFailures": true
+				},
+				{
+					"text": "source ${workspaceFolder}/../tools/.gdbinit"
+				}
+			],
+			"preLaunchTask": "launch-qemu"
+		},
+		{
+			"type": "gdb",
+			"request": "attach",
+			"name": "Launch QEMU & attach to gdbserver",
+			"executable": "${workspaceFolder}/../Kernel/fennix.elf",
+			"target": "/tmp/gdb-fennix",
+			"remote": true,
+			"cwd": "${workspaceRoot}",
+			"valuesFormatting": "parseText",
+			"gdbpath": "${workspaceFolder}/../tools/cross/bin/x86_64-fennix-gdb",
+			"autorun": [
+				"set auto-load safe-path ${workspaceFolder}",
+				"source ${workspaceFolder}/../tools/.gdbinit",
+			],
+			"internalConsoleOptions": "neverOpen",
+			"printCalls": false,
+			"preLaunchTask": "launch-qemu"
+		},
+	]
+}

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-    "C_Cpp.errorSquiggles": "Enabled",
+    "C_Cpp.errorSquiggles": "enabled",
     "C_Cpp.autocompleteAddParentheses": true,
     "C_Cpp.codeAnalysis.clangTidy.enabled": true,
     "C_Cpp.clang_format_style": "Visual Studio",
@@ -11,16 +11,10 @@
     "editor.cursorSmoothCaretAnimation": "on",
     "files.watcherExclude": {
         "**/tools/binutils-gdb/**": true,
-        "**/tools/build-binutilsamd64/**": true,
-        "**/tools/build-binutilsarm64/**": true,
-        "**/tools/build-binutilsi386/**": true,
-        "**/tools/build-gccamd64/**": true,
-        "**/tools/build-gccarm64/**": true,
-        "**/tools/build-gcci386/**": true,
-        "**/tools/cross/**": true,
         "**/tools/gcc/**": true,
         "**/tools/limine/**": true,
         "**/tools/qemu/**": true,
+        "**/tools/cross/**": true,
         "**/doxygen-doc/**": true,
     }
 }

.vscode/tasks.json

@@ -0,0 +1,28 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "launch-qemu",
+			"type": "shell",
+			"command": "make -C ../ build && make -C ../ vscode_debug_only",
+			"isBackground": true,
+			"problemMatcher": [],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		}
+	]
+}

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+enderice2@protonmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -0,0 +1,70 @@
+# Contributing to Fennix
+
+We welcome contributions to Fennix! Whether you are reporting a bug, suggesting a feature, or submitting a pull request, we’re excited to collaborate with you.
+
+## Table of Contents
+- [How to Contribute](#how-to-contribute)
+- [Code of Conduct](#code-of-conduct)
+- [Getting Started](#getting-started)
+- [Pull Request Guidelines](#pull-request-guidelines)
+- [Reporting Issues](#reporting-issues)
+- [Style Guide](#style-guide)
+
+---
+
+## How to Contribute
+
+1. **Check existing issues or discussions** to see if your idea has already been mentioned or if someone is already working on it.
+2. If you’re new to the project, consider contributing to [good first issues](https://github.com/EnderIce2/Fennix/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
+3. Fork the repository and create a new branch for your changes.
+
+---
+
+## Code of Conduct
+
+By participating in this project, you agree to abide by our [Code of Conduct](CODE_OF_CONDUCT.md). Be respectful and inclusive while interacting with the community.
+
+---
+
+## Getting Started
+
+1. Fork this repository and clone your fork.
+2. Set up your development environment according to the [README.md](README.md) or any other setup guide provided.
+3. Ensure all tests pass before submitting changes. Add tests for new features where applicable.
+
+---
+
+## Pull Request Guidelines
+
+1. Keep pull requests focused on a single issue or feature.
+2. Write clear, descriptive commit messages.
+3. Ensure all tests pass before submitting your PR.
+4. Include a detailed description of your changes and reference any relevant issue numbers.
+5. Be open to feedback and revise your pull request if requested.
+6. Mark your pull request as a draft if it’s still a work in progress.
+
+---
+
+## Reporting Issues
+
+1. Check if the issue has already been reported.
+2. Include a clear and descriptive title.
+3. Provide detailed steps to reproduce the problem (if applicable).
+4. Mention your environment details (e.g., OS, version, etc.).
+5. Attach screenshots or logs if they help explain the issue.
+
+---
+
+## Style Guide
+
+Follow the coding style used in the repository to ensure consistency. Adhere to:
+- Use CamelCase for all names.
+- Start function and global declaration names with an uppercase letter.
+- Start local variable names with a lowercase letter.
+- Maintain consistent formatting and commenting guidelines.
+
+Refer to the [style guide document](STYLE_GUIDE.md) if available.
+
+---
+
+Thank you for contributing! Your effort makes Fennix better for everyone. If you have any questions, feel free to reach out by opening an issue or joining our discussions.

Doxyfile

@@ -44,14 +44,14 @@ PROJECT_NUMBER         = 1.0.0
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Opeating System from scratch made in C and C++"
+PROJECT_BRIEF          = "Full Documentation"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           =
+PROJECT_LOGO           = tools/doxygen/favicon.ico
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -246,7 +246,7 @@ INHERIT_DOCS           = YES
 # of the file/class/namespace that contains it.
 # The default value is: NO.
 
-SEPARATE_MEMBER_PAGES  = YES
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
 # uses this value to replace tabs by spaces in code fragments.
@@ -424,7 +424,7 @@ SUBGROUPING            = YES
 # SEPARATE_MEMBER_PAGES.
 # The default value is: NO.
 
-INLINE_GROUPED_CLASSES = YES
+INLINE_GROUPED_CLASSES = NO
 
 # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
 # with only public data fields or simple typedef fields will be shown inline in
@@ -614,7 +614,7 @@ HIDE_COMPOUND_REFERENCE= NO
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
-SHOW_INCLUDE_FILES     = YES
+SHOW_INCLUDE_FILES     = NO
 
 # If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
 # grouped member an include statement to the documentation, telling the reader
@@ -794,7 +794,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = NO
+QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
@@ -864,7 +864,14 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = Kernel Lynx Userspace Drivers tools/doxymds/main.md
+INPUT                  = tools/doxygen/index.md \
+                         tools/doxygen/api.md \
+                         tools/doxygen/develop.md \
+                         README \
+                         Userspace/README.md \
+                         Drivers/README.md \
+                         Kernel/README.md \
+                         Kernel/include/interface
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -955,7 +962,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = .vscode tools
+EXCLUDE                = .vscode .github
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1064,7 +1071,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE = tools/doxymds/main.md
+USE_MDFILE_AS_MAINPAGE = tools/doxygen/index.md
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1224,7 +1231,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = doxygen-doc/fulldoc
+HTML_OUTPUT            = doxygen-doc/docs
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
@@ -1251,7 +1258,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            =
+HTML_HEADER            = tools/doxygen/header.html
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1286,7 +1293,8 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = tools/doxygen-awesome.css tools/custom.css
+HTML_EXTRA_STYLESHEET  = tools/doxygen/theme/doxygen-awesome.css \
+                         tools/doxygen/custom.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1296,7 +1304,11 @@ HTML_EXTRA_STYLESHEET  = tools/doxygen-awesome.css tools/custom.css
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       =
+HTML_EXTRA_FILES       = tools/doxygen/theme/doxygen-awesome-darkmode-toggle.js \
+                         tools/doxygen/theme/doxygen-awesome-fragment-copy-button.js \
+                         tools/doxygen/theme/doxygen-awesome-paragraph-link.js \
+                         tools/doxygen/theme/doxygen-awesome-interactive-toc.js \
+                         tools/doxygen/theme/doxygen-awesome-tabs.js
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
@@ -1335,7 +1347,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_TIMESTAMP         = NO
+HTML_TIMESTAMP         = YES
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
@@ -2071,7 +2083,7 @@ MAN_OUTPUT             = man
 # The default value is: .3.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 
-MAN_EXTENSION          = .3
+MAN_EXTENSION          = .2
 
 # The MAN_SUBDIR tag determines the name of the directory created within
 # MAN_OUTPUT in which the man pages are placed. If defaults to man followed by

Drivers/.vscode/c_cpp_properties.json

@@ -12,7 +12,6 @@
                 "KERNEL_VERSION=\"1.0\"",
                 "GIT_COMMIT=\"0000000000000000000000000000000000000000\"",
                 "GIT_COMMIT_SHORT=\"0000000\"",
-                "a64",
                 "DEBUG=\"1\""
             ],
             "compilerPath": "${workspaceFolder}/../tools/cross/bin/x86_64-fennix-gcc",
@@ -69,7 +68,6 @@
                 "KERNEL_VERSION=\"1.0\"",
                 "GIT_COMMIT=\"0000000000000000000000000000000000000000\"",
                 "GIT_COMMIT_SHORT=\"0000000\"",
-                "a32",
                 "DEBUG=\"1\""
             ],
             "compilerPath": "${workspaceFolder}/../tools/cross/bin/i386-elf-gcc",

Drivers/.vscode/launch.json

@@ -0,0 +1 @@
+../../.vscode/launch.json

Drivers/.vscode/tasks.json

@@ -0,0 +1 @@
+../../.vscode/tasks.json

Drivers/LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2022, EnderIce2
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Drivers/Makefile

@@ -1,3 +1,48 @@
+default:
+	$(error Do not run this Makefile directly!)
+
+export CC := $(__CONF_CC)
+export CXX := $(__CONF_CXX)
+export LD := $(__CONF_LD)
+export AS := $(__CONF_AS)
+export OBJDUMP := $(__CONF_OBJDUMP)
+
+export OUTPUT_DIR := $(CURDIR)/out/
+export INCLUDE_DIR := $(CURDIR)/include
+
+DRIVER_LDFLAGS = -nostdlib -nodefaultlibs -nolibc -zmax-page-size=0x1000	\
+			-Wl,-Map file.map -fvisibility=hidden -Wl,--dynamic-linker=/boot/fennix.elf
+
+ifeq ($(OSARCH), amd64)
+DRIVER_CFLAGS = -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
+		  -mno-red-zone -mno-sse -mno-sse2							\
+		  -march=x86-64 -pipe -ffunction-sections					\
+		  -msoft-float -fno-builtin
+
+else ifeq ($(OSARCH), i386)
+DRIVER_CFLAGS = -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
+		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections		\
+		  -march=i386 -pipe -msoft-float -fno-builtin
+else ifeq ($(OSARCH), aarch64)
+DRIVER_CFLAGS = -pipe -fno-builtin -fPIC
+endif
+
+DRIVER_CFLAGS += -I$(CURDIR)/include
+
+ifeq ($(DEBUG), 1)
+	DRIVER_CFLAGS += -DDEBUG -ggdb3 -O0 -fdiagnostics-color=always -fstack-usage
+ifeq ($(OSARCH), amd64)
+	DRIVER_CFLAGS += -fverbose-asm
+endif
+ifneq ($(OSARCH), aarch64)
+	DRIVER_CFLAGS += -fstack-check
+endif
+	DRIVER_LDFLAGS += -ggdb3 -O0
+endif
+
+export DRIVER_LDFLAGS
+export DRIVER_CFLAGS
+
 build:
 	cp -rf ../Kernel/include/interface/* include/
 	mkdir -p out

Drivers/README.md

@@ -1,11 +1 @@
 # Drivers
-
-Drivers for [Fennix](https://github.com/Fennix-Project/Fennix).
-
----
-
-Use `Fennix` repo to build the operating system.
-
-```bash
-git clone --recurse-submodules https://github.com/Fennix-Project/Fennix.git
-```

Drivers/audio/Makefile

@@ -1,7 +1,9 @@
-build:
+MAKE_TARGETS := build clean
-	make -C ac97 build
+DIRECTORIES := $(sort $(dir $(wildcard ./*/)))
-	make -C hda build
 
-clean:
+.PHONY: $(MAKE_TARGETS) $(DIRECTORIES)
-	make -C ac97 clean
+
-	make -C hda clean
+$(MAKE_TARGETS): $(DIRECTORIES)
+
+$(DIRECTORIES):
+	$(MAKE) -C $@ $(MAKECMDGOALS)

Drivers/audio/ac97/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = ac97.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/audio/hda/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = hda.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/config.mk

@@ -1,54 +0,0 @@
-CC = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)gcc
-CPP = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)g++
-LD = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)ld
-AS = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)as
-OBJDUMP = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)objdump
-
-DRIVER_LDFLAGS := -nostdlib -nodefaultlibs -nolibc -zmax-page-size=0x1000	\
-			-Wl,-Map file.map -fvisibility=hidden -Wl,--dynamic-linker=/boot/fennix.elf
-
-ifeq ($(OSARCH), amd64)
-
-DRIVER_CFLAGS := -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
-		  -mno-red-zone -mno-sse -mno-sse2							\
-		  -march=x86-64 -pipe -ffunction-sections					\
-		  -msoft-float -fno-builtin
-
-else ifeq ($(OSARCH), i386)
-
-DRIVER_CFLAGS := -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
-		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections		\
-		  -march=i386 -pipe -msoft-float -fno-builtin
-
-else ifeq ($(OSARCH), aarch64)
-
-DRIVER_CFLAGS += -pipe -fno-builtin -fPIC
-
-endif
-
-DRIVER_CFLAGS += -I../../include
-
-ifeq ($(DEBUG), 1)
-	DRIVER_CFLAGS += -DDEBUG -ggdb3 -O0 -fdiagnostics-color=always -fstack-usage
-ifeq ($(OSARCH), amd64)
-	DRIVER_CFLAGS += -fverbose-asm
-endif
-ifneq ($(OSARCH), aarch64)
-	DRIVER_CFLAGS += -fstack-check
-endif
-	DRIVER_LDFLAGS += -ggdb3 -O0
-endif
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CPP) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<

Drivers/filesystem/Makefile

@@ -1,5 +1,9 @@
-build:
+MAKE_TARGETS := build clean
-	make -C fat build
+DIRECTORIES := $(sort $(dir $(wildcard ./*/)))
 
-clean:
+.PHONY: $(MAKE_TARGETS) $(DIRECTORIES)
-	make -C fat clean
+
+$(MAKE_TARGETS): $(DIRECTORIES)
+
+$(DIRECTORIES):
+	$(MAKE) -C $@ $(MAKECMDGOALS)

Drivers/filesystem/fat/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = fat.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/include/aip.h

@@ -1,18 +1,18 @@
 /*
-	This file is part of Fennix Drivers.
+	This file is part of Fennix Kernel.
 
-	Fennix Drivers is free software: you can redistribute it and/or
+	Fennix Kernel is free software: you can redistribute it and/or
 	modify it under the terms of the GNU General Public License as
 	published by the Free Software Foundation, either version 3 of
 	the License, or (at your option) any later version.
 
-	Fennix Drivers is distributed in the hope that it will be useful,
+	Fennix Kernel is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
+	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
 */
 
 #ifndef __FENNIX_API_AIP_H__

Drivers/include/errno.h

@@ -15,8 +15,8 @@
 	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef __FENNIX_KERNEL_ERRNO_H__
+#ifndef __FENNIX_API_ERRNO_H__
-#define __FENNIX_KERNEL_ERRNO_H__
+#define __FENNIX_API_ERRNO_H__
 
 /**
  * The documentation for these error codes are from:
@@ -416,8 +416,8 @@ typedef enum
 	 * Not a directory. A component of the specified pathname exists, but
 	 *  it is not a directory, when a directory was expected; or an
 	 *  attempt was made to create a non-directory file, and the specified
-	 *  pathname contains at least one non- <slash> character and ends
+	 *  pathname contains at least one non- \<slash\> character and ends
-	 *  with one or more trailing <slash> characters.
+	 *  with one or more trailing \<slash\> characters.
 	 */
 	ENOTDIR = 57,
 
@@ -588,17 +588,18 @@ typedef enum
 	__ERRNO_MAX
 } KernelErrors;
 
-#include <types.h>
-EXTERNC int *__errno_location(void) __attribute__((const));
-#define errno (*__errno_location())
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
+
+	int *__errno_location(void) __attribute__((const));
 	char *strerror(int errnum);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif // !__FENNIX_KERNEL_ERRNO_H__
+#define errno (*__errno_location())
+
+#endif // !__FENNIX_API_ERRNO_H__

Drivers/include/fs.h

@@ -348,6 +348,7 @@ struct SuperBlockOperations
 	 * Write all pending changes to the disk.
 	 *
 	 * @param Info Inode to synchronize. If NULL, synchronize all inodes.
+	 * @param Node Inode to synchronize.
 	 *
 	 * @return Zero on success, otherwise an error code.
 	 */

Drivers/include/pci.h

@@ -1,18 +1,18 @@
 /*
-	This file is part of Fennix Drivers.
+	This file is part of Fennix Kernel.
 
-	Fennix Drivers is free software: you can redistribute it and/or
+	Fennix Kernel is free software: you can redistribute it and/or
 	modify it under the terms of the GNU General Public License as
 	published by the Free Software Foundation, either version 3 of
 	the License, or (at your option) any later version.
 
-	Fennix Drivers is distributed in the hope that it will be useful,
+	Fennix Kernel is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
+	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
 */
 
 #ifndef __FENNIX_API_PCI_H__

Drivers/input/Makefile

@@ -1,5 +1,9 @@
-build:
+MAKE_TARGETS := build clean
-	make -C aip build
+DIRECTORIES := $(sort $(dir $(wildcard ./*/)))
 
-clean:
+.PHONY: $(MAKE_TARGETS) $(DIRECTORIES)
-	make -C aip clean
+
+$(MAKE_TARGETS): $(DIRECTORIES)
+
+$(DIRECTORIES):
+	$(MAKE) -C $@ $(MAKECMDGOALS)

Drivers/input/aip/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = aip.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/library/Makefile

@@ -1,21 +1,14 @@
-# Config file
-include ../../Makefile.conf
-
 FILENAME = libkernel.so
 
-CC = ../../$(COMPILER_PATH)/$(COMPILER_ARCH)gcc
+default:
-CPP = ../../$(COMPILER_PATH)/$(COMPILER_ARCH)g++
+	$(error Do not run this Makefile directly!)
-LD = ../../$(COMPILER_PATH)/$(COMPILER_ARCH)ld
-AS = ../../$(COMPILER_PATH)/$(COMPILER_ARCH)as
-AR = ../../$(COMPILER_PATH)/$(COMPILER_ARCH)ar
 
 S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./crt/*")
 C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./crt/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./crt/*")
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./crt/*")
-HEADERS = $(sort $(dir $(wildcard ../include/*)))
+HEADERS = $(sort $(dir $(wildcard $(INCLUDE_DIR)/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-INCLUDE_DIR = ../include
 
 LDFLAGS := -fPIC -fPIE -pie -nostdlib -nodefaultlibs -nolibc	\
 	-zmax-page-size=0x1000 -Wl,-Map libkernel.map -shared
@@ -43,7 +36,7 @@ CFLAGS += -pipe -fno-builtin -fPIC
 
 endif
 
-CRT_CFLAGS := -fPIC -fPIE -pie -mno-red-zone -std=c++20 -I../include
+CRT_CFLAGS := -fPIC -fPIE -pie -mno-red-zone -std=c++20 -I$(INCLUDE_DIR)
 
 ifeq ($(DEBUG), 1)
 	CFLAGS += -DDEBUG -ggdb3 -O0 -fdiagnostics-color=always -fstack-usage
@@ -60,12 +53,12 @@ endif
 endif
 
 build: $(FILENAME)
-	$(CPP) $(CRT_CFLAGS) -c crt/crt0.cpp -o dcrt0.o
+	$(CXX) $(CRT_CFLAGS) -c crt/crt0.cpp -o dcrt0.o
-	mv dcrt0.o ../out/dcrt0.o
+	mv dcrt0.o $(OUTPUT_DIR)dcrt0.o
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(LDFLAGS) $(OBJ) -o ../out/$(FILENAME)
+	$(CC) $(LDFLAGS) $(OBJ) -o $(OUTPUT_DIR)$(FILENAME)
 
 %.o: %.c $(HEADERS)
 	$(info Compiling $<)
@@ -73,7 +66,7 @@ $(FILENAME): $(OBJ)
 
 %.o: %.cpp $(HEADERS)
 	$(info Compiling $<)
-	$(CPP) $(CFLAGS) $(WARNCFLAG) -std=c++20 -fexceptions -c $< -o $@
+	$(CXX) $(CFLAGS) $(WARNCFLAG) -std=c++20 -fexceptions -c $< -o $@
 
 %.o: %.S
 	$(info Compiling $<)

Drivers/misc/Makefile

@@ -1,7 +1,9 @@
-build:
+MAKE_TARGETS := build clean
-	make -C example build
+DIRECTORIES := $(sort $(dir $(wildcard ./*/)))
-	make -C vmware build
 
-clean:
+.PHONY: $(MAKE_TARGETS) $(DIRECTORIES)
-	make -C example clean
+
-	make -C vmware clean
+$(MAKE_TARGETS): $(DIRECTORIES)
+
+$(DIRECTORIES):
+	$(MAKE) -C $@ $(MAKECMDGOALS)

Drivers/misc/example/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = example.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/misc/example/main.c

@@ -66,15 +66,14 @@ int DriverProbe()
 	 * This function is to test if the driver is compatible
 	 * with the hardware.
 	 * Example: Like if there is a PCI device that the driver
-	 * is for, or a CPU feature that etc.
+	 * is for, or a CPU feature etc.
 	 *
 	 * Return 0 if the driver is compatible with the hardware.
-	 * Otherwise, return a value that is not 0.
 	 *
 	 * Note: In this function you cannot use variables that
 	 * have constructors or destructors. Before DriverEntry,
 	 * the constructors are called and after DriverFinalize,
-	 * the destructors are called.
+	 * the destructors.
 	 */
 
 	return 0;

Drivers/misc/vmware/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = vmware.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/network/Makefile

@@ -1,7 +1,9 @@
-build:
+MAKE_TARGETS := build clean
-	make -C e1000 build
+DIRECTORIES := $(sort $(dir $(wildcard ./*/)))
-	make -C rtl8139 build
 
-clean:
+.PHONY: $(MAKE_TARGETS) $(DIRECTORIES)
-	make -C e1000 clean
+
-	make -C rtl8139 clean
+$(MAKE_TARGETS): $(DIRECTORIES)
+
+$(DIRECTORIES):
+	$(MAKE) -C $@ $(MAKECMDGOALS)

Drivers/network/e1000/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = e1000.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/network/rtl8139/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = rtl8139.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/storage/ahci/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = ahci.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/storage/ata/Makefile

@@ -1,22 +1,35 @@
-# Config files
+default:
-include ../../../Makefile.conf
+	$(error Do not run this Makefile directly!)
-include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
+CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 
-FILENAME = ata.drv
+FILENAME = $(notdir $(shell pwd)).drv
 
 build: $(FILENAME)
-	mv $(FILENAME) ../../out/$(FILENAME)
+	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
+
+WARNCFLAG = -Wall -Wextra
+
+%.o: %.c $(HEADERS)
+	$(info Compiling $<)
+	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
+
+%.o: %.cpp $(HEADERS)
+	$(info Compiling $<)
+	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
+
+%.o: %.S
+	$(info Compiling $<)
+	$(AS) -o $@ $<
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Fennix Drivers.code-workspace

@@ -5,108 +5,11 @@
 		}
 	],
 	"settings": {
+		"terminal.integrated.cwd": "../",
 		"debug.allowBreakpointsEverywhere": true,
-		"cSpell.words": [
+		"git.alwaysSignOff": true,
-			"ABAR",
+		"git.defaultBranchName": "master",
-			"ABSPOINTER",
+		"git.openRepositoryInParentFolders": "always",
-			"AHCI",
+		"C_Cpp.autoAddFileAssociations": false
-			"BIST",
-			"Cardbus",
-			"CFIEN",
-			"cmdret",
-			"cmpb",
-			"driverinfo",
-			"ECTRL",
-			"EEPROM",
-			"Fennix",
-			"GETVERSION",
-			"HBAPRDT",
-			"IFCS",
-			"inportb",
-			"inportl",
-			"inportw",
-			"INTX",
-			"KAPI",
-			"LEDS",
-			"LPBK",
-			"LSTA",
-			"mminb",
-			"mminl",
-			"mminq",
-			"mminw",
-			"mmioin",
-			"mmioout",
-			"mmoutb",
-			"mmoutl",
-			"mmoutw",
-			"NABM",
-			"NABMB",
-			"NABMBOFF",
-			"outportb",
-			"outportl",
-			"outportw",
-			"PCIBAR",
-			"PCMOUT",
-			"PCNET",
-			"PCTRL",
-			"PMCF",
-			"PORTHB",
-			"PRDT",
-			"Prefetchable",
-			"RCTL",
-			"RCTRL",
-			"RDMTS",
-			"RDTR",
-			"rpci",
-			"RSRPD",
-			"RTCL",
-			"RTLC",
-			"RTLIB",
-			"RTLIL",
-			"RTLIW",
-			"RTLOB",
-			"RTLOL",
-			"RTLOW",
-			"RXDCTL",
-			"RXDESCHEAD",
-			"RXDESCHI",
-			"RXDESCLEN",
-			"RXDESCLO",
-			"RXDESCTAIL",
-			"Sata",
-			"SATAPI",
-			"SECRC",
-			"SEMB",
-			"SWXOFF",
-			"tclo",
-			"TCTL",
-			"TCTRL",
-			"TFES",
-			"TIPG",
-			"TSAD",
-			"TSTA",
-			"TXDESCHEAD",
-			"TXDESCHI",
-			"TXDESCLEN",
-			"TXDESCLO",
-			"TXDESCTAIL",
-			"TYPEMATIC",
-			"ubit",
-			"Virtio",
-			"Wmissing"
-		],
-		"files.associations": {
-			"*.su": "tsv",
-			"driver.h": "c",
-			"base.h": "c",
-			"types.h": "c",
-			"syscall.h": "c",
-			"aip.h": "c",
-			"input.h": "c",
-			"errno.h": "c",
-			"io.h": "c",
-			"rtl8139.hpp": "c",
-			"net.h": "c"
-		}
 	}
 }

Fennix Kernel.code-workspace

@@ -5,513 +5,8 @@
 		}
 	],
 	"settings": {
+		"terminal.integrated.cwd": "../",
 		"debug.allowBreakpointsEverywhere": true,
-		"files.associations": {
-			"*.su": "tsv",
-			"thread": "cpp",
-			"bitset": "cpp",
-			"initializer_list": "cpp",
-			"semaphore": "cpp",
-			"memory": "cpp",
-			"limits": "cpp",
-			"climits": "cpp",
-			"iterator": "cpp",
-			"ranges": "cpp",
-			"cassert": "cpp",
-			"concepts": "cpp",
-			"cctype": "cpp",
-			"tuple": "cpp",
-			"streambuf": "cpp",
-			"system_error": "cpp",
-			"coroutine": "cpp",
-			"static_vector": "cpp",
-			"string_view": "cpp",
-			"compare": "cpp",
-			"limine.h": "c",
-			"types.h": "c",
-			"binfo.h": "c",
-			"liballoc_1_1.h": "c",
-			"cstring": "cpp",
-			"cargs.h": "c",
-			"memory.hpp": "c",
-			"convert.h": "c",
-			"limits.h": "c",
-			"assert.h": "c",
-			"cwalk.h": "c",
-			"md5.h": "c",
-			"stdint.h": "c",
-			"debug.h": "c",
-			"ubsan.h": "c",
-			"kernel.h": "c",
-			"filesystem.hpp": "c",
-			"vector.hpp": "c",
-			"string.hpp": "c",
-			"nc.hpp": "c",
-			"vector": "c",
-			"task.hpp": "c",
-			"recovery.hpp": "c",
-			"symbols.hpp": "c",
-			"cstddef": "cpp",
-			"atomic.hpp": "c",
-			"atomic": "cpp",
-			"syscalls.h": "c",
-			"cmath": "cpp",
-			"typeinfo": "c",
-			"exception": "cpp",
-			"errno.h": "c",
-			"float.h": "c",
-			"mutex": "cpp",
-			"type_trails": "cpp",
-			"utility": "cpp",
-			"algorithm": "cpp",
-			"functional": "cpp",
-			"stdio.h": "c",
-			"string": "cpp",
-			"list": "cpp",
-			"stdexcept": "cpp",
-			"unistd.h": "c",
-			"unordered_map": "cpp",
-			"sched.h": "c",
-			"mman.h": "c",
-			"string.h": "c",
-			"macro.hpp": "c",
-			"stddef.h": "c",
-			"cfloat": "c",
-			"type_traits": "cpp",
-			"stdlib.h": "c",
-			"new": "cpp",
-			"ostream": "cpp",
-			"iostream": "cpp",
-			"istream": "cpp",
-			"ios": "cpp",
-			"locale": "cpp",
-			"unwind.h": "c",
-			"memory.h": "c",
-			"physical.hpp": "c",
-			"swap_pt.hpp": "c",
-			"brk.hpp": "c",
-			"bitmap.hpp": "c",
-			"lock.hpp": "c",
-			"virtual.hpp": "c",
-			"table.hpp": "c",
-			"vma.hpp": "c",
-			"abi.h": "c",
-			"kstack.hpp": "c",
-			"stack.hpp": "c",
-			"optional": "cpp"
-		},
-		"cSpell.words": [
-			"AABBCC",
-			"AAFF",
-			"AAFFAA",
-			"ABAR",
-			"ABIVERSION",
-			"ABSPOINTER",
-			"ACPI",
-			"ACPINVS",
-			"addralign",
-			"AEFF",
-			"AFAFAF",
-			"AHBA",
-			"AHCI",
-			"ALTLBA",
-			"APERF",
-			"apic",
-			"APICID",
-			"archaux",
-			"AROS",
-			"ARRAYSZ",
-			"auxv",
-			"BABABA",
-			"BADRAM",
-			"BGRT",
-			"bimi",
-			"binfo",
-			"biosdev",
-			"BIST",
-			"BITALG",
-			"BLOCKDEV",
-			"BLOCKDEVICE",
-			"BNDCFGS",
-			"bochs",
-			"bootanim",
-			"bootdev",
-			"Bootloader",
-			"brontobyte",
-			"CACACA",
-			"calloc",
-			"Cardbus",
-			"CCCCCCCPU",
-			"CHARDEV",
-			"CHARDEVICE",
-			"charsize",
-			"clac",
-			"CLOUDABI",
-			"CMCI",
-			"CMOS",
-			"cntvct",
-			"COMNULL",
-			"copydoc",
-			"cpudata",
-			"CPUID",
-			"crashdata",
-			"CSTAR",
-			"CTLS",
-			"cutlim",
-			"DADADA",
-			"daif",
-			"daifclr",
-			"daifset",
-			"DAPI",
-			"DBGP",
-			"DEBUGCTL",
-			"defragment",
-			"dfdesc",
-			"dialup",
-			"Didx",
-			"DLAB",
-			"Drivermemcpy",
-			"Drivermemset",
-			"Driversprintf",
-			"drvdir",
-			"DRVER",
-			"DSDT",
-			"DUID",
-			"dynstr",
-			"dynsym",
-			"EBDA",
-			"edid",
-			"EEPROM",
-			"EFER",
-			"Ehdr",
-			"ehsize",
-			"EISA",
-			"ELFABI",
-			"ELFCLASS",
-			"ELFDATA",
-			"ELFMAG",
-			"ELFOSABI",
-			"EMMINTRIN",
-			"endregion",
-			"Ensoniq",
-			"EVTSEL",
-			"EXECFN",
-			"exobyte",
-			"EXTD",
-			"FADT",
-			"FAFAFA",
-			"FAFAFAI",
-			"Fargc",
-			"Fargv",
-			"fcreat",
-			"fctprintf",
-			"Femto",
-			"FENIXOS",
-			"FENNIX",
-			"FFAA",
-			"FFAAAA",
-			"FFSMBIOS",
-			"FFXSR",
-			"filestatus",
-			"FMAPS",
-			"fonthdr",
-			"Framebuffer",
-			"FSGSBASE",
-			"fsmi",
-			"fxrstor",
-			"fxsave",
-			"Gamepad",
-			"Gameport",
-			"geopbyte",
-			"GETVERSION",
-			"GFNI",
-			"haddpd",
-			"headersize",
-			"HIPROC",
-			"HPET",
-			"hwaddress",
-			"ICRHI",
-			"ICRLO",
-			"IDIV",
-			"idtd",
-			"IFHLNK",
-			"infloop",
-			"inportb",
-			"inportl",
-			"inportw",
-			"INTFASTX",
-			"INTLEASTX",
-			"INTX",
-			"invlpg",
-			"ioapic",
-			"ioapicirq",
-			"IOCTLFS",
-			"IPCID",
-			"IRET",
-			"iretq",
-			"isdelim",
-			"ishld",
-			"ishst",
-			"itimerspec",
-			"itrfb",
-			"JMPREL",
-			"KAPI",
-			"KAPIPCI",
-			"kcalloc",
-			"kcon",
-			"kdentry",
-			"kdirent",
-			"kernelctl",
-			"kfree",
-			"klog",
-			"kmalloc",
-			"kproc",
-			"krealloc",
-			"kthrd",
-			"lapic",
-			"lfanew",
-			"LFLR",
-			"lgdt",
-			"liballoc",
-			"LIBLIST",
-			"lidt",
-			"limine",
-			"LMSLE",
-			"LOPROC",
-			"lsacpi",
-			"LSTAR",
-			"MADT",
-			"MADTIO",
-			"malloc",
-			"MCFG",
-			"memdbg",
-			"memmap",
-			"memsz",
-			"MEMTEST",
-			"mfence",
-			"MIDR",
-			"mminb",
-			"mminl",
-			"mminq",
-			"mminw",
-			"mmioin",
-			"mmioout",
-			"mmoutb",
-			"mmoutl",
-			"mmoutq",
-			"mmoutw",
-			"modbg",
-			"Modulememcpy",
-			"Modulememset",
-			"Modulesprintf",
-			"movaps",
-			"movddup",
-			"movdqa",
-			"movdqu",
-			"movntdq",
-			"movntdqa",
-			"movw",
-			"MPERF",
-			"MSRID",
-			"MTRR",
-			"MTRRCAP",
-			"multiboot",
-			"MWAIT",
-			"newfstatat",
-			"NIDENT",
-			"NOBITS",
-			"nullfd",
-			"nullptr",
-			"objptr",
-			"OEMID",
-			"Ofast",
-			"okstat",
-			"oldfd",
-			"OPENVOS",
-			"OPTMZ",
-			"OSABI",
-			"OSFXSR",
-			"OSXMMEXCPT",
-			"OSXSAVE",
-			"Outof",
-			"outportb",
-			"outportl",
-			"outportw",
-			"PAGESZ",
-			"palignr",
-			"PCIDE",
-			"pcmpistri",
-			"PCNET",
-			"PDBR",
-			"PDPTE",
-			"PEBS",
-			"PERFEVTSEL",
-			"PEXIT",
-			"PFLA",
-			"Phdrs",
-			"pheader",
-			"PHENT",
-			"phentsize",
-			"phnum",
-			"phoff",
-			"PHYSBASE",
-			"PHYSMASK",
-			"Pico",
-			"PINBASED",
-			"Pipefd",
-			"PKRU",
-			"PLTGOT",
-			"PLTREL",
-			"PLTRELSZ",
-			"POPCNT",
-			"PORTHB",
-			"powerline",
-			"Prefetchable",
-			"PREINIT",
-			"PROCBASED",
-			"PROGBITS",
-			"PTMX",
-			"ptys",
-			"pushfl",
-			"pushfq",
-			"Raphson",
-			"RARP",
-			"RBSTART",
-			"rdmsr",
-			"RDRAND",
-			"rdseed",
-			"rdtsc",
-			"readcr",
-			"readxcr",
-			"realloc",
-			"Realtek",
-			"RELAENT",
-			"RELASZ",
-			"RELSZ",
-			"Rodata",
-			"RPCI",
-			"rpmalloc",
-			"RRGGBB",
-			"RSDP",
-			"RSDT",
-			"RTIT",
-			"SATA",
-			"schedbg",
-			"SERCOS",
-			"serialports",
-			"sfence",
-			"sgdt",
-			"SGXLEPUBKEYHASH",
-			"Shdr",
-			"Sheader",
-			"shentsize",
-			"shnum",
-			"shoff",
-			"showbuf",
-			"shstrndx",
-			"shstrtab",
-			"sidt",
-			"SIGCOMP",
-			"sigsetsize",
-			"SIVR",
-			"SMAP",
-			"SMBASE",
-			"SMBIOSBIOS",
-			"SMEP",
-			"SMRR",
-			"SMXE",
-			"SNTP",
-			"SRAT",
-			"SSDT",
-			"sspt",
-			"SSSE",
-			"stac",
-			"strdbg",
-			"STRSZ",
-			"SVME",
-			"swapgs",
-			"Symbios",
-			"SYMENT",
-			"SYSENTER",
-			"sysret",
-			"sysretq",
-			"Tamsyn",
-			"targp",
-			"TCCR",
-			"TCLO",
-			"TCPA",
-			"TDCR",
-			"TEXIT",
-			"TEXTREL",
-			"Thrd",
-			"TICR",
-			"tlbi",
-			"Touchpad",
-			"tracepagetable",
-			"tskdbg",
-			"ttbr",
-			"uarch",
-			"uartmemdmp",
-			"ubsan",
-			"UINTFASTX",
-			"UINTLEASTX",
-			"UINTX",
-			"ultoa",
-			"UMIP",
-			"UMWAIT",
-			"UNMAP",
-			"Unmaskable",
-			"Unreserving",
-			"unseek",
-			"Unswap",
-			"unsynchronized",
-			"UPDT",
-			"UPID",
-			"uroot",
-			"UTID",
-			"VAES",
-			"VBMI",
-			"vectorize",
-			"vfctprintf",
-			"vfsdbg",
-			"Vidx",
-			"Virtio",
-			"VMCS",
-			"VMFUNC",
-			"vmouse",
-			"VMXE",
-			"VNNI",
-			"VNNIW",
-			"VPCLMULQDQ",
-			"VPID",
-			"VPOKE",
-			"VPOPCNTDQ",
-			"WAET",
-			"weakrefalias",
-			"Wignored",
-			"Wmissing",
-			"writecr",
-			"writexcr",
-			"wrmsr",
-			"WWVB",
-			"WWVH",
-			"Xalloc",
-			"xallocv",
-			"Xclac",
-			"xgetbv",
-			"Xmemcpy",
-			"Xmemset",
-			"XSDT",
-			"Xsize",
-			"XSLC",
-			"XSLF",
-			"XSLM",
-			"XSLR",
-			"Xstac",
-			"Xuintptr",
-			"yottabyte",
-			"zettabyte"
-		],
 		"editor.tabCompletion": "on",
 		"diffEditor.codeLens": true,
 		"editor.quickSuggestionsDelay": 100,
@@ -527,6 +22,10 @@
 		"editor.cursorBlinking": "blink",
 		"editor.cursorSmoothCaretAnimation": "on",
 		"editor.cursorStyle": "line",
-		"editor.cursorWidth": 2
+		"editor.cursorWidth": 2,
+		"git.alwaysSignOff": true,
+		"git.defaultBranchName": "master",
+		"git.openRepositoryInParentFolders": "always",
+		"C_Cpp.autoAddFileAssociations": false
 	}
 }

Fennix Lynx.code-workspace

@@ -1,22 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "./Lynx"
-		}
-	],
-	"settings": {
-		"debug.allowBreakpointsEverywhere": true,
-		"files.associations": {
-			"*.su": "tsv",
-			"limine.h": "c"
-		},
-		"cSpell.words": [
-			"Bootloader",
-			"COMNULL",
-			"CPUID",
-			"FENNIX",
-			"JMPREL",
-			"UBSAN"
-		]
-	}
-}

Fennix Userspace.code-workspace

@@ -5,67 +5,11 @@
 		}
 	],
 	"settings": {
+		"terminal.integrated.cwd": "../",
 		"debug.allowBreakpointsEverywhere": true,
-		"files.associations": {
+		"git.alwaysSignOff": true,
-			"*.su": "tsv",
+		"git.defaultBranchName": "master",
-			"thread": "cpp",
+		"git.openRepositoryInParentFolders": "always",
-			"bitset": "cpp",
+		"C_Cpp.autoAddFileAssociations": false
-			"initializer_list": "cpp",
-			"fex.hpp": "c",
-			"types.h": "c",
-			"dlfcn.h": "c",
-			"aux.h": "c",
-			"stddef.h": "c",
-			"stdio.h": "c",
-			"syscalls.h": "c",
-			"syslib.h": "c",
-			"sysfile.h": "c",
-			"ipc.h": "c",
-			"sysbase.h": "c",
-			"inttypes.h": "c",
-			"doomkeys.h": "c",
-			"doomgeneric.h": "c",
-			"elf.h": "c",
-			"init.h": "c",
-			"unused_code": "cpp",
-			"liballoc_1_1.h": "c",
-			"errno.h": "c",
-			"stdlib.h": "c",
-			"stdarg.h": "c",
-			"printf.h": "c",
-			"ctype.h": "c",
-			"unistd.h": "c",
-			"stat.h": "c",
-			"wait.h": "c",
-			"base.h": "c",
-			"ld.h": "c",
-			"syscall.h": "c",
-			"stdint.h": "c",
-			"setjmp.h": "c",
-			"limits.h": "c",
-			"fcntl.h": "c",
-			"pty.h": "c",
-			"string.h": "c",
-			"time.h": "c",
-			"reboot.h": "c",
-			"*.in": "c",
-			"signal.h": "c",
-			"alltypes.h": "c",
-			"pr44328.C": "cpp"
-		},
-		"cSpell.words": [
-			"auxv",
-			"cmpq",
-			"FENNIX",
-			"JMPREL",
-			"Krnl",
-			"liballoc",
-			"libinit",
-			"oldpath",
-			"preinit",
-			"Shdr",
-			"vfctprintf",
-			"WAITSTATUS"
-		]
 	}
 }

Fennix Website.code-workspace

@@ -0,0 +1,14 @@
+{
+	"folders": [
+		{
+			"path": "./tools/website"
+		}
+	],
+	"settings": {
+		"debug.allowBreakpointsEverywhere": true,
+		"git.alwaysSignOff": true,
+		"git.defaultBranchName": "master",
+		"git.openRepositoryInParentFolders": "always",
+		"C_Cpp.autoAddFileAssociations": false
+	}
+}

Fennix.code-workspace

@@ -6,30 +6,9 @@
 	],
 	"settings": {
 		"debug.allowBreakpointsEverywhere": true,
-		"files.associations": {
+		"git.alwaysSignOff": true,
-			"*.su": "tsv",
+		"git.defaultBranchName": "master",
-			"thread": "cpp",
+		"git.openRepositoryInParentFolders": "always",
-			"bitset": "cpp",
+		"C_Cpp.autoAddFileAssociations": false
-			"initializer_list": "cpp",
-			"semaphore": "cpp",
-			"memory": "cpp",
-			"limits": "cpp",
-			"climits": "cpp",
-			"iterator": "cpp",
-			"ranges": "cpp",
-			"cassert": "cpp",
-			"concepts": "cpp",
-			"cctype": "cpp",
-			"tuple": "cpp",
-			"streambuf": "cpp",
-			"system_error": "cpp",
-			"coroutine": "cpp",
-			"static_vector": "cpp",
-			"string_view": "cpp",
-			"compare": "cpp",
-			"ostream": "cpp",
-			"unordered_map": "cpp",
-			"vector": "cpp"
-		}
 	}
 }

Kernel/.github/workflows/flawfinder.yml

@@ -1,36 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: flawfinder
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "master" ]
-
-jobs:
-  flawfinder:
-    name: Flawfinder
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: flawfinder_scan
-        uses: david-a-wheeler/flawfinder@8e4a779ad59dbfaee5da586aa9210853b701959c
-        with:
-          arguments: '--sarif ./'
-          output: 'flawfinder_results.sarif'
-
-      - name: Upload analysis results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: ${{github.workspace}}/flawfinder_results.sarif

Kernel/.vscode/c_boilerplates.code-snippets

@@ -1,5 +1,7 @@
 {
 	"Fennix Kernel C++ Header": {
+		"isFileTemplate": true,
+		"scope": "c,cpp",
 		"prefix": [
 			"head",
 		],
@@ -31,6 +33,8 @@
 		"description": "Create kernel header."
 	},
 	"Fennix Kernel C Header": {
+		"isFileTemplate": true,
+		"scope": "c,cpp",
 		"prefix": [
 			"headc",
 		],
@@ -74,6 +78,7 @@
 		"description": "Create kernel documentation brief."
 	},
 	"License": {
+		"isFileTemplate": true,
 		"prefix": [
 			"license",
 		],

Kernel/.vscode/c_cpp_properties.json

@@ -10,8 +10,6 @@
 				"${workspaceFolder}/arch/amd64/include"
 			],
 			"defines": [
-				"a64",
-				"a86",
 				"DEBUG=\"1\""
 			],
 			"forcedInclude": [
@@ -82,8 +80,6 @@
 				"${workspaceFolder}/.vscode/preinclude.h"
 			],
 			"defines": [
-				"a32",
-				"a86",
 				"DEBUG=\"1\""
 			],
 			"compilerPath": "${workspaceFolder}/../tools/cross/bin/i386-fennix-gcc",
@@ -154,7 +150,6 @@
 				"${workspaceFolder}/.vscode/preinclude.h"
 			],
 			"defines": [
-				"aa64",
 				"DEBUG=\"1\""
 			],
 			"compilerPath": "${workspaceFolder}/../tools/cross/bin/aarch64-fennix-gcc",

Kernel/.vscode/extensions.json

@@ -1,14 +0,0 @@
-{
-	"recommendations": [
-		"jeff-hykin.better-cpp-syntax",
-		"aaron-bond.better-comments",
-		"ms-vscode.cpptools",
-		"maziac.hex-hover-converter",
-		"zixuanwang.linkerscript",
-		"webfreak.debug",
-		"ibm.output-colorizer",
-		"wayou.vscode-todo-highlight",
-		"gruntfuggly.todo-tree",
-		"maziac.asm-code-lens"
-	]
-}

Kernel/.vscode/launch.json

@@ -1,175 +0,0 @@
-{
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "Launch QEMU and debug the kernel",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/fennix.elf",
-			"cwd": "${workspaceFolder}",
-			"args": [],
-			"targetArchitecture": "x64",
-			"MIMode": "gdb",
-			"miDebuggerPath": "${workspaceFolder}/../tools/cross/bin/x86_64-fennix-gdb",
-			"miDebuggerArgs": "",
-			"externalConsole": false,
-			"additionalSOLibSearchPath": "${workspaceFolder}",
-			"customLaunchSetupCommands": [
-				{
-					"text": "target remote localhost:1234",
-					"description": "Connect to QEMU remote debugger"
-				}
-			],
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"text": "set breakpoint pending on",
-					"description": "Make breakpoint pending on future shared library load."
-				},
-				{
-					"text": "file ${workspaceFolder}/fennix.elf",
-					"description": "Load binary."
-				},
-				{
-					"text": "source ${workspaceFolder}/.gdbinit"
-				}
-			],
-			"preLaunchTask": "launch-qemu"
-		},
-		{
-			"name": "Attach to a running VM instance",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/fennix.elf",
-			"cwd": "${workspaceFolder}",
-			"args": [],
-			"targetArchitecture": "x64",
-			"MIMode": "gdb",
-			"miDebuggerPath": "${workspaceFolder}/../tools/cross/bin/x86_64-fennix-gdb",
-			"miDebuggerArgs": "",
-			"externalConsole": false,
-			"additionalSOLibSearchPath": "${workspaceFolder}",
-			"customLaunchSetupCommands": [
-				{
-					"text": "target remote localhost:1234",
-					"description": "Connect to QEMU remote debugger"
-				}
-			],
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"text": "set breakpoint pending on",
-					"description": "Make breakpoint pending on future shared library load."
-				},
-				{
-					"text": "file ${workspaceFolder}/fennix.elf",
-					"description": "Load binary."
-				},
-				{
-					"text": "source ${workspaceFolder}/.gdbinit"
-				}
-			],
-		},
-		{
-			"name": "Attach to VM w/utest",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/fennix.elf",
-			"cwd": "${workspaceFolder}",
-			"args": [],
-			"targetArchitecture": "x64",
-			"MIMode": "gdb",
-			"miDebuggerPath": "${workspaceFolder}/../tools/cross/bin/x86_64-fennix-gdb",
-			"miDebuggerArgs": "",
-			"externalConsole": false,
-			"additionalSOLibSearchPath": "${workspaceFolder}",
-			"customLaunchSetupCommands": [
-				{
-					"text": "target remote localhost:1234",
-					"description": "Connect to QEMU remote debugger"
-				}
-			],
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"text": "set breakpoint pending on",
-					"description": "Make breakpoint pending on future shared library load."
-				},
-				{
-					"text": "file ${workspaceFolder}/fennix.elf",
-					"description": "Load binary."
-				},
-				{
-					"text": "add-symbol-file ${workspaceFolder}/../initrd_tmp_data/bin/utest",
-					"description": "Load /bin/utest.",
-					"ignoreFailures": true
-				},
-				{
-					"text": "source ${workspaceFolder}/.gdbinit"
-				}
-			],
-			"preLaunchTask": "launch-qemu",
-		},
-		{
-			"name": "Attach to VM w/utest_linux",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/fennix.elf",
-			"cwd": "${workspaceFolder}",
-			"args": [],
-			"targetArchitecture": "x64",
-			"MIMode": "gdb",
-			"miDebuggerPath": "${workspaceFolder}/../tools/cross/bin/x86_64-fennix-gdb",
-			"miDebuggerArgs": "",
-			"externalConsole": false,
-			"additionalSOLibSearchPath": "${workspaceFolder}",
-			"customLaunchSetupCommands": [
-				{
-					"text": "target remote localhost:1234",
-					"description": "Connect to QEMU remote debugger"
-				}
-			],
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"text": "set breakpoint pending on",
-					"description": "Make breakpoint pending on future shared library load."
-				},
-				{
-					"text": "file ${workspaceFolder}/fennix.elf",
-					"description": "Load binary."
-				},
-				{
-					"text": "set debug-file-directory /usr/lib/debug",
-					"description": "Set debug-file-directory to /usr/lib/debug.",
-					"ignoreFailures": true
-				},
-				{
-					"text": "add-symbol-file ${workspaceFolder}/../initrd_tmp_data/bin/utest_linux",
-					"description": "Load /bin/utest_linux.",
-					"ignoreFailures": true
-				},
-				{
-					"text": "source ${workspaceFolder}/.gdbinit"
-				}
-			],
-			"preLaunchTask": "launch-qemu",
-		},
-	]
-}

Kernel/.vscode/launch.json

@@ -0,0 +1 @@
+../../.vscode/launch.json

Kernel/.vscode/tasks.json

@@ -1,26 +0,0 @@
-{
-	"version": "2.0.0",
-	"tasks": [
-		{
-			"label": "launch-qemu",
-			"type": "shell",
-			"command": "make -j$(shell nproc) build && make -C ../ build_image && make -C ../ vscode_debug_only",
-			"isBackground": true,
-			"problemMatcher": [],
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
-			"presentation": {
-				"reveal": "always",
-				"panel": "shared"
-			},
-			"options": {
-				"shell": {
-					"executable": "bash",
-					"args": ["-c"]
-				}
-			}
-		}
-	]
-}

Kernel/.vscode/tasks.json

@@ -0,0 +1 @@
+../../.vscode/tasks.json

Kernel/LICENSES.md

@@ -1,54 +0,0 @@
-# Licenses in the project
-
-This project uses code from other projects, each with its own licenses.
-Below are the licenses associated with these components.
-Make sure to read and comply with these licenses before using or redistributing this software.
-
-## printf
-
-- **License:** The MIT License (MIT)
-- **Location:** [library/printf.c](library/printf.c) [include/printf.h](include/printf.h)
-
-## stb_image
-
-- **License:** The MIT License (MIT) and Public Domain
-- **Location:** [include/stb/image.h](include/stb/image.h)
-
-## stb_image_resize
-
-- **License:** The MIT License (MIT) and Public Domain
-- **Location:** [include/stb/image_resize.h](include/stb/image_resize.h)
-
-## cargs
-
-- **License:** The MIT License (MIT)
-- **Location:** [library/cargs.c](library/cargs.c) [include/cargs.h](include/cargs.h)
-
-## cwalk
-
-- **License:** The MIT License (MIT)
-- **Location:** [library/cwalk.c](library/cwalk.c) [include/cwalk.h](include/cwalk.h)
-
-## Tamsyn Font (v1.11)
-
-- **License:** Unknown
-- **Location:** [files/tamsyn-font-1.11/LICENSE](files/tamsyn-font-1.11/LICENSE)
-
-## liballoc
-
-- **License:** Public Domain
-- **Location:** [https://raw.githubusercontent.com/blanham/liballoc/master/LICENSE](https://raw.githubusercontent.com/blanham/liballoc/master/LICENSE)
-
-## rpmalloc
-
-- **License:** The MIT License (MIT) and Public Domain
-- **Location:** [https://raw.githubusercontent.com/mjansson/rpmalloc/develop/LICENSE](https://raw.githubusercontent.com/mjansson/rpmalloc/develop/LICENSE)
-
-## ini.h
-
-- **License:** The MIT License (MIT) and Public Domain
-- **Location:** [include/ini.h](include/ini.h)
-
----
-
-Please refer to the respective license files for the full text of each license.

Kernel/Makefile

@@ -1,54 +1,38 @@
-# Config file
-include ../Makefile.conf
-
 KERNEL_FILENAME = fennix.elf
 
-CC = ../$(COMPILER_PATH)/$(COMPILER_ARCH)gcc
-CPP = ../$(COMPILER_PATH)/$(COMPILER_ARCH)g++
-LD = ../$(COMPILER_PATH)/$(COMPILER_ARCH)ld
-AS = ../$(COMPILER_PATH)/$(COMPILER_ARCH)as
-NM = ../$(COMPILER_PATH)/$(COMPILER_ARCH)nm
-OBJCOPY = ../$(COMPILER_PATH)/$(COMPILER_ARCH)objcopy
-OBJDUMP = ../$(COMPILER_PATH)/$(COMPILER_ARCH)objdump
-GDB = ../$(COMPILER_PATH)/$(COMPILER_ARCH)gdb
-
-RUST_TARGET_PATH = arch/$(OSARCH)/rust-target.json
-
 GIT_COMMIT = $(shell git rev-parse HEAD)
 GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD)
 
-HEADERS = $(sort $(dir $(wildcard ./include/*))) $(sort $(dir $(wildcard ./include_std/*)))
+HEADERS := $(sort $(dir $(wildcard ./include/*))) $(sort $(dir $(wildcard ./include_std/*)))
 INCLUDE_DIR = -I./include -I./include_std
 
-BMP_SOURCES = $(shell find ./ -type f -name '*.bmp')
+BMP_SOURCES := $(shell find ./ -type f -name '*.bmp')
-PSF_SOURCES = $(shell find ./ -type f -name '*.psf')
+PSF_SOURCES := $(shell find ./ -type f -name '*.psf')
 ifeq ($(OSARCH), amd64)
-S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+S_SOURCES := $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
-s_SOURCES = $(shell find ./ -type f -name '*.s' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+s_SOURCES := $(shell find ./ -type f -name '*.s' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
-C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+C_SOURCES := $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+CXX_SOURCES := $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
-HEADERS += $(sort $(dir $(wildcard ./arch/amd64/include/*)))
-INCLUDE_DIR += -I./arch/amd64/include
 else ifeq ($(OSARCH), i386)
-S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
+S_SOURCES := $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
-s_SOURCES = $(shell find ./ -type f -name '*.s' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
+s_SOURCES := $(shell find ./ -type f -name '*.s' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
-C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
+C_SOURCES := $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
+CXX_SOURCES := $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
-HEADERS += $(sort $(dir $(wildcard ./arch/i386/include/*)))
-INCLUDE_DIR += -I./arch/i386/include
 else ifeq ($(OSARCH), aarch64)
-S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
+S_SOURCES := $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
-s_SOURCES = $(shell find ./ -type f -name '*.s' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
+s_SOURCES := $(shell find ./ -type f -name '*.s' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
-C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
+C_SOURCES := $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
+CXX_SOURCES := $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
-HEADERS += $(sort $(dir $(wildcard ./arch/aarch64/include/*)))
+endif # OSARCH
-INCLUDE_DIR += -I./arch/aarch64/include
-endif
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(s_SOURCES:.s=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
-GCNO_OBJ = $(C_SOURCES:.c=.gcno) $(CPP_SOURCES:.cpp=.gcno)
 
-LDFLAGS := -Wl,-Map kernel.map -static -nostdlib -nodefaultlibs -nolibc
+OBJ = $(BMP_SOURCES:.bmp=.o) $(PSF_SOURCES:.psf=.o) $(s_SOURCES:.s=.o) $(S_SOURCES:.S=.o) $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o)
+STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
+GCNO_OBJ = $(C_SOURCES:.c=.gcno) $(CXX_SOURCES:.cpp=.gcno)
+
+LDFLAGS = -static -nostdlib -nodefaultlibs -nolibc \
+	-Wl,-static,--no-dynamic-linker,-ztext 	\
+	-zmax-page-size=0x1000					\
+	-Wl,-Map kernel.map -fno-pic -fno-pie
 
 # Disable all warnings by adding "-w" in WARNCFLAG and if you want to treat the warnings as errors, add "-Werror"
 # -Wconversion this may be re-added later
@@ -58,6 +42,8 @@ WARNCFLAG = -Wall -Wextra \
 			-Wstrict-overflow=5 -Wno-error=cpp -Werror \
 			-Wno-unused-parameter
 
+CFLAG_STACK_PROTECTOR := -fstack-protector-all
+
 # https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
 CFLAGS :=										\
 	$(INCLUDE_DIR)								\
@@ -66,40 +52,19 @@ CFLAGS :=										\
 	-DKERNEL_ARCH='"$(OSARCH)"' 				\
 	-DKERNEL_VERSION='"$(KERNEL_VERSION)"'		\
 	-DGIT_COMMIT='"$(GIT_COMMIT)"'				\
-	-DGIT_COMMIT_SHORT='"$(GIT_COMMIT_SHORT)"'
+	-DGIT_COMMIT_SHORT='"$(GIT_COMMIT_SHORT)"'	\
+	-fno-pic -fno-pie -mno-red-zone -fno-builtin
 
 ifeq ($(OSARCH), amd64)
-
+CFLAGS += -march=core2 -mcmodel=kernel -m64
-CFLAGS += -fno-pic -fno-pie -mno-red-zone -march=core2	\
+LDFLAGS += -Tarch/amd64/linker.ld
-		  -mcmodel=kernel -fno-builtin -Da64 -Da86 -m64
-CFLAG_STACK_PROTECTOR := -fstack-protector-all
-LDFLAGS += -Tarch/amd64/linker.ld 			\
-	-fno-pic -fno-pie 						\
-	-Wl,-static,--no-dynamic-linker,-ztext 	\
-	-zmax-page-size=0x1000					\
-	-Wl,-Map kernel.map
-
 else ifeq ($(OSARCH), i386)
-
+CFLAGS += -march=pentium -m32
-CFLAGS += -fno-pic -fno-pie -mno-red-zone -march=pentium \
+LDFLAGS += -Tarch/i386/linker.ld
-		  -fno-builtin -Da32 -Da86 -m32
-CFLAG_STACK_PROTECTOR := -fstack-protector-all
-LDFLAGS += -Tarch/i386/linker.ld 			\
-	-fno-pic -fno-pie 						\
-	-Wl,-static,--no-dynamic-linker,-ztext 	\
-	-zmax-page-size=0x1000					\
-	-Wl,-Map kernel.map
-
 else ifeq ($(OSARCH), aarch64)
-
+CFLAGS +=
-CFLAGS += -fno-builtin -Wstack-protector -Daa64 -fPIC -mno-outline-atomics
+LDFLAGS += -Tarch/aarch64/linker.ld
-CFLAG_STACK_PROTECTOR := -fstack-protector-all
+endif # OSARCH
-LDFLAGS += -Tarch/aarch64/linker.ld -fPIC -pie 	\
-	-Wl,-static,--no-dynamic-linker,-ztext 		\
-	-zmax-page-size=0x1000 						\
-	-Wl,-Map kernel.map
-
-endif
 
 # -finstrument-functions for __cyg_profile_func_enter & __cyg_profile_func_exit. Used for profiling and debugging.
 ifeq ($(DEBUG), 1)
@@ -109,17 +74,17 @@ ifeq ($(DEBUG), 1)
 	CFLAGS += -DDEBUG -ggdb3 -O0 -fdiagnostics-color=always -fstack-usage -fsanitize=undefined
 ifeq ($(OSARCH), amd64)
 	CFLAGS += -fverbose-asm
-endif
+endif # amd64
 ifneq ($(OSARCH), aarch64)
 	CFLAGS += -fstack-check
-endif
+endif # aarch64
 	LDFLAGS += -ggdb3 -O0
 	ASFLAGS += -g --gstabs+ --gdwarf-5 -D
 	WARNCFLAG += -Wno-unused-function -Wno-maybe-uninitialized -Wno-builtin-declaration-mismatch -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable
-endif
+endif # DEBUG
 
 default:
-	$(error Please specify a target)
+	$(error Do not run this Makefile directly!)
 
 prepare:
 	$(info Nothing to prepare)
@@ -131,51 +96,51 @@ ifeq (,$(wildcard $(KERNEL_FILENAME)))
 	$(error $(KERNEL_FILENAME) does not exist)
 endif
 	$(info Dumping $(KERNEL_FILENAME) in AT T syntax...)
-	$(OBJDUMP) -D -g -s -d $(KERNEL_FILENAME) > kernel_dump.map
+	$(__CONF_OBJDUMP) -D -g -s -d $(KERNEL_FILENAME) > kernel_dump.map
 	$(info Dumping $(KERNEL_FILENAME) in Intel syntax...)
-	$(OBJDUMP) -M intel -D -g -s -d $(KERNEL_FILENAME) > kernel_dump_intel.map
+	$(__CONF_OBJDUMP) -M intel -D -g -s -d $(KERNEL_FILENAME) > kernel_dump_intel.map
 
 $(KERNEL_FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(LDFLAGS) $(OBJ) -o $@
+	$(__CONF_CC) $(LDFLAGS) $(OBJ) -o $@
-#	$(CC) $(LDFLAGS) $(OBJ) -mno-red-zone -lgcc -o $@
+#	$(__CONF_CC) $(LDFLAGS) $(OBJ) -mno-red-zone -lgcc -o $@
 
 %.o: %.c $(HEADERS)
 	$(info Compiling $<)
-	$(CC) $(CFLAGS) $(CFLAG_STACK_PROTECTOR) $(WARNCFLAG) -std=c17 -c $< -o $@
+	$(__CONF_CC) $(CFLAGS) $(CFLAG_STACK_PROTECTOR) $(WARNCFLAG) -std=c17 -c $< -o $@
 
 # https://gcc.gnu.org/projects/cxx-status.html
 %.o: %.cpp $(HEADERS)
 	$(info Compiling $<)
-	$(CPP) $(CFLAGS) -fcoroutines $(CFLAG_STACK_PROTECTOR) $(WARNCFLAG) -std=c++20 -c $< -o $@ -fno-rtti
+	$(__CONF_CXX) $(CFLAGS) -fcoroutines $(CFLAG_STACK_PROTECTOR) $(WARNCFLAG) -std=c++20 -c $< -o $@ -fno-rtti
 
 %.o: %.S
 	$(info Compiling $<)
-	$(AS) $(ASFLAGS) -c $< -o $@
+	$(__CONF_AS) $(ASFLAGS) -c $< -o $@
 
 %.o: %.s
 	$(info Compiling $<)
-	$(AS) $(ASFLAGS) -c $< -o $@
+	$(__CONF_AS) $(ASFLAGS) -c $< -o $@
 
 %.o: %.psf
 ifeq ($(OSARCH), amd64)
-	$(OBJCOPY) -O elf64-x86-64 -I binary $< $@
+	$(__CONF_OBJCOPY) -O elf64-x86-64 -I binary $< $@
 else ifeq ($(OSARCH), i386)
-	$(OBJCOPY) -O elf32-i386 -I binary $< $@
+	$(__CONF_OBJCOPY) -O elf32-i386 -I binary $< $@
 else ifeq ($(OSARCH), aarch64)
-	$(OBJCOPY) -O elf64-littleaarch64 -I binary $< $@
+	$(__CONF_OBJCOPY) -O elf64-littleaarch64 -I binary $< $@
 endif
-	$(NM) $@
+	$(__CONF_NM) $@
 
 %.o: %.bmp
 ifeq ($(OSARCH), amd64)
-	$(OBJCOPY) -O elf64-x86-64 -I binary $< $@
+	$(__CONF_OBJCOPY) -O elf64-x86-64 -I binary $< $@
 else ifeq ($(OSARCH), i386)
-	$(OBJCOPY) -O elf32-i386 -I binary $< $@
+	$(__CONF_OBJCOPY) -O elf32-i386 -I binary $< $@
 else ifeq ($(OSARCH), aarch64)
-	$(OBJCOPY) -O elf64-littlearch64 -I binary $< $@
+	$(__CONF_OBJCOPY) -O elf64-littlearch64 -I binary $< $@
 endif
-	$(NM) $@
+	$(__CONF_NM) $@
 
 clean:
 	rm -f kernel.map kernel_dump.map kernel_dump_intel.map $(OBJ) $(STACK_USAGE_OBJ) $(GCNO_OBJ) $(KERNEL_FILENAME)

Kernel/README.md

@@ -1,11 +1,3 @@
 # Kernel
 
 The core of the operating system.
-
----
-
-Use `Fennix` repo to build the operating system.
-
-```bash
-git clone --recurse-submodules https://github.com/Fennix-Project/Fennix.git
-```

Kernel/TODO.md

@@ -31,6 +31,8 @@
 - [ ] Fix std::string.
 - [x] Rewrite PS/2 drivers.
 - [ ] Improve signal handling.
+- [ ] Handle empty initrd.
+- [ ] Fix CoW.
 
 - [ ] Improve the way the kernel crashes.
 	- Add panic() function.

Kernel/arch/aarch64/linker.ld

@@ -85,6 +85,5 @@ SECTIONS
 	/DISCARD/ :
 	{
 		*(.comment*)
-		*(.note*)
 	}
 }

Kernel/arch/amd64/cpu/idt.cpp

@@ -139,10 +139,14 @@ namespace InterruptDescriptorTable
 			"pushq %r14\n"
 			"pushq %r15\n"
 
-			"movq %ds, %rax\n pushq %rax\n"
+			// "movq %ds, %rax\n pushq %rax\n"
-			"movq %es, %rax\n pushq %rax\n"
+			// "movq %es, %rax\n pushq %rax\n"
-			"movq %fs, %rax\n pushq %rax\n"
+			// "movq %fs, %rax\n pushq %rax\n"
-			"movq %gs, %rax\n pushq %rax\n"
+			// "movq %gs, %rax\n pushq %rax\n"
+			"pushq %rax\n"
+			"pushq %rax\n"
+			"pushq %rax\n"
+			"pushq %rax\n"
 
 			"movq %dr7, %rax\n pushq %rax\n"
 			"movq %dr6, %rax\n pushq %rax\n"
@@ -173,10 +177,14 @@ namespace InterruptDescriptorTable
 			"popq %rax\n movq %rax, %dr6\n"
 			"popq %rax\n movq %rax, %dr7\n"
 
-			"popq %rax\n movq %rax, %gs\n"
+			"popq %rax\n"
-			"popq %rax\n movq %rax, %fs\n"
+			"popq %rax\n"
-			"popq %rax\n movq %rax, %es\n"
+			"popq %rax\n"
-			"popq %rax\n movq %rax, %ds\n"
+			"popq %rax\n"
+			// "popq %rax\n movq %rax, %gs\n"
+			// "popq %rax\n movq %rax, %fs\n"
+			// "popq %rax\n movq %rax, %es\n"
+			// "popq %rax\n movq %rax, %ds\n"
 
 			"popq %r15\n"
 			"popq %r14\n"
@@ -660,7 +668,7 @@ namespace InterruptDescriptorTable
 		SetEntry(0xb, InterruptHandler_0xb, IST1, INTERRUPT_GATE_64BIT, RING0, (!DebuggerIsAttached), GDT_KERNEL_CODE);
 		SetEntry(0xc, InterruptHandler_0xc, IST3, INTERRUPT_GATE_64BIT, RING0, EnableISRs, GDT_KERNEL_CODE);
 		SetEntry(0xd, InterruptHandler_0xd, IST3, INTERRUPT_GATE_64BIT, RING0, EnableISRs, GDT_KERNEL_CODE);
-		SetEntry(0xe, InterruptHandler_0xe, IST3, INTERRUPT_GATE_64BIT, RING0, EnableISRs /* FIXME: CoW? */, GDT_KERNEL_CODE);
+		SetEntry(0xe, InterruptHandler_0xe, IST3, INTERRUPT_GATE_64BIT, RING0, true /* FIXME: CoW? */, GDT_KERNEL_CODE);
 		SetEntry(0xf, InterruptHandler_0xf, IST1, INTERRUPT_GATE_64BIT, RING0, EnableISRs, GDT_KERNEL_CODE);
 		SetEntry(0x10, InterruptHandler_0x10, IST1, INTERRUPT_GATE_64BIT, RING0, EnableISRs, GDT_KERNEL_CODE);
 		SetEntry(0x11, InterruptHandler_0x11, IST1, INTERRUPT_GATE_64BIT, RING0, EnableISRs, GDT_KERNEL_CODE);

Kernel/arch/amd64/linker.ld

@@ -124,6 +124,5 @@ SECTIONS
 	/DISCARD/ :
 	{
 		*(.comment*)
-		*(.note*)
 	}
 }

Kernel/arch/i386/linker.ld

@@ -124,6 +124,5 @@ SECTIONS
 	/DISCARD/ :
 	{
 		*(.comment*)
-		*(.note*)
 	}
 }

Kernel/core/cpu.cpp

@@ -24,11 +24,11 @@
 
 #include "../kernel.h"
 
-#if defined(a64)
+#if defined(__amd64__)
 using namespace CPU::x64;
-#elif defined(a32)
+#elif defined(__i386__)
 using namespace CPU::x32;
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 namespace CPU
@@ -40,19 +40,19 @@ namespace CPU
 		static char Vendor[13] = {0};
 		if (Vendor[0] != 0)
 			return Vendor;
-#if defined(a64)
+#if defined(__amd64__)
 		uint32_t eax, ebx, ecx, edx;
 		x64::cpuid(0x0, &eax, &ebx, &ecx, &edx);
 		memcpy(Vendor + 0, &ebx, 4);
 		memcpy(Vendor + 4, &edx, 4);
 		memcpy(Vendor + 8, &ecx, 4);
-#elif defined(a32)
+#elif defined(__i386__)
 		uint32_t eax, ebx, ecx, edx;
 		x32::cpuid(0x0, &eax, &ebx, &ecx, &edx);
 		memcpy(Vendor + 0, &ebx, 4);
 		memcpy(Vendor + 4, &edx, 4);
 		memcpy(Vendor + 8, &ecx, 4);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #error "Not implemented"
 #endif
 		return Vendor;
@@ -63,7 +63,7 @@ namespace CPU
 		static char Name[49] = {0};
 		if (Name[0] != 0)
 			return Name;
-#if defined(a64)
+#if defined(__amd64__)
 		uint32_t eax, ebx, ecx, edx;
 		x64::cpuid(0x80000002, &eax, &ebx, &ecx, &edx);
 		memcpy(Name + 0, &eax, 4);
@@ -80,7 +80,7 @@ namespace CPU
 		memcpy(Name + 36, &ebx, 4);
 		memcpy(Name + 40, &ecx, 4);
 		memcpy(Name + 44, &edx, 4);
-#elif defined(a32)
+#elif defined(__i386__)
 		uint32_t eax, ebx, ecx, edx;
 		x32::cpuid(0x80000002, &eax, &ebx, &ecx, &edx);
 		memcpy(Name + 0, &eax, 4);
@@ -97,7 +97,7 @@ namespace CPU
 		memcpy(Name + 36, &ebx, 4);
 		memcpy(Name + 40, &ecx, 4);
 		memcpy(Name + 44, &edx, 4);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #error "Not implemented"
 #endif
 		return Name;
@@ -108,7 +108,7 @@ namespace CPU
 		static char Hypervisor[13] = {0};
 		if (Hypervisor[0] != 0)
 			return Hypervisor;
-#if defined(a64)
+#if defined(__amd64__)
 		uint32_t eax, ebx, ecx, edx;
 		x64::cpuid(0x1, &eax, &ebx, &ecx, &edx);
 		if (!(ecx & (1 << 31))) /* Intel & AMD are the same */
@@ -124,7 +124,7 @@ namespace CPU
 		memcpy(Hypervisor + 0, &ebx, 4);
 		memcpy(Hypervisor + 4, &ecx, 4);
 		memcpy(Hypervisor + 8, &edx, 4);
-#elif defined(a32)
+#elif defined(__i386__)
 		uint32_t eax, ebx, ecx, edx;
 		x32::cpuid(0x1, &eax, &ebx, &ecx, &edx);
 		if (!(ecx & (1 << 31))) /* Intel & AMD are the same */
@@ -140,7 +140,7 @@ namespace CPU
 		memcpy(Hypervisor + 0, &ebx, 4);
 		memcpy(Hypervisor + 4, &ecx, 4);
 		memcpy(Hypervisor + 8, &edx, 4);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #error "Not implemented"
 #endif
 		return Hypervisor;
@@ -153,17 +153,17 @@ namespace CPU
 		case Check:
 		{
 			uintptr_t Flags;
-#if defined(a64)
+#if defined(__amd64__)
 			asmv("pushfq");
 			asmv("popq %0"
 				 : "=r"(Flags));
 			return Flags & (1 << 9);
-#elif defined(a32)
+#elif defined(__i386__)
 			asmv("pushfl");
 			asmv("popl %0"
 				 : "=r"(Flags));
 			return Flags & (1 << 9);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 			asmv("mrs %0, cpsr"
 				 : "=r"(Flags));
 			return Flags & (1 << 7);
@@ -171,18 +171,18 @@ namespace CPU
 		}
 		case Enable:
 		{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 			asmv("sti");
-#elif defined(aa64)
+#elif defined(__aarch64__)
 			asmv("cpsie i");
 #endif
 			return true;
 		}
 		case Disable:
 		{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 			asmv("cli");
-#elif defined(aa64)
+#elif defined(__aarch64__)
 			asmv("cpsid i");
 #endif
 			return true;
@@ -197,7 +197,7 @@ namespace CPU
 	void *PageTable(void *PT)
 	{
 		void *ret;
-#if defined(a64)
+#if defined(__amd64__)
 		asmv("movq %%cr3, %0"
 			 : "=r"(ret));
 
@@ -208,7 +208,7 @@ namespace CPU
 				 : "r"(PT)
 				 : "memory");
 		}
-#elif defined(a32)
+#elif defined(__i386__)
 		asmv("movl %%cr3, %0"
 			 : "=r"(ret));
 
@@ -219,7 +219,7 @@ namespace CPU
 				 : "r"(PT)
 				 : "memory");
 		}
-#elif defined(aa64)
+#elif defined(__aarch64__)
 		asmv("mrs %0, ttbr0_el1"
 			 : "=r"(ret));
 
@@ -392,13 +392,13 @@ namespace CPU
 	{
 		// TODO: Get the counter from the x2APIC or any other timer that is available. (TSC is not available on all CPUs)
 		uint64_t Counter;
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		uint32_t eax, edx;
 		asmv("rdtsc"
 			 : "=a"(eax),
 			   "=d"(edx));
 		Counter = ((uint64_t)eax) | (((uint64_t)edx) << 32);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 		asmv("mrs %0, cntvct_el0"
 			 : "=r"(Counter));
 #endif
@@ -413,7 +413,7 @@ namespace CPU
 #warning "TODO: Proper SIMD support"
 		return SIMD_NONE;
 
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		static uint64_t SIMDType = SIMD_NONE;
 
 		if (likely(SIMDType != SIMD_NONE))
@@ -495,7 +495,7 @@ namespace CPU
 		}
 
 		debug("No SIMD support.");
-#endif // a64 || a32
+#endif // __amd64__ || __i386__
 		return SIMD_NONE;
 	}
 
@@ -504,7 +504,7 @@ namespace CPU
 		if (unlikely(!SSEEnabled))
 			return false;
 
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (strcmp(CPU::Vendor(), x86_CPUID_VENDOR_AMD) == 0)
 		{
 			CPU::x86::AMD::CPUID0x00000001 cpuid;
@@ -545,7 +545,7 @@ namespace CPU
 			else if (Type == SIMD_SSE)
 				return cpuid.EDX.SSE;
 		}
-#endif // a64 || a32
+#endif // __amd64__ || __i386__
 		return false;
 	}
 }

Kernel/core/debugger.cpp

@@ -27,48 +27,9 @@ NewLock(DebuggerLock);
 
 extern bool serialports[8];
 
-EXTERNC NIF void uart_wrapper(char c, void *unused)
+EXTERNC NIF void uart_wrapper(char c, void *)
 {
-	static int once = 0;
+	uart.DebugWrite(c);
-	if (unlikely(!once++))
-	{
-		uint8_t com = inb(0x3F8);
-		if (com != 0xFF)
-		{
-			outb(s_cst(uint16_t, 0x3F8 + 1), 0x00); // Disable all interrupts
-			outb(s_cst(uint16_t, 0x3F8 + 3), 0x80); // Enable DLAB (set baud rate divisor)
-			outb(s_cst(uint16_t, 0x3F8 + 0), 0x1);	// Set divisor to 1 (lo byte) 115200 baud
-			outb(s_cst(uint16_t, 0x3F8 + 1), 0x0);	//                  (hi byte)
-			outb(s_cst(uint16_t, 0x3F8 + 3), 0x03); // 8 bits, no parity, one stop bit
-			outb(s_cst(uint16_t, 0x3F8 + 2), 0xC7); // Enable FIFO, clear them, with 14-byte threshold
-			outb(s_cst(uint16_t, 0x3F8 + 4), 0x0B); // IRQs enabled, RTS/DSR set
-
-			/* FIXME  https://wiki.osdev.org/Serial_Ports */
-			// outb(s_cst(uint16_t, 0x3F8 + 0), 0x1E);
-			// outb(s_cst(uint16_t, 0x3F8 + 0), 0xAE);
-			// Check if the serial port is faulty.
-			// if (inb(s_cst(uint16_t, 0x3F8 + 0)) != 0xAE)
-			// {
-			//     static int once = 0;
-			//     if (!once++)
-			//         warn("Serial port %#llx is faulty.", 0x3F8);
-			//     // serialports[0x3F8] = false; // ignore for now
-			//     // return;
-			// }
-
-			// Set to normal operation mode.
-			outb(s_cst(uint16_t, 0x3F8 + 4), 0x0F);
-			serialports[0] = true;
-		}
-	}
-
-	if (likely(serialports[0]))
-	{
-		while ((inb(s_cst(uint16_t, 0x3F8 + 5)) & 0x20) == 0)
-			;
-		outb(0x3F8, c);
-	}
-	UNUSED(unused);
 }
 
 static inline NIF bool WritePrefix(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, va_list args)

Kernel/core/dsdt.cpp

@@ -22,9 +22,9 @@
 #include <smp.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../arch/amd64/cpu/apic.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
 #include "../arch/i386/cpu/apic.hpp"
 #endif
 #include "../kernel.h"

Kernel/core/interrupts_manager.cpp

@@ -23,15 +23,15 @@
 #include <vector>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../arch/amd64/cpu/apic.hpp"
 #include "../arch/amd64/cpu/gdt.hpp"
 #include "../arch/amd64/cpu/idt.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
 #include "../arch/i386/cpu/apic.hpp"
 #include "../arch/i386/cpu/gdt.hpp"
 #include "../arch/i386/cpu/idt.hpp"
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../kernel.h"
@@ -106,15 +106,15 @@ namespace Interrupts
 	std::atomic_uint SortEvents = SORT_START / SORT_DIVIDER;
 	constexpr uint32_t SORT_ITR = (SORT_START * 100) / SORT_DIVIDER;
 
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	/* APIC::APIC */ void *apic[MAX_CPU] = {nullptr};
 	/* APIC::Timer */ void *apicTimer[MAX_CPU] = {nullptr};
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 	void Initialize(int Core)
 	{
-#if defined(a64)
+#if defined(__amd64__)
 		GlobalDescriptorTable::Init(Core);
 		InterruptDescriptorTable::Init(Core);
 		CPUData *CoreData = GetCPU(Core);
@@ -133,7 +133,7 @@ namespace Interrupts
 		debug("Stack for core %d is %#lx (Address: %#lx)",
 			  Core, CoreData->Stack, CoreData->Stack - STACK_SIZE);
 		InitializeSystemCalls();
-#elif defined(a32)
+#elif defined(__i386__)
 		GlobalDescriptorTable::Init(Core);
 		InterruptDescriptorTable::Init(Core);
 		CPUData *CoreData = GetCPU(Core);
@@ -151,14 +151,14 @@ namespace Interrupts
 		}
 		debug("Stack for core %d is %#lx (Address: %#lx)",
 			  Core, CoreData->Stack, CoreData->Stack - STACK_SIZE);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 		warn("aarch64 is not supported yet");
 #endif
 	}
 
 	void Enable(int Core)
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (((ACPI::MADT *)PowerManager->GetMADT())->LAPICAddress != nullptr)
 		{
 			// TODO: This function is called by SMP too. Do not initialize timers that doesn't support multiple cores.
@@ -171,7 +171,7 @@ namespace Interrupts
 			error("LAPIC not found");
 			// TODO: PIC
 		}
-#elif defined(aa64)
+#elif defined(__aarch64__)
 		warn("aarch64 is not supported yet");
 #endif
 		CPU::Interrupts(CPU::Enable);
@@ -180,14 +180,14 @@ namespace Interrupts
 	void InitializeTimer(int Core)
 	{
 		// TODO: This function is called by SMP too. Do not initialize timers that doesn't support multiple cores.
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (apic[Core] != nullptr)
 			apicTimer[Core] = new APIC::Timer((APIC::APIC *)apic[Core]);
 		else
 		{
 			fixme("apic not found");
 		}
-#elif defined(aa64)
+#elif defined(__aarch64__)
 		warn("aarch64 is not supported yet");
 #endif
 	}
@@ -333,12 +333,12 @@ namespace Interrupts
 		public:
 			AutoSwitchPageTable()
 			{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 				asmv("mov %%cr3, %0" : "=r"(Original));
 #endif
 				if (likely(Original == KernelPageTable))
 					return;
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 				asmv("mov %0, %%cr3" : : "r"(KernelPageTable));
 #endif
 			}
@@ -347,7 +347,7 @@ namespace Interrupts
 			{
 				if (likely(Original == KernelPageTable))
 					return;
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 				asmv("mov %0, %%cr3" : : "r"(Original));
 #endif
 			}
@@ -365,7 +365,7 @@ namespace Interrupts
 		while (it != RegisteredEvents.end())
 		{
 			int iEvNum = it->IRQ;
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 			iEvNum += CPU::x86::IRQ0;
 #endif
 			if (iEvNum == s_cst(int, Frame->InterruptNumber))
@@ -402,7 +402,7 @@ namespace Interrupts
 	{
 		KernelPageTable->Update();
 		CPU::SchedulerFrame *Frame = (CPU::SchedulerFrame *)Data;
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		assert(Frame->InterruptNumber == CPU::x86::IRQ16);
 #else
 		assert(Frame->InterruptNumber == 16);

Kernel/core/memory/find_bitmap_region.cpp

@@ -75,7 +75,7 @@ namespace Memory
 			}
 		}
 
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (bInfo.RSDP)
 		{
 			RSDPStart = (uintptr_t)bInfo.RSDP;
@@ -101,7 +101,7 @@ namespace Memory
 			}
 #endif
 		}
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 		for (uint64_t i = 0; i < bInfo.Memory.Entries; i++)

Kernel/core/memory/heap_allocators/Xalloc/XallocV1.cpp

@@ -121,7 +121,7 @@ namespace Xalloc
 	{
 		if (this->SMAPUsed)
 		{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 			asm volatile("stac" ::
 							 : "cc");
 #endif
@@ -132,7 +132,7 @@ namespace Xalloc
 	{
 		if (this->SMAPUsed)
 		{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 			asm volatile("clac" ::
 							 : "cc");
 #endif

Kernel/core/memory/heap_allocators/liballoc_1_1/LICENSE

@@ -0,0 +1,10 @@
+
+This code is released into the public domain. Use this code at your own 
+risk. Feel free to use it for whatever purpose you want. I take no responsibilty or
+whatever if anything goes wrong.  Use it at your own risk.
+
+If you have any fixes or patches, please email me.
+
+Durand Miller <clutter@djm.co.za>
+
+

Kernel/core/memory/heap_allocators/rpmalloc/LICENSE

@@ -0,0 +1,52 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
+
+
+You can also use this software under the MIT license if public domain
+is not recognized in your country
+
+
+The MIT License (MIT)
+
+Copyright (c) 2017 Mattias Jansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Kernel/core/memory/memory.cpp

@@ -56,7 +56,7 @@ NIF void tracepagetable(PageTable *pt)
 {
 	for (int i = 0; i < 512; i++)
 	{
-#if defined(a64)
+#if defined(__amd64__)
 		if (pt->Entries[i].Present)
 			debug("Entry %03d: %x %x %x %x %x %x %x %p-%#llx", i,
 				  pt->Entries[i].Present, pt->Entries[i].ReadWrite,
@@ -64,8 +64,8 @@ NIF void tracepagetable(PageTable *pt)
 				  pt->Entries[i].CacheDisable, pt->Entries[i].Accessed,
 				  pt->Entries[i].ExecuteDisable, pt->Entries[i].Address << 12,
 				  pt->Entries[i]);
-#elif defined(a32)
+#elif defined(__i386__)
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 	}
 }
@@ -257,15 +257,15 @@ NIF void CreatePageTable(PageTable *pt)
 
 		if (PSESupport)
 		{
-#if defined(a64)
+#if defined(__amd64__)
 			CPU::x64::CR4 cr4 = CPU::x64::readcr4();
 			cr4.PSE = 1;
 			CPU::x64::writecr4(cr4);
-#elif defined(a32)
+#elif defined(__i386__)
 			CPU::x32::CR4 cr4 = CPU::x32::readcr4();
 			cr4.PSE = 1;
 			CPU::x32::writecr4(cr4);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 			trace("PSE Support Enabled");
 		}
@@ -289,7 +289,7 @@ NIF void CreatePageTable(PageTable *pt)
 NIF void InitializeMemoryManagement()
 {
 #ifdef DEBUG
-#ifndef a32
+#ifndef __i386__
 	for (uint64_t i = 0; i < bInfo.Memory.Entries; i++)
 	{
 		uintptr_t Base = r_cst(uintptr_t, bInfo.Memory.Entry[i].BaseAddress);
@@ -333,7 +333,7 @@ NIF void InitializeMemoryManagement()
 			  End,
 			  Type);
 	}
-#endif // a32
+#endif // __i386__
 #endif // DEBUG
 	trace("Initializing Physical Memory Manager");
 	// KernelAllocator = Physical(); <- Already called in the constructor

Kernel/core/memory/page_table.cpp

@@ -9,9 +9,9 @@ namespace Memory
 {
 	void PageTable::Update()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		asmv("mov %0, %%cr3" ::"r"(this));
-#elif defined(aa64)
+#elif defined(__aarch64__)
 		asmv("msr ttbr0_el1, %0" ::"r"(this));
 #endif
 	}
@@ -24,7 +24,7 @@ namespace Memory
 		memcpy(NewTable, this, sizeof(PageTable));
 
 		debug("Forking page table %#lx to %#lx", this, NewTable);
-#if defined(a64)
+#if defined(__amd64__)
 		for (size_t i = 0; i < sizeof(Entries) / sizeof(Entries[0]); i++)
 		{
 			PageMapLevel4 *PML4 = &Entries[i];

Kernel/core/memory/pmi.cpp

@@ -22,7 +22,7 @@ namespace Memory
 	Virtual::PageMapIndexer::PageMapIndexer(uintptr_t VirtualAddress)
 	{
 		uintptr_t Address = VirtualAddress;
-#if defined(a64)
+#if defined(__amd64__)
 		Address >>= 12;
 		this->PTEIndex = Address & 0x1FF;
 		Address >>= 9;
@@ -31,12 +31,12 @@ namespace Memory
 		this->PDPTEIndex = Address & 0x1FF;
 		Address >>= 9;
 		this->PMLIndex = Address & 0x1FF;
-#elif defined(a32)
+#elif defined(__i386__)
 		Address >>= 12;
 		this->PTEIndex = Address & 0x3FF;
 		Address >>= 10;
 		this->PDEIndex = Address & 0x3FF;
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 		if (VirtualAddress > PAGE_SIZE)
@@ -44,7 +44,7 @@ namespace Memory
 			assert(
 				this->PTEIndex != 0 ||
 				this->PDEIndex != 0
-#if defined(a64)
+#if defined(__amd64__)
 				|| this->PDPTEIndex != 0 ||
 				this->PMLIndex != 0
 #endif

Kernel/core/memory/reserve_essentials.cpp

@@ -90,10 +90,10 @@ namespace Memory
 			Elf_Sym *Symbols = nullptr;
 			uint8_t *StringAddress = nullptr;
 
-#if defined(a64) || defined(aa64)
+#if defined(__amd64__) || defined(__aarch64__)
 			Elf64_Xword SymbolSize = 0;
 			Elf64_Xword StringSize = 0;
-#elif defined(a32)
+#elif defined(__i386__)
 			Elf32_Word SymbolSize = 0;
 			Elf32_Word StringSize = 0;
 #endif
@@ -149,7 +149,7 @@ namespace Memory
 							   TO_PAGES(bInfo.Modules[i].Size));
 		}
 
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (bInfo.RSDP)
 		{
 			debug("Reserving RSDT region %#lx-%#lx...", bInfo.RSDP,
@@ -201,7 +201,7 @@ namespace Memory
 				this->ReservePages(SDTHdr, TO_PAGES(SDTHdr->Length));
 			}
 		}
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 	}
 }

Kernel/core/memory/stack_guard.cpp

@@ -26,8 +26,7 @@ namespace Memory
 		if (!this->UserMode)
 			assert(!"Kernel mode stack expansion not implemented");
 
-		if (FaultAddress < USER_STACK_END ||
+		if (FaultAddress < USER_STACK_END || FaultAddress > USER_STACK_BASE)
-			FaultAddress > USER_STACK_BASE)
 		{
 			info("Fault address %#lx is not in range of stack %#lx - %#lx",
 				 FaultAddress, USER_STACK_END, USER_STACK_BASE);
@@ -39,16 +38,16 @@ namespace Memory
 		size_t stackPages = TO_PAGES(diff);
 		stackPages = stackPages < 1 ? 1 : stackPages;
 
-		debug("roundFA: %#lx, sb: %#lx, diff: %#lx, stackPages: %d",
+		debug("roundFA: %#lx, StackBottom: %#lx, diff: %#lx, stackPages: %d",
 			  roundFA, this->StackBottom, diff, stackPages);
 
-		void *AllocatedStack = vma->RequestPages(stackPages);
+		void *pPage = vma->RequestPages(stackPages);
-		debug("AllocatedStack: %#lx", AllocatedStack);
+		debug("pPage: %#lx", pPage);
 
-		for (size_t i = 0; i < stackPages; i++)
+		for (size_t i = 1; i < stackPages + 1; i++)
 		{
 			void *vAddress = (void *)((uintptr_t)this->StackBottom - (i * PAGE_SIZE));
-			void *pAddress = (void *)((uintptr_t)AllocatedStack + (i * PAGE_SIZE));
+			void *pAddress = (void *)((uintptr_t)pPage + (i * PAGE_SIZE));
 
 			vma->Map(vAddress, pAddress, PAGE_SIZE, PTFlag::RW | PTFlag::US);
 			AllocatedPages ap = {
@@ -56,11 +55,11 @@ namespace Memory
 				.VirtualAddress = vAddress,
 			};
 			AllocatedPagesList.push_back(ap);
-			debug("Mapped %#lx to %#lx", pAddress, vAddress);
+			debug("Mapped p:%#lx to v:%#lx", pAddress, vAddress);
 		}
 
 		this->StackBottom = (void *)((uintptr_t)this->StackBottom - (stackPages * PAGE_SIZE));
-		this->Size += stackPages * PAGE_SIZE;
+		this->CurrentSize += stackPages * PAGE_SIZE;
 		debug("Stack expanded to %#lx", this->StackBottom);
 		this->Expanded = true;
 		return true;
@@ -76,7 +75,7 @@ namespace Memory
 		this->StackTop = Parent->StackTop;
 		this->StackPhysicalBottom = Parent->StackPhysicalBottom;
 		this->StackPhysicalTop = Parent->StackPhysicalTop;
-		this->Size = Parent->Size;
+		this->CurrentSize = Parent->CurrentSize;
 		this->Expanded = Parent->Expanded;
 
 		std::list<AllocatedPages> ParentAllocatedPages = Parent->GetAllocatedPages();
@@ -103,19 +102,19 @@ namespace Memory
 
 		if (this->UserMode)
 		{
-			void *AllocatedStack = vma->RequestPages(TO_PAGES(USER_STACK_SIZE));
+			void *pPage = vma->RequestPages(TO_PAGES(USER_STACK_SIZE));
+			debug("pPage: %#lx", pPage);
+
 			this->StackBottom = (void *)USER_STACK_BASE;
 			this->StackTop = (void *)(USER_STACK_BASE + USER_STACK_SIZE);
-			this->StackPhysicalBottom = AllocatedStack;
+			this->StackPhysicalBottom = pPage;
-			this->StackPhysicalTop = (void *)((uintptr_t)AllocatedStack + USER_STACK_SIZE);
+			this->StackPhysicalTop = (void *)((uintptr_t)pPage + USER_STACK_SIZE);
-			this->Size = USER_STACK_SIZE;
+			this->CurrentSize = USER_STACK_SIZE;
-
-			debug("AllocatedStack: %#lx", AllocatedStack);
 
 			for (size_t i = 0; i < TO_PAGES(USER_STACK_SIZE); i++)
 			{
 				void *vAddress = (void *)(USER_STACK_BASE + (i * PAGE_SIZE));
-				void *pAddress = (void *)((uintptr_t)AllocatedStack + (i * PAGE_SIZE));
+				void *pAddress = (void *)((uintptr_t)pPage + (i * PAGE_SIZE));
 				vma->Map(vAddress, pAddress, PAGE_SIZE, PTFlag::RW | PTFlag::US);
 
 				AllocatedPages ap = {
@@ -123,7 +122,7 @@ namespace Memory
 					.VirtualAddress = vAddress,
 				};
 				AllocatedPagesList.push_back(ap);
-				debug("Mapped %#lx to %#lx", pAddress, vAddress);
+				debug("Mapped p:%#lx to v:%#lx", pAddress, vAddress);
 			}
 		}
 		else
@@ -133,7 +132,7 @@ namespace Memory
 			this->StackTop = (void *)((uintptr_t)this->StackBottom + LARGE_STACK_SIZE);
 			this->StackPhysicalBottom = sa.PhysicalAddress;
 			this->StackPhysicalTop = (void *)((uintptr_t)this->StackPhysicalBottom + LARGE_STACK_SIZE);
-			this->Size = LARGE_STACK_SIZE;
+			this->CurrentSize = LARGE_STACK_SIZE;
 
 			debug("StackBottom: %#lx", this->StackBottom);
 

Kernel/core/memory/vma.cpp

@@ -241,9 +241,9 @@ namespace Memory
 				pte->CopyOnWrite = false;
 				debug("PFA %#lx is CoW (pt %#lx, flags %#lx)",
 					  PFA, this->Table, pte->raw);
-#if defined(a64)
+#if defined(__amd64__)
 				CPU::x64::invlpg((void *)PFA);
-#elif defined(a32)
+#elif defined(__i386__)
 				CPU::x32::invlpg((void *)PFA);
 #endif
 				return true;
@@ -303,7 +303,7 @@ namespace Memory
 				void *AddressToMap = (void *)((uintptr_t)ap.Address + (i * PAGE_SIZE));
 				void *RealAddress = (void *)((uintptr_t)Address + (i * PAGE_SIZE));
 
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 				PageTableEntry *pte = vmm.GetPTE(AddressToMap);
 				uintptr_t Flags = 0;
 				Flags |= pte->Present ? (uintptr_t)PTFlag::P : 0;

Kernel/core/panic/diag.cpp

@@ -28,13 +28,13 @@
 #include <cpu.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../arch/amd64/cpu/gdt.hpp"
 #include "../arch/amd64/cpu/apic.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
 #include "../../arch/i386/cpu/gdt.hpp"
 #include "../arch/i386/cpu/apic.hpp"
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../kernel.h"

Kernel/core/panic/handler.cpp

@@ -28,13 +28,13 @@
 #include <cpu.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../arch/amd64/cpu/gdt.hpp"
 #include "../arch/amd64/cpu/apic.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
 #include "../../arch/i386/cpu/gdt.hpp"
 #include "../arch/i386/cpu/apic.hpp"
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../kernel.h"
@@ -100,7 +100,7 @@ nsa void HaltAllCores()
 	if (SMP::CPUCores <= 1)
 		return;
 
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	if (Interrupts::apic[0] == nullptr)
 		return;
 
@@ -131,7 +131,7 @@ nsa void HaltAllCores()
 			((APIC::APIC *)Interrupts::apic[i])->ICR(icr);
 		}
 	}
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 }
 
@@ -187,7 +187,7 @@ nsa __noreturn void HandleUnrecoverableException(CPU::ExceptionFrame *Frame)
 	ExPrint("\x1b[0m-----------------------------------------------\n");
 	ExPrint("\x1b[30;41mUnrecoverable exception %#lx on CPU %d\n",
 			Frame->InterruptNumber, core->ID);
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	ExPrint("CR0=%#lx CR2=%#lx CR3=%#lx CR4=%#lx CR8=%#lx\n",
 			Frame->cr0, Frame->cr2, Frame->cr3, Frame->cr4, Frame->cr8);
 	ExPrint("DR0=%#lx DR1=%#lx DR2=%#lx DR3=%#lx DR6=%#lx DR7=%#lx\n",
@@ -195,29 +195,29 @@ nsa __noreturn void HandleUnrecoverableException(CPU::ExceptionFrame *Frame)
 	ExPrint("GS=%#lx FS=%#lx ES=%#lx DS=%#lx SS=%#lx CS=%#lx\n",
 			Frame->gs, Frame->fs, Frame->es, Frame->ds, Frame->ss, Frame->cs);
 #endif
-#if defined(a64)
+#if defined(__amd64__)
 	ExPrint("R8=%#lx R9=%#lx R10=%#lx R11=%#lx R12=%#lx R13=%#lx R14=%#lx R15=%#lx\n",
 			Frame->r8, Frame->r9, Frame->r10, Frame->r11, Frame->r12, Frame->r13,
 			Frame->r14, Frame->r15);
 #endif
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	ExPrint("AX=%#lx BX=%#lx CX=%#lx DX=%#lx SI=%#lx DI=%#lx BP=%#lx SP=%#lx\n",
 
-#ifdef a64
+#ifdef __amd64__
 			Frame->rax, Frame->rbx, Frame->rcx, Frame->rdx, Frame->rsi, Frame->rdi,
 			Frame->rbp, Frame->rsp);
 #else
 			Frame->eax, Frame->ebx, Frame->ecx, Frame->edx, Frame->esi, Frame->edi,
 			Frame->ebp, Frame->esp);
-#endif /* a64 */
+#endif /* __amd64__ */
 
 	ExPrint("IP=%#lx FL=%#lx INT=%#lx ERR=%#lx\n",
 
-#ifdef a64
+#ifdef __amd64__
 			Frame->rip, Frame->rflags.raw,
 #else
 			Frame->eip, Frame->eflags.raw,
-#endif /* a64 */
+#endif /* __amd64__ */
 			Frame->InterruptNumber, Frame->ErrorCode);
 #endif /* a86 */
 
@@ -233,14 +233,14 @@ nsa __noreturn void HandleExceptionInsideException(CPU::ExceptionFrame *Frame)
 	ExPrint("\x1b[0m-----------------------------------------------\n");
 	ExPrint("Exception inside exception: %#lx at %#lx\n",
 			Frame->InterruptNumber,
-#if defined(a64)
+#if defined(__amd64__)
 			Frame->rip);
-#elif defined(a32)
+#elif defined(__i386__)
 			Frame->eip);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 			Frame->pc);
 #endif
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	ExPrint("CR0=%#lx CR2=%#lx CR3=%#lx CR4=%#lx CR8=%#lx\n",
 			Frame->cr0, Frame->cr2, Frame->cr3, Frame->cr4, Frame->cr8);
 	ExPrint("DR0=%#lx DR1=%#lx DR2=%#lx DR3=%#lx DR6=%#lx DR7=%#lx\n",
@@ -248,29 +248,29 @@ nsa __noreturn void HandleExceptionInsideException(CPU::ExceptionFrame *Frame)
 	ExPrint("GS=%#lx FS=%#lx ES=%#lx DS=%#lx SS=%#lx CS=%#lx\n",
 			Frame->gs, Frame->fs, Frame->es, Frame->ds, Frame->ss, Frame->cs);
 #endif
-#if defined(a64)
+#if defined(__amd64__)
 	ExPrint("R8=%#lx R9=%#lx R10=%#lx R11=%#lx R12=%#lx R13=%#lx R14=%#lx R15=%#lx\n",
 			Frame->r8, Frame->r9, Frame->r10, Frame->r11, Frame->r12, Frame->r13,
 			Frame->r14, Frame->r15);
 #endif
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	ExPrint("AX=%#lx BX=%#lx CX=%#lx DX=%#lx SI=%#lx DI=%#lx BP=%#lx SP=%#lx\n",
 
-#ifdef a64
+#ifdef __amd64__
 			Frame->rax, Frame->rbx, Frame->rcx, Frame->rdx, Frame->rsi, Frame->rdi,
 			Frame->rbp, Frame->rsp);
 #else
 			Frame->eax, Frame->ebx, Frame->ecx, Frame->edx, Frame->esi, Frame->edi,
 			Frame->ebp, Frame->esp);
-#endif /* a64 */
+#endif /* __amd64__ */
 
 	ExPrint("IP=%#lx FL=%#lx INT=%#lx ERR=%#lx\n",
 
-#ifdef a64
+#ifdef __amd64__
 			Frame->rip, Frame->rflags.raw,
 #else
 			Frame->eip, Frame->eflags.raw,
-#endif /* a64 */
+#endif /* __amd64__ */
 			Frame->InterruptNumber, Frame->ErrorCode);
 #endif /* a86 */
 	Display->UpdateBuffer();

Kernel/core/panic/kbd/ehci.cpp

@@ -27,10 +27,10 @@
 #include <cpu.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../../arch/amd64/cpu/gdt.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../../kernel.h"

Kernel/core/panic/kbd/keyboard.cpp

@@ -31,10 +31,10 @@
 #include <cpu.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../../arch/amd64/cpu/gdt.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../../kernel.h"

Kernel/core/panic/kbd/ps2.cpp

@@ -28,10 +28,10 @@
 #include <cpu.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../../arch/amd64/cpu/gdt.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../../kernel.h"
@@ -107,7 +107,7 @@ nsa static inline int GetLetterFromScanCode(uint8_t ScanCode)
 
 nsa void CrashPS2KeyboardDriver::PS2Wait(bool Output)
 {
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	TimeoutCallNumber++;
 	int timeout = 100000;
 	PS2_STATUSES status = {.Raw = inb(PS2_STATUS)};
@@ -153,7 +153,7 @@ nsa CrashPS2KeyboardDriver::CrashPS2KeyboardDriver() : Interrupts::Handler(1) /*
 
 	/* Dots will be printed at the bottom of the screen as a progress bar. */
 	ExPrint("\x1b[%d;%dH", (Display->GetWidth / CrashFontRenderer.CurrentFont->GetInfo().Width) - 2, 0);
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 
 	/* Disable port 1 & 2 */
 	{
@@ -355,14 +355,14 @@ nsa CrashPS2KeyboardDriver::CrashPS2KeyboardDriver() : Interrupts::Handler(1) /*
 
 	ExPrint(".");
 
-#endif // defined(a86)
+#endif // defined(__amd64__) || defined(__i386__)
 
 	CPU::Interrupts(CPU::Enable);
 }
 
 nsa void CrashPS2KeyboardDriver::OnInterruptReceived(CPU::TrapFrame *)
 {
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	uint8_t scanCode = inb(PS2_DATA);
 
 	if (scanCode == KEY_D_TAB ||
@@ -412,5 +412,5 @@ nsa void CrashPS2KeyboardDriver::OnInterruptReceived(CPU::TrapFrame *)
 		}
 		Display->UpdateBuffer(); /* Update as we type. */
 	}
-#endif // a64 || a32
+#endif // __amd64__ || __i386__
 }

Kernel/core/panic/kbd/uhci.cpp

@@ -27,10 +27,10 @@
 #include <cpu.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../../arch/amd64/cpu/gdt.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../../kernel.h"

Kernel/core/panic/kbd/xhci.cpp

@@ -27,10 +27,10 @@
 #include <cpu.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../../arch/amd64/cpu/gdt.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../../kernel.h"
@@ -68,7 +68,7 @@ nsa bool CrashXHCIKeyboardDriver::TakeOwnership()
 
 nsa bool CrashXHCIKeyboardDriver::Initialize()
 {
-	int timeout = 10;
+	// int timeout = 10;
 
 	if (!TakeOwnership())
 	{
@@ -192,7 +192,9 @@ nsa void CrashXHCIKeyboardDriver::OnInterruptReceived(CPU::TrapFrame *Frame)
 	Interrupter->IMAN.IP = 1;
 
 	if (!ops->USBSTS.EINT)
+	{
 		debug("!USBSTS.EINT");
+	}
 	// return;
 
 	ops->USBSTS.EINT = 1;

Kernel/core/panic/ui.cpp

@@ -27,13 +27,13 @@
 #include <cpu.hpp>
 #include <io.h>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../arch/amd64/cpu/gdt.hpp"
 #include "../arch/amd64/cpu/apic.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
 #include "../../arch/i386/cpu/gdt.hpp"
 #include "../arch/i386/cpu/apic.hpp"
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../kernel.h"
@@ -143,11 +143,11 @@ nsa const char *ExGetKSymbol(CPU::ExceptionFrame *Frame)
 		Frame->rip > (uintptr_t)&_kernel_end)
 		return "<OUTSIDE KERNEL>";
 
-#if defined(a64)
+#if defined(__amd64__)
 	return ExGetKSymbolByAddress(Frame->rip);
-#elif defined(a32)
+#elif defined(__i386__)
 	return ExGetKSymbolByAddress(Frame->eip);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 	return ExGetKSymbolByAddress(Frame->pc);
 #endif
 }
@@ -299,23 +299,23 @@ nsa void DisplayMainScreen(CPU::ExceptionFrame *Frame)
 	ExPrint("\nWe're sorry, but the system has encountered a critical error and needs to restart.\n");
 
 	ExPrint("\nError: %s (%s 0x%x)\n",
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 			x86Exceptions[Frame->InterruptNumber].Name,
 			x86Exceptions[Frame->InterruptNumber].Mnemonic,
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #error "AA64 not implemented"
 #endif
 			Frame->InterruptNumber);
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	ExPrint("Cause: %s\n", x86Exceptions[Frame->InterruptNumber].Cause);
 #endif
 	ExPrint("Exception occurred in function %s (%#lx)\n",
 			ExGetKSymbol(Frame),
-#if defined(a64)
+#if defined(__amd64__)
 			Frame->rip);
-#elif defined(a32)
+#elif defined(__i386__)
 			Frame->eip);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 			Frame->pc);
 #endif
 
@@ -431,9 +431,9 @@ nsa void DisplayStackScreen(CPU::ExceptionFrame *Frame)
 {
 	Memory::Virtual vmm;
 	struct StackFrame *sf;
-#if defined(a64)
+#if defined(__amd64__)
 	sf = (struct StackFrame *)Frame->rbp;
-#elif defined(a32)
+#elif defined(__i386__)
 	sf = (struct StackFrame *)Frame->ebp;
 #endif
 
@@ -455,11 +455,11 @@ nsa void DisplayStackScreen(CPU::ExceptionFrame *Frame)
 	/* FIXME: Get symbol offset more efficiently */
 
 	uintptr_t fIP;
-#if defined(a64)
+#if defined(__amd64__)
 	fIP = Frame->rip;
-#elif defined(a32)
+#elif defined(__i386__)
 	fIP = Frame->eip;
-#elif defined(aa64)
+#elif defined(__aarch64__)
 	fIP = Frame->pc;
 #endif
 

Kernel/core/panic/user.cpp

@@ -21,10 +21,10 @@
 #include <smp.hpp>
 #include <cpu.hpp>
 
-#if defined(a64)
+#if defined(__amd64__)
 #include "../../arch/amd64/cpu/gdt.hpp"
-#elif defined(a32)
+#elif defined(__i386__)
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
 #include "../../kernel.h"
@@ -32,26 +32,26 @@
 #ifdef DEBUG
 nsa void dbgPrint(CPU::ExceptionFrame *Frame)
 {
-#if defined(a64)
+#if defined(__amd64__)
 	debug("FS=%#lx GS=%#lx SS=%#lx CS=%#lx DS=%#lx", Frame->fs, Frame->gs, Frame->ss, Frame->cs, Frame->ds);
 	debug("R8=%#lx R9=%#lx R10=%#lx R11=%#lx", Frame->r8, Frame->r9, Frame->r10, Frame->r11);
 	debug("R12=%#lx R13=%#lx R14=%#lx R15=%#lx", Frame->r12, Frame->r13, Frame->r14, Frame->r15);
 	debug("RAX=%#lx RBX=%#lx RCX=%#lx RDX=%#lx", Frame->rax, Frame->rbx, Frame->rcx, Frame->rdx);
 	debug("RSI=%#lx RDI=%#lx RBP=%#lx RSP=%#lx", Frame->rsi, Frame->rdi, Frame->rbp, Frame->rsp);
 	debug("RIP=%#lx RFL=%#lx INT=%#lx ERR=%#lx", Frame->rip, Frame->rflags.raw, Frame->InterruptNumber, Frame->ErrorCode);
-#elif defined(a32)
+#elif defined(__i386__)
 	debug("FS=%#x GS=%#x CS=%#x DS=%#x", Frame->fs, Frame->gs, Frame->cs, Frame->ds);
 	debug("EAX=%#x EBX=%#x ECX=%#x EDX=%#x", Frame->eax, Frame->ebx, Frame->ecx, Frame->edx);
 	debug("ESI=%#x EDI=%#x EBP=%#x ESP=%#x", Frame->esi, Frame->edi, Frame->ebp, Frame->esp);
 	debug("EIP=%#x EFL=%#x INT=%#x ERR=%#x", Frame->eip, Frame->eflags.raw, Frame->InterruptNumber, Frame->ErrorCode);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 	debug("CR2=%#lx CR3=%#lx", Frame->cr2, Frame->cr3);
-#endif // defined(a86)
+#endif // defined(__amd64__) || defined(__i386__)
 
-#if defined(a64)
+#if defined(__amd64__)
 	debug("RFL: CF:%s PF:%s AF:%s ZF:%s SF:%s TF:%s IF:%s DF:%s OF:%s IOPL:%s NT:%s RF:%s VM:%s AC:%s VIF:%s VIP:%s ID:%s AlwaysOne:%d R0:%#x R1:%#x R2:%#x R3:%#x",
 		  Frame->rflags.CF ? "True " : "False", Frame->rflags.PF ? "True " : "False", Frame->rflags.AF ? "True " : "False", Frame->rflags.ZF ? "True " : "False",
 		  Frame->rflags.SF ? "True " : "False", Frame->rflags.TF ? "True " : "False", Frame->rflags.IF ? "True " : "False", Frame->rflags.DF ? "True " : "False",
@@ -59,7 +59,7 @@ nsa void dbgPrint(CPU::ExceptionFrame *Frame)
 		  Frame->rflags.VM ? "True " : "False", Frame->rflags.AC ? "True " : "False", Frame->rflags.VIF ? "True " : "False", Frame->rflags.VIP ? "True " : "False",
 		  Frame->rflags.ID ? "True " : "False", Frame->rflags.AlwaysOne,
 		  Frame->rflags.Reserved0, Frame->rflags.Reserved1, Frame->rflags.Reserved2, Frame->rflags.Reserved3);
-#elif defined(a32)
+#elif defined(__i386__)
 	debug("EFL: CF:%s PF:%s AF:%s ZF:%s SF:%s TF:%s IF:%s DF:%s OF:%s IOPL:%s NT:%s RF:%s VM:%s AC:%s VIF:%s VIP:%s ID:%s AlwaysOne:%d R0:%#x R1:%#x R2:%#x",
 		  Frame->eflags.CF ? "True " : "False", Frame->eflags.PF ? "True " : "False", Frame->eflags.AF ? "True " : "False", Frame->eflags.ZF ? "True " : "False",
 		  Frame->eflags.SF ? "True " : "False", Frame->eflags.TF ? "True " : "False", Frame->eflags.IF ? "True " : "False", Frame->eflags.DF ? "True " : "False",
@@ -67,7 +67,7 @@ nsa void dbgPrint(CPU::ExceptionFrame *Frame)
 		  Frame->eflags.VM ? "True " : "False", Frame->eflags.AC ? "True " : "False", Frame->eflags.VIF ? "True " : "False", Frame->eflags.VIP ? "True " : "False",
 		  Frame->eflags.ID ? "True " : "False", Frame->eflags.AlwaysOne,
 		  Frame->eflags.Reserved0, Frame->eflags.Reserved1, Frame->eflags.Reserved2);
-#elif defined(aa64)
+#elif defined(__aarch64__)
 #endif
 }
 #endif

Kernel/core/pci.cpp

@@ -1100,7 +1100,7 @@ namespace PCI
 
 	Manager::Manager()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (!PowerManager->GetACPI())
 		{
 			error("ACPI not found");
@@ -1127,7 +1127,7 @@ namespace PCI
 			for (uint32_t Bus = NewDeviceConfig->StartBus; Bus < NewDeviceConfig->EndBus; Bus++)
 				EnumerateBus(NewDeviceConfig->BaseAddress, Bus, dev);
 		}
-#elif defined(aa64)
+#elif defined(__aarch64__)
 		error("PCI not implemented on aarch64");
 #endif
 	}

Kernel/core/random.cpp

@@ -63,7 +63,7 @@ namespace Random
 
 	uint16_t rand16()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (RDRANDFlag)
 		{
 			uint16_t RDRANDValue = 0;
@@ -80,7 +80,7 @@ namespace Random
 
 	uint32_t rand32()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (RDRANDFlag)
 		{
 			uint32_t RDRANDValue = 0;
@@ -97,7 +97,7 @@ namespace Random
 
 	uint64_t rand64()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		if (RDRANDFlag)
 		{
 			uintptr_t RDRANDValue = 0;

Kernel/core/stack_check.cpp

@@ -60,13 +60,13 @@ EXTERNC __noreturn __no_stack_protector void __stack_chk_fail(void)
 	CPU::PageTable(KernelPageTable);
 
 	void *Stack = nullptr;
-#if defined(a64)
+#if defined(__amd64__)
 	asmv("movq %%rsp, %0"
 		 : "=r"(Stack));
-#elif defined(a32)
+#elif defined(__i386__)
 	asmv("movl %%esp, %0"
 		 : "=r"(Stack));
-#elif defined(aa64)
+#elif defined(__aarch64__)
 	asmv("mov %%sp, %0"
 		 : "=r"(Stack));
 #endif

Kernel/core/symbols.cpp

@@ -101,10 +101,10 @@ namespace SymbolResolver
 		Elf_Sym *Symbols = nullptr;
 		uint8_t *StringAddress = nullptr;
 
-#if defined(a64) || defined(aa64)
+#if defined(__amd64__) || defined(__aarch64__)
 		Elf64_Xword SymbolSize = 0;
 		// Elf64_Xword StringSize = 0;
-#elif defined(a32)
+#elif defined(__i386__)
 		Elf32_Word SymbolSize = 0;
 		// Elf32_Word StringSize = 0;
 #endif
@@ -218,9 +218,9 @@ namespace SymbolResolver
 		}
 		debug("Solving symbols for address: %#llx", ImageAddress);
 
-#if defined(a64) || defined(aa64)
+#if defined(__amd64__) || defined(__aarch64__)
 		Elf64_Ehdr *Header = (Elf64_Ehdr *)ImageAddress;
-#elif defined(a32)
+#elif defined(__i386__)
 		Elf32_Ehdr *Header = (Elf32_Ehdr *)ImageAddress;
 #endif
 		if (Header->e_ident[0] != 0x7F &&

Kernel/core/syscalls.cpp

@@ -29,7 +29,7 @@ private:
 public:
 	AutoSwitchPageTable()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		asmv("mov %%cr3, %0"
 			 : "=r"(Original));
 
@@ -45,7 +45,7 @@ public:
 	{
 		debug("-    %#lx %s(%d)", Original,
 			  thisProcess->Name, thisProcess->ID);
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		asmv("mov %0, %%cr3"
 			 :
 			 : "r"(Original));

Kernel/core/time/hpet.cpp

@@ -28,12 +28,12 @@ namespace Time
 {
 	bool HighPrecisionEventTimer::Sleep(size_t Duration, Units Unit)
 	{
-#if defined(a64)
+#if defined(__amd64__)
 		uint64_t Target = mminq(&hpet->MainCounterValue) + (Duration * ConvertUnit(Unit)) / clk;
 		while (mminq(&hpet->MainCounterValue) < Target)
 			CPU::Pause();
 		return true;
-#elif defined(a32)
+#elif defined(__i386__)
 		uint64_t Target = mminl(&hpet->MainCounterValue) + (Duration * ConvertUnit(Unit)) / clk;
 		while (mminl(&hpet->MainCounterValue) < Target)
 			CPU::Pause();
@@ -44,25 +44,25 @@ namespace Time
 
 	uint64_t HighPrecisionEventTimer::GetCounter()
 	{
-#if defined(a64)
+#if defined(__amd64__)
 		return mminq(&hpet->MainCounterValue);
-#elif defined(a32)
+#elif defined(__i386__)
 		return mminl(&hpet->MainCounterValue);
 #endif
 	}
 
 	uint64_t HighPrecisionEventTimer::CalculateTarget(uint64_t Target, Units Unit)
 	{
-#if defined(a64)
+#if defined(__amd64__)
 		return mminq(&hpet->MainCounterValue) + (Target * ConvertUnit(Unit)) / clk;
-#elif defined(a32)
+#elif defined(__i386__)
 		return mminl(&hpet->MainCounterValue) + (Target * ConvertUnit(Unit)) / clk;
 #endif
 	}
 
 	uint64_t HighPrecisionEventTimer::GetNanosecondsSinceClassCreation()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		uint64_t Subtraction = this->GetCounter() - this->ClassCreationTime;
 		if (Subtraction <= 0 || this->clk <= 0)
 			return 0;
@@ -74,7 +74,7 @@ namespace Time
 
 	HighPrecisionEventTimer::HighPrecisionEventTimer(void *hpet)
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		ACPI::ACPI::HPETHeader *HPET_HDR = (ACPI::ACPI::HPETHeader *)hpet;
 		Memory::Virtual vmm;
 		vmm.Map((void *)HPET_HDR->Address.Address,
@@ -86,7 +86,7 @@ namespace Time
 			  (void *)HPET_HDR->Address.Address);
 		clk = s_cst(uint32_t, (uint64_t)this->hpet->GeneralCapabilities >> 32);
 		KPrint("HPET clock is %u Hz", clk);
-#ifdef a64
+#ifdef __amd64__
 		mmoutq(&this->hpet->GeneralConfiguration, 0);
 		mmoutq(&this->hpet->MainCounterValue, 0);
 		mmoutq(&this->hpet->GeneralConfiguration, 1);

Kernel/core/time/time.cpp

@@ -24,7 +24,7 @@ namespace Time
 	Clock ReadClock()
 	{
 		Clock tm;
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		uint32_t t = 0;
 		outb(0x70, 0x00);
 		t = inb(0x71);
@@ -45,7 +45,7 @@ namespace Time
 		t = inb(0x71);
 		tm.Year = ((t & 0x0F) + ((t >> 4) * 10));
 		tm.Counter = 0;
-#elif defined(aa64)
+#elif defined(__aarch64__)
 		tm.Year = 0;
 		tm.Month = 0;
 		tm.Day = 0;

Kernel/core/time/timer.cpp

@@ -145,7 +145,7 @@ namespace Time
 
 	void time::FindTimers(void *acpi)
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		/* TODO: RTC check */
 		/* TODO: PIT check */
 

Kernel/core/time/tsc.cpp

@@ -28,7 +28,7 @@ namespace Time
 {
 	bool TimeStampCounter::Sleep(size_t Duration, Units Unit)
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		uint64_t Target = this->GetCounter() + (Duration * ConvertUnit(Unit)) / this->clk;
 		while (this->GetCounter() < Target)
 			CPU::Pause();
@@ -38,28 +38,28 @@ namespace Time
 
 	uint64_t TimeStampCounter::GetCounter()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		return CPU::Counter();
 #endif
 	}
 
 	uint64_t TimeStampCounter::CalculateTarget(uint64_t Target, Units Unit)
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		return uint64_t((this->GetCounter() + (Target * ConvertUnit(Unit))) / this->clk);
 #endif
 	}
 
 	uint64_t TimeStampCounter::GetNanosecondsSinceClassCreation()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		return uint64_t((this->GetCounter() - this->ClassCreationTime) / this->clk);
 #endif
 	}
 
 	TimeStampCounter::TimeStampCounter()
 	{
-#if defined(a86)
+#if defined(__amd64__) || defined(__i386__)
 		stub; // FIXME: This is not a good way to measure the clock speed
 		uint64_t Start = CPU::Counter();
 		TimeManager->Sleep(1, Units::Milliseconds);