Merge pull request #1434 from phil-opp/post-04-test-true

Set `test=true` to enable `main.rs` testing again
Set test=true to enable main.rs testing again
2025-12-16 14:27:49 +00:00 · 2025-08-26 16:41:21 +02:00 · 2025-08-26 16:21:28 +02:00 · 2025-08-18 09:44:27 +02:00 · 2025-08-18 09:44:16 +02:00 · 2025-08-18 09:43:39 +02:00
25 changed files with 249 additions and 1439 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,3 +1,7 @@
+[unstable]
+build-std = ["core", "compiler_builtins"]
+build-std-features = ["compiler-builtins-mem"]
+
 [build]
 target = "x86_64-blog_os.json"

--- a/.github/workflows/build-code.yml
+++ b/.github/workflows/build-code.yml
@@ -1,96 +0,0 @@
-name: Build Code
-
-on:
-  push:
-    branches:
-      - '*'
-      - '!staging.tmp'
-    tags:
-      - '*'
-  schedule:
-    - cron: '40 3 * * *'   # every day at 3:40
-  pull_request:
-
-jobs:
-  test:
-    name: "Test"
-
-    strategy:
-      matrix:
-        platform: [
-          ubuntu-latest,
-          macos-latest,
-          windows-latest
-        ]
-
-    runs-on: ${{ matrix.platform }}
-    timeout-minutes: 15
-
-    steps:
-    - name: "Checkout Repository"
-      uses: actions/checkout@v1
-
-    - name: Install Rustup
-      run: |
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
-        echo ::add-path::$HOME/.cargo/bin
-      if: runner.os == 'macOS'
-
-    - name: "Print Rust Version"
-      run: |
-        rustc -Vv
-        cargo -Vv
-
-    - name: "Install Rustup Components"
-      run: rustup component add rust-src llvm-tools-preview
-    - name: "Install cargo-xbuild"
-      run: cargo install cargo-xbuild --debug
-    - name: "Install bootimage"
-      run: cargo install bootimage --debug
-
-    - name: "Run cargo xbuild"
-      run: cargo xbuild
-    - name: "Create Bootimage"
-      run: cargo bootimage
-
-     # install QEMU
-    - name: Install QEMU (Linux)
-      run: sudo apt update && sudo apt install qemu-system-x86
-      if: runner.os == 'Linux'
-    - name: Install QEMU (macOS)
-      run: brew install qemu
-      if: runner.os == 'macOS'
-      env:
-        HOMEBREW_NO_AUTO_UPDATE: 1
-        HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1
-        HOMEBREW_NO_INSTALL_CLEANUP: 1
-    - name: Install Scoop (Windows)
-      run: |
-        Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
-        echo ::add-path::$HOME\scoop\shims
-      if: runner.os == 'Windows'
-      shell: pwsh
-    - name: Install QEMU (Windows)
-      run: scoop install qemu
-      if: runner.os == 'Windows'
-      shell: pwsh
-    - name: "Print QEMU Version"
-      run: qemu-system-x86_64 --version
-
-    - name: "Run cargo xtest"
-      run: cargo xtest
-
-  check_formatting:
-    name: "Check Formatting"
-    runs-on: ubuntu-latest
-    timeout-minutes: 2
-    steps:
-    - uses: actions/checkout@v1
-    - name: "Use the latest Rust nightly with rustfmt"
-      uses: actions-rs/toolchain@v1
-      with:
-          toolchain: nightly
-          profile: minimal
-          components: rustfmt
-          override: true
-    - run: cargo fmt -- --check
--- a/.github/workflows/code.yml
+++ b/.github/workflows/code.yml
@@ -0,0 +1,130 @@
+name: Code
+
+on:
+  push:
+    branches:
+      - '*'
+      - '!staging.tmp'
+    tags:
+      - '*'
+  schedule:
+    - cron: '40 3 * * *'   # every day at 3:40
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  check:
+    name: Check
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [
+          ubuntu-latest,
+          macos-latest,
+          windows-latest
+        ]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Install Rust Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+      - name: Install `rust-src` Rustup Component
+        run: rustup component add rust-src
+      - name: Run `cargo check`
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+
+  test:
+    name: Test
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [
+          ubuntu-latest,
+          macos-latest,
+          windows-latest
+        ]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Install Rust Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+      - name: Install bootimage
+        run: cargo install bootimage --debug
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Install Rustup Components
+        run: rustup component add rust-src llvm-tools-preview
+      - name: Run `cargo bootimage`
+        uses: actions-rs/cargo@v1
+        with:
+          command: bootimage
+
+      # install QEMU
+      - name: Install QEMU (Linux)
+        run: sudo apt update && sudo apt install qemu-system-x86
+        if: runner.os == 'Linux'
+      - name: Install QEMU (macOS)
+        run: brew install qemu
+        if: runner.os == 'macOS'
+        env:
+          HOMEBREW_NO_AUTO_UPDATE: 1
+          HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+      - name: Install QEMU (Windows)
+        run: |
+          choco install qemu --version 2021.5.5
+          echo "$Env:Programfiles\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        if: runner.os == 'Windows'
+        shell: pwsh
+      - name: "Print QEMU Version"
+        run: qemu-system-x86_64 --version
+
+      - name: Run `cargo test`
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+
+  check_formatting:
+    name: Check Formatting
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Install Rust Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: rustfmt
+          override: true
+      - name: Run `cargo fmt`
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Install Rust Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: clippy, rust-src
+          override: true
+      - name: Run `cargo clippy`
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,210 +1,57 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+version = 4

 [[package]]
 name = "bit_field"
-version = "0.9.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"

 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29"

 [[package]]
 name = "blog_os"
 version = "0.1.0"
 dependencies = [
 "bootloader",
- "conquer-once",
- "cooked-waker",
- "crossbeam-queue",
- "futures-util",
 "lazy_static",
- "linked_list_allocator",
- "pc-keyboard",
- "pic8259_simple",
- "spin",
+ "spin 0.5.2",
 "uart_16550",
- "volatile",
+ "volatile 0.2.7",
 "x86_64",
 ]

 [[package]]
 name = "bootloader"
-version = "0.8.9"
+version = "0.9.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "152a28c753e229e037e910b4cd4cd16a90c53dd9a67fd751fa304b4b4a03970c"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "conquer-once"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f7644600a548ecad74e4a918392af1798f7dd045be610be3203b9e129b4f98f"
-dependencies = [
- "conquer-util",
-]
-
-[[package]]
-name = "conquer-util"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "654fb2472cc369d311c547103a1fa81d467bef370ae7a0680f65939895b1182a"
-
-[[package]]
-name = "cooked-waker"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0032e8be0680b63daf14b0fd7fd57f85fd6897951e110b041d32e839a831914"
-dependencies = [
- "cooked-waker-derive",
- "stowaway",
-]
-
-[[package]]
-name = "cooked-waker-derive"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ded02b04a8ff53ea7328cd71297cde598bee70d165ad92512bdb7e20be9d74"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "cpuio"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22b8e308ccfc5acf3b82f79c0eac444cf6114cb2ac67a230ca6c177210068daa"
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
-
-[[package]]
-name = "futures-task"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
-
-[[package]]
-name = "futures-util"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
-dependencies = [
- "futures-core",
- "futures-task",
- "pin-utils",
-]
+checksum = "1ea119c3ed05625c179e09d17d0914570a3753ca09c890a73d98f6b72aea00d2"

 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin",
+ "spin 0.9.8",
 ]

 [[package]]
-name = "linked_list_allocator"
-version = "0.8.0"
+name = "rustversion"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c618c431dfe4419afbe22852f6aceffbc17bd82ba0a18b982def291000824c"
-dependencies = [
- "spinning_top",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "pc-keyboard"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c48392db76c4e9a69e0b3be356c5f97ebb7b14413c5e4fd0af4755dbf86e2fce"
-
-[[package]]
-name = "pic8259_simple"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc64b2fd10828da8521b6cdabe0679385d7d2a3a6d4c336b819d1fa31ba35c72"
-dependencies = [
- "cpuio",
-]
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0-alpha.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"

 [[package]]
 name = "spin"
@@ -213,59 +60,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
-name = "spinning_top"
-version = "0.1.0"
+name = "spin"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d801a3a53bcf5071f85fef8d5cab9e5f638fc5580a37e6eb7aba4b37438d24"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "stowaway"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b13d61e782863c0eaeeaf7e8e580dc956a625851fd2fb73e5e92db9601c891"
-
-[[package]]
-name = "syn"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"

 [[package]]
 name = "uart_16550"
-version = "0.2.4"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d44b0f30cb82b0fbc15b78ade1064226529ad52028bc8cb8accb98ff6f3d7131"
+checksum = "614ff2a87880d4bd4374722268598a970bbad05ced8bf630439417347254ab2e"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+ "rustversion",
 "x86_64",
 ]

 [[package]]
-name = "unicode-xid"
-version = "0.2.0"
+name = "volatile"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945"

 [[package]]
 name = "volatile"
-version = "0.2.6"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29"
+checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793"

 [[package]]
 name = "x86_64"
