Wip

WIP
Merge branch 'post-09' into post-10
2025-12-16 22:37:49 +00:00 · 2019-06-17 13:23:39 +02:00 · 2019-03-18 18:28:04 +01:00 · 2019-03-14 11:18:40 +01:00 · 2019-03-14 11:18:22 +01:00 · 2019-03-14 11:18:22 +01:00
31 changed files with 1574 additions and 635 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -0,0 +1,91 @@
+branches:
+  only:
+    - staging
+    - trying
+    - master
+    - /post-.*/
+
+# Appveyor configuration template for Rust using rustup for Rust installation
+# https://github.com/starkat99/appveyor-rust
+
+## Operating System (VM environment) ##
+
+# Rust needs at least Visual Studio 2013 Appveyor OS for MSVC targets.
+os: Visual Studio 2015
+
+## Build Matrix ##
+environment:
+  matrix:
+
+### MSVC Toolchains ###
+  # Nightly 64-bit MSVC
+    - channel: nightly
+      target: x86_64-pc-windows-msvc
+      MSYS_BITS: 64
+  # Nightly 32-bit MSVC
+    - channel: nightly
+      target: i686-pc-windows-msvc
+      MSYS_BITS: 32
+
+### GNU Toolchains ###
+  # Nightly 64-bit GNU
+    - channel: nightly
+      target: x86_64-pc-windows-gnu
+      MSYS_BITS: 64
+  # Nightly 32-bit GNU
+    - channel: nightly
+      target: i686-pc-windows-gnu
+      MSYS_BITS: 32
+
+cache:
+  - '%USERPROFILE%\.cargo\bin'
+  - '%USERPROFILE%\.cargo\.crates.toml'
+
+## Install Script ##
+
+# This is the most important part of the Appveyor configuration. This installs the version of Rust
+# specified by the 'channel' and 'target' environment variables from the build matrix. This uses
+# rustup to install Rust.
+#
+# For simple configurations, instead of using the build matrix, you can simply set the
+# default-toolchain and default-host manually here.
+install:
+  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init -yv --default-toolchain %channel% --default-host %target%
+  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+  - rustc -vV
+  - cargo -vV
+
+  # Install qemu
+  - echo %cd%
+  - mkdir "C:\Program Files\qemu"
+  - cd "C:\Program Files\qemu"
+  - if %target%==i686-pc-windows-msvc appveyor DownloadFile "https://qemu.weilnetz.de/w32/2018/qemu-w32-setup-20180801.exe" -FileName "qemu-setup.exe"
+  - if %target%==i686-pc-windows-gnu appveyor DownloadFile "https://qemu.weilnetz.de/w32/2018/qemu-w32-setup-20180801.exe" -FileName "qemu-setup.exe"
+  - if %target%==x86_64-pc-windows-msvc appveyor DownloadFile "https://qemu.weilnetz.de/w64/2018/qemu-w64-setup-20180801.exe" -FileName "qemu-setup.exe"
+  - if %target%==x86_64-pc-windows-gnu appveyor DownloadFile "https://qemu.weilnetz.de/w64/2018/qemu-w64-setup-20180801.exe" -FileName "qemu-setup.exe"
+  - 7z x qemu-setup.exe
+  - set PATH=%PATH%;C:\Program Files\qemu
+  - cd "C:\projects\blog-os"
+
+## Build Script ##
+
+# 'cargo test' takes care of building for us, so disable Appveyor's build stage. This prevents
+# the "directory does not contain a project or solution file" error.
+build: false
+
+before_test:
+  - set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
+  # Fix undefined references to __acrt_iob_func()
+  - sed -rie "s/#define std([[:alpha:]]+)[[:space:]]+\(__acrt_iob_func\(([[:digit:]]+)\)\)/#define std\1 (\&__iob_func()[\2])/" "C:\msys64\mingw64\x86_64-w64-mingw32\include\stdio.h"
+  - sed -rie "s/#define std([[:alpha:]]+)[[:space:]]+\(__acrt_iob_func\(([[:digit:]]+)\)\)/#define std\1 (\&__iob_func()[\2])/" "C:\msys64\mingw32\i686-w64-mingw32\include\stdio.h"
+  - rustup component add rust-src
+  - set RUST_BACKTRACE=1
+  - if not exist %USERPROFILE%\.cargo\bin\cargo-install-latest.exe cargo install cargo-install-latest
+  - cargo install-latest cargo-xbuild bootimage
+
+test_script:
+  - bootimage build
+  - if %target%==x86_64-pc-windows-gnu cargo test
+  - if %target%==x86_64-pc-windows-msvc cargo test
+  - bootimage test
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,9 +0,0 @@
-[unstable]
-build-std = ["core", "compiler_builtins"]
-build-std-features = ["compiler-builtins-mem"]
-
-[build]
-target = "x86_64-blog_os.json"
-
-[target.'cfg(target_os = "none")']
-runner = "bootimage runner"
--- a/.github/workflows/code.yml
+++ b/.github/workflows/code.yml
@@ -1,130 +0,0 @@
-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/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 /target
-**/*.rs.bk
-
-.vscode
+**/*.rs.bk
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,52 @@
+language: rust
+
+rust:
+    - nightly
+
+os:
+  - linux
+  - osx
+  - windows
+
+notifications:
+    email:
+        on_success: never
+        on_failure: always
+
+branches:
+  only:
+    # This is where pull requests from "bors r+" are built.
+    - staging
+    # This is where pull requests from "bors try" are built.
+    - trying
+    # Build pull requests.
+    - master
+    # Build post braches
+    - /^post-.*$/
+
+cache:
+  directories:
+    - $HOME/.cargo
+    - $HOME/Library/Caches/Homebrew
+
+addons:
+  apt:
+    packages:
+      - qemu-system-x86
+  homebrew:
+    packages:
+      - qemu
+
+install:
+  - if [ $TRAVIS_OS_NAME = windows ]; then choco install qemu; export PATH="/c/Program Files/qemu:$PATH"; fi
+
+before_script:
+  - rustup component add rust-src
+  - (test -x $HOME/.cargo/bin/cargo-install-latest || cargo install cargo-install-latest)
+  - cargo install-latest cargo-xbuild bootimage cargo-cache
+
+script:
+  - bootimage build
+  - cargo test
+  - bootimage test
+  - cargo cache --autoclean
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,101 +1,383 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+[[package]]
+name = "array-init"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "array-init"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]

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

 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-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",
- "lazy_static",
- "spin 0.5.2",
- "uart_16550",
- "volatile 0.2.7",
- "x86_64",
+ "array-init 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bootloader 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pc-keyboard 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pic8259_simple 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uart_16550 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "x86_64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "bootloader"
-version = "0.9.33"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bdfddac270bbdd45903296bc1caf29a7fdce6b326aaf0bbab7f04c5f98b7447"
+dependencies = [
+ "fixedvec 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "font8x8 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "usize_conversions 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "x86_64 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xmas-elf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cpuio"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fixedvec"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "skeptic 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "font8x8"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "getopts"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]

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

 [[package]]
-name = "rustversion"
-version = "1.0.22"
+name = "libc"
+version = "0.2.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "nodrop"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "os_bootinfo"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pc-keyboard"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pic8259_simple"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cpuio 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pulldown-cmark"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "raw-cpuid"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "skeptic"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]

 [[package]]
 name = "spin"
-version = "0.5.2"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
-name = "spin"
-version = "0.9.8"
+name = "tempdir"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]

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

 [[package]]
-name = "volatile"
-version = "0.2.7"
+name = "unicode-width"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "usize_conversions"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "ux"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945"

 [[package]]
 name = "volatile"
-version = "0.4.6"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793"

 [[package]]
 name = "x86_64"
