Merge branch 'post-04' into post-05

Merge branch 'post-03' into post-04
Merge branch 'post-02' into post-03
2025-12-16 14:27:49 +00:00 · 2025-09-03 17:58:33 +02:00 · 2025-09-03 17:58:33 +02:00 · 2025-09-03 17:58:28 +02:00 · 2025-09-03 17:56:38 +02:00 · 2025-09-03 17:53:14 +02:00
3 changed files with 54 additions and 25 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,15 +4,21 @@ version = 4

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

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

 [[package]]
 name = "blog_os"
@@ -20,7 +26,7 @@ version = "0.1.0"
 dependencies = [
 "bootloader",
 "lazy_static",
- "spin",
+ "spin 0.5.2",
 "uart_16550",
 "volatile 0.2.7",
 "x86_64",
@@ -28,19 +34,25 @@ dependencies = [

 [[package]]
 name = "bootloader"
-version = "0.9.31"
+version = "0.9.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "974e79cf1b0b737839f01330fb5393095daf1124d52693696494e32523ae9ef5"
+checksum = "7bdfddac270bbdd45903296bc1caf29a7fdce6b326aaf0bbab7f04c5f98b7447"

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

+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -48,12 +60,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
-name = "uart_16550"
-version = "0.2.14"
+name = "spin"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503a6c0e6d82daa87985e662d120c0176b09587c92a68db22781b28ae95405dd"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "uart_16550"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614ff2a87880d4bd4374722268598a970bbad05ced8bf630439417347254ab2e"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+ "rustversion",
 "x86_64",
 ]

@@ -65,17 +84,18 @@ checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945"

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

 [[package]]
 name = "x86_64"
-version = "0.14.7"
+version = "0.14.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb611915c917c6296d11e23f71ff1ecfe49c5766daba92cd3df52df6b58285b6"
+checksum = "c101112411baafbb4bf8d33e4c4a80ab5b02d74d2612331c61e8192fc9710491"
 dependencies = [
 "bit_field",
- "bitflags",
- "volatile 0.4.4",
+ "bitflags 2.9.2",
+ "rustversion",
+ "volatile 0.4.6",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,10 +19,19 @@ uart_16550 = "0.2.0"
 version = "1.0"
 features = ["spin_no_std"]

+[[bin]]
+name = "blog_os"
+test = true
+bench = false
+

 [package.metadata.bootimage]
 test-args = [
-    "-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-serial", "stdio",
-    "-display", "none"
+    "-device",
+    "isa-debug-exit,iobase=0xf4,iosize=0x04",
+    "-serial",
+    "stdio",
+    "-display",
+    "none",
 ]
 test-success-exit-code = 33 # (0x10 << 1) | 1
--- a/x86_64-blog_os.json
+++ b/x86_64-blog_os.json
@@ -3,8 +3,8 @@
    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
    "arch": "x86_64",
    "target-endian": "little",
-    "target-pointer-width": "64",
-    "target-c-int-width": "32",
+    "target-pointer-width": 64,
+    "target-c-int-width": 32,
    "os": "none",
    "executables": true,
    "linker-flavor": "ld.lld",
Author	SHA1	Message	Date
Philipp Oppermann	d788a21b40	Merge branch 'post-04' into post-05	2025-09-03 17:58:33 +02:00
Philipp Oppermann	bb5899e437	Merge branch 'post-03' into post-04	2025-09-03 17:58:33 +02:00
Philipp Oppermann	93d0daa1e0	Merge branch 'post-02' into post-03	2025-09-03 17:58:28 +02:00
Philipp Oppermann	83e6c0bc00	Merge pull request #1436 from phil-opp/post-02-fix-target Fix: `target-pointer-width` field now expects an integer	2025-09-03 17:56:38 +02:00
Philipp Oppermann	2b11ad8397	Fix: `target-pointer-width` field now expects an integer	2025-09-03 17:53:14 +02:00
Philipp Oppermann	fa51f3adbf	Update to latest bootloader version	2025-09-03 17:52:56 +02:00
Philipp Oppermann	0b61e748fb	Merge branch 'post-04' into post-05	2025-08-26 16:41:45 +02:00
Philipp Oppermann	ceb91f955a	Merge pull request #1434 from phil-opp/post-04-test-true Set `test=true` to enable `main.rs` testing again	2025-08-26 16:41:21 +02:00
Philipp Oppermann	3340babf51	Set `test=true` to enable `main.rs` testing again We set `test=false` for previous posts in https://github.com/phil-opp/blog_os/pull/1412 to avoid errors e.g. in rust-analyzer. For this testing post, we want to set it back to `true`.	2025-08-26 16:21:28 +02:00
Philipp Oppermann	a862287880	Merge branch 'post-04' into post-05	2025-08-18 09:44:29 +02:00
Philipp Oppermann	37a0ae0097	Run cargo update	2025-08-18 09:44:27 +02:00
Philipp Oppermann	6fc9fbfb7d	Merge branch 'post-03' into post-04	2025-08-18 09:44:16 +02:00
Philipp Oppermann	1f097bba71	Run cargo update	2025-08-18 09:43:39 +02:00
Philipp Oppermann	99fbbad9b0	Merge branch 'post-02' into post-03	2025-08-18 09:43:25 +02:00
Philipp Oppermann	94d14d8d62	Run cargo update for bootloader crate	2025-08-18 09:42:41 +02:00
Philipp Oppermann	d46aef945f	Merge branch 'post-04' into post-05	2025-08-07 13:09:45 +02:00
Philipp Oppermann	ebfc7c5f7e	Merge branch 'post-03' into post-04	2025-08-07 13:09:45 +02:00
Philipp Oppermann	6f0be666f3	Merge branch 'post-02' into post-03	2025-08-07 13:09:45 +02:00
Philipp Oppermann	d9fa84edd6	Merge pull request #1425 from phil-opp/post-02-fix-target Fix: `target-c-int-width` field now expects an integer	2025-08-07 13:09:35 +02:00
Philipp Oppermann	e24e33f6ff	Merge branch 'post-04' into post-05	2025-08-07 13:08:03 +02:00
Philipp Oppermann	d1bf96108a	Merge branch 'post-03' into post-04	2025-08-07 13:08:00 +02:00
Philipp Oppermann	97de98df33	Merge branch 'post-02' into post-03	2025-08-07 13:07:41 +02:00
Philipp Oppermann	9684f75819	Merge branch 'post-01' into post-02	2025-08-07 13:07:09 +02:00
Philipp Oppermann	d6cc562907	Fix: `target-c-int-width` field now expects an integer	2025-08-07 12:25:03 +02:00
Philipp Oppermann	b44d8ab7fc	Merge pull request #1412 from tigeryant/post-01 Added [[bin]] section to Cargo.toml	2025-05-09 15:46:51 +02:00
John Davies	c551fec1ce	Added [[bin]] section to Cargo.toml with test and bench set to false to prevent duplicate definition of lang item	2025-05-02 00:35:50 +07:00