-version = "0.9.6"
+version = "0.14.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4206b60c9f99766329b66962aa8ddc01df6c7edd02edc046b7a69d5df9fcdbcf"
+checksum = "c101112411baafbb4bf8d33e4c4a80ab5b02d74d2612331c61e8192fc9710491"
 dependencies = [
 "bit_field",
- "bitflags",
+ "bitflags 2.9.2",
+ "rustversion",
+ "volatile 0.4.6",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,48 +2,36 @@
 name = "blog_os"
 version = "0.1.0"
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
-edition = "2018"
+edition = "2024"

 [[test]]
 name = "should_panic"
 harness = false

-[[test]]
-name = "stack_overflow"
-harness = false
-
 [dependencies]
-bootloader = { version = "0.8.8", features = ["map_physical_memory"]}
+bootloader = "0.9"
 volatile = "0.2.6"
 spin = "0.5.2"
-x86_64 = "0.9.6"
+x86_64 = "0.14.2"
 uart_16550 = "0.2.0"
-pic8259_simple = "0.1.1"
-pc-keyboard = "0.5.0"
-linked_list_allocator = "0.8.0"
-cooked-waker = "1.0.2"

 [dependencies.lazy_static]
 version = "1.0"
 features = ["spin_no_std"]

-[dependencies.crossbeam-queue]
-version = "0.2.1"
-default-features = false
-features = ["alloc"]
+[[bin]]
+name = "blog_os"
+test = true
+bench = false

-[dependencies.conquer-once]
-version = "0.2.0"
-default-features = false
-
-[dependencies.futures-util]
-version = "0.3.4"
-default-features = false
-features = ["alloc"]

 [package.metadata.bootimage]
 test-args = [
-    "-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-serial", "stdio",
-    "-display", "none"
+    "-device",
+    "isa-debug-exit,iobase=0xf4,iosize=0x04",
+    "-serial",
+    "stdio",
+    "-display",
+    "none",
 ]
-test-success-exit-code = 33         # (0x10 << 1) | 1
+test-success-exit-code = 33 # (0x10 << 1) | 1
--- a/README.md
+++ b/README.md
@@ -1,28 +1,32 @@
-# Blog OS (Heap Allocation)
+# Blog OS (Testing)

-[![Build Status](https://github.com/phil-opp/blog_os/workflows/Build%20Code/badge.svg?branch=post-10)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Build+Code%22+branch%3Apost-10)
+[![Build Status](https://github.com/phil-opp/blog_os/workflows/Code/badge.svg?branch=post-04)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Code%22+branch%3Apost-04)

-This repository contains the source code for the [Heap Allocation][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.
+This repository contains the source code for the [Testing][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.

-[post]: https://os.phil-opp.com/heap-allocation/
+[post]: https://os.phil-opp.com/testing/

 **Check out the [master branch](https://github.com/phil-opp/blog_os) for more information.**

 ## Building

-You need a nightly Rust compiler. First you need to install the `cargo-xbuild` and `bootimage` tools:
+This project requires a nightly version of Rust because it uses some unstable features. At least nightly _2020-07-15_ is required for building. You might need to run `rustup update nightly --force` to update to the latest nightly even if some components such as `rustfmt` are missing it.
+
+You can build the project by running:

 ```
-cargo install cargo-xbuild bootimage
+cargo build
 ```

-Then you can build the project by running:
+To create a bootable disk image from the compiled kernel, you need to install the [`bootimage`] tool:
+
+[`bootimage`]: https://github.com/rust-osdev/bootimage

 ```
-cargo xbuild
+cargo install bootimage
 ```

-To create a bootable disk image, run:
+After installing, you can create the bootable disk image by running:

 ```
 cargo bootimage
@@ -39,10 +43,10 @@ You can run the disk image in [QEMU] through:
 [QEMU]: https://www.qemu.org/

 ```
-cargo xrun
+cargo run
 ```

-Of course [QEMU] needs to be installed for this.
+[QEMU] and the [`bootimage`] tool need to be installed for this.

 You can also write the image to an USB stick for booting it on a real machine. On Linux, the command for this is:

--- a/src/allocator.rs
+++ b/src/allocator.rs
@@ -1,82 +0,0 @@
-use alloc::alloc::{GlobalAlloc, Layout};
-use core::ptr::null_mut;
-use fixed_size_block::FixedSizeBlockAllocator;
-use x86_64::{
-    structures::paging::{
-        mapper::MapToError, FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB,
-    },
-    VirtAddr,
-};
-
-pub mod bump;
-pub mod fixed_size_block;
-pub mod linked_list;
-
-pub const HEAP_START: usize = 0x_4444_4444_0000;
-pub const HEAP_SIZE: usize = 100 * 1024; // 100 KiB
-
-#[global_allocator]
-static ALLOCATOR: Locked<FixedSizeBlockAllocator> = Locked::new(FixedSizeBlockAllocator::new());
-
-pub fn init_heap(
-    mapper: &mut impl Mapper<Size4KiB>,
-    frame_allocator: &mut impl FrameAllocator<Size4KiB>,
-) -> Result<(), MapToError<Size4KiB>> {
-    let page_range = {
-        let heap_start = VirtAddr::new(HEAP_START as u64);
-        let heap_end = heap_start + HEAP_SIZE - 1u64;
-        let heap_start_page = Page::containing_address(heap_start);
-        let heap_end_page = Page::containing_address(heap_end);
-        Page::range_inclusive(heap_start_page, heap_end_page)
-    };
-
-    for page in page_range {
-        let frame = frame_allocator
-            .allocate_frame()
-            .ok_or(MapToError::FrameAllocationFailed)?;
-        let flags = PageTableFlags::PRESENT | PageTableFlags::WRITABLE;
-        mapper.map_to(page, frame, flags, frame_allocator)?.flush();
-    }
-
-    unsafe {
-        ALLOCATOR.lock().init(HEAP_START, HEAP_SIZE);
-    }
-
-    Ok(())
-}
-
-pub struct Dummy;
-
-unsafe impl GlobalAlloc for Dummy {
-    unsafe fn alloc(&self, _layout: Layout) -> *mut u8 {
-        null_mut()
-    }
-
-    unsafe fn dealloc(&self, _ptr: *mut u8, _layout: Layout) {
-        panic!("dealloc should be never called")
-    }
-}
-
-/// A wrapper around spin::Mutex to permit trait implementations.
-pub struct Locked<A> {
-    inner: spin::Mutex<A>,
-}
-
-impl<A> Locked<A> {
-    pub const fn new(inner: A) -> Self {
-        Locked {
-            inner: spin::Mutex::new(inner),
-        }
-    }
-
-    pub fn lock(&self) -> spin::MutexGuard<A> {
-        self.inner.lock()
-    }
-}
-
-/// Align the given address `addr` upwards to alignment `align`.
-///
-/// Requires that `align` is a power of two.
-fn align_up(addr: usize, align: usize) -> usize {
-    (addr + align - 1) & !(align - 1)
-}
--- a/src/allocator/bump.rs
+++ b/src/allocator/bump.rs
@@ -1,61 +0,0 @@
-use super::{align_up, Locked};
-use alloc::alloc::{GlobalAlloc, Layout};
-use core::ptr;
-
-pub struct BumpAllocator {
-    heap_start: usize,
-    heap_end: usize,
-    next: usize,
-    allocations: usize,
-}
-
-impl BumpAllocator {
-    /// Creates a new empty bump allocator.
-    pub const fn new() -> Self {
-        BumpAllocator {
-            heap_start: 0,
-            heap_end: 0,
-            next: 0,
-            allocations: 0,
-        }
-    }
-
-    /// Initializes the bump allocator with the given heap bounds.
-    ///
-    /// This method is unsafe because the caller must ensure that the given
-    /// memory range is unused. Also, this method must be called only once.
-    pub unsafe fn init(&mut self, heap_start: usize, heap_size: usize) {
-        self.heap_start = heap_start;
-        self.heap_end = heap_start.saturating_add(heap_size);
-        self.next = heap_start;
-    }
-}
-
-unsafe impl GlobalAlloc for Locked<BumpAllocator> {
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        let mut bump = self.lock(); // get a mutable reference
-
-        let alloc_start = align_up(bump.next, layout.align());
-        let alloc_end = match alloc_start.checked_add(layout.size()) {
-            Some(end) => end,
-            None => return ptr::null_mut(),
-        };
-
-        if alloc_end > bump.heap_end {
-            ptr::null_mut() // out of memory
-        } else {
-            bump.next = alloc_end;
-            bump.allocations += 1;
-            alloc_start as *mut u8
-        }
-    }
-
-    unsafe fn dealloc(&self, _ptr: *mut u8, _layout: Layout) {
-        let mut bump = self.lock(); // get a mutable reference
-
-        bump.allocations -= 1;
-        if bump.allocations == 0 {
-            bump.next = bump.heap_start;
-        }
-    }
-}
--- a/src/allocator/fixed_size_block.rs
+++ b/src/allocator/fixed_size_block.rs
@@ -1,102 +0,0 @@
-use super::Locked;
-use alloc::alloc::{GlobalAlloc, Layout};
-use core::{
-    mem,
-    ptr::{self, NonNull},
-};
-
-/// The block sizes to use.
-///
-/// The sizes must each be power of 2 because they are also used as
-/// the block alignment (alignments must be always powers of 2).
-const BLOCK_SIZES: &[usize] = &[8, 16, 32, 64, 128, 256, 512, 1024, 2048];
-
-/// Choose an appropriate block size for the given layout.
-///
-/// Returns an index into the `BLOCK_SIZES` array.
-fn list_index(layout: &Layout) -> Option<usize> {
-    let required_block_size = layout.size().max(layout.align());
-    BLOCK_SIZES.iter().position(|&s| s >= required_block_size)
-}
-
-struct ListNode {
-    next: Option<&'static mut ListNode>,
-}
-
-pub struct FixedSizeBlockAllocator {
-    list_heads: [Option<&'static mut ListNode>; BLOCK_SIZES.len()],
-    fallback_allocator: linked_list_allocator::Heap,
-}
-
-impl FixedSizeBlockAllocator {
-    /// Creates an empty FixedSizeBlockAllocator.
-    pub const fn new() -> Self {
-        FixedSizeBlockAllocator {
-            list_heads: [None; BLOCK_SIZES.len()],
-            fallback_allocator: linked_list_allocator::Heap::empty(),
-        }
-    }
-
-    /// Initialize the allocator with the given heap bounds.
-    ///
-    /// This function is unsafe because the caller must guarantee that the given
-    /// heap bounds are valid and that the heap is unused. This method must be
-    /// called only once.
-    pub unsafe fn init(&mut self, heap_start: usize, heap_size: usize) {
-        self.fallback_allocator.init(heap_start, heap_size);
-    }
-
-    /// Allocates using the fallback allocator.
-    fn fallback_alloc(&mut self, layout: Layout) -> *mut u8 {
-        match self.fallback_allocator.allocate_first_fit(layout) {
-            Ok(ptr) => ptr.as_ptr(),
-            Err(_) => ptr::null_mut(),
-        }
-    }
-}
-
-unsafe impl GlobalAlloc for Locked<FixedSizeBlockAllocator> {
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        let mut allocator = self.lock();
-        match list_index(&layout) {
-            Some(index) => {
-                match allocator.list_heads[index].take() {
-                    Some(node) => {
-                        allocator.list_heads[index] = node.next.take();
-                        node as *mut ListNode as *mut u8
-                    }
-                    None => {
-                        // no block exists in list => allocate new block
-                        let block_size = BLOCK_SIZES[index];
-                        // only works if all block sizes are a power of 2
-                        let block_align = block_size;
-                        let layout = Layout::from_size_align(block_size, block_align).unwrap();
-                        allocator.fallback_alloc(layout)
-                    }
-                }
-            }
-            None => allocator.fallback_alloc(layout),
-        }
-    }
-
-    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        let mut allocator = self.lock();
-        match list_index(&layout) {
-            Some(index) => {
-                let new_node = ListNode {
-                    next: allocator.list_heads[index].take(),
-                };
-                // verify that block has size and alignment required for storing node
-                assert!(mem::size_of::<ListNode>() <= BLOCK_SIZES[index]);
-                assert!(mem::align_of::<ListNode>() <= BLOCK_SIZES[index]);
-                let new_node_ptr = ptr as *mut ListNode;
-                new_node_ptr.write(new_node);
-                allocator.list_heads[index] = Some(&mut *new_node_ptr);
-            }
-            None => {
-                let ptr = NonNull::new(ptr).unwrap();
-                allocator.fallback_allocator.deallocate(ptr, layout);
-            }
-        }
-    }
-}
--- a/src/allocator/linked_list.rs
+++ b/src/allocator/linked_list.rs
@@ -1,145 +0,0 @@
-use super::{align_up, Locked};
-use alloc::alloc::{GlobalAlloc, Layout};
-use core::{mem, ptr};
-
-struct ListNode {
-    size: usize,
-    next: Option<&'static mut ListNode>,
-}
-
-impl ListNode {
-    const fn new(size: usize) -> Self {
-        ListNode { size, next: None }
-    }
-
-    fn start_addr(&self) -> usize {
-        self as *const Self as usize
-    }
-
-    fn end_addr(&self) -> usize {
-        self.start_addr() + self.size
-    }
-}
-
-pub struct LinkedListAllocator {
-    head: ListNode,
-}
-
-impl LinkedListAllocator {
-    /// Creates an empty LinkedListAllocator.
-    pub const fn new() -> Self {
-        Self {
-            head: ListNode::new(0),
-        }
-    }
-
-    /// Initialize the allocator with the given heap bounds.
-    ///
-    /// This function is unsafe because the caller must guarantee that the given
-    /// heap bounds are valid and that the heap is unused. This method must be
-    /// called only once.
-    pub unsafe fn init(&mut self, heap_start: usize, heap_size: usize) {
-        self.add_free_region(heap_start, heap_size);
-    }
-
-    /// Adds the given memory region to the front of the list.
-    unsafe fn add_free_region(&mut self, addr: usize, size: usize) {
-        // ensure that the freed region is capable of holding ListNode
-        assert!(align_up(addr, mem::align_of::<ListNode>()) == addr);
-        assert!(size >= mem::size_of::<ListNode>());
-
-        // create a new list node and append it at the start of the list
-        let mut node = ListNode::new(size);
-        node.next = self.head.next.take();
-        let node_ptr = addr as *mut ListNode;
-        node_ptr.write(node);
-        self.head.next = Some(&mut *node_ptr)
-    }
-
-    /// Looks for a free region with the given size and alignment and removes
-    /// it from the list.
-    ///
-    /// Returns a tuple of the list node and the start address of the allocation.
-    fn find_region(&mut self, size: usize, align: usize) -> Option<(&'static mut ListNode, usize)> {
-        // reference to current list node, updated for each iteration
-        let mut current = &mut self.head;
-        // look for a large enough memory region in linked list
-        while let Some(ref mut region) = current.next {
-            if let Ok(alloc_start) = Self::alloc_from_region(&region, size, align) {
-                // region suitable for allocation -> remove node from list
-                let next = region.next.take();
-                let ret = Some((current.next.take().unwrap(), alloc_start));
-                current.next = next;
-                return ret;
-            } else {
-                // region not suitable -> continue with next region
-                current = current.next.as_mut().unwrap();
-            }
-        }
-
-        // no suitable region found
-        None
-    }
-
-    /// Try to use the given region for an allocation with given size and alignment.
-    ///
-    /// Returns the allocation start address on success.
-    fn alloc_from_region(region: &ListNode, size: usize, align: usize) -> Result<usize, ()> {
-        let alloc_start = align_up(region.start_addr(), align);
-        let alloc_end = alloc_start.checked_add(size).ok_or(())?;
-
-        if alloc_end > region.end_addr() {
-            // region too small
-            return Err(());
-        }
-
-        let excess_size = region.end_addr() - alloc_end;
-        if excess_size > 0 && excess_size < mem::size_of::<ListNode>() {
-            // rest of region too small to hold a ListNode (required because the
-            // allocation splits the region in a used and a free part)
-            return Err(());
-        }
-
-        // region suitable for allocation
-        Ok(alloc_start)
-    }
-
-    /// Adjust the given layout so that the resulting allocated memory
-    /// region is also capable of storing a `ListNode`.
-    ///
-    /// Returns the adjusted size and alignment as a (size, align) tuple.
-    fn size_align(layout: Layout) -> (usize, usize) {
-        let layout = layout
-            .align_to(mem::align_of::<ListNode>())
-            .expect("adjusting alignment failed")
-            .pad_to_align();
-        let size = layout.size().max(mem::size_of::<ListNode>());
-        (size, layout.align())
-    }
-}
-
-unsafe impl GlobalAlloc for Locked<LinkedListAllocator> {
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        // perform layout adjustments
-        let (size, align) = LinkedListAllocator::size_align(layout);
-        let mut allocator = self.lock();
-
-        if let Some((region, alloc_start)) = allocator.find_region(size, align) {
-            let alloc_end = alloc_start.checked_add(size).expect("overflow");
-            let excess_size = region.end_addr() - alloc_end;
-            if excess_size > 0 {
-                allocator.add_free_region(alloc_end, excess_size);
-            }
-            alloc_start as *mut u8
-        } else {
-            ptr::null_mut()
-        }
-    }
-
-    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        // perform layout adjustments
-        let (size, _) = LinkedListAllocator::size_align(layout);
-
-        self.lock().add_free_region(ptr as usize, size)
-    }
-}
--- a/src/gdt.rs
+++ b/src/gdt.rs
@@ -1,52 +0,0 @@
-use lazy_static::lazy_static;
-use x86_64::structures::gdt::{Descriptor, GlobalDescriptorTable, SegmentSelector};
-use x86_64::structures::tss::TaskStateSegment;
-use x86_64::VirtAddr;
-
-pub const DOUBLE_FAULT_IST_INDEX: u16 = 0;
-
-lazy_static! {
-    static ref TSS: TaskStateSegment = {
-        let mut tss = TaskStateSegment::new();
-        tss.interrupt_stack_table[DOUBLE_FAULT_IST_INDEX as usize] = {
-            const STACK_SIZE: usize = 4096;
-            static mut STACK: [u8; STACK_SIZE] = [0; STACK_SIZE];
-
-            let stack_start = VirtAddr::from_ptr(unsafe { &STACK });
-            let stack_end = stack_start + STACK_SIZE;
-            stack_end
-        };
-        tss
-    };
-}
-
-lazy_static! {
-    static ref GDT: (GlobalDescriptorTable, Selectors) = {
-        let mut gdt = GlobalDescriptorTable::new();
-        let code_selector = gdt.add_entry(Descriptor::kernel_code_segment());
-        let tss_selector = gdt.add_entry(Descriptor::tss_segment(&TSS));
-        (
-            gdt,
-            Selectors {
-                code_selector,
-                tss_selector,
-            },
-        )
-    };
-}
-
-struct Selectors {
-    code_selector: SegmentSelector,
-    tss_selector: SegmentSelector,
-}
-
-pub fn init() {
-    use x86_64::instructions::segmentation::set_cs;
-    use x86_64::instructions::tables::load_tss;
-
-    GDT.0.load();
-    unsafe {
-        set_cs(GDT.1.code_selector);
-        load_tss(GDT.1.tss_selector);
-    }
-}
--- a/src/interrupts.rs
+++ b/src/interrupts.rs
@@ -1,104 +0,0 @@
-use crate::{gdt, hlt_loop, print, println};
-use lazy_static::lazy_static;
-use pic8259_simple::ChainedPics;
-use spin;
-use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode};
-
-pub const PIC_1_OFFSET: u8 = 32;
-pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;
-
-#[derive(Debug, Clone, Copy)]
-#[repr(u8)]
-pub enum InterruptIndex {
-    Timer = PIC_1_OFFSET,
-    Keyboard,
-}
-
-impl InterruptIndex {
-    fn as_u8(self) -> u8 {
-        self as u8
-    }
-
-    fn as_usize(self) -> usize {
-        usize::from(self.as_u8())
-    }
-}
-
-pub static PICS: spin::Mutex<ChainedPics> =
-    spin::Mutex::new(unsafe { ChainedPics::new(PIC_1_OFFSET, PIC_2_OFFSET) });
-
-lazy_static! {
-    static ref IDT: InterruptDescriptorTable = {
-        let mut idt = InterruptDescriptorTable::new();
-        idt.breakpoint.set_handler_fn(breakpoint_handler);
-        idt.page_fault.set_handler_fn(page_fault_handler);
-        unsafe {
-            idt.double_fault
-                .set_handler_fn(double_fault_handler)
-                .set_stack_index(gdt::DOUBLE_FAULT_IST_INDEX);
-        }
-        idt[InterruptIndex::Timer.as_usize()].set_handler_fn(timer_interrupt_handler);
-        idt[InterruptIndex::Keyboard.as_usize()].set_handler_fn(keyboard_interrupt_handler);
-        idt
-    };
-}
-
-pub fn init_idt() {
-    IDT.load();
-}
-
-extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFrame) {
-    println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
-}
-
-extern "x86-interrupt" fn page_fault_handler(
-    stack_frame: &mut InterruptStackFrame,
-    error_code: PageFaultErrorCode,
-) {
-    use x86_64::registers::control::Cr2;
-
-    println!("EXCEPTION: PAGE FAULT");
-    println!("Accessed Address: {:?}", Cr2::read());
-    println!("Error Code: {:?}", error_code);
-    println!("{:#?}", stack_frame);
-    hlt_loop();
-}
-
-extern "x86-interrupt" fn double_fault_handler(
-    stack_frame: &mut InterruptStackFrame,
-    _error_code: u64,
-) -> ! {
-    panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
-}
-
-extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
-    print!(".");
-    unsafe {
-        PICS.lock()
-            .notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
-    }
-}
-
-extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
-    use x86_64::instructions::port::Port;
-
-    let mut port = Port::new(0x60);
-    let scancode: u8 = unsafe { port.read() };
-    crate::task::keyboard::add_scancode(scancode);
-
-    unsafe {
-        PICS.lock()
-            .notify_end_of_interrupt(InterruptIndex::Keyboard.as_u8());
-    }
-}
-
-#[cfg(test)]
-use crate::{serial_print, serial_println};
-
-#[test_case]
-fn test_breakpoint_exception() {
-    serial_print!("test_breakpoint_exception...");
-    // invoke a breakpoint exception
-    x86_64::instructions::interrupts::int3();
-    serial_println!("[ok]");
-}
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,37 +1,33 @@
 #![no_std]
 #![cfg_attr(test, no_main)]
 #![feature(custom_test_frameworks)]
-#![feature(abi_x86_interrupt)]
-#![feature(alloc_error_handler)]
-#![feature(const_fn)]
-#![feature(alloc_layout_extra)]
-#![feature(const_in_array_repeat_expressions)]
 #![test_runner(crate::test_runner)]
 #![reexport_test_harness_main = "test_main"]

-extern crate alloc;
-
 use core::panic::PanicInfo;

-pub mod allocator;
-pub mod gdt;
-pub mod interrupts;
-pub mod memory;
 pub mod serial;
-pub mod task;
 pub mod vga_buffer;

-pub fn init() {
-    gdt::init();
-    interrupts::init_idt();
-    unsafe { interrupts::PICS.lock().initialize() };
-    x86_64::instructions::interrupts::enable();
+pub trait Testable {
+    fn run(&self) -> ();
 }

-pub fn test_runner(tests: &[&dyn Fn()]) {
+impl<T> Testable for T
+where
+    T: Fn(),
+{
+    fn run(&self) {
+        serial_print!("{}...\t", core::any::type_name::<T>());
+        self();
+        serial_println!("[ok]");
+    }
+}
+
+pub fn test_runner(tests: &[&dyn Testable]) {
    serial_println!("Running {} tests", tests.len());
    for test in tests {
-        test();
+        test.run();
    }
    exit_qemu(QemuExitCode::Success);
 }
@@ -40,7 +36,7 @@ pub fn test_panic_handler(info: &PanicInfo) -> ! {
    serial_println!("[failed]\n");
    serial_println!("Error: {}\n", info);
    exit_qemu(QemuExitCode::Failed);
-    hlt_loop();
+    loop {}
 }

 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -59,24 +55,12 @@ pub fn exit_qemu(exit_code: QemuExitCode) {
    }
 }

-pub fn hlt_loop() -> ! {
-    loop {
-        x86_64::instructions::hlt();
-    }
-}
-
-#[cfg(test)]
-use bootloader::{entry_point, BootInfo};
-
-#[cfg(test)]
-entry_point!(test_kernel_main);
-
 /// Entry point for `cargo xtest`
 #[cfg(test)]
-fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
-    init();
+#[unsafe(no_mangle)]
+pub extern "C" fn _start() -> ! {
    test_main();
-    hlt_loop();
+    loop {}
 }

 #[cfg(test)]
@@ -84,8 +68,3 @@ fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
 fn panic(info: &PanicInfo) -> ! {
    test_panic_handler(info)
 }
-
-#[alloc_error_handler]
-fn alloc_error_handler(layout: alloc::alloc::Layout) -> ! {
-    panic!("allocation error: {:?}", layout)
-}
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,48 +4,17 @@
 #![test_runner(blog_os::test_runner)]
 #![reexport_test_harness_main = "test_main"]

-extern crate alloc;
-
 use blog_os::println;
-use bootloader::{entry_point, BootInfo};
 use core::panic::PanicInfo;

-entry_point!(kernel_main);
-
-fn kernel_main(boot_info: &'static BootInfo) -> ! {
-    use blog_os::allocator;
-    use blog_os::memory::{self, BootInfoFrameAllocator};
-    use blog_os::task::{keyboard, simple_executor::SimpleExecutor, Task};
-    use x86_64::VirtAddr;
-
+#[unsafe(no_mangle)]
+pub extern "C" fn _start() -> ! {
    println!("Hello World{}", "!");
-    blog_os::init();
-
-    let phys_mem_offset = VirtAddr::new(boot_info.physical_memory_offset);
-    let mut mapper = unsafe { memory::init(phys_mem_offset) };
-    let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_map) };
-
-    allocator::init_heap(&mut mapper, &mut frame_allocator).expect("heap initialization failed");
-
-    let mut executor = SimpleExecutor::new();
-    executor.spawn(Task::new(example_task()));
-    executor.spawn(Task::new(keyboard::print_keypresses()));
-    executor.run();

    #[cfg(test)]
    test_main();

-    println!("It did not crash!");
-    blog_os::hlt_loop();
-}
-
-async fn async_number() -> u32 {
-    42
-}
-
-async fn example_task() {
-    let number = async_number().await;
-    println!("async number: {}", number);
+    loop {}
 }

 /// This function is called on panic.
@@ -53,7 +22,7 @@ async fn example_task() {
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
    println!("{}", info);
-    blog_os::hlt_loop();
+    loop {}
 }

 #[cfg(test)]
@@ -61,3 +30,8 @@ fn panic(info: &PanicInfo) -> ! {
 fn panic(info: &PanicInfo) -> ! {
    blog_os::test_panic_handler(info)
 }
+
+#[test_case]
+fn trivial_assertion() {
+    assert_eq!(1, 1);
+}
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -1,106 +0,0 @@
-use bootloader::bootinfo::{MemoryMap, MemoryRegionType};
-use x86_64::{
-    structures::paging::{
-        FrameAllocator, Mapper, OffsetPageTable, Page, PageTable, PhysFrame, Size4KiB,
-        UnusedPhysFrame,
-    },
-    PhysAddr, VirtAddr,
-};
-
-/// Initialize a new OffsetPageTable.
-///
-/// This function is unsafe because the caller must guarantee that the
-/// complete physical memory is mapped to virtual memory at the passed
-/// `physical_memory_offset`. Also, this function must be only called once
-/// to avoid aliasing `&mut` references (which is undefined behavior).
-pub unsafe fn init(physical_memory_offset: VirtAddr) -> OffsetPageTable<'static> {
-    let level_4_table = active_level_4_table(physical_memory_offset);
-    OffsetPageTable::new(level_4_table, physical_memory_offset)
-}
-
-/// Returns a mutable reference to the active level 4 table.
-///
-/// This function is unsafe because the caller must guarantee that the
-/// complete physical memory is mapped to virtual memory at the passed
-/// `physical_memory_offset`. Also, this function must be only called once
-/// to avoid aliasing `&mut` references (which is undefined behavior).
-unsafe fn active_level_4_table(physical_memory_offset: VirtAddr) -> &'static mut PageTable {
-    use x86_64::registers::control::Cr3;
-
-    let (level_4_table_frame, _) = Cr3::read();
-
-    let phys = level_4_table_frame.start_address();
-    let virt = physical_memory_offset + phys.as_u64();
-    let page_table_ptr: *mut PageTable = virt.as_mut_ptr();
-
-    &mut *page_table_ptr // unsafe
-}
-
-/// Creates an example mapping for the given page to frame `0xb8000`.
-pub fn create_example_mapping(
-    page: Page,
-    mapper: &mut OffsetPageTable,
-    frame_allocator: &mut impl FrameAllocator<Size4KiB>,
-) {
-    use x86_64::structures::paging::PageTableFlags as Flags;
-
-    let frame = PhysFrame::containing_address(PhysAddr::new(0xb8000));
-    // FIXME: ONLY FOR TEMPORARY TESTING
-    let unused_frame = unsafe { UnusedPhysFrame::new(frame) };
-    let flags = Flags::PRESENT | Flags::WRITABLE;
-
-    let map_to_result = mapper.map_to(page, unused_frame, flags, frame_allocator);
-    map_to_result.expect("map_to failed").flush();
-}
-
-/// A FrameAllocator that always returns `None`.
-pub struct EmptyFrameAllocator;
-
-unsafe impl FrameAllocator<Size4KiB> for EmptyFrameAllocator {
-    fn allocate_frame(&mut self) -> Option<UnusedPhysFrame> {
-        None
-    }
-}
-
-/// A FrameAllocator that returns usable frames from the bootloader's memory map.
-pub struct BootInfoFrameAllocator {
-    memory_map: &'static MemoryMap,
-    next: usize,
-}
-
-impl BootInfoFrameAllocator {
-    /// Create a FrameAllocator from the passed memory map.
-    ///
-    /// This function is unsafe because the caller must guarantee that the passed
-    /// memory map is valid. The main requirement is that all frames that are marked
-    /// as `USABLE` in it are really unused.
-    pub unsafe fn init(memory_map: &'static MemoryMap) -> Self {
-        BootInfoFrameAllocator {
-            memory_map,
-            next: 0,
-        }
-    }
-
-    /// Returns an iterator over the usable frames specified in the memory map.
-    fn usable_frames(&self) -> impl Iterator<Item = UnusedPhysFrame> {
-        // get usable regions from memory map
-        let regions = self.memory_map.iter();
-        let usable_regions = regions.filter(|r| r.region_type == MemoryRegionType::Usable);
-        // map each region to its address range
-        let addr_ranges = usable_regions.map(|r| r.range.start_addr()..r.range.end_addr());
-        // transform to an iterator of frame start addresses
-        let frame_addresses = addr_ranges.flat_map(|r| r.step_by(4096));
-        // create `PhysFrame` types from the start addresses
-        let frames = frame_addresses.map(|addr| PhysFrame::containing_address(PhysAddr::new(addr)));
-        // we know that the frames are really unused
-        frames.map(|f| unsafe { UnusedPhysFrame::new(f) })
-    }
-}
-
-unsafe impl FrameAllocator<Size4KiB> for BootInfoFrameAllocator {
-    fn allocate_frame(&mut self) -> Option<UnusedPhysFrame> {
-        let frame = self.usable_frames().nth(self.next);
-        self.next += 1;
-        frame
-    }
-}
--- a/src/serial.rs
+++ b/src/serial.rs
@@ -13,14 +13,10 @@ lazy_static! {
 #[doc(hidden)]
 pub fn _print(args: ::core::fmt::Arguments) {
    use core::fmt::Write;
-    use x86_64::instructions::interrupts;
-
-    interrupts::without_interrupts(|| {
-        SERIAL1
-            .lock()
-            .write_fmt(args)
-            .expect("Printing to serial failed");
-    });
+    SERIAL1
+        .lock()
+        .write_fmt(args)
+        .expect("Printing to serial failed");
 }

 /// Prints to the host through the serial interface.
--- a/src/task/keyboard.rs
+++ b/src/task/keyboard.rs
@@ -1,79 +0,0 @@
-use crate::print;
-use crate::println;
-use conquer_once::spin::OnceCell;
-use core::{
-    pin::Pin,
-    task::{Context, Poll},
-};
-use crossbeam_queue::ArrayQueue;
-use futures_util::stream::StreamExt;
-use futures_util::{stream::Stream, task::AtomicWaker};
-use pc_keyboard::{layouts, DecodedKey, HandleControl, Keyboard, ScancodeSet1};
-
-static SCANCODE_QUEUE: OnceCell<ArrayQueue<u8>> = OnceCell::uninit();
-static WAKER: AtomicWaker = AtomicWaker::new();
-
-/// Called by the keyboard interrupt handler
-///
-/// Must not block or allocate.
-pub(crate) fn add_scancode(scancode: u8) {
-    if let Ok(queue) = SCANCODE_QUEUE.try_get() {
-        if let Err(_) = queue.push(scancode) {
-            println!("WARNING: scancode queue full; dropping keyboard input");
-        } else {
-            WAKER.wake();
-        }
-    } else {
-        println!("WARNING: scancode queue uninitialized");
-    }
-}
-
-pub struct ScancodeStream {
-    _private: (),
-}
-
-impl ScancodeStream {
-    pub fn new() -> Self {
-        SCANCODE_QUEUE
-            .try_init_once(|| ArrayQueue::new(100))
-            .expect("ScancodeStream::new should only be called once");
-        ScancodeStream { _private: () }
-    }
-}
-
-impl Stream for ScancodeStream {
-    type Item = u8;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<u8>> {
-        let queue = SCANCODE_QUEUE
-            .try_get()
-            .expect("scancode queue not initialized");
-
-        // fast path
-        if let Ok(scancode) = queue.pop() {
-            return Poll::Ready(Some(scancode));
-        }
-
-        WAKER.register(&cx.waker());
-        match queue.pop() {
-            Ok(scancode) => Poll::Ready(Some(scancode)),
-            Err(crossbeam_queue::PopError) => Poll::Pending,
-        }
-    }
-}
-
-pub async fn print_keypresses() {
-    let mut scancodes = ScancodeStream::new();
-    let mut keyboard = Keyboard::new(layouts::Us104Key, ScancodeSet1, HandleControl::Ignore);
-
-    while let Some(scancode) = scancodes.next().await {
-        if let Ok(Some(key_event)) = keyboard.add_byte(scancode) {
-            if let Some(key) = keyboard.process_keyevent(key_event) {
-                match key {
-                    DecodedKey::Unicode(character) => print!("{}", character),
-                    DecodedKey::RawKey(key) => print!("{:?}", key),
-                }
-            }
-        }
-    }
-}
--- a/src/task/mod.rs
+++ b/src/task/mod.rs
@@ -1,26 +0,0 @@
-use alloc::boxed::Box;
-use core::task::{Context, Poll};
-use core::{future::Future, pin::Pin};
-
-pub mod keyboard;
-pub mod simple_executor;
-
-pub struct Task {
-    future: Pin<Box<dyn Future<Output = ()>>>,
-}
-
-impl Task {
-    pub fn new(future: impl Future<Output = ()> + 'static) -> Task {
-        Task {
-            future: Box::pin(future),
-        }
-    }
-
-    fn poll(&mut self, context: &mut Context) -> Poll<()> {
-        self.future.as_mut().poll(context)
-    }
-
-    fn id(&self) -> usize {
-        &*self.future as *const _ as *const () as usize
-    }
-}
--- a/src/task/simple_executor.rs
+++ b/src/task/simple_executor.rs
@@ -1,86 +0,0 @@
-use super::Task;
-use alloc::{
-    collections::{BTreeMap, VecDeque},
-    sync::Arc,
-};
-use cooked_waker::IntoWaker;
-use core::task::{Context, Poll};
-use crossbeam_queue::ArrayQueue;
-
-pub struct SimpleExecutor {
-    task_queue: VecDeque<Task>,
-    waiting_tasks: BTreeMap<usize, Task>,
-    wake_queue: Arc<ArrayQueue<usize>>,
-}
-
-impl SimpleExecutor {
-    pub fn new() -> SimpleExecutor {
-        SimpleExecutor {
-            task_queue: VecDeque::new(),
-            waiting_tasks: BTreeMap::new(),
-            wake_queue: Arc::new(ArrayQueue::new(100)),
-        }
-    }
-
-    pub fn spawn(&mut self, task: Task) {
-        self.task_queue.push_back(task)
-    }
-
-    pub fn run(&mut self) {
-        loop {
-            self.handle_wakeups();
-            self.run_ready_tasks();
-        }
-    }
-
-    fn handle_wakeups(&mut self) {
-        while let Ok(task_id) = self.wake_queue.pop() {
-            if let Some(task) = self.waiting_tasks.remove(&task_id) {
-                self.task_queue.push_back(task);
-            }
-        }
-    }
-
-    fn run_ready_tasks(&mut self) {
-        while let Some(mut task) = self.task_queue.pop_front() {
-            let waker = TaskWaker {
-                task_id: task.id(),
-                wake_queue: self.wake_queue.clone(),
-            }
-            .into_waker();
-            let mut context = Context::from_waker(&waker);
-            match task.poll(&mut context) {
-                Poll::Ready(()) => {} // task done
-                Poll::Pending => {
-                    if self.waiting_tasks.insert(task.id(), task).is_some() {
-                        panic!("Same task inserted into waiting_tasks twice");
-                    }
-                }
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone, IntoWaker)]
-struct TaskWaker {
-    task_id: usize,
-    wake_queue: Arc<ArrayQueue<usize>>,
-}
-
-impl TaskWaker {
-    fn wake_task(&self) {
-        self.wake_queue.push(self.task_id).expect("wake queue full");
-    }
-}
-
-impl cooked_waker::WakeRef for TaskWaker {
-    fn wake_by_ref(&self) {
-        self.wake_task();
-    }
-}
-
-impl cooked_waker::Wake for TaskWaker {
-    fn wake(self) {
-        self.wake_task();
-    }
-}
--- a/src/vga_buffer.rs
+++ b/src/vga_buffer.rs
@@ -3,9 +3,6 @@ use lazy_static::lazy_static;
 use spin::Mutex;
 use volatile::Volatile;

-#[cfg(test)]
-use crate::{serial_print, serial_println};
-
 lazy_static! {
    /// A global `Writer` instance that can be used for printing to the VGA text buffer.
    ///
@@ -166,50 +163,31 @@ macro_rules! println {
    ($($arg:tt)*) => ($crate::print!("{}\n", format_args!($($arg)*)));
 }

-/// Prints the given formatted string to the VGA text buffer
-/// through the global `WRITER` instance.
+/// Prints the given formatted string to the VGA text buffer through the global `WRITER` instance.
 #[doc(hidden)]
 pub fn _print(args: fmt::Arguments) {
    use core::fmt::Write;
-    use x86_64::instructions::interrupts;
-
-    interrupts::without_interrupts(|| {
-        WRITER.lock().write_fmt(args).unwrap();
-    });
+    WRITER.lock().write_fmt(args).unwrap();
 }

 #[test_case]
 fn test_println_simple() {
-    serial_print!("test_println... ");
    println!("test_println_simple output");
-    serial_println!("[ok]");
 }

 #[test_case]
 fn test_println_many() {
-    serial_print!("test_println_many... ");
    for _ in 0..200 {
        println!("test_println_many output");
    }
-    serial_println!("[ok]");
 }

 #[test_case]
 fn test_println_output() {
-    use core::fmt::Write;
-    use x86_64::instructions::interrupts;
-
-    serial_print!("test_println_output... ");
-
    let s = "Some test string that fits on a single line";
-    interrupts::without_interrupts(|| {
-        let mut writer = WRITER.lock();
-        writeln!(writer, "\n{}", s).expect("writeln failed");
-        for (i, c) in s.chars().enumerate() {
-            let screen_char = writer.buffer.chars[BUFFER_HEIGHT - 2][i].read();
-            assert_eq!(char::from(screen_char.ascii_character), c);
-        }
-    });
-
-    serial_println!("[ok]");
+    println!("{}", s);
+    for (i, c) in s.chars().enumerate() {
+        let screen_char = WRITER.lock().buffer.chars[BUFFER_HEIGHT - 2][i].read();
+        assert_eq!(char::from(screen_char.ascii_character), c);
+    }
 }
--- a/tests/basic_boot.rs
+++ b/tests/basic_boot.rs
@@ -4,10 +4,10 @@
 #![test_runner(blog_os::test_runner)]
 #![reexport_test_harness_main = "test_main"]

-use blog_os::{println, serial_print, serial_println};
+use blog_os::println;
 use core::panic::PanicInfo;

-#[no_mangle] // don't mangle the name of this function
+#[unsafe(no_mangle)] // don't mangle the name of this function
 pub extern "C" fn _start() -> ! {
    test_main();

@@ -21,7 +21,5 @@ fn panic(info: &PanicInfo) -> ! {

 #[test_case]
 fn test_println() {
-    serial_print!("test_println... ");
    println!("test_println output");
-    serial_println!("[ok]");
 }
--- a/tests/heap_allocation.rs
+++ b/tests/heap_allocation.rs
@@ -1,76 +0,0 @@
-#![no_std]
-#![no_main]
-#![feature(custom_test_frameworks)]
-#![test_runner(blog_os::test_runner)]
-#![reexport_test_harness_main = "test_main"]
-
-extern crate alloc;
-
-use alloc::{boxed::Box, vec::Vec};
-use blog_os::{allocator::HEAP_SIZE, serial_print, serial_println};
-use bootloader::{entry_point, BootInfo};
-use core::panic::PanicInfo;
-
-entry_point!(main);
-
-fn main(boot_info: &'static BootInfo) -> ! {
-    use blog_os::allocator;
-    use blog_os::memory::{self, BootInfoFrameAllocator};
-    use x86_64::VirtAddr;
-
-    blog_os::init();
-    let phys_mem_offset = VirtAddr::new(boot_info.physical_memory_offset);
-    let mut mapper = unsafe { memory::init(phys_mem_offset) };
-    let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_map) };
-    allocator::init_heap(&mut mapper, &mut frame_allocator).expect("heap initialization failed");
-
-    test_main();
-    loop {}
-}
-
-#[test_case]
-fn simple_allocation() {
-    serial_print!("simple_allocation... ");
-    let heap_value = Box::new(41);
-    assert_eq!(*heap_value, 41);
-    serial_println!("[ok]");
-}
-
-#[test_case]
-fn large_vec() {
-    serial_print!("large_vec... ");
-    let n = 1000;
-    let mut vec = Vec::new();
-    for i in 0..n {
-        vec.push(i);
-    }
-    assert_eq!(vec.iter().sum::<u64>(), (n - 1) * n / 2);
-    serial_println!("[ok]");
-}
-
-#[test_case]
-fn many_boxes() {
-    serial_print!("many_boxes... ");
-    for i in 0..HEAP_SIZE {
-        let x = Box::new(i);
-        assert_eq!(*x, i);
-    }
-    serial_println!("[ok]");
-}
-
-#[test_case]
-fn many_boxes_long_lived() {
-    serial_print!("many_boxes_long_lived... ");
-    let long_lived = Box::new(1); // new
-    for i in 0..HEAP_SIZE {
-        let x = Box::new(i);
-        assert_eq!(*x, i);
-    }
-    assert_eq!(*long_lived, 1); // new
-    serial_println!("[ok]");
-}
-
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    blog_os::test_panic_handler(info)
-}
--- a/tests/should_panic.rs
+++ b/tests/should_panic.rs
@@ -1,10 +1,10 @@
 #![no_std]
 #![no_main]

-use blog_os::{exit_qemu, serial_print, serial_println, QemuExitCode};
+use blog_os::{QemuExitCode, exit_qemu, serial_print, serial_println};
 use core::panic::PanicInfo;

-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn _start() -> ! {
    should_fail();
    serial_println!("[test did not panic]");
@@ -13,7 +13,7 @@ pub extern "C" fn _start() -> ! {
 }

 fn should_fail() {
-    serial_print!("should_fail... ");
+    serial_print!("should_panic::should_fail...\t");
    assert_eq!(0, 1);
 }

--- a/tests/stack_overflow.rs
+++ b/tests/stack_overflow.rs
@@ -1,57 +0,0 @@
-#![no_std]
-#![no_main]
-#![feature(abi_x86_interrupt)]
-
-use blog_os::{exit_qemu, serial_print, serial_println, QemuExitCode};
-use core::panic::PanicInfo;
-use lazy_static::lazy_static;
-use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
-
-#[no_mangle]
-pub extern "C" fn _start() -> ! {
-    serial_print!("stack_overflow... ");
-
-    blog_os::gdt::init();
-    init_test_idt();
-
-    // trigger a stack overflow
-    stack_overflow();
-
-    panic!("Execution continued after stack overflow");
-}
-
-#[allow(unconditional_recursion)]
-fn stack_overflow() {
-    stack_overflow(); // for each recursion, the return address is pushed
-}
-
-lazy_static! {
-    static ref TEST_IDT: InterruptDescriptorTable = {
-        let mut idt = InterruptDescriptorTable::new();
-        unsafe {
-            idt.double_fault
-                .set_handler_fn(test_double_fault_handler)
-                .set_stack_index(blog_os::gdt::DOUBLE_FAULT_IST_INDEX);
-        }
-
-        idt
-    };
-}
-
-pub fn init_test_idt() {
-    TEST_IDT.load();
-}
-
-extern "x86-interrupt" fn test_double_fault_handler(
-    _stack_frame: &mut InterruptStackFrame,
-    _error_code: u64,
-) -> ! {
-    serial_println!("[ok]");
-    exit_qemu(QemuExitCode::Success);
-    loop {}
-}
-
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    blog_os::test_panic_handler(info)
-}
--- a/x86_64-blog_os.json
+++ b/x86_64-blog_os.json
@@ -1,15 +1,16 @@
 {
    "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
    "arch": "x86_64",
    "target-endian": "little",
    "target-pointer-width": "64",
-    "target-c-int-width": "32",
+    "target-c-int-width": 32,
    "os": "none",
    "executables": true,
    "linker-flavor": "ld.lld",
    "linker": "rust-lld",
    "panic-strategy": "abort",
    "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
  }
Author	SHA1	Message	Date
Philipp Oppermann	ceb91f955a	Merge pull request #1434 from phil-opp/post-04-test-true Set `test=true` to enable `main.rs` testing again	2025-08-26 16:41:21 +02:00
Philipp Oppermann	3340babf51	Set `test=true` to enable `main.rs` testing again We set `test=false` for previous posts in https://github.com/phil-opp/blog_os/pull/1412 to avoid errors e.g. in rust-analyzer. For this testing post, we want to set it back to `true`.	2025-08-26 16:21:28 +02:00
Philipp Oppermann	37a0ae0097	Run cargo update	2025-08-18 09:44:27 +02:00
Philipp Oppermann	6fc9fbfb7d	Merge branch 'post-03' into post-04	2025-08-18 09:44:16 +02:00
Philipp Oppermann	1f097bba71	Run cargo update	2025-08-18 09:43:39 +02:00
Philipp Oppermann	99fbbad9b0	Merge branch 'post-02' into post-03	2025-08-18 09:43:25 +02:00
Philipp Oppermann	94d14d8d62	Run cargo update for bootloader crate	2025-08-18 09:42:41 +02:00
Philipp Oppermann	ebfc7c5f7e	Merge branch 'post-03' into post-04	2025-08-07 13:09:45 +02:00
Philipp Oppermann	6f0be666f3	Merge branch 'post-02' into post-03	2025-08-07 13:09:45 +02:00
Philipp Oppermann	d9fa84edd6	Merge pull request #1425 from phil-opp/post-02-fix-target Fix: `target-c-int-width` field now expects an integer	2025-08-07 13:09:35 +02:00
Philipp Oppermann	d1bf96108a	Merge branch 'post-03' into post-04	2025-08-07 13:08:00 +02:00
Philipp Oppermann	97de98df33	Merge branch 'post-02' into post-03	2025-08-07 13:07:41 +02:00
Philipp Oppermann	9684f75819	Merge branch 'post-01' into post-02	2025-08-07 13:07:09 +02:00
Philipp Oppermann	d6cc562907	Fix: `target-c-int-width` field now expects an integer	2025-08-07 12:25:03 +02:00
Philipp Oppermann	b44d8ab7fc	Merge pull request #1412 from tigeryant/post-01 Added [[bin]] section to Cargo.toml	2025-05-09 15:46:51 +02:00
John Davies	c551fec1ce	Added [[bin]] section to Cargo.toml with test and bench set to false to prevent duplicate definition of lang item	2025-05-02 00:35:50 +07:00
Philipp Oppermann	1d0aa17531	Update tests to make `no_mangle` attribute `unsafe` Required since Rust 2024 edition	2025-03-27 15:50:07 +01:00
Philipp Oppermann	e4b3ed6d42	Fix: `no_mangle` is an unsafe attribute since Rust 2024	2025-03-27 15:13:34 +01:00
Philipp Oppermann	b1aec7eb66	Merge branch 'post-03' into post-04	2025-03-27 15:13:25 +01:00
Philipp Oppermann	e2a3e76a32	Merge branch 'post-02' into post-03	2025-03-27 15:07:41 +01:00
Philipp Oppermann	16bbb8f972	Merge branch 'post-01' into post-02	2025-03-27 15:07:24 +01:00
Philipp Oppermann	430e2143f8	Fix: `no_mangle` is an unsafe attribute since Rust 2024	2025-03-27 15:06:17 +01:00
Philipp Oppermann	86ffa24e8e	Update to Rust 2024 edition	2025-03-27 15:05:58 +01:00
Philipp Oppermann	a6141e8d2e	Merge branch 'post-03' into post-04	2025-03-24 11:09:24 +01:00
Philipp Oppermann	df0c0b5783	Merge branch 'post-02' into post-03	2025-03-24 11:09:21 +01:00
Philipp Oppermann	c27eb1da9c	Run cargo update for bootloader crate	2025-03-24 11:08:41 +01:00
Philipp Oppermann	deb7c82872	Merge branch 'post-03' into post-04	2025-02-10 12:36:07 +01:00
Philipp Oppermann	2a61f88d8a	Merge branch 'post-02' into post-03	2025-02-10 12:35:54 +01:00
Philipp Oppermann	a90a8bea67	Run cargo update for bootloader crate	2025-02-10 12:35:16 +01:00
Philipp Oppermann	fda382c6bc	Merge branch 'post-03' into post-04	2025-02-10 11:16:21 +01:00
Philipp Oppermann	f52872f3b9	Merge branch 'post-02' into post-03	2025-02-10 11:16:21 +01:00
Philipp Oppermann	688a21e4ed	Set `rustc-abi: x86-softfloat` in target JSON This additional field is required by the Rust compiler since https://github.com/rust-lang/rust/pull/136146 .	2025-02-10 11:16:14 +01:00
Philipp Oppermann	75354fe142	Merge branch 'post-03' into post-04	2024-04-30 15:39:16 +02:00
Philipp Oppermann	07d6c9c84e	Merge branch 'post-02' into post-03	2024-04-30 15:39:07 +02:00
Philipp Oppermann	2265ddecad	Run cargo update	2024-04-30 15:37:30 +02:00
Philipp Oppermann	9edc2c59c7	Merge branch 'post-03' into post-04	2024-02-16 15:59:40 +01:00
Philipp Oppermann	3bc023ec2d	Merge branch 'post-02' into post-03	2024-02-16 15:59:38 +01:00
Philipp Oppermann	38604da92f	Update bootloader version to v0.9.27 in Cargo.lock	2024-02-16 15:59:13 +01:00
Philipp Oppermann	6e7c2f4344	Merge branch 'post-03' into post-04	2024-02-16 13:22:06 +01:00
Philipp Oppermann	1a53a115da	Merge branch 'post-02' into post-03	2024-02-16 13:21:45 +01:00
Philipp Oppermann	c6990cb52d	Don't specify patch version in Cargo.toml Avoids confusion for people that don't know that cargo always chooses the latest patch version.	2024-02-16 13:21:21 +01:00
Philipp Oppermann	3916bebd15	Merge branch 'post-03' into post-04	2024-02-16 13:14:09 +01:00
Philipp Oppermann	ef9bb1a087	Merge branch 'post-02' into post-03	2024-02-16 13:13:55 +01:00
Philipp Oppermann	2bc4490404	Update bootloader version to v0.9.26 in Cargo.lock	2024-02-16 13:13:31 +01:00
Philipp Oppermann	f45954e7e4	Merge branch 'post-03' into post-04	2024-02-16 12:39:56 +01:00
Philipp Oppermann	7288459bdf	Merge branch 'post-02' into post-03	2024-02-16 12:39:51 +01:00
Philipp Oppermann	7959b77ebd	Update data layout for LLVM 18 Fixes build on latest rustc nightly.	2024-02-16 12:38:32 +01:00
Philipp Oppermann	bebad6d5a9	Update bootloader version in Cargo.lock	2024-02-16 12:36:31 +01:00
Philipp Oppermann	c73b412ec6	Merge branch 'post-03' into post-04	2024-01-28 11:45:38 +01:00
Philipp Oppermann	6c8fea8b00	Merge branch 'post-02' into post-03	2024-01-28 11:45:32 +01:00
Philipp Oppermann	b99c3f6d1d	Use latest data layout for custom target	2024-01-28 11:44:35 +01:00
Philipp Oppermann	66c1792034	Update bootloader version in Cargo.lock	2024-01-28 11:44:23 +01:00
Philipp Oppermann	445833408c	Merge branch 'post-03' into post-04	2022-09-25 11:32:07 +02:00
Philipp Oppermann	3280a0afc7	Merge branch 'post-02' into post-03	2022-09-25 11:31:07 +02:00
Philipp Oppermann	6393247a3b	Update bootloader version in Cargo.lock	2022-09-25 11:29:38 +02:00
Philipp Oppermann	8622b9c41b	Merge branch 'post-03' into post-04	2022-01-18 10:06:44 +01:00
Philipp Oppermann	a387a00c85	Merge branch 'post-02' into post-03 # Conflicts: # Cargo.lock	2022-01-18 10:06:27 +01:00
Philipp Oppermann	faa8d15cb7	Run cargo update for bootloader crate	2022-01-18 10:05:56 +01:00
Philipp Oppermann	736a4183db	Merge branch 'post-03' into post-04	2021-12-22 09:27:53 +01:00
Philipp Oppermann	4c9cd3ae32	Merge branch 'post-02' into post-03	2021-12-22 09:27:26 +01:00
Philipp Oppermann	26f1f5b896	Run cargo update for bootloader crate	2021-12-22 09:27:00 +01:00
Philipp Oppermann	c2dd2477ab	Run cargo update for bootloader and x86_64 crates	2021-12-21 12:43:22 +01:00
Philipp Oppermann	9d16f0a139	CI: Use choco to install QEMU 6.0.0 This should fix our CI build errors. We install a pinned version of QEMU since the latest 6.1 pre-releases appear to have some problems too.	2021-08-22 14:36:17 +02:00
Philipp Oppermann	a671ad3dbc	Merge branch 'post-03' into post-04	2021-05-21 19:54:47 +02:00
Philipp Oppermann	cbead25b43	Merge branch 'post-02' into post-03	2021-05-21 19:54:20 +02:00
Philipp Oppermann	1f49e2e9fe	Merge branch 'post-01' into post-02	2021-05-21 19:53:49 +02:00
Philipp Oppermann	8708b54756	Readme: Update workflow name in badge	2021-05-21 19:53:01 +02:00
Philipp Oppermann	765c7b21e9	Merge branch 'post-03' into post-04	2021-05-20 14:33:10 +02:00
Philipp Oppermann	2c25d55810	Merge branch 'post-02' into post-03	2021-05-20 14:32:42 +02:00
Philipp Oppermann	021762cf30	Run `cargo update` for bootloader	2021-05-20 14:32:27 +02:00
Philipp Oppermann	eb2f818194	Merge branch 'post-04-update-x86_64' into post-04	2021-05-17 11:41:19 +02:00
Philipp Oppermann	167ef5bb83	Update x86_64 dependency to v0.14.2 to fix nightly breakage	2021-05-17 11:38:51 +02:00
Philipp Oppermann	4f68f9ba93	Run cargo update for `uart_16550` crate	2021-05-17 11:30:00 +02:00
Philipp Oppermann	36e4dc22f3	Merge branch 'post-03' into post-04	2021-05-17 11:29:23 +02:00
Philipp Oppermann	ec95ac0e5a	Merge branch 'post-02' into post-03	2021-05-17 11:29:14 +02:00
Philipp Oppermann	d8f280315f	Run cargo update for bootloader crate	2021-05-17 11:28:54 +02:00
Philipp Oppermann	0e365109be	Merge branch 'post-03' into post-04	2021-03-10 09:23:02 +01:00
Philipp Oppermann	e39c7d8ad8	Merge branch 'post-02' into post-03	2021-03-10 09:23:02 +01:00
Philipp Oppermann	066c278277	Merge branch 'post-01' into post-02	2021-03-10 09:23:02 +01:00
Philipp Oppermann	bdb6a424a8	CI: Rename 'Build Code' workflow to 'Code'	2021-03-10 09:22:57 +01:00
Philipp Oppermann	c8f72adeb3	Merge branch 'post-03' into post-04	2021-03-10 09:15:58 +01:00
Philipp Oppermann	f40717901b	Merge branch 'post-02' into post-03	2021-03-10 09:15:58 +01:00
Philipp Oppermann	96844f6519	Merge branch 'post-01' into post-02	2021-03-10 09:15:58 +01:00
Philipp Oppermann	1501669819	Update lockfile format	2021-03-10 09:15:54 +01:00
Philipp Oppermann	cc617ec35e	Merge branch 'post-03' into post-04	2021-03-10 09:13:39 +01:00
Philipp Oppermann	195f4489e6	Merge branch 'post-02' into post-03	2021-03-10 09:13:39 +01:00
Philipp Oppermann	1b86d7fd62	Merge branch 'post-01' into post-02	2021-03-10 09:13:39 +01:00
Philipp Oppermann	deb0f63dff	Ci: Don't fail fast	2021-03-10 09:13:00 +01:00
Philipp Oppermann	bee9a7f7ea	Merge branch 'post-03' into post-04	2021-03-10 08:53:42 +01:00
Philipp Oppermann	fbdcd45d16	Merge branch 'post-02' into post-03	2021-03-10 08:53:37 +01:00
Philipp Oppermann	d658949f5b	Run cargo update for bootloader crate	2021-03-10 08:53:21 +01:00
Philipp Oppermann	4c07101f8f	Merge pull request #919 from phil-opp/post-04-update-x86_64 Update x86_64 dependency to v0.13.2 to fix nightly breakage	2021-02-02 11:06:15 +01:00
Philipp Oppermann	30be97d035	Update x86_64 dependency to v0.13.2 to fix nightly breakage Also: Run cargo update for uart_16550 dependency.	2021-02-02 10:54:08 +01:00
Philipp Oppermann	63d0d8cc9f	Merge branch 'post-03' into post-04	2021-02-02 10:52:06 +01:00
Philipp Oppermann	d12842bcd5	Merge branch 'post-02' into post-03	2021-02-02 10:52:00 +01:00
Philipp Oppermann	0e52ccbebb	Run cargo update for bootloader crate	2021-02-02 10:51:03 +01:00
Philipp Oppermann	4de18a8a10	CI: Use environment files instead of deprecated `set-env`	2020-11-22 13:27:41 +01:00
Philipp Oppermann	3fac6af7b0	Merge branch 'post-03' into post-04	2020-10-02 23:35:18 +02:00
Philipp Oppermann	d4e1f47e62	Update post-04 to use compiler_builtins `mem` feature instead of `rlibc` (#868 ) * Remove rlibc and use compiler-builtins-mem feature (#865) * Update post-04 to use compiler_builtins `mem` feature instead of `rlibc` Co-authored-by: Rob Gries <robert.w.gries@gmail.com>	2020-10-02 23:28:03 +02:00
Philipp Oppermann	ea5aad0e0c	Merge branch 'post-02' into post-03	2020-10-02 23:17:08 +02:00
Rob Gries	4e38e7ddf8	Remove rlibc and use compiler-builtins-mem feature (#865 )	2020-10-02 23:14:25 +02:00
Philipp Oppermann	4215162b62	`cargo update` the `x86_64` and `uart_16550` crates to fix nightly breakage	2020-09-29 12:21:59 +02:00
Philipp Oppermann	1afa3af79d	Merge branch 'post-02' into post-03	2020-09-29 12:19:54 +02:00
Philipp Oppermann	35c642b3c2	Merge branch 'post-03' into post-04	2020-09-29 12:19:54 +02:00
Philipp Oppermann	49dce7ada7	`cargo update` the `bootloader`crate to fix nightly breakage	2020-09-29 12:19:48 +02:00
Philipp Oppermann	3d96415940	Update `x86_64` to v0.12.1 (#858 )	2020-09-24 10:26:04 +02:00
Philipp Oppermann	fd8a2e0182	Merge branch 'post-03' into post-04	2020-09-24 10:10:51 +02:00
Philipp Oppermann	552eb97f75	Merge branch 'post-02' into post-03	2020-09-24 10:10:16 +02:00
Philipp Oppermann	c42cee8d89	Update bootloader to 0.9.10	2020-09-24 10:09:57 +02:00
Philipp Oppermann	3bb076a00f	Run cargo update for post-04	2020-09-24 09:09:13 +02:00
Philipp Oppermann	e5bd06edcc	Merge branch 'post-03' into post-04	2020-09-24 09:08:54 +02:00
Philipp Oppermann	eace075f2c	Run cargo update for post-03	2020-09-24 09:08:28 +02:00
Philipp Oppermann	2d5150f2a3	Merge branch 'post-02' into post-03	2020-09-24 09:08:11 +02:00
Philipp Oppermann	ebb9f0b8a7	Run cargo update	2020-09-24 09:07:45 +02:00
Philipp Oppermann	edd155d570	Merge branch 'post-03' into post-04	2020-08-16 18:03:09 +02:00
Philipp Oppermann	3200b7a68d	Merge branch 'post-02' into post-03	2020-08-16 18:03:09 +02:00
Philipp Oppermann	cde3c8f955	Merge branch 'post-01' into post-02	2020-08-16 18:03:09 +02:00
Philipp Oppermann	6ad573bb11	Run workflow on `workflow_dispatch` event This allows us to trigger a branch build from the master branch on schedule.	2020-08-16 18:01:58 +02:00
Philipp Oppermann	c18cd874ca	Merge branch 'post-03' into post-04	2020-07-17 15:57:35 +02:00
Philipp Oppermann	f316bd1a08	Merge branch 'post-02' into post-03	2020-07-17 15:57:35 +02:00
Philipp Oppermann	4a4d704384	Add note about minimum required nightly version	2020-07-17 15:57:32 +02:00
Philipp Oppermann	6380e069f7	Merge branch 'post-03' into post-04	2020-07-17 11:48:35 +02:00
Philipp Oppermann	1ddc27ca88	Merge branch 'post-02' into post-03	2020-07-17 11:48:35 +02:00
Philipp Oppermann	71d8a438f7	Update Readme for new build-std build instructions	2020-07-17 11:48:27 +02:00
Philipp Oppermann	3a77cbe794	Merge branch 'post-01' into post-02	2020-07-17 11:44:17 +02:00
Philipp Oppermann	3fb4695f6c	Bootimage is not needed for post-01	2020-07-17 11:39:47 +02:00
Philipp Oppermann	635677d07c	Fix workflow syntax	2020-07-17 11:38:30 +02:00
Philipp Oppermann	b276ec4765	Update CI script to be consistent with other branches	2020-07-17 11:36:33 +02:00
Philipp Oppermann	7341cff39d	Merge branch 'post-03' into post-04	2020-07-17 11:28:04 +02:00
Philipp Oppermann	406c406d5f	Merge branch 'post-02' into post-03	2020-07-17 11:28:04 +02:00
Philipp Oppermann	6f9cfce6f9	Don't deny clippy warnings	2020-07-17 11:27:18 +02:00
Philipp Oppermann	acf3717551	Move `extern crate rlibc` to lib.rs	2020-07-17 11:22:42 +02:00
Philipp Oppermann	e78d33a5bf	Update test command on CI for build-std	2020-07-17 11:21:18 +02:00
Philipp Oppermann	6292789393	Merge branch 'post-03' into post-04	2020-07-17 11:19:25 +02:00
Philipp Oppermann	651adbc8bd	Merge branch 'post-02' into post-03	2020-07-17 11:16:18 +02:00
Philipp Oppermann	4bbaae24a4	Merge pull request #835 from phil-opp/post-02-Zbuild-std Migrate post-02 code from cargo-xbuild to `-Zbuild-std`	2020-07-17 11:13:11 +02:00
Philipp Oppermann	44d7654ef6	Add `toml` extension to .cargo/config and use table format for `unstable`	2020-07-17 10:57:04 +02:00
Philipp Oppermann	f135aefae8	Update to bootloader 0.9.8	2020-07-17 10:52:21 +02:00
Philipp Oppermann	ffaac76876	Use latest release of bootimage on CI	2020-07-17 10:52:08 +02:00
Philipp Oppermann	5ae9f62f4d	Adjust job names on CI to match existing names	2020-07-16 17:15:03 +02:00
Philipp Oppermann	da0ee38f09	Add names for all CI operations	2020-07-16 17:10:50 +02:00
Philipp Oppermann	263e852dcc	Use functionality of toolchain action for installing rustup components	2020-07-16 17:04:02 +02:00
Philipp Oppermann	614e5b0e86	Install rustup components after checking out the repo so that the components are installed for the nightly toolchain.	2020-07-16 16:36:19 +02:00
Philipp Oppermann	9ee42e0f5f	Install Zbuild-std branch of bootimage	2020-07-16 16:32:50 +02:00
Philipp Oppermann	c4672096d4	Install rust-src component for cargo check	2020-07-16 16:31:52 +02:00
Philipp Oppermann	ffe1b6abd0	Rewrite CI script with using actions-rs actions This gives use support for github's scoped annotations when there are errors or warnings.	2020-07-16 16:21:37 +02:00
Philipp Oppermann	16ffe80fd5	Add dependency on rlibc	2020-07-16 15:39:07 +02:00
Philipp Oppermann	07d8a22a53	Use `-Zbuildstd` instead of cargo-xbuild	2020-07-16 15:37:09 +02:00
Philipp Oppermann	bf33685d00	Merge pull request #816 from phil-opp/post-04-testable-trait Create a testable trait for printing test messages automatically	2020-06-08 11:50:57 +02:00
Philipp Oppermann	3ee6badb33	Keep trivial_assertion test	2020-06-08 11:39:09 +02:00
Philipp Oppermann	9f9ff59489	Create a testable trait for printing test messages automatically	2020-06-08 11:04:03 +02:00
Philipp Oppermann	a1c7931a77	Run cargo update for post-04	2020-05-20 14:56:06 +02:00
Philipp Oppermann	2c30310281	Update x86_64 to version 0.11.0	2020-05-20 14:25:16 +02:00
Philipp Oppermann	57cd52b7f5	Merge branch 'post-03' into post-04	2020-05-20 14:04:54 +02:00
Philipp Oppermann	a004e7da9c	Merge branch 'post-02' into post-03	2020-05-20 14:04:37 +02:00
Philipp Oppermann	b1bf0873ce	Update bootloader to v0.9.3	2020-05-20 14:03:59 +02:00