-version = "0.14.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c101112411baafbb4bf8d33e4c4a80ab5b02d74d2612331c61e8192fc9710491"
 dependencies = [
- "bit_field",
- "bitflags 2.9.2",
- "rustversion",
- "volatile 0.4.6",
+ "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "os_bootinfo 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "usize_conversions 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
+
+[[package]]
+name = "x86_64"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "os_bootinfo 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "usize_conversions 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "x86_64"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "usize_conversions 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "xmas-elf"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "zero 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "zero"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum array-init 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c3cc8456d0ae81a8c76f59e384683a601548c38949a4bfcb65dd31ded5c75ff3"
+"checksum array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72"
+"checksum bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum bootloader 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0808c55da932b82d3ababdaa0caa3f18522c5d2d06309b98f73adda849a3f03"
+"checksum cc 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)" = "d01c69d08ff207f231f07196e30f84c70f1c815b04f980f8b7b01ff01f05eb92"
+"checksum cpuio 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "22b8e308ccfc5acf3b82f79c0eac444cf6114cb2ac67a230ca6c177210068daa"
+"checksum fixedvec 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7c6c16d316ccdac21a4dd648e314e76facbbaf316e83ca137d0857a9c07419d0"
+"checksum font8x8 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b81d84c3c978af7d05d31a2198af4b9ba956d819d15d8f6d58fc150e33f8dc1f"
+"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797"
+"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047"
+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum os_bootinfo 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "66481dbeb5e773e7bd85b63cd6042c30786f834338288c5ec4f3742673db360a"
+"checksum pc-keyboard 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fff50ab09ba31bcebc0669f4e64c0952fae1acdca9e6e0587e68e4e8443808ac"
+"checksum pic8259_simple 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc64b2fd10828da8521b6cdabe0679385d7d2a3a6d4c336b819d1fa31ba35c72"
+"checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07"
+"checksum rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dee497e66d8d76bf08ce20c8d36e16f93749ab0bf89975b4f8ae5cee660c2da2"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d"
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+"checksum skeptic 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "061203a849117b0f7090baf8157aa91dac30545208fbb85166ac58b4ca33d89c"
+"checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f"
+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+"checksum uart_16550 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "269f953d8de3226f7c065c589c7b4a3e83d10a419c7c3b5e2e0f197e6acc966e"
+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
+"checksum usize_conversions 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f70329e2cbe45d6c97a5112daad40c34cd9a4e18edb5a2a18fefeb584d8d25e5"
+"checksum ux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88dfeb711b61ce620c0cb6fd9f8e3e678622f0c971da2a63c4b3e25e88ed012f"
+"checksum volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29"
+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum x86_64 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd647af1614659e1febec1d681231aea4ebda4818bf55a578aff02f3e4db4b4"
+"checksum x86_64 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f9258d7e2dd25008d69e8c9e9ee37865887a5e1e3d06a62f1cb3f6c209e6f177"
+"checksum x86_64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de155d368de1d32afc8f90838bf81986e4bd43a0cd5fcd7f7e9c85cb8f51dc7c"
+"checksum xmas-elf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58"
+"checksum zero 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,36 +2,29 @@
 name = "blog_os"
 version = "0.1.0"
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
-edition = "2024"
-
-[[test]]
-name = "should_panic"
-harness = false
+edition = "2018"

 [dependencies]
-bootloader = "0.9"
-volatile = "0.2.6"
-spin = "0.5.2"
-x86_64 = "0.14.2"
-uart_16550 = "0.2.0"
+bootloader = { version = "0.4.0", features = ["map_physical_memory"]}
+volatile = "0.2.3"
+spin = "0.4.9"
+uart_16550 = "0.1.0"
+x86_64 = "0.5.2"
+pic8259_simple = "0.1.1"
+pc-keyboard = "0.3.1"

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

-[[bin]]
-name = "blog_os"
-test = true
-bench = false
+[dev-dependencies]
+array-init = "0.0.3"

+[profile.dev]
+panic = "abort"
+
+[profile.release]
+panic = "abort"

 [package.metadata.bootimage]
-test-args = [
-    "-device",
-    "isa-debug-exit,iobase=0xf4,iosize=0x04",
-    "-serial",
-    "stdio",
-    "-display",
-    "none",
-]
-test-success-exit-code = 33 # (0x10 << 1) | 1
+default-target = "x86_64-blog_os.json"
--- a/201
+++ b/201
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- a/9
+++ b/9
@@ -1,9 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Philipp Oppermann
-
-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.
--- a/README.md
+++ b/README.md
@@ -1,35 +1,25 @@
-# Blog OS (CPU Exceptions)
+# Blog OS (Paging Implementation)

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

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

-[post]: https://os.phil-opp.com/cpu-exceptions/
+[post]: https://os.phil-opp.com/paging-implementation/

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

 ## Building

-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:
+You need a nightly Rust compiler. First you need to install the `cargo-xbuild` and `bootimage` tools:

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

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

 ```
-cargo install bootimage
-```
-
-After installing, you can create the bootable disk image by running:
-
-```
-cargo bootimage
+bootimage build
 ```

 This creates a bootable disk image in the `target/x86_64-blog_os/debug` directory.
@@ -43,10 +33,10 @@ You can run the disk image in [QEMU] through:
 [QEMU]: https://www.qemu.org/

 ```
-cargo run
+bootimage run
 ```

-[QEMU] and the [`bootimage`] tool need to be installed for this.
+Of course [QEMU] needs 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:

@@ -58,20 +48,7 @@ Where `sdX` is the device name of your USB stick. **Be careful** to choose the c

 ## Testing

-To run the unit and integration tests, execute `cargo xtest`.
+To run the unit tests on the host system, execute `cargo test`. To run the integration tests in [QEMU], run `bootimage test`.

 ## License
-
-Licensed under either of
-
- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
-  http://www.apache.org/licenses/LICENSE-2.0)
- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-Note that this only applies to this git branch, other branches might be licensed differently.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
+The source code is dual-licensed under MIT or the Apache License (Version 2.0).
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -0,0 +1,99 @@
+# Documentation: https://aka.ms/yaml
+
+trigger:
+  batch: true
+  branches:
+    include:
+    # This is where pull requests from "bors r+" are built.
+    - staging
+    # This is where pull requests from "bors try" are built.
+    - trying
+    # Build pull requests.
+    - master
+    # Build post braches
+    - post-*
+
+strategy:
+  matrix:
+    linux:
+      image_name: 'ubuntu-16.04'
+      rustup_toolchain: nightly
+    mac:
+      image_name: 'macos-10.13'
+      rustup_toolchain: nightly
+    windows:
+      image_name: 'vs2017-win2016'
+      rustup_toolchain: nightly
+
+pool:
+  vmImage: $(image_name)
+
+steps:
+- bash: |
+    echo "Hello world from $AGENT_NAME running on $AGENT_OS"
+    echo "Reason: $BUILD_REASON"
+    echo "Requested for: $BUILD_REQUESTEDFOR"
+  displayName: 'Build Info'
+  continueOnError: true
+
+- script: |
+    curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
+    echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
+  condition: or(eq( variables['Agent.OS'], 'Linux' ),  eq( variables['Agent.OS'], 'Darwin' ))
+  displayName: 'Install Rust (Linux/macOS)'
+
+- script: |
+    curl -sSf -o rustup-init.exe https://win.rustup.rs
+    rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
+    echo ##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin
+  condition: eq( variables['Agent.OS'], 'Windows_NT' )
+  displayName: 'Install Rust (Windows)'
+
+- script: |
+    rustc -Vv
+    cargo -V
+  displayName: 'Print Rust Version'
+  continueOnError: true
+
+- script: rustup component add rust-src
+  displayName: 'Install Rustup Src Component'
+
+- script: |
+    cargo install cargo-xbuild --debug
+    cargo install bootimage --debug
+  displayName: 'Install cargo-xbuild and bootimage'
+
+- script: bootimage build
+  displayName: 'Build'
+
+- script: cargo test
+  displayName: 'Unit Tests'
+
+- script: sudo apt install qemu-system-x86
+  condition: eq( variables['Agent.OS'], 'Linux' )
+  displayName: 'Install QEMU (Linux)'
+
+- script: |
+    export HOMEBREW_NO_AUTO_UPDATE=1
+    export HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK=1
+    export HOMEBREW_NO_INSTALL_CLEANUP=1
+    brew install qemu
+  condition: eq( variables['Agent.OS'], 'Darwin' )
+  displayName: 'Install QEMU (macOS)'
+
+- script: |
+    choco install qemu --limit-output --no-progress
+    echo ##vso[task.setvariable variable=PATH;]%PATH%;C:\Program Files\qemu
+    set PATH=%PATH%;C:\Program Files\qemu
+    qemu-system-x86_64 --version
+  condition: eq( variables['Agent.OS'], 'Windows_NT' )
+  displayName: 'Install QEMU (Windows)'
+
+- script: bootimage test
+  displayName: 'Integration Tests'
+
+- script: rustup component add rustfmt
+  displayName: 'Install Rustfmt'
+
+- script: cargo fmt -- --check
+  displayName: 'Check Formatting'
--- a/bors.toml
+++ b/bors.toml
@@ -1,4 +1,4 @@
 status = [
-  "Test",
+  "phil-opp.blog_os",
 ]
 delete_merged_branches = true
--- a/src/bin/test-basic-boot.rs
+++ b/src/bin/test-basic-boot.rs
@@ -0,0 +1,44 @@
+#![cfg_attr(not(test), no_std)]
+#![cfg_attr(not(test), no_main)] // disable all Rust-level entry points
+#![cfg_attr(test, allow(unused_imports))]
+#![feature(alloc_error_handler)]
+
+use blog_os::memory::allocator::DummyAllocator;
+use blog_os::{exit_qemu, serial_println};
+use core::alloc::Layout;
+use core::panic::PanicInfo;
+
+/// This function is the entry point, since the linker looks for a function
+/// named `_start` by default.
+#[cfg(not(test))]
+#[no_mangle] // don't mangle the name of this function
+pub extern "C" fn _start() -> ! {
+    serial_println!("ok");
+
+    unsafe {
+        exit_qemu();
+    }
+    loop {}
+}
+
+/// This function is called on panic.
+#[cfg(not(test))]
+#[panic_handler]
+fn panic(info: &PanicInfo) -> ! {
+    serial_println!("failed");
+
+    serial_println!("{}", info);
+
+    unsafe {
+        exit_qemu();
+    }
+    loop {}
+}
+
+#[global_allocator]
+static ALLOCATOR: DummyAllocator = DummyAllocator;
+
+#[alloc_error_handler]
+fn out_of_memory(layout: Layout) -> ! {
+    panic!("out of memory: allocation for {:?} failed", layout);
+}
--- a/src/bin/test-exception-breakpoint.rs
+++ b/src/bin/test-exception-breakpoint.rs
@@ -0,0 +1,45 @@
+#![no_std]
+#![cfg_attr(not(test), no_main)]
+#![cfg_attr(test, allow(dead_code, unused_macros, unused_imports))]
+#![feature(alloc_error_handler)]
+
+use blog_os::memory::allocator::DummyAllocator;
+use blog_os::{exit_qemu, serial_println};
+use core::alloc::Layout;
+use core::panic::PanicInfo;
+
+#[cfg(not(test))]
+#[no_mangle]
+pub extern "C" fn _start() -> ! {
+    blog_os::interrupts::init_idt();
+
+    x86_64::instructions::interrupts::int3();
+
+    serial_println!("ok");
+
+    unsafe {
+        exit_qemu();
+    }
+    loop {}
+}
+
+#[cfg(not(test))]
+#[panic_handler]
+fn panic(info: &PanicInfo) -> ! {
+    serial_println!("failed");
+
+    serial_println!("{}", info);
+
+    unsafe {
+        exit_qemu();
+    }
+    loop {}
+}
+
+#[global_allocator]
+static ALLOCATOR: DummyAllocator = DummyAllocator;
+
+#[alloc_error_handler]
+fn out_of_memory(layout: Layout) -> ! {
+    panic!("out of memory: allocation for {:?} failed", layout);
+}
--- a/src/bin/test-exception-double-fault-stack-overflow.rs
+++ b/src/bin/test-exception-double-fault-stack-overflow.rs
@@ -0,0 +1,88 @@
+#![feature(abi_x86_interrupt)]
+#![no_std]
+#![cfg_attr(not(test), no_main)]
+#![cfg_attr(test, allow(dead_code, unused_macros, unused_imports))]
+#![feature(alloc_error_handler)]
+
+use blog_os::memory::allocator::DummyAllocator;
+use blog_os::{exit_qemu, serial_println};
+use core::alloc::Layout;
+use core::panic::PanicInfo;
+use lazy_static::lazy_static;
+
+#[cfg(not(test))]
+#[no_mangle]
+#[allow(unconditional_recursion)]
+pub extern "C" fn _start() -> ! {
+    blog_os::gdt::init();
+    init_test_idt();
+
+    fn stack_overflow() {
+        stack_overflow(); // for each recursion, the return address is pushed
+    }
+
+    // trigger a stack overflow
+    stack_overflow();
+
+    serial_println!("failed");
+    serial_println!("No exception occured");
+
+    unsafe {
+        exit_qemu();
+    }
+
+    loop {}
+}
+
+/// This function is called on panic.
+#[cfg(not(test))]
+#[panic_handler]
+fn panic(info: &PanicInfo) -> ! {
+    serial_println!("failed");
+    serial_println!("{}", info);
+
+    unsafe {
+        exit_qemu();
+    }
+
+    loop {}
+}
+
+#[global_allocator]
+static ALLOCATOR: DummyAllocator = DummyAllocator;
+
+#[alloc_error_handler]
+fn out_of_memory(layout: Layout) -> ! {
+    panic!("out of memory: allocation for {:?} failed", layout);
+}
+
+use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
+
+lazy_static! {
+    static ref TEST_IDT: InterruptDescriptorTable = {
+        let mut idt = InterruptDescriptorTable::new();
+        unsafe {
+            idt.double_fault
+                .set_handler_fn(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 double_fault_handler(
+    _stack_frame: &mut InterruptStackFrame,
+    _error_code: u64,
+) {
+    serial_println!("ok");
+
+    unsafe {
+        exit_qemu();
+    }
+    loop {}
+}
--- a/src/bin/test-panic.rs
+++ b/src/bin/test-panic.rs
@@ -0,0 +1,34 @@
+#![cfg_attr(not(test), no_std)]
+#![cfg_attr(not(test), no_main)]
+#![cfg_attr(test, allow(unused_imports))]
+#![feature(alloc_error_handler)]
+
+use blog_os::memory::allocator::DummyAllocator;
+use blog_os::{exit_qemu, serial_println};
+use core::alloc::Layout;
+use core::panic::PanicInfo;
+
+#[cfg(not(test))]
+#[no_mangle]
+pub extern "C" fn _start() -> ! {
+    panic!();
+}
+
+#[cfg(not(test))]
+#[panic_handler]
+fn panic(_info: &PanicInfo) -> ! {
+    serial_println!("ok");
+
+    unsafe {
+        exit_qemu();
+    }
+    loop {}
+}
+
+#[global_allocator]
+static ALLOCATOR: DummyAllocator = DummyAllocator;
+
+#[alloc_error_handler]
+fn out_of_memory(layout: Layout) -> ! {
+    panic!("out of memory: allocation for {:?} failed", layout);
+}
--- a/src/gdt.rs
+++ b/src/gdt.rs
@@ -0,0 +1,52 @@
+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,11 +1,50 @@
-use crate::println;
+// The x86-interrupt calling convention leads to the following LLVM error
+// when compiled for a Windows target: "offset is not a multiple of 16". This
+// happens for example when running `cargo test` on Windows. To avoid this
+// problem we skip compilation of this module on Windows.
+#![cfg(not(windows))]
+
+use crate::{gdt, hlt_loop, print, println};
 use lazy_static::lazy_static;
-use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
+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
    };
 }
@@ -14,12 +53,64 @@ pub fn init_idt() {
    IDT.load();
 }

-extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
+extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFrame) {
    println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
 }

-#[test_case]
-fn test_breakpoint_exception() {
-    // invoke a breakpoint exception
-    x86_64::instructions::interrupts::int3();
+extern "x86-interrupt" fn page_fault_handler(
+    stack_frame: &mut InterruptStackFrame,
+    _error_code: PageFaultErrorCode,
+) {
+    use crate::hlt_loop;
+    use x86_64::registers::control::Cr2;
+
+    println!("EXCEPTION: PAGE FAULT");
+    println!("Accessed Address: {:?}", Cr2::read());
+    println!("{:#?}", stack_frame);
+    hlt_loop();
+}
+
+extern "x86-interrupt" fn double_fault_handler(
+    stack_frame: &mut InterruptStackFrame,
+    _error_code: u64,
+) {
+    println!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
+    hlt_loop();
+}
+
+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 pc_keyboard::{layouts, DecodedKey, Keyboard, ScancodeSet1};
+    use spin::Mutex;
+    use x86_64::instructions::port::Port;
+
+    lazy_static! {
+        static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
+            Mutex::new(Keyboard::new(layouts::Us104Key, ScancodeSet1));
+    }
+
+    let mut keyboard = KEYBOARD.lock();
+    let port = Port::new(0x60);
+
+    let scancode: u8 = unsafe { port.read() };
+    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),
+            }
+        }
+    }
+
+    unsafe {
+        PICS.lock()
+            .notify_end_of_interrupt(InterruptIndex::Keyboard.as_u8());
+    }
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,76 +1,25 @@
-#![no_std]
-#![cfg_attr(test, no_main)]
-#![feature(custom_test_frameworks)]
+#![cfg_attr(not(test), no_std)]
 #![feature(abi_x86_interrupt)]
