Merge branch 'post-04' into post-05

Merge branch 'post-03' into post-04
Merge branch 'post-02' into post-03
2025-12-16 22:37:49 +00:00 · 2025-02-10 12:36:07 +01:00 · 2025-02-10 12:36:07 +01:00 · 2025-02-10 12:35:54 +01:00 · 2025-02-10 12:35:16 +01:00 · 2025-02-10 11:16:21 +01:00
9 changed files with 73 additions and 37 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,6 @@
 [unstable]
 build-std = ["core", "compiler_builtins"]
+build-std-features = ["compiler-builtins-mem"]

 [build]
 target = "x86_64-blog_os.json"
--- a/.github/workflows/build-code.yml
+++ b/.github/workflows/build-code.yml
@@ -1,4 +1,4 @@
-name: Build Code
+name: Code

 on:
  push:
@@ -16,6 +16,7 @@ jobs:
  check:
    name: Check
    strategy:
+      fail-fast: false
      matrix:
        platform: [
          ubuntu-latest,
@@ -41,6 +42,7 @@ jobs:
  test:
    name: Test
    strategy:
+      fail-fast: false
      matrix:
        platform: [
          ubuntu-latest,
@@ -76,14 +78,10 @@ jobs:
          HOMEBREW_NO_AUTO_UPDATE: 1
          HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1
          HOMEBREW_NO_INSTALL_CLEANUP: 1
-      - name: Install Scoop (Windows)
-        run: |
-          Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
-          echo ::add-path::$HOME\scoop\shims
-        if: runner.os == 'Windows'
-        shell: pwsh
      - name: Install QEMU (Windows)
-        run: scoop install qemu
+        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"
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,10 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 4
+
 [[package]]
 name = "bit_field"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
+checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"

 [[package]]
 name = "bitflags"
@@ -18,18 +20,17 @@ version = "0.1.0"
 dependencies = [
 "bootloader",
 "lazy_static",
- "rlibc",
 "spin",
 "uart_16550",
- "volatile",
+ "volatile 0.2.7",
 "x86_64",
 ]

 [[package]]
 name = "bootloader"
-version = "0.9.8"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad686b9b47363de7d36c05fb6885f17d08d0f2d15b1bc782a101fe3c94a2c7c"
+checksum = "8a9c8b93781debeb5bc44a12adc4be812aa9feb659d60eeafcd7e9bedb549561"

 [[package]]
 name = "lazy_static"
@@ -40,12 +41,6 @@ dependencies = [
 "spin",
 ]

-[[package]]
-name = "rlibc"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -54,9 +49,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
 name = "uart_16550"
-version = "0.2.7"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e58fc40dc1712664fc9b0a7bd8ca2f21ab49960924fb245a80a05e1e92f3dfe9"
+checksum = "503a6c0e6d82daa87985e662d120c0176b09587c92a68db22781b28ae95405dd"
 dependencies = [
 "bitflags",
 "x86_64",
@@ -64,16 +59,23 @@ dependencies = [

 [[package]]
 name = "volatile"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29"
+checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945"
+
+[[package]]
+name = "volatile"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0"

 [[package]]
 name = "x86_64"
-version = "0.11.0"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "365de37eb7c6da582cbb510dd0f3f1235d24ff6309a8a96e8a9909cc9bfd608f"
+checksum = "fb611915c917c6296d11e23f71ff1ecfe49c5766daba92cd3df52df6b58285b6"
 dependencies = [
 "bit_field",
 "bitflags",
+ "volatile 0.4.4",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,11 +9,10 @@ name = "should_panic"
 harness = false

 [dependencies]
-bootloader = "0.9.8"
-rlibc = "1.0.0"
+bootloader = "0.9"
 volatile = "0.2.6"
 spin = "0.5.2"
-x86_64 = "0.11.0"
+x86_64 = "0.14.2"
 uart_16550 = "0.2.0"

 [dependencies.lazy_static]
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Blog OS (Testing)
+# Blog OS (CPU Exceptions)

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

-This repository contains the source code for the [Testing][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.
+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.

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

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

--- a/src/interrupts.rs
+++ b/src/interrupts.rs
@@ -0,0 +1,25 @@
+use crate::println;
+use lazy_static::lazy_static;
+use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
+
+lazy_static! {
+    static ref IDT: InterruptDescriptorTable = {
+        let mut idt = InterruptDescriptorTable::new();
+        idt.breakpoint.set_handler_fn(breakpoint_handler);
+        idt
+    };
+}
+
+pub fn init_idt() {
+    IDT.load();
+}
+
+extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
+    println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
+}
+
+#[test_case]
+fn test_breakpoint_exception() {
+    // invoke a breakpoint exception
+    x86_64::instructions::interrupts::int3();
+}
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,16 +1,19 @@
 #![no_std]
 #![cfg_attr(test, no_main)]
 #![feature(custom_test_frameworks)]
+#![feature(abi_x86_interrupt)]
 #![test_runner(crate::test_runner)]
 #![reexport_test_harness_main = "test_main"]

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

+pub mod interrupts;
 pub mod serial;
 pub mod vga_buffer;

+pub fn init() {
+    interrupts::init_idt();
+}
 pub trait Testable {
    fn run(&self) -> ();
 }
@@ -61,6 +64,7 @@ pub fn exit_qemu(exit_code: QemuExitCode) {
 #[cfg(test)]
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
+    init();
    test_main();
    loop {}
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,9 +11,15 @@ use core::panic::PanicInfo;
 pub extern "C" fn _start() -> ! {
    println!("Hello World{}", "!");

+    blog_os::init();
+
+    // invoke a breakpoint exception
+    x86_64::instructions::interrupts::int3();
+
    #[cfg(test)]
    test_main();

+    println!("It did not crash!");
    loop {}
 }

--- a/x86_64-blog_os.json
+++ b/x86_64-blog_os.json
@@ -1,6 +1,6 @@
 {
    "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
    "arch": "x86_64",
    "target-endian": "little",
    "target-pointer-width": "64",
@@ -11,5 +11,6 @@
    "linker": "rust-lld",
    "panic-strategy": "abort",
    "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
  }