-#![test_runner(crate::test_runner)]
-#![reexport_test_harness_main = "test_main"]
+#![feature(alloc)]
+#![feature(const_fn)]

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

+pub mod gdt;
 pub mod interrupts;
+pub mod memory;
 pub mod serial;
 pub mod vga_buffer;

-pub fn init() {
-    interrupts::init_idt();
-}
-pub trait Testable {
-    fn run(&self) -> ();
-}
-
-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.run();
-    }
-    exit_qemu(QemuExitCode::Success);
-}
-
-pub fn test_panic_handler(info: &PanicInfo) -> ! {
-    serial_println!("[failed]\n");
-    serial_println!("Error: {}\n", info);
-    exit_qemu(QemuExitCode::Failed);
-    loop {}
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[repr(u32)]
-pub enum QemuExitCode {
-    Success = 0x10,
-    Failed = 0x11,
-}
-
-pub fn exit_qemu(exit_code: QemuExitCode) {
+pub unsafe fn exit_qemu() {
    use x86_64::instructions::port::Port;

-    unsafe {
-        let mut port = Port::new(0xf4);
-        port.write(exit_code as u32);
+    let mut port = Port::<u32>::new(0xf4);
+    port.write(0);
+}
+
+pub fn hlt_loop() -> ! {
+    loop {
+        x86_64::instructions::hlt();
    }
 }
-
-/// Entry point for `cargo xtest`
-#[cfg(test)]
-#[unsafe(no_mangle)]
-pub extern "C" fn _start() -> ! {
-    init();
-    test_main();
-    loop {}
-}
-
-#[cfg(test)]
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    test_panic_handler(info)
-}
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,26 +1,56 @@
-#![no_std]
-#![no_main]
-#![feature(custom_test_frameworks)]
-#![test_runner(blog_os::test_runner)]
-#![reexport_test_harness_main = "test_main"]
+#![cfg_attr(not(test), no_std)]
+#![cfg_attr(not(test), no_main)]
+#![cfg_attr(test, allow(unused_imports))]
+#![feature(alloc)]
+#![feature(alloc_error_handler)]

-use blog_os::println;
+extern crate alloc;
+
+use alloc::vec::Vec;
+use blog_os::{
+    memory::allocator::{BumpAllocator, LinkedListAllocator, LockedAllocator, BucketAllocator},
+    println,
+};
+use bootloader::{entry_point, BootInfo};
+use core::alloc::Layout;
 use core::panic::PanicInfo;

-#[unsafe(no_mangle)]
-pub extern "C" fn _start() -> ! {
+entry_point!(kernel_main);
+
+#[cfg(not(test))]
+fn kernel_main(boot_info: &'static BootInfo) -> ! {
+    use blog_os::interrupts::PICS;
+    use blog_os::memory;
+    use x86_64::{structures::paging::Page, VirtAddr};
+
    println!("Hello World{}", "!");

-    blog_os::init();
+    blog_os::gdt::init();
+    blog_os::interrupts::init_idt();
+    unsafe { PICS.lock().initialize() };
+    x86_64::instructions::interrupts::enable();

-    // invoke a breakpoint exception
-    x86_64::instructions::interrupts::int3();
+    let mut mapper = unsafe { memory::init(boot_info.physical_memory_offset) };
+    let mut frame_allocator = memory::init_frame_allocator(&boot_info.memory_map);

-    #[cfg(test)]
-    test_main();
+    let heap_start = VirtAddr::new(HEAP_START);
+    let heap_end = VirtAddr::new(HEAP_END);
+    memory::map_heap(heap_start, heap_end, &mut mapper, &mut frame_allocator)
+        .expect("map_heap failed");
+
+    ALLOCATOR.lock().underlying().add_memory(heap_start, HEAP_END - HEAP_START);
+
+    //let mut x = Vec::with_capacity(1000);
+    let mut x = Vec::new();
+    for i in 0..1000 {
+        x.push(i);
+    }
+    println!("{:?}", *ALLOCATOR.lock());
+    println!("with vec of size {}: {}", x.len(), x.iter().sum::<i32>());
+    println!("with formular: {}", 999 * 1000 / 2);

    println!("It did not crash!");
-    loop {}
+    blog_os::hlt_loop();
 }

 /// This function is called on panic.
@@ -28,16 +58,17 @@ pub extern "C" fn _start() -> ! {
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
    println!("{}", info);
-    loop {}
+    blog_os::hlt_loop();
 }

-#[cfg(test)]
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    blog_os::test_panic_handler(info)
-}
+const HEAP_START: u64 = 0o_001_000_000_0000;
+const HEAP_END: u64 = HEAP_START + 10 * 0x1000;

-#[test_case]
-fn trivial_assertion() {
-    assert_eq!(1, 1);
+#[global_allocator]
+static ALLOCATOR: LockedAllocator<BucketAllocator<LinkedListAllocator>> =
+    LockedAllocator::new(BucketAllocator::new(LinkedListAllocator::empty()));
+
+#[alloc_error_handler]
+fn out_of_memory(layout: Layout) -> ! {
+    panic!("out of memory: allocation for {:?} failed", layout);
 }
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -0,0 +1,120 @@
+use bootloader::bootinfo::{MemoryMap, MemoryRegionType};
+use x86_64::{
+    structures::paging::{
+        mapper, FrameAllocator, MappedPageTable, Mapper, MapperAllSizes, Page, PageTable,
+        PhysFrame, Size4KiB,
+    },
+    PhysAddr, VirtAddr,
+};
+
+pub mod allocator;
+
+/// Initialize a new MappedPageTable.
+///
+/// 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: u64) -> impl MapperAllSizes {
+    let level_4_table = active_level_4_table(physical_memory_offset);
+    let phys_to_virt = move |frame: PhysFrame| -> *mut PageTable {
+        let phys = frame.start_address().as_u64();
+        let virt = VirtAddr::new(phys + physical_memory_offset);
+        virt.as_mut_ptr()
+    };
+    MappedPageTable::new(level_4_table, phys_to_virt)
+}
+
+/// Create a FrameAllocator from the passed memory map
+pub fn init_frame_allocator(
+    memory_map: &'static MemoryMap,
+) -> BootInfoFrameAllocator<impl Iterator<Item = PhysFrame>> {
+    // get usable regions from memory map
+    let regions = memory_map
+        .iter()
+        .filter(|r| r.region_type == MemoryRegionType::Usable);
+    // map each region to its address range
+    let addr_ranges = 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.into_iter().step_by(4096));
+    // create `PhysFrame` types from the start addresses
+    let frames = frame_addresses.map(|addr| PhysFrame::containing_address(PhysAddr::new(addr)));
+
+    BootInfoFrameAllocator { frames }
+}
+
+/// 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: u64) -> &'static mut PageTable {
+    use x86_64::{registers::control::Cr3, VirtAddr};
+
+    let (level_4_table_frame, _) = Cr3::read();
+
+    let phys = level_4_table_frame.start_address();
+    let virt = VirtAddr::new(phys.as_u64() + physical_memory_offset);
+    let page_table_ptr: *mut PageTable = virt.as_mut_ptr();
+
+    &mut *page_table_ptr // unsafe
+}
+
+pub fn map_heap(
+    heap_start: VirtAddr,
+    heap_end: VirtAddr,
+    mapper: &mut impl Mapper<Size4KiB>,
+    frame_allocator: &mut impl FrameAllocator<Size4KiB>,
+) -> Result<(), MapHeapError> {
+    use x86_64::structures::paging::PageTableFlags as Flags;
+
+    let flags = Flags::PRESENT | Flags::WRITABLE;
+    let start_page = Page::containing_address(heap_start);
+    let end_page = Page::containing_address(heap_end - 1u64);
+
+    for page in Page::range_inclusive(start_page, end_page) {
+        let frame = frame_allocator.allocate_frame();
+        let frame = frame.ok_or(MapHeapError::FrameAllocationFailed)?;
+        unsafe { mapper.map_to(page, frame, flags, frame_allocator)?.flush() };
+    }
+
+    Ok(())
+}
+
+#[derive(Debug)]
+pub enum MapHeapError {
+    FrameAllocationFailed,
+    MapToError(mapper::MapToError),
+}
+
+impl From<mapper::MapToError> for MapHeapError {
+    fn from(err: mapper::MapToError) -> Self {
+        MapHeapError::MapToError(err)
+    }
+}
+
+/// A FrameAllocator that always returns `None`.
+pub struct EmptyFrameAllocator;
+
+impl FrameAllocator<Size4KiB> for EmptyFrameAllocator {
+    fn allocate_frame(&mut self) -> Option<PhysFrame> {
+        None
+    }
+}
+
+pub struct BootInfoFrameAllocator<I>
+where
+    I: Iterator<Item = PhysFrame>,
+{
+    frames: I,
+}
+
+impl<I> FrameAllocator<Size4KiB> for BootInfoFrameAllocator<I>
+where
+    I: Iterator<Item = PhysFrame>,
+{
+    fn allocate_frame(&mut self) -> Option<PhysFrame> {
+        self.frames.next()
+    }
+}
--- a/src/memory/allocator.rs
+++ b/src/memory/allocator.rs
@@ -0,0 +1,49 @@
+pub use bump::BumpAllocator;
+pub use dummy::DummyAllocator;
+pub use linked_list::LinkedListAllocator;
+pub use bucket::BucketAllocator;
+
+use core::alloc::{GlobalAlloc, Layout};
+use spin::{Mutex, MutexGuard};
+
+mod bump;
+mod dummy;
+mod linked_list;
+mod bucket;
+
+pub struct LockedAllocator<T> {
+    allocator: Mutex<T>,
+}
+
+impl<T> LockedAllocator<T> {
+    pub const fn new(allocator: T) -> Self {
+        Self {
+            allocator: Mutex::new(allocator),
+        }
+    }
+}
+
+impl<T> LockedAllocator<T> {
+    pub fn lock(&self) -> MutexGuard<T> {
+        self.allocator.lock()
+    }
+}
+
+unsafe impl<T> GlobalAlloc for LockedAllocator<T>
+where
+    T: MutGlobalAlloc,
+{
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        self.allocator.lock().alloc(layout)
+    }
+
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+        self.allocator.lock().dealloc(ptr, layout)
+    }
+}
+
+pub trait MutGlobalAlloc {
+    fn alloc(&mut self, layout: Layout) -> *mut u8;
+
+    fn dealloc(&mut self, ptr: *mut u8, layout: Layout);
+}
--- a/src/memory/allocator/bucket.rs
+++ b/src/memory/allocator/bucket.rs
@@ -0,0 +1,126 @@
+use super::MutGlobalAlloc;
+use core::alloc::Layout;
+use core::mem::size_of;
+use core::fmt::{self, Debug};
+use core::cmp;
+
+#[derive(Debug)]
+pub struct BucketAllocator<A> where A: MutGlobalAlloc + Debug {
+    underlying: A,
+    buckets: [Bucket; 10],
+}
+
+impl<A> BucketAllocator<A> where A: MutGlobalAlloc + Debug {
+    pub const fn new(underlying: A) -> Self {
+        Self {
+            underlying,
+            buckets: [
+                Bucket::new(size_of::<Region>()),
+                Bucket::new(16),
+                Bucket::new(32),
+                Bucket::new(64),
+                Bucket::new(128),
+                Bucket::new(256),
+                Bucket::new(512),
+                Bucket::new(1024),
+                Bucket::new(2048),
+                Bucket::new(4096),
+            ]
+        }
+    }
+
+    pub fn underlying(&mut self) -> &mut A {
+        &mut self.underlying
+    }
+}
+
+pub struct Bucket {
+    size: usize,
+    head: Option<&'static mut Region>,
+}
+
+impl Bucket {
+    const fn new(size: usize) -> Self {
+        Bucket {
+            size,
+            head: None,
+        }
+    }
+
+    fn layout(&self) -> Layout {
+        Layout::from_size_align(self.size, self.size).unwrap()
+    }
+}
+
+impl fmt::Debug for Bucket {
+    fn fmt(&self, f: &mut fmt::Formatter)-> fmt::Result {
+        let mut regions = 0;
+        let mut current = &self.head;
+        while let Some(region) = current {
+            current = &region.next;
+            regions += 1;
+        }
+        f.debug_struct("Bucket").field("size", &self.size).field("regions", &regions).finish()
+    }
+}
+
+#[derive(Debug)]
+struct Region {
+    next: Option<&'static mut Region>,
+}
+
+impl Region {
+    fn new() -> Self {
+        Self {
+            next: None,
+        }
+    }
+
+    fn as_mut_u8(&'static mut self) -> *mut u8 {
+        self as *mut Region as *mut u8
+    }
+
+    unsafe fn from_mut_u8(ptr: *mut u8) -> &'static mut Self {
+        (ptr as *mut Region).write(Region::new());
+        &mut *(ptr as *mut Region)
+    }
+}
+
+impl<A> BucketAllocator<A> where A: MutGlobalAlloc + Debug {
+    fn get_bucket_index(&self, layout: &Layout) -> Option<usize> {
+        let required_bucket_size = cmp::max(layout.size(), layout.align());
+        match self.buckets.binary_search_by(|bucket| bucket.size.cmp(&required_bucket_size)) {
+            Ok(index) => Some(index),
+            Err(index) if index < self.buckets.len() => Some(index),
+            Err(_) => None,
+        }
+    }
+}
+
+impl<A> MutGlobalAlloc for BucketAllocator<A> where A: MutGlobalAlloc + Debug {
+    fn alloc(&mut self, layout: Layout) -> *mut u8 {
+        if let Some(bucket_index) = self.get_bucket_index(&layout) {
+            let bucket = &mut self.buckets[bucket_index];
+            if let Some(head) = bucket.head.take() {
+                let next = head.next.take();
+                bucket.head = next;
+                return head.as_mut_u8();
+            } else {
+                self.underlying.alloc(bucket.layout())
+            }
+        } else {
+            self.underlying.alloc(layout)
+        }
+    }
+
+    fn dealloc(&mut self, ptr: *mut u8, layout: Layout) {
+        if let Some(bucket_index) = self.get_bucket_index(&layout) {
+            let bucket = &mut self.buckets[bucket_index];
+            let region = unsafe {Region::from_mut_u8(ptr)};
+            region.next = bucket.head.take();
+            bucket.head = Some(region);
+        } else {
+            self.underlying.dealloc(ptr, layout);
+        }
+    }
+}
--- a/src/memory/allocator/bump.rs
+++ b/src/memory/allocator/bump.rs
@@ -0,0 +1,38 @@
+use super::MutGlobalAlloc;
+use core::alloc::Layout;
+use x86_64::align_up;
+
+pub struct BumpAllocator {
+    heap_start: u64,
+    heap_end: u64,
+    next: u64,
+}
+
+impl BumpAllocator {
+    pub const fn new(heap_start: u64, heap_end: u64) -> Self {
+        Self {
+            heap_start,
+            heap_end,
+            next: heap_start,
+        }
+    }
+}
+
+impl MutGlobalAlloc for BumpAllocator {
+    fn alloc(&mut self, layout: Layout) -> *mut u8 {
+        let alloc_start = align_up(self.next, layout.align() as u64);
+        let alloc_end = alloc_start.saturating_add(layout.size() as u64);
+
+        if alloc_end >= self.heap_end {
+            // out of memory
+            return 0 as *mut u8;
+        }
+
+        self.next = alloc_end;
+        alloc_start as *mut u8
+    }
+
+    fn dealloc(&mut self, _ptr: *mut u8, _layout: Layout) {
+        panic!("BumpAllocator::dealloc called");
+    }
+}
--- a/src/memory/allocator/dummy.rs
+++ b/src/memory/allocator/dummy.rs
@@ -0,0 +1,16 @@
+use core::alloc::{GlobalAlloc, Layout};
+
+/// A dummy allocator that panics on every `alloc` or `dealloc` call.
+pub struct DummyAllocator;
+
+unsafe impl GlobalAlloc for DummyAllocator {
+    /// Always panics.
+    unsafe fn alloc(&self, _layout: Layout) -> *mut u8 {
+        panic!("DummyAllocator::alloc called");
+    }
+
+    /// Always panics.
+    unsafe fn dealloc(&self, _ptr: *mut u8, _layout: Layout) {
+        panic!("DummyAllocator::dealloc called");
+    }
+}
--- a/src/memory/allocator/linked_list.rs
+++ b/src/memory/allocator/linked_list.rs
@@ -0,0 +1,95 @@
+use super::MutGlobalAlloc;
+use core::alloc::Layout;
+use core::mem;
+use x86_64::{align_up, VirtAddr};
+
+#[derive(Debug)]
+pub struct LinkedListAllocator {
+    head: Region,
+}
+
+impl LinkedListAllocator {
+    pub const fn empty() -> Self {
+        let head = Region {
+            size: 0,
+            next: None,
+        };
+        Self { head }
+    }
+
+    pub unsafe fn new(heap_start: VirtAddr, heap_size: u64) -> Self {
+        let mut allocator = Self::empty();
+        allocator.add_memory(heap_start, heap_size);
+        allocator
+    }
+
+    pub fn add_memory(&mut self, start: VirtAddr, size: u64) {
+        let aligned = start.align_up(mem::size_of::<Region>() as u64);
+        let mut region = Region {
+            size: size - (aligned - start),
+            next: None
+        };
+        mem::swap(&mut self.head.next, &mut region.next);
+
+        let region_ptr: *mut Region = aligned.as_mut_ptr();
+        unsafe { region_ptr.write(region) };
+        self.head.next = Some(unsafe { &mut *region_ptr });
+    }
+}
+
+impl MutGlobalAlloc for LinkedListAllocator {
+    fn alloc(&mut self, layout: Layout) -> *mut u8 {
+        let size = align_up(layout.size() as u64, mem::size_of::<Region>() as u64);
+
+        let mut current = &mut self.head;
+        loop {
+            let next = match current.next {
+                Some(ref mut next) => next,
+                None => break,
+            };
+            let next_start = VirtAddr::new(*next as *mut Region as u64);
+            let next_end = next_start + next.size;
+
+            let alloc_start = next_start.align_up(layout.align() as u64);
+            let alloc_end = alloc_start + size;
+
+            // check if Region large enough
+            if alloc_end <= next_end {
+                // remove Region from list
+                let next_next = next.next.take();
+                current.next = next_next;
+                // insert remaining Region to list
+                self.add_memory(alloc_end, next_end - alloc_end);
+                // return allocated memory
+                return alloc_start.as_mut_ptr();
+            }
+
+            // continue with next element
+            //
+            // This is basically `current = next`, but we need a new `match` expression because
+            // the compiler can't figure the lifetimes out when we use the `next` binding
+            // from above.
+            current = match current.next {
+                Some(ref mut next) => next,
+                None => unreachable!(),
+            };
+        }
+
+        // no large enough Region found
+        0 as *mut u8
+    }
+
+    fn dealloc(&mut self, ptr: *mut u8, layout: Layout) {
+        let size = align_up(layout.size() as u64, mem::size_of::<Region>() as u64);
+        self.add_memory(VirtAddr::new(ptr as u64), size);
+    }
+}
+
+#[derive(Debug)]
+struct Region {
+    size: u64,
+    next: Option<&'static mut Region>,
+}
+
+
+// TODO recycle alignment
--- a/src/serial.rs
+++ b/src/serial.rs
@@ -4,7 +4,7 @@ use uart_16550::SerialPort;

 lazy_static! {
    pub static ref SERIAL1: Mutex<SerialPort> = {
-        let mut serial_port = unsafe { SerialPort::new(0x3F8) };
+        let mut serial_port = SerialPort::new(0x3F8);
        serial_port.init();
        Mutex::new(serial_port)
    };
@@ -13,10 +13,14 @@ lazy_static! {
 #[doc(hidden)]
 pub fn _print(args: ::core::fmt::Arguments) {
    use core::fmt::Write;
-    SERIAL1
-        .lock()
-        .write_fmt(args)
-        .expect("Printing to serial failed");
+    use x86_64::instructions::interrupts;
+
+    interrupts::without_interrupts(|| {
+        SERIAL1
+            .lock()
+            .write_fmt(args)
+            .expect("Printing to serial failed");
+    });
 }

 /// Prints to the host through the serial interface.
@@ -32,6 +36,5 @@ macro_rules! serial_print {
 macro_rules! serial_println {
    () => ($crate::serial_print!("\n"));
    ($fmt:expr) => ($crate::serial_print!(concat!($fmt, "\n")));
-    ($fmt:expr, $($arg:tt)*) => ($crate::serial_print!(
-        concat!($fmt, "\n"), $($arg)*));
+    ($fmt:expr, $($arg:tt)*) => ($crate::serial_print!(concat!($fmt, "\n"), $($arg)*));
 }
--- a/src/vga_buffer.rs
+++ b/src/vga_buffer.rs
@@ -112,7 +112,7 @@ impl Writer {
        for byte in s.bytes() {
            match byte {
                // printable ASCII byte or newline
-                0x20..=0x7e | b'\n' => self.write_byte(byte),
+                0x20...0x7e | b'\n' => self.write_byte(byte),
                // not part of printable ASCII range
                _ => self.write_byte(0xfe),
            }
@@ -163,31 +163,97 @@ 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;
-    WRITER.lock().write_fmt(args).unwrap();
+    use x86_64::instructions::interrupts;
+
+    interrupts::without_interrupts(|| {
+        WRITER.lock().write_fmt(args).unwrap();
+    });
 }

-#[test_case]
-fn test_println_simple() {
-    println!("test_println_simple output");
-}
+#[cfg(test)]
+mod test {
+    use super::*;

-#[test_case]
-fn test_println_many() {
-    for _ in 0..200 {
-        println!("test_println_many output");
-    }
-}
-
-#[test_case]
-fn test_println_output() {
-    let s = "Some test string that fits on a single line";
-    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);
+    fn construct_writer() -> Writer {
+        use std::boxed::Box;
+
+        let buffer = construct_buffer();
+        Writer {
+            column_position: 0,
+            color_code: ColorCode::new(Color::Blue, Color::Magenta),
+            buffer: Box::leak(Box::new(buffer)),
+        }
+    }
+
+    fn construct_buffer() -> Buffer {
+        use array_init::array_init;
+
+        Buffer {
+            chars: array_init(|_| array_init(|_| Volatile::new(empty_char()))),
+        }
+    }
+
+    fn empty_char() -> ScreenChar {
+        ScreenChar {
+            ascii_character: b' ',
+            color_code: ColorCode::new(Color::Green, Color::Brown),
+        }
+    }
+
+    #[test]
+    fn write_byte() {
+        let mut writer = construct_writer();
+        writer.write_byte(b'X');
+        writer.write_byte(b'Y');
+
+        for (i, row) in writer.buffer.chars.iter().enumerate() {
+            for (j, screen_char) in row.iter().enumerate() {
+                let screen_char = screen_char.read();
+                if i == BUFFER_HEIGHT - 1 && j == 0 {
+                    assert_eq!(screen_char.ascii_character, b'X');
+                    assert_eq!(screen_char.color_code, writer.color_code);
+                } else if i == BUFFER_HEIGHT - 1 && j == 1 {
+                    assert_eq!(screen_char.ascii_character, b'Y');
+                    assert_eq!(screen_char.color_code, writer.color_code);
+                } else {
+                    assert_eq!(screen_char, empty_char());
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn write_formatted() {
+        use core::fmt::Write;
+
+        let mut writer = construct_writer();
+        writeln!(&mut writer, "a").unwrap();
+        writeln!(&mut writer, "b{}", "c").unwrap();
+
+        for (i, row) in writer.buffer.chars.iter().enumerate() {
+            for (j, screen_char) in row.iter().enumerate() {
+                let screen_char = screen_char.read();
+                if i == BUFFER_HEIGHT - 3 && j == 0 {
+                    assert_eq!(screen_char.ascii_character, b'a');
+                    assert_eq!(screen_char.color_code, writer.color_code);
+                } else if i == BUFFER_HEIGHT - 2 && j == 0 {
+                    assert_eq!(screen_char.ascii_character, b'b');
+                    assert_eq!(screen_char.color_code, writer.color_code);
+                } else if i == BUFFER_HEIGHT - 2 && j == 1 {
+                    assert_eq!(screen_char.ascii_character, b'c');
+                    assert_eq!(screen_char.color_code, writer.color_code);
+                } else if i >= BUFFER_HEIGHT - 2 {
+                    assert_eq!(screen_char.ascii_character, b' ');
+                    assert_eq!(screen_char.color_code, writer.color_code);
+                } else {
+                    assert_eq!(screen_char, empty_char());
+                }
+            }
+        }
    }
 }
--- a/tests/basic_boot.rs
+++ b/tests/basic_boot.rs
@@ -1,25 +0,0 @@
-#![no_std]
-#![no_main]
-#![feature(custom_test_frameworks)]
-#![test_runner(blog_os::test_runner)]
-#![reexport_test_harness_main = "test_main"]
-
-use blog_os::println;
-use core::panic::PanicInfo;
-
-#[unsafe(no_mangle)] // don't mangle the name of this function
-pub extern "C" fn _start() -> ! {
-    test_main();
-
-    loop {}
-}
-
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    blog_os::test_panic_handler(info)
-}
-
-#[test_case]
-fn test_println() {
-    println!("test_println output");
-}
--- a/tests/should_panic.rs
+++ b/tests/should_panic.rs
@@ -1,25 +0,0 @@
-#![no_std]
-#![no_main]
-
-use blog_os::{QemuExitCode, exit_qemu, serial_print, serial_println};
-use core::panic::PanicInfo;
-
-#[unsafe(no_mangle)]
-pub extern "C" fn _start() -> ! {
-    should_fail();
-    serial_println!("[test did not panic]");
-    exit_qemu(QemuExitCode::Failed);
-    loop {}
-}
-
-fn should_fail() {
-    serial_print!("should_panic::should_fail...\t");
-    assert_eq!(0, 1);
-}
-
-#[panic_handler]
-fn panic(_info: &PanicInfo) -> ! {
-    serial_println!("[ok]");
-    exit_qemu(QemuExitCode::Success);
-    loop {}
-}
--- a/x86_64-blog_os.json
+++ b/x86_64-blog_os.json
@@ -1,16 +1,15 @@
 {
    "llvm-target": "x86_64-unknown-none",
-    "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",
+    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
    "arch": "x86_64",
    "target-endian": "little",
-    "target-pointer-width": 64,
-    "target-c-int-width": 32,
+    "target-pointer-width": "64",
+    "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",
-    "rustc-abi": "x86-softfloat"
+    "features": "-mmx,-sse,+soft-float"
  }
Author	SHA1	Message	Date
Philipp Oppermann	1eb8f0f2c7	Wip	2019-06-17 13:23:39 +02:00
Philipp Oppermann	398ca5357c	WIP	2019-03-18 18:28:04 +01:00
Philipp Oppermann	4acf12bb69	Merge branch 'post-09' into post-10	2019-03-14 11:18:40 +01:00
Philipp Oppermann	6f25c34d46	Merge branch 'post-08' into post-09	2019-03-14 11:18:22 +01:00
Philipp Oppermann	23e45b5b13	Merge branch 'post-07' into post-08	2019-03-14 11:18:22 +01:00
Philipp Oppermann	701823742e	Merge branch 'post-06' into post-07	2019-03-14 11:18:22 +01:00
Philipp Oppermann	161d5fe7be	Merge pull request #569 from phil-opp/post-10-new Update post-10 branch for new "Paging Implementation" post	2019-03-14 10:49:55 +01:00
Philipp Oppermann	9bf4ea7341	Use `BootInfoFrameAllocator` to create a `0xdeadbeaf000` mapping	2019-03-14 10:30:37 +01:00
Philipp Oppermann	a1bf5651fc	Create an `init_frame_allocator` function	2019-03-14 10:30:37 +01:00
Philipp Oppermann	763228c859	Create a generic `BootInfoFrameAllocator` type	2019-03-14 10:30:37 +01:00
Philipp Oppermann	770af27d75	Create a new mapping and write through it to the screen	2019-03-14 10:30:37 +01:00
Philipp Oppermann	3e59283c19	Create an `EmptyFrameAllocator`	2019-03-14 10:30:37 +01:00
Philipp Oppermann	6146ccba2d	Add a `memory::create_example_mapping` function	2019-03-14 10:30:37 +01:00
Philipp Oppermann	b0e1527a95	Delete our `memory::translate_addr` function again	2019-03-14 10:30:37 +01:00
Philipp Oppermann	cb4410c84e	Update kernel_main to use `MapperAllSizes::translate_addr`	2019-03-14 10:30:37 +01:00
Philipp Oppermann	98b5976656	Create a memory::init function that initializes a MappedPageTable	2019-03-14 10:30:37 +01:00
Philipp Oppermann	9335386928	Add and test a `memory::translate_addr` function	2019-03-14 10:30:37 +01:00
Philipp Oppermann	7c30d62f33	Also show non-empty level 3 table entries	2019-03-14 10:30:37 +01:00
Philipp Oppermann	61683bccda	Print non-empty level 4 table entries	2019-03-14 10:30:37 +01:00
Philipp Oppermann	e1ec5159b8	Add boot info argument and use entry_point macro	2019-03-14 10:30:37 +01:00
Philipp Oppermann	7b7d19592f	Enable `map_physical_memory` feature of bootloader	2019-03-14 10:30:37 +01:00
Philipp Oppermann	e387c0b6b8	Create a memory::active_level_4_table function	2019-03-14 10:30:37 +01:00
Philipp Oppermann	d5abc119f3	Update Readme for `Paging Implementation` post	2019-03-14 10:30:37 +01:00
Philipp Oppermann	59da6e5620	Update `bootloader` to version 0.4.0	2019-03-14 10:30:37 +01:00
Philipp Oppermann	ef1cc0ed4f	Reset code to post-09 branch for new 'Paging Implementation' post	2019-03-14 10:20:46 +01:00
Philipp Oppermann	90f0caec1a	Merge branch 'post-09' into post-10	2019-03-14 10:17:37 +01:00
Philipp Oppermann	7198a4d110	The code for reading the level 4 table was moved to the next post	2019-03-12 17:49:31 +01:00
Philipp Oppermann	5c0fb63f33	Merge branch 'post-09' into post-10	2019-03-12 17:48:43 +01:00
Philipp Oppermann	6ffcb2cf1a	Merge branch 'post-08' into post-09	2019-03-12 17:48:43 +01:00
Philipp Oppermann	1c72107cb1	Merge branch 'post-07' into post-08	2019-03-12 17:48:24 +01:00
Philipp Oppermann	b533bf6596	Merge branch 'post-06' into post-07	2019-03-12 17:48:11 +01:00
Philipp Oppermann	036a8e7608	Merge branch 'post-09' into post-10	2019-03-09 14:21:12 +01:00
Philipp Oppermann	3b960751f4	Merge branch 'post-08' into post-09	2019-03-09 14:21:12 +01:00
Philipp Oppermann	0ff6334026	Merge branch 'post-07' into post-08	2019-03-09 14:21:12 +01:00
Philipp Oppermann	1ed76411f7	Fix remaining use of `ExceptionStackFrame` in test	2019-03-09 14:21:03 +01:00
Philipp Oppermann	10c4d0509d	Update post-10 code for changes in x86_64 0.5.0 We no longer need a custom translate function as we can directly use MapperAllSizes::translate_addr.	2019-03-09 12:40:27 +01:00
Philipp Oppermann	57998ea4f8	Merge branch 'post-09' into post-10	2019-03-09 12:39:25 +01:00
Philipp Oppermann	f05aaeb0ac	Update post-09 code for changes in x86_64 0.5.0	2019-03-09 12:39:14 +01:00
Philipp Oppermann	78a30984bc	Merge branch 'post-08' into post-09	2019-03-09 12:38:25 +01:00
Philipp Oppermann	09dd68a1a2	Update post-08 code for changes in x86_64 0.5.0	2019-03-09 12:37:45 +01:00
Philipp Oppermann	81e4eec055	Merge branch 'post-07' into post-08	2019-03-09 12:36:39 +01:00
Philipp Oppermann	8e5b6a3e3f	Update post-07 code for changes in x86_64 0.5.0	2019-03-09 12:34:49 +01:00
Philipp Oppermann	be0ed3a54d	Merge branch 'post-06' into post-07	2019-03-09 12:32:03 +01:00
Philipp Oppermann	ef9a629ddc	Merge branch 'post-09' into post-10	2019-02-25 17:04:56 +01:00
Philipp Oppermann	18d8d311cb	Merge branch 'post-08' into post-09	2019-02-25 17:04:40 +01:00
Philipp Oppermann	7b61da94a0	Run `cargo fmt`	2019-02-25 17:04:25 +01:00
Philipp Oppermann	d974cf5200	Merge branch 'post-09' into post-10	2019-02-25 16:37:31 +01:00
Philipp Oppermann	f5b6094521	Merge branch 'post-06' into post-07	2019-02-25 16:37:30 +01:00
Philipp Oppermann	94447af25a	Merge branch 'post-08' into post-09	2019-02-25 16:37:30 +01:00
Philipp Oppermann	a7f487f206	Merge branch 'post-07' into post-08	2019-02-25 16:37:30 +01:00
Philipp Oppermann	36d6c6d0e9	Merge branch 'post-09' into post-10	2019-02-12 19:31:09 +01:00
Philipp Oppermann	76d3715eef	Merge branch 'post-08' into post-09	2019-02-12 19:31:09 +01:00
Antoine	babf9d8cce	Introduce an InterruptIndex enum (#557 ) The following modifications aim to group the hardware interrupts' indexes in an easily accessible structure, while being more friendly to eventual evolutions. * the hardware interrupts' indexes `TIMER_INTERRUPT_ID` and `KEYBOARD_INTERRUPT_ID` have been replaced by the attributes `Timer` and `Keyboard` contained in `enum InterruptIndex`. * only the first attribute `Timer` is explicitly declared, the following as inferred by the compiler. * the functions `as_u8` and `as_usize` avoid the need of casts to `u8` or `usize`.	2019-02-12 19:28:24 +01:00
Philipp Oppermann	ff49104764	Merge branch 'post-09' into post-10	2019-02-07 18:48:39 +01:00
Philipp Oppermann	bda1b8929c	Merge branch 'post-08' into post-09	2019-02-07 18:48:39 +01:00
Philipp Oppermann	38bd9a65b6	Merge branch 'post-06' into post-07	2019-02-07 18:46:32 +01:00
Philipp Oppermann	09ff2e01b1	Merge branch 'post-07' into post-08	2019-02-07 18:46:32 +01:00
Philipp Oppermann	03e43da9f9	Merge branch 'post-09' into post-10	2019-02-07 16:17:54 +01:00
Philipp Oppermann	58e171cce7	Merge branch 'post-08' into post-09	2019-02-07 16:15:10 +01:00
Philipp Oppermann	b3e94470e4	Merge branch 'post-06' into post-07	2019-02-07 16:15:10 +01:00
Philipp Oppermann	901a1630eb	Merge branch 'post-07' into post-08	2019-02-07 16:15:10 +01:00
Philipp Oppermann	e696d65b60	Merge branch 'post-09' into post-10	2019-02-05 15:23:49 +01:00
Philipp Oppermann	ef09418cbf	Merge branch 'post-08' into post-09	2019-02-05 15:23:49 +01:00
Philipp Oppermann	7b01e9c862	Merge branch 'post-06' into post-07	2019-02-05 15:23:49 +01:00
Philipp Oppermann	28f37da07d	Merge branch 'post-07' into post-08	2019-02-05 15:23:49 +01:00
Philipp Oppermann	ebf626061f	Merge branch 'post-09' into post-10	2019-02-05 14:59:15 +01:00
Philipp Oppermann	4c9352d898	Merge branch 'post-08' into post-09	2019-02-05 14:59:15 +01:00
Philipp Oppermann	5452e0f455	Merge branch 'post-06' into post-07	2019-02-05 14:59:15 +01:00
Philipp Oppermann	a41a007039	Merge branch 'post-07' into post-08	2019-02-05 14:59:15 +01:00
Philipp Oppermann	c3d023ad40	Merge branch 'post-09' into post-10	2019-02-05 10:46:08 +01:00
Philipp Oppermann	f3cf5b51de	Merge branch 'post-08' into post-09	2019-02-05 10:46:08 +01:00
Philipp Oppermann	202902f30d	Merge branch 'post-06' into post-07	2019-02-05 10:46:08 +01:00
Philipp Oppermann	26be4cb84d	Merge branch 'post-07' into post-08	2019-02-05 10:46:08 +01:00
Philipp Oppermann	0a10b3e784	Merge branch 'post-09' into post-10	2019-02-05 10:45:12 +01:00
Philipp Oppermann	9617680e45	Merge branch 'post-08' into post-09	2019-02-05 10:45:12 +01:00
Philipp Oppermann	3bb30fd1e8	Merge branch 'post-06' into post-07	2019-02-05 10:45:12 +01:00
Philipp Oppermann	8f18fb4282	Merge branch 'post-07' into post-08	2019-02-05 10:45:12 +01:00
Philipp Oppermann	e0f66a8196	Merge branch 'post-09' into post-10	2019-01-29 12:16:54 +01:00
Philipp Oppermann	ba54fd2503	Merge branch 'post-08' into post-09	2019-01-29 12:16:54 +01:00
Philipp Oppermann	41e36b4afa	Merge branch 'post-06' into post-07	2019-01-29 12:16:54 +01:00
Philipp Oppermann	6b9d275c2d	Merge branch 'post-07' into post-08	2019-01-29 12:16:54 +01:00
Philipp Oppermann	e5dfbd4b23	Merge branch 'post-09' into post-10	2019-01-28 11:51:35 +01:00
Philipp Oppermann	4e6ce8d16e	Merge branch 'post-08' into post-09	2019-01-28 11:51:23 +01:00
Philipp Oppermann	519f47286c	Merge branch 'post-07' into post-08	2019-01-28 11:51:03 +01:00
Philipp Oppermann	f76ec1ae32	Only set double fault handler once	2019-01-28 11:50:59 +01:00
Philipp Oppermann	5ad2962389	Merge branch 'post-09' into post-10	2019-01-28 11:44:14 +01:00
Philipp Oppermann	82e6c4b066	Merge branch 'post-08' into post-09	2019-01-28 11:44:14 +01:00
Philipp Oppermann	d564dc208f	Merge branch 'post-07' into post-08	2019-01-28 11:44:14 +01:00
Philipp Oppermann	efe92e5004	Merge branch 'post-06' into post-07	2019-01-28 11:44:14 +01:00
Philipp Oppermann	a56e22b6fc	Use BootInfoFrameAllocator instead of EmptyFrameAllocator	2019-01-28 11:30:27 +01:00
Philipp Oppermann	67f536d7c6	Add a BootInfoFrameAllocator	2019-01-28 11:28:51 +01:00
Philipp Oppermann	741224411b	Use the BootInfo struct passed by the bootloader	2019-01-28 11:24:16 +01:00
Philipp Oppermann	818417d119	Try to create example mapping for page 0xdeadbeaf000	2019-01-28 11:23:46 +01:00
Philipp Oppermann	f272785861	Create example mapping for page 0x1000	2019-01-28 11:19:46 +01:00
Philipp Oppermann	5d807ee622	Run rustfmt	2019-01-28 11:19:34 +01:00
Philipp Oppermann	90c3cdf0f3	Update Readme for `Advanced Paging` post	2019-01-27 17:14:58 +01:00
Philipp Oppermann	2bc233b2f6	Merge branch 'post-09' into post-10	2019-01-27 17:14:12 +01:00
Philipp Oppermann	0df629df47	Update Readme for `Introduction to Paging` post	2019-01-27 17:13:57 +01:00
Philipp Oppermann	cca85de5ed	Merge branch 'post-08' into post-09	2019-01-27 17:13:21 +01:00
Philipp Oppermann	1da81c6f84	Update Readme for `Hardware Interrupts` post	2019-01-27 17:13:00 +01:00
Philipp Oppermann	42d89c1030	Merge branch 'post-07' into post-08	2019-01-27 17:12:28 +01:00
Philipp Oppermann	233943310c	Update Readme for `Double Faults` post	2019-01-27 17:12:21 +01:00
Philipp Oppermann	ef6d69f82b	Merge branch 'post-06' into post-07	2019-01-27 17:11:38 +01:00
Philipp Oppermann	051b23f577	Merge branch 'post-09' into post-10	2019-01-27 16:33:54 +01:00
Philipp Oppermann	97e884e6a3	Merge branch 'post-08' into post-09	2019-01-27 16:33:54 +01:00
Philipp Oppermann	954c0bcfbb	Merge branch 'post-07' into post-08	2019-01-27 16:33:54 +01:00
Philipp Oppermann	637b517f47	Merge branch 'post-06' into post-07	2019-01-27 16:33:54 +01:00
Philipp Oppermann	bd1f5345da	Merge branch 'z_post_08' into z_post_09	2019-01-27 15:46:59 +01:00
Philipp Oppermann	662faa8dd0	Merge branch 'z_post_07' into z_post_08	2019-01-27 15:46:59 +01:00
Philipp Oppermann	5802c97938	Merge branch 'z_post_06' into z_post_07	2019-01-27 15:46:59 +01:00
Philipp Oppermann	f2bc2d33f0	Rewrite translation function on top of RecursivePageTable	2019-01-27 14:38:49 +01:00
Philipp Oppermann	38a121a887	Test `translate_addr` by translating some virtual addresses	2019-01-27 14:38:49 +01:00
Philipp Oppermann	8b380f0692	Create a new memory module with a `translate_addr` function	2019-01-27 14:38:49 +01:00
Philipp Oppermann	f23ee04161	Merge branch 'z_post_08' into z_post_09	2019-01-27 14:30:32 +01:00
Philipp Oppermann	2031a8dc81	Merge branch 'z_post_07' into z_post_08	2019-01-27 14:29:25 +01:00
Philipp Oppermann	29ee6b15dd	Merge branch 'z_post_06' into z_post_07	2019-01-27 14:28:55 +01:00
Philipp Oppermann	b184f7d996	Move the testing code to the end of `_start`	2019-01-26 12:57:32 +01:00
Philipp Oppermann	7c07a67bf5	Merge branch 'z_post_08' into z_post_09	2019-01-25 14:47:46 +01:00
Philipp Oppermann	ec2da4bebd	Merge branch 'z_post_07' into z_post_08	2019-01-25 14:47:32 +01:00
Philipp Oppermann	90ad333e90	Merge branch 'z_post_06' into z_post_07	2019-01-25 14:46:29 +01:00
Philipp Oppermann	afe8dc3dcf	Add stack overflow integration test	2019-01-25 14:45:02 +01:00
Philipp Oppermann	8bb0187f35	Run rustfmt	2019-01-25 14:44:42 +01:00
Philipp Oppermann	abaf5bd862	Use PageTable struct of x86_64 crate for accessing entries	2019-01-25 14:29:50 +01:00
Philipp Oppermann	b7005b766f	Print first 10 entries of level 4 page table	2019-01-25 14:29:04 +01:00
Philipp Oppermann	91ca04e8c2	Retrieve address of level 4 page table	2019-01-25 14:28:23 +01:00
Philipp Oppermann	ada45c6e52	Provoke page fault	2019-01-25 14:27:31 +01:00
Philipp Oppermann	207a466707	Add a page fault handler	2019-01-25 14:26:35 +01:00
Philipp Oppermann	a954c02fbe	Use pc-keyboard crate to translate all scancodes	2019-01-25 14:23:23 +01:00
Philipp Oppermann	895991fee3	Translate keycodes for keys 0-9	2019-01-25 14:22:25 +01:00
Philipp Oppermann	25796110f3	Read and print scancodes in keyboard interrupt handler	2019-01-25 14:21:49 +01:00
Philipp Oppermann	1d153d694e	Add a keyboard interrupt handler	2019-01-25 14:21:12 +01:00
Philipp Oppermann	c2e4e8c96f	Add and use hlt_loop function	2019-01-25 14:21:12 +01:00
Philipp Oppermann	599a643d97	Remove deadlock provoking code again This reverts commit `1a39774ead`.	2019-01-25 14:14:45 +01:00
Philipp Oppermann	5efcecc2f2	Avoid deadlock by disabling interrupts in print! and serial_print! macros	2019-01-25 14:14:26 +01:00
Philipp Oppermann	1a39774ead	Provoke a print! deadlock	2019-01-25 14:12:14 +01:00
Philipp Oppermann	1ea8cf6ed1	Send end of interrupt signal	2019-01-25 14:09:47 +01:00
Philipp Oppermann	4060ac558c	Add a timer interrupt handler	2019-01-25 14:09:12 +01:00
Philipp Oppermann	28a11e47bc	Enable hardware interrupts	2019-01-25 14:05:20 +01:00
Philipp Oppermann	6504bed810	Initialize the PIC	2019-01-25 14:04:55 +01:00
Philipp Oppermann	d8edfccca4	Set the stack_index for the double fault handler	2019-01-25 14:01:29 +01:00
Philipp Oppermann	ff25a7d86c	Reload code and TSS selector registers	2019-01-25 13:59:09 +01:00
Philipp Oppermann	b5202e26a1	Load the GDT	2019-01-25 13:57:40 +01:00
Philipp Oppermann	ea1b031fd3	Create a static GDT	2019-01-25 13:57:08 +01:00
Philipp Oppermann	db4e879c34	Create a new GDT module and a static TSS	2019-01-25 13:56:40 +01:00
Philipp Oppermann	7fd29c9cbe	Trigger a double fault through a stack overflow -> triple fault	2019-01-25 13:55:42 +01:00
Philipp Oppermann	218cb9399e	Add a double fault handler and test it	2019-01-25 13:54:44 +01:00