Compare commits

..

192 Commits

Author SHA1 Message Date
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
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
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
97de98df33 Merge branch 'post-02' into post-03 2025-08-07 13:07:41 +02:00
Philipp Oppermann
9684f75819 Merge branch 'post-01' into post-02 2025-08-07 13:07:09 +02:00
Philipp Oppermann
d6cc562907 Fix: target-c-int-width field now expects an integer 2025-08-07 12:25:03 +02:00
Philipp Oppermann
b44d8ab7fc Merge pull request #1412 from tigeryant/post-01
Added [[bin]] section to Cargo.toml
2025-05-09 15:46:51 +02:00
John Davies
c551fec1ce Added [[bin]] section to Cargo.toml with test and bench set to false to prevent duplicate definition of lang item 2025-05-02 00:35:50 +07:00
Philipp Oppermann
e2a3e76a32 Merge branch 'post-02' into post-03 2025-03-27 15:07:41 +01:00
Philipp Oppermann
16bbb8f972 Merge branch 'post-01' into post-02 2025-03-27 15:07:24 +01:00
Philipp Oppermann
430e2143f8 Fix: no_mangle is an unsafe attribute since Rust 2024 2025-03-27 15:06:17 +01:00
Philipp Oppermann
86ffa24e8e Update to Rust 2024 edition 2025-03-27 15:05:58 +01:00
Philipp Oppermann
df0c0b5783 Merge branch 'post-02' into post-03 2025-03-24 11:09:21 +01:00
Philipp Oppermann
c27eb1da9c Run cargo update for bootloader crate 2025-03-24 11:08:41 +01:00
Philipp Oppermann
2a61f88d8a Merge branch 'post-02' into post-03 2025-02-10 12:35:54 +01:00
Philipp Oppermann
a90a8bea67 Run cargo update for bootloader crate 2025-02-10 12:35:16 +01:00
Philipp Oppermann
f52872f3b9 Merge branch 'post-02' into post-03 2025-02-10 11:16:21 +01:00
Philipp Oppermann
688a21e4ed Set rustc-abi: x86-softfloat in target JSON
This additional field is required by the Rust compiler since https://github.com/rust-lang/rust/pull/136146 .
2025-02-10 11:16:14 +01:00
Philipp Oppermann
07d6c9c84e Merge branch 'post-02' into post-03 2024-04-30 15:39:07 +02:00
Philipp Oppermann
2265ddecad Run cargo update 2024-04-30 15:37:30 +02:00
Philipp Oppermann
3bc023ec2d Merge branch 'post-02' into post-03 2024-02-16 15:59:38 +01:00
Philipp Oppermann
38604da92f Update bootloader version to v0.9.27 in Cargo.lock 2024-02-16 15:59:13 +01:00
Philipp Oppermann
1a53a115da Merge branch 'post-02' into post-03 2024-02-16 13:21:45 +01:00
Philipp Oppermann
c6990cb52d Don't specify patch version in Cargo.toml
Avoids confusion for people that don't know that cargo always chooses the latest patch version.
2024-02-16 13:21:21 +01:00
Philipp Oppermann
ef9bb1a087 Merge branch 'post-02' into post-03 2024-02-16 13:13:55 +01:00
Philipp Oppermann
2bc4490404 Update bootloader version to v0.9.26 in Cargo.lock 2024-02-16 13:13:31 +01:00
Philipp Oppermann
7288459bdf Merge branch 'post-02' into post-03 2024-02-16 12:39:51 +01:00
Philipp Oppermann
7959b77ebd Update data layout for LLVM 18
Fixes build on latest rustc nightly.
2024-02-16 12:38:32 +01:00
Philipp Oppermann
bebad6d5a9 Update bootloader version in Cargo.lock 2024-02-16 12:36:31 +01:00
Philipp Oppermann
6c8fea8b00 Merge branch 'post-02' into post-03 2024-01-28 11:45:32 +01:00
Philipp Oppermann
b99c3f6d1d Use latest data layout for custom target 2024-01-28 11:44:35 +01:00
Philipp Oppermann
66c1792034 Update bootloader version in Cargo.lock 2024-01-28 11:44:23 +01:00
Philipp Oppermann
3280a0afc7 Merge branch 'post-02' into post-03 2022-09-25 11:31:07 +02:00
Philipp Oppermann
6393247a3b Update bootloader version in Cargo.lock 2022-09-25 11:29:38 +02:00
Philipp Oppermann
a387a00c85 Merge branch 'post-02' into post-03
# Conflicts:
#	Cargo.lock
2022-01-18 10:06:27 +01:00
Philipp Oppermann
faa8d15cb7 Run cargo update for bootloader crate 2022-01-18 10:05:56 +01:00
Philipp Oppermann
4c9cd3ae32 Merge branch 'post-02' into post-03 2021-12-22 09:27:26 +01:00
Philipp Oppermann
26f1f5b896 Run cargo update for bootloader crate 2021-12-22 09:27:00 +01:00
Philipp Oppermann
cbead25b43 Merge branch 'post-02' into post-03 2021-05-21 19:54:20 +02:00
Philipp Oppermann
1f49e2e9fe Merge branch 'post-01' into post-02 2021-05-21 19:53:49 +02:00
Philipp Oppermann
8708b54756 Readme: Update workflow name in badge 2021-05-21 19:53:01 +02:00
Philipp Oppermann
2c25d55810 Merge branch 'post-02' into post-03 2021-05-20 14:32:42 +02:00
Philipp Oppermann
021762cf30 Run cargo update for bootloader 2021-05-20 14:32:27 +02:00
Philipp Oppermann
ec95ac0e5a Merge branch 'post-02' into post-03 2021-05-17 11:29:14 +02:00
Philipp Oppermann
d8f280315f Run cargo update for bootloader crate 2021-05-17 11:28:54 +02:00
Philipp Oppermann
e39c7d8ad8 Merge branch 'post-02' into post-03 2021-03-10 09:23:02 +01:00
Philipp Oppermann
066c278277 Merge branch 'post-01' into post-02 2021-03-10 09:23:02 +01:00
Philipp Oppermann
bdb6a424a8 CI: Rename 'Build Code' workflow to 'Code' 2021-03-10 09:22:57 +01:00
Philipp Oppermann
f40717901b Merge branch 'post-02' into post-03 2021-03-10 09:15:58 +01:00
Philipp Oppermann
96844f6519 Merge branch 'post-01' into post-02 2021-03-10 09:15:58 +01:00
Philipp Oppermann
1501669819 Update lockfile format 2021-03-10 09:15:54 +01:00
Philipp Oppermann
195f4489e6 Merge branch 'post-02' into post-03 2021-03-10 09:13:39 +01:00
Philipp Oppermann
1b86d7fd62 Merge branch 'post-01' into post-02 2021-03-10 09:13:39 +01:00
Philipp Oppermann
deb0f63dff Ci: Don't fail fast 2021-03-10 09:13:00 +01:00
Philipp Oppermann
fbdcd45d16 Merge branch 'post-02' into post-03 2021-03-10 08:53:37 +01:00
Philipp Oppermann
d658949f5b Run cargo update for bootloader crate 2021-03-10 08:53:21 +01:00
Philipp Oppermann
d12842bcd5 Merge branch 'post-02' into post-03 2021-02-02 10:52:00 +01:00
Philipp Oppermann
0e52ccbebb Run cargo update for bootloader crate 2021-02-02 10:51:03 +01:00
Philipp Oppermann
ea5aad0e0c Merge branch 'post-02' into post-03 2020-10-02 23:17:08 +02:00
Rob Gries
4e38e7ddf8 Remove rlibc and use compiler-builtins-mem feature (#865) 2020-10-02 23:14:25 +02:00
Philipp Oppermann
1afa3af79d Merge branch 'post-02' into post-03 2020-09-29 12:19:54 +02:00
Philipp Oppermann
49dce7ada7 cargo update the bootloadercrate to fix nightly breakage 2020-09-29 12:19:48 +02:00
Philipp Oppermann
552eb97f75 Merge branch 'post-02' into post-03 2020-09-24 10:10:16 +02:00
Philipp Oppermann
c42cee8d89 Update bootloader to 0.9.10 2020-09-24 10:09:57 +02:00
Philipp Oppermann
eace075f2c Run cargo update for post-03 2020-09-24 09:08:28 +02:00
Philipp Oppermann
2d5150f2a3 Merge branch 'post-02' into post-03 2020-09-24 09:08:11 +02:00
Philipp Oppermann
ebb9f0b8a7 Run cargo update 2020-09-24 09:07:45 +02:00
Philipp Oppermann
3200b7a68d Merge branch 'post-02' into post-03 2020-08-16 18:03:09 +02:00
Philipp Oppermann
cde3c8f955 Merge branch 'post-01' into post-02 2020-08-16 18:03:09 +02:00
Philipp Oppermann
6ad573bb11 Run workflow on workflow_dispatch event
This allows us to trigger a branch build from the master branch on schedule.
2020-08-16 18:01:58 +02:00
Philipp Oppermann
f316bd1a08 Merge branch 'post-02' into post-03 2020-07-17 15:57:35 +02:00
Philipp Oppermann
4a4d704384 Add note about minimum required nightly version 2020-07-17 15:57:32 +02:00
Philipp Oppermann
1ddc27ca88 Merge branch 'post-02' into post-03 2020-07-17 11:48:35 +02:00
Philipp Oppermann
71d8a438f7 Update Readme for new build-std build instructions 2020-07-17 11:48:27 +02:00
Philipp Oppermann
3a77cbe794 Merge branch 'post-01' into post-02 2020-07-17 11:44:17 +02:00
Philipp Oppermann
3fb4695f6c Bootimage is not needed for post-01 2020-07-17 11:39:47 +02:00
Philipp Oppermann
635677d07c Fix workflow syntax 2020-07-17 11:38:30 +02:00
Philipp Oppermann
b276ec4765 Update CI script to be consistent with other branches 2020-07-17 11:36:33 +02:00
Philipp Oppermann
406c406d5f Merge branch 'post-02' into post-03 2020-07-17 11:28:04 +02:00
Philipp Oppermann
6f9cfce6f9 Don't deny clippy warnings 2020-07-17 11:27:18 +02:00
Philipp Oppermann
651adbc8bd Merge branch 'post-02' into post-03 2020-07-17 11:16:18 +02:00
Philipp Oppermann
4bbaae24a4 Merge pull request #835 from phil-opp/post-02-Zbuild-std
Migrate post-02 code from cargo-xbuild to `-Zbuild-std`
2020-07-17 11:13:11 +02:00
Philipp Oppermann
44d7654ef6 Add toml extension to .cargo/config and use table format for unstable 2020-07-17 10:57:04 +02:00
Philipp Oppermann
f135aefae8 Update to bootloader 0.9.8 2020-07-17 10:52:21 +02:00
Philipp Oppermann
ffaac76876 Use latest release of bootimage on CI 2020-07-17 10:52:08 +02:00
Philipp Oppermann
5ae9f62f4d Adjust job names on CI to match existing names 2020-07-16 17:15:03 +02:00
Philipp Oppermann
da0ee38f09 Add names for all CI operations 2020-07-16 17:10:50 +02:00
Philipp Oppermann
263e852dcc Use functionality of toolchain action for installing rustup components 2020-07-16 17:04:02 +02:00
Philipp Oppermann
614e5b0e86 Install rustup components after checking out the repo
so that the components are installed for the nightly toolchain.
2020-07-16 16:36:19 +02:00
Philipp Oppermann
9ee42e0f5f Install Zbuild-std branch of bootimage 2020-07-16 16:32:50 +02:00
Philipp Oppermann
c4672096d4 Install rust-src component for cargo check 2020-07-16 16:31:52 +02:00
Philipp Oppermann
ffe1b6abd0 Rewrite CI script with using actions-rs actions
This gives use support for github's scoped annotations when there are errors or warnings.
2020-07-16 16:21:37 +02:00
Philipp Oppermann
16ffe80fd5 Add dependency on rlibc 2020-07-16 15:39:07 +02:00
Philipp Oppermann
07d8a22a53 Use -Zbuildstd instead of cargo-xbuild 2020-07-16 15:37:09 +02:00
Philipp Oppermann
a004e7da9c Merge branch 'post-02' into post-03 2020-05-20 14:04:37 +02:00
Philipp Oppermann
b1bf0873ce Update bootloader to v0.9.3 2020-05-20 14:03:59 +02:00
Philipp Oppermann
f23269ed93 Merge branch 'post-02' into post-03 2020-02-26 12:45:27 +01:00
Philipp Oppermann
46264d08ca Run cargo update 2020-02-26 12:43:51 +01:00
Philipp Oppermann
0489c09d05 Update Github Actions badge for post-03 2019-12-12 09:28:56 +01:00
Philipp Oppermann
99b139ddff Merge branch 'post-02' into post-03 2019-12-12 09:28:44 +01:00
Philipp Oppermann
fea4fa9c67 Update Github Actions badge for post-02 2019-12-12 09:28:05 +01:00
Philipp Oppermann
ddbe317099 Merge branch 'post-01' into post-02 2019-12-12 09:27:30 +01:00
Philipp Oppermann
5dc842d05f Use Github Actions CI badge 2019-12-12 09:26:53 +01:00
Philipp Oppermann
abd2f4c5e2 Merge branch 'post-02' into post-03 2019-12-12 09:23:30 +01:00
Philipp Oppermann
0cc02f02c5 Merge branch 'post-01' into post-02 2019-12-12 09:23:30 +01:00
Philipp Oppermann
db8769cca3 Clarify licensing 2019-12-12 09:23:25 +01:00
Philipp Oppermann
dbb3db2dc7 Merge branch 'post-02' into post-03 2019-12-10 16:55:29 +01:00
Philipp Oppermann
58629ea208 Merge branch 'post-01' into post-02 2019-12-10 16:55:26 +01:00
Philipp Oppermann
1be386ae78 Remove azure pipelines CI script 2019-12-10 16:48:00 +01:00
Philipp Oppermann
748365bf62 Update post-03 to new lockfile format 2019-11-28 14:04:38 +01:00
Philipp Oppermann
2b1f72ccd8 Merge branch 'post-02' into post-03 2019-11-28 14:04:16 +01:00
Philipp Oppermann
1c4ca04a2f Update post-02 to new lockfile format 2019-11-28 14:03:59 +01:00
Philipp Oppermann
60856aac6b Merge branch 'post-01' into post-02 2019-11-28 14:03:19 +01:00
Philipp Oppermann
fcdf3aa8d7 Update to new lockfile format 2019-11-28 14:02:08 +01:00
Philipp Oppermann
c0bb7e5848 Ignore VSCode workspace settings 2019-11-28 13:59:32 +01:00
Philipp Oppermann
679e453509 Merge branch 'post-02' into post-03 2019-11-22 15:57:18 +01:00
Philipp Oppermann
7de138aa04 Merge branch 'post-01' into post-02 2019-11-22 15:57:18 +01:00
Philipp Oppermann
76520e761a Fix rustfmt check on Github Actions (#688) 2019-11-22 15:53:24 +01:00
Philipp Oppermann
4f90781b3f Merge branch 'post-02' into post-03 2019-10-08 19:44:38 +02:00
Philipp Oppermann
9e40f377db Merge branch 'post-01' into post-02 2019-10-08 19:44:38 +02:00
Philipp Oppermann
f45c265142 Use latest nightly with rustfmt for formatting check (#679)
Don't fail if current nightly has no rustfmt
2019-10-08 19:44:05 +02:00
Philipp Oppermann
515d98645e Merge branch 'post-02' into post-03 2019-09-25 13:18:58 +02:00
Philipp Oppermann
6b23fa3d28 Run cargo update 2019-09-25 13:18:32 +02:00
Philipp Oppermann
a86fe5c2af Merge branch 'post-02' into post-03 2019-09-13 17:42:32 +02:00
Philipp Oppermann
99a7231d52 Remove profile.{dev, release}.panic keys from Cargo.toml 2019-09-13 17:42:06 +02:00
Philipp Oppermann
ab10af6f99 Merge branch 'post-02' into post-03 2019-09-13 10:53:50 +02:00
Philipp Oppermann
621364bd1b Merge branch 'post-01' into post-02 2019-09-13 10:53:50 +02:00
Philipp Oppermann
36a85b2d66 Debug scheduled builds 2019-09-13 10:53:43 +02:00
Philipp Oppermann
bcafb60069 Update spin and volatile dependencies 2019-09-11 13:13:34 +02:00
Philipp Oppermann
818bfb9646 Merge branch 'post-01' into post-02 2019-09-11 11:21:15 +02:00
Philipp Oppermann
465eb45cfe Merge branch 'post-02' into post-03 2019-09-11 11:21:15 +02:00
Philipp Oppermann
80302ad306 Gate bors on Github Actions Test job 2019-09-11 11:21:11 +02:00
Philipp Oppermann
c6d5a4d567 Run cargo update 2019-09-11 10:57:07 +02:00
Philipp Oppermann
fe5e1fd92c Merge branch 'post-02' into post-03 2019-09-11 10:56:41 +02:00
Philipp Oppermann
ffd1bda509 Update bootloader to version 0.8.0 2019-09-11 10:55:49 +02:00
Philipp Oppermann
a1060f79f0 Merge branch 'post-02' into post-03 2019-09-11 10:32:57 +02:00
Philipp Oppermann
bb8923cf56 Merge branch 'post-01' into post-02 2019-09-11 10:32:57 +02:00
Philipp Oppermann
8c71d77e58 Set stricter timeouts to deal with hanging tasks
Example: https://github.com/phil-opp/blog_os/runs/218474634
2019-09-11 10:32:51 +02:00
Philipp Oppermann
3765c27020 Merge branch 'post-02' into post-03 2019-09-11 10:12:46 +02:00
Philipp Oppermann
dbe0802c6d Merge branch 'post-01' into post-02 2019-09-11 10:12:46 +02:00
Philipp Oppermann
70373be738 Fix Actions script: delete duplicate on key 2019-09-11 10:12:42 +02:00
Philipp Oppermann
70b339a4a5 Merge branch 'post-02' into post-03 2019-09-11 10:09:32 +02:00
Philipp Oppermann
9e1e3926fa Merge branch 'post-01' into post-02 2019-09-11 10:09:29 +02:00
Philipp Oppermann
cddda2578e Schedule builds every day
To test with latest nightly.
2019-09-11 10:09:12 +02:00
Philipp Oppermann
2fa43262f2 Github Actions: Don't build staging.tmp branch 2019-09-11 10:07:06 +02:00
Philipp Oppermann
95f7803f6c Delete Travis and Appveyor CI scripts
We now use Github Actions and still have Azure Pipelines as fallback.
2019-09-11 10:05:27 +02:00
Philipp Oppermann
153beec1c4 Merge branch 'post-02' into post-03 2019-09-11 09:46:34 +02:00
Philipp Oppermann
7b00599bf8 Merge pull request #662 from phil-opp/post-02-actions
Set up GitHub Actions for post-02 branch
2019-09-11 09:45:20 +02:00
Philipp Oppermann
72aa3a4580 Update github actions script for post-02 2019-09-10 23:50:14 +02:00
Philipp Oppermann
5d7c4678de Merge branch 'post-01' into post-02-actions 2019-09-10 23:50:08 +02:00
Philipp Oppermann
398aaf578c Rename job to Test 2019-09-10 23:47:26 +02:00
Philipp Oppermann
3452511f18 Merge pull request #661 from phil-opp/post-01-actions
Set up GitHub Actions for post-01 branch
2019-09-10 23:21:44 +02:00
Philipp Oppermann
5d1559f475 Build post-01 on GitHub Actions 2019-09-10 20:42:06 +02:00
Philipp Oppermann
bfde53de79 Merge branch 'post-02' into post-03 2019-09-10 10:20:47 +02:00
Philipp Oppermann
7197d8b18a Remove old package.metadata.bootimage configuration key 2019-09-10 10:20:42 +02:00
Philipp Oppermann
298ec5f4b6 Merge branch 'post-02' into post-03 2019-07-22 10:33:24 +02:00
Philipp Oppermann
e86c95bd24 Run cargo update 2019-07-22 10:24:54 +02:00
Philipp Oppermann
ff8afb814e Merge branch 'post-02' into post-03 2019-07-18 10:16:01 +02:00
Philipp Oppermann
47bcca33b3 Run cargo update 2019-07-18 10:14:57 +02:00
Philipp Oppermann
5ed27923e8 Update to bootloader 0.6.4 2019-07-18 10:14:39 +02:00
Philipp Oppermann
fcd849f471 Fix deprecated range syntax 2019-06-17 17:28:27 +02:00
Philipp Oppermann
70c24b76d0 Merge branch 'post-02' into post-03 2019-04-26 11:27:45 +02:00
Philipp Oppermann
b59720f6e1 Update Readme for new runner 2019-04-26 11:27:36 +02:00
Philipp Oppermann
16a314ab8d Merge branch 'post-02' into post-03 2019-04-26 11:24:17 +02:00
Philipp Oppermann
63b97fe1f8 Update bootloader to version 0.6.0 2019-04-26 11:23:32 +02:00
Philipp Oppermann
528bbd4e9f Add a cargo xbuild check on CI 2019-04-25 14:28:43 +02:00
Philipp Oppermann
06d1c9ff81 Update CI scripts to use cargo bootimage 2019-04-25 14:17:27 +02:00
Philipp Oppermann
c1064ad316 Add a .cargo/config file 2019-04-25 13:18:28 +02:00
Philipp Oppermann
f875a933e5 Merge branch 'post-02' into post-03 2019-04-25 11:08:11 +02:00
Philipp Oppermann
3c2a5ef0f6 Merge branch 'post-01' into post-02 2019-04-25 11:08:11 +02:00
Philipp Oppermann
4209c85908 Build all branches on azure pipelines 2019-04-25 11:08:05 +02:00
Philipp Oppermann
652d91154f Merge branch 'post-02' into post-03 2019-04-11 15:32:21 +02:00
Philipp Oppermann
64e7ea7b1a Merge branch 'post-01' into post-02 2019-04-11 15:32:06 +02:00
Philipp Oppermann
3a07a23c39 Update CI build for rewrite of "A Freestanding Rust Binary" (#578)
See https://github.com/phil-opp/blog_os/pull/577 for information about the rewrite.

This commit updates the azure pipelines CI script in the following way:

- build on all three OSs
- build for thumbv7em-none-eabihf
2019-04-11 15:29:16 +02:00
Philipp Oppermann
9a879e69c5 Merge branch 'post-02' into post-03 2019-04-06 17:35:16 +02:00
Philipp Oppermann
eee4718115 Add llvm-tools-preview also in travis and appveyor scripts 2019-04-06 17:35:11 +02:00
Philipp Oppermann
186321623a Run cargo update 2019-04-06 16:55:17 +02:00
Philipp Oppermann
1246fc4df9 Merge branch 'post-02' into post-03 2019-04-06 16:54:48 +02:00
Philipp Oppermann
9237c875f3 Run cargo update 2019-04-06 16:53:52 +02:00
Philipp Oppermann
03da22d8e1 Merge branch 'post-02' into post-03 2019-04-06 16:47:45 +02:00
Philipp Oppermann
62b89cd80f Install llvm-tools-preview rustup component 2019-04-06 16:37:43 +02:00
Philipp Oppermann
e1034aa9ac Update Cargo.lock 2019-04-06 15:34:23 +02:00
Philipp Oppermann
577c6b8cfc Update to bootloader 0.5.1 2019-04-06 15:33:13 +02:00
Philipp Oppermann
d98a4d0cbc Merge branch 'post-02' into post-03
# Conflicts:
#	README.md
2019-04-03 10:45:48 +02:00
Philipp Oppermann
f308628db2 Merge branch 'post-01' into post-02 2019-04-03 10:45:28 +02:00
Philipp Oppermann
f8462956f2 Use azure pipelines status badge 2019-04-03 10:44:07 +02:00
29 changed files with 402 additions and 1676 deletions

View File

@@ -1,91 +0,0 @@
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

9
.cargo/config.toml Normal file
View File

@@ -0,0 +1,9 @@
[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"

105
.github/workflows/code.yml vendored Normal file
View File

@@ -0,0 +1,105 @@
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
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

4
.gitignore vendored
View File

@@ -1,2 +1,4 @@
/target
**/*.rs.bk
**/*.rs.bk
.vscode

View File

@@ -1,52 +0,0 @@
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

371
Cargo.lock generated
View File

@@ -1,383 +1,46 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[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.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bitflags"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
version = 4
[[package]]
name = "blog_os"
version = "0.1.0"
dependencies = [
"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)",
"bootloader",
"lazy_static",
"spin 0.5.2",
"volatile",
]
[[package]]
name = "bootloader"
version = "0.4.0"
version = "0.9.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
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)",
]
checksum = "7bdfddac270bbdd45903296bc1caf29a7fdce6b326aaf0bbab7f04c5f98b7447"
[[package]]
name = "lazy_static"
version = "1.2.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
dependencies = [
"spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "libc"
version = "0.2.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[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)",
"spin 0.9.8",
]
[[package]]
name = "spin"
version = "0.4.10"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "tempdir"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
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.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)",
"x86_64 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
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"
name = "spin"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
[[package]]
name = "volatile"
version = "0.2.6"
version = "0.2.7"
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"
[[package]]
name = "x86_64"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"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"
checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945"

View File

@@ -2,29 +2,18 @@
name = "blog_os"
version = "0.1.0"
authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"
edition = "2024"
[dependencies]
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"
bootloader = "0.9"
volatile = "0.2.6"
spin = "0.5.2"
[dependencies.lazy_static]
version = "1.0"
features = ["spin_no_std"]
[dev-dependencies]
array-init = "0.0.3"
[profile.dev]
panic = "abort"
[profile.release]
panic = "abort"
[package.metadata.bootimage]
default-target = "x86_64-blog_os.json"
[[bin]]
name = "blog_os"
test = false
bench = false

201
LICENSE-APACHE Normal file
View File

@@ -0,0 +1,201 @@
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.

9
LICENSE-MIT Normal file
View File

@@ -0,0 +1,9 @@
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.

View File

@@ -1,25 +1,35 @@
# Blog OS (Paging Implementation)
# Blog OS (VGA Text Mode)
[![Build Status](https://travis-ci.org/phil-opp/blog_os.svg?branch=post-10)](https://travis-ci.org/phil-opp/blog_os/branches)
[![Build Status](https://github.com/phil-opp/blog_os/workflows/Code/badge.svg?branch=post-03)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Code%22+branch%3Apost-03)
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.
This repository contains the source code for the [VGA Text Mode][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.
[post]: https://os.phil-opp.com/paging-implementation/
[post]: https://os.phil-opp.com/vga-text-mode/
**Check out the [master branch](https://github.com/phil-opp/blog_os) for more information.**
## Building
You need a nightly Rust compiler. First you need to install the `cargo-xbuild` and `bootimage` tools:
This project requires a nightly version of Rust because it uses some unstable features. At least nightly _2020-07-15_ is required for building. You might need to run `rustup update nightly --force` to update to the latest nightly even if some components such as `rustfmt` are missing it.
You can build the project by running:
```
cargo install cargo-xbuild bootimage
cargo build
```
Then you can build the project by running:
To create a bootable disk image from the compiled kernel, you need to install the [`bootimage`] tool:
[`bootimage`]: https://github.com/rust-osdev/bootimage
```
bootimage build
cargo install bootimage
```
After installing, you can create the bootable disk image by running:
```
cargo bootimage
```
This creates a bootable disk image in the `target/x86_64-blog_os/debug` directory.
@@ -33,10 +43,10 @@ You can run the disk image in [QEMU] through:
[QEMU]: https://www.qemu.org/
```
bootimage run
cargo run
```
Of course [QEMU] needs to be installed for this.
[QEMU] and the [`bootimage`] tool need to be installed for this.
You can also write the image to an USB stick for booting it on a real machine. On Linux, the command for this is:
@@ -46,9 +56,18 @@ dd if=target/x86_64-blog_os/debug/bootimage-blog_os.bin of=/dev/sdX && sync
Where `sdX` is the device name of your USB stick. **Be careful** to choose the correct device name, because everything on that device is overwritten.
## Testing
To run the unit tests on the host system, execute `cargo test`. To run the integration tests in [QEMU], run `bootimage test`.
## License
The source code is dual-licensed under MIT or the Apache License (Version 2.0).
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.

View File

@@ -1,99 +0,0 @@
# 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'

View File

@@ -1,4 +1,4 @@
status = [
"phil-opp.blog_os",
"Test",
]
delete_merged_branches = true

View File

@@ -1,44 +0,0 @@
#![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);
}

View File

@@ -1,45 +0,0 @@
#![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);
}

View File

@@ -1,88 +0,0 @@
#![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 {}
}

View File

@@ -1,34 +0,0 @@
#![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);
}

View File

@@ -1,52 +0,0 @@
use lazy_static::lazy_static;
use x86_64::structures::gdt::{Descriptor, GlobalDescriptorTable, SegmentSelector};
use x86_64::structures::tss::TaskStateSegment;
use x86_64::VirtAddr;
pub const DOUBLE_FAULT_IST_INDEX: u16 = 0;
lazy_static! {
static ref TSS: TaskStateSegment = {
let mut tss = TaskStateSegment::new();
tss.interrupt_stack_table[DOUBLE_FAULT_IST_INDEX as usize] = {
const STACK_SIZE: usize = 4096;
static mut STACK: [u8; STACK_SIZE] = [0; STACK_SIZE];
let stack_start = VirtAddr::from_ptr(unsafe { &STACK });
let stack_end = stack_start + STACK_SIZE;
stack_end
};
tss
};
}
lazy_static! {
static ref GDT: (GlobalDescriptorTable, Selectors) = {
let mut gdt = GlobalDescriptorTable::new();
let code_selector = gdt.add_entry(Descriptor::kernel_code_segment());
let tss_selector = gdt.add_entry(Descriptor::tss_segment(&TSS));
(
gdt,
Selectors {
code_selector,
tss_selector,
},
)
};
}
struct Selectors {
code_selector: SegmentSelector,
tss_selector: SegmentSelector,
}
pub fn init() {
use x86_64::instructions::segmentation::set_cs;
use x86_64::instructions::tables::load_tss;
GDT.0.load();
unsafe {
set_cs(GDT.1.code_selector);
load_tss(GDT.1.tss_selector);
}
}

View File

@@ -1,116 +0,0 @@
// 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 pic8259_simple::ChainedPics;
use spin;
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode};
pub const PIC_1_OFFSET: u8 = 32;
pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;
#[derive(Debug, Clone, Copy)]
#[repr(u8)]
pub enum InterruptIndex {
Timer = PIC_1_OFFSET,
Keyboard,
}
impl InterruptIndex {
fn as_u8(self) -> u8 {
self as u8
}
fn as_usize(self) -> usize {
usize::from(self.as_u8())
}
}
pub static PICS: spin::Mutex<ChainedPics> =
spin::Mutex::new(unsafe { ChainedPics::new(PIC_1_OFFSET, PIC_2_OFFSET) });
lazy_static! {
static ref IDT: InterruptDescriptorTable = {
let mut idt = InterruptDescriptorTable::new();
idt.breakpoint.set_handler_fn(breakpoint_handler);
idt.page_fault.set_handler_fn(page_fault_handler);
unsafe {
idt.double_fault
.set_handler_fn(double_fault_handler)
.set_stack_index(gdt::DOUBLE_FAULT_IST_INDEX);
}
idt[InterruptIndex::Timer.as_usize()].set_handler_fn(timer_interrupt_handler);
idt[InterruptIndex::Keyboard.as_usize()].set_handler_fn(keyboard_interrupt_handler);
idt
};
}
pub fn init_idt() {
IDT.load();
}
extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFrame) {
println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
}
extern "x86-interrupt" fn page_fault_handler(
stack_frame: &mut InterruptStackFrame,
_error_code: PageFaultErrorCode,
) {
use 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());
}
}

View File

@@ -1,25 +0,0 @@
#![cfg_attr(not(test), no_std)]
#![feature(abi_x86_interrupt)]
#![feature(alloc)]
#![feature(const_fn)]
extern crate alloc;
pub mod gdt;
pub mod interrupts;
pub mod memory;
pub mod serial;
pub mod vga_buffer;
pub unsafe fn exit_qemu() {
use x86_64::instructions::port::Port;
let mut port = Port::<u32>::new(0xf4);
port.write(0);
}
pub fn hlt_loop() -> ! {
loop {
x86_64::instructions::hlt();
}
}

View File

@@ -1,74 +1,20 @@
#![cfg_attr(not(test), no_std)]
#![cfg_attr(not(test), no_main)]
#![cfg_attr(test, allow(unused_imports))]
#![feature(alloc)]
#![feature(alloc_error_handler)]
#![no_std]
#![no_main]
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;
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};
mod vga_buffer;
#[unsafe(no_mangle)]
pub extern "C" fn _start() -> ! {
println!("Hello World{}", "!");
blog_os::gdt::init();
blog_os::interrupts::init_idt();
unsafe { PICS.lock().initialize() };
x86_64::instructions::interrupts::enable();
let mut mapper = unsafe { memory::init(boot_info.physical_memory_offset) };
let mut frame_allocator = memory::init_frame_allocator(&boot_info.memory_map);
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!");
blog_os::hlt_loop();
loop {}
}
/// This function is called on panic.
#[cfg(not(test))]
#[panic_handler]
fn panic(info: &PanicInfo) -> ! {
println!("{}", info);
blog_os::hlt_loop();
}
const HEAP_START: u64 = 0o_001_000_000_0000;
const HEAP_END: u64 = HEAP_START + 10 * 0x1000;
#[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);
loop {}
}

View File

@@ -1,120 +0,0 @@
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()
}
}

View File

@@ -1,49 +0,0 @@
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);
}

View File

@@ -1,126 +0,0 @@
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);
}
}
}

View File

@@ -1,38 +0,0 @@
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");
}
}

View File

@@ -1,16 +0,0 @@
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");
}
}

View File

@@ -1,95 +0,0 @@
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

View File

@@ -1,40 +0,0 @@
use lazy_static::lazy_static;
use spin::Mutex;
use uart_16550::SerialPort;
lazy_static! {
pub static ref SERIAL1: Mutex<SerialPort> = {
let mut serial_port = SerialPort::new(0x3F8);
serial_port.init();
Mutex::new(serial_port)
};
}
#[doc(hidden)]
pub fn _print(args: ::core::fmt::Arguments) {
use core::fmt::Write;
use x86_64::instructions::interrupts;
interrupts::without_interrupts(|| {
SERIAL1
.lock()
.write_fmt(args)
.expect("Printing to serial failed");
});
}
/// Prints to the host through the serial interface.
#[macro_export]
macro_rules! serial_print {
($($arg:tt)*) => {
$crate::serial::_print(format_args!($($arg)*));
};
}
/// Prints to the host through the serial interface, appending a newline.
#[macro_export]
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)*));
}

View File

@@ -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,97 +163,9 @@ macro_rules! println {
($($arg:tt)*) => ($crate::print!("{}\n", format_args!($($arg)*)));
}
/// Prints the given formatted string to the VGA text buffer
/// through the global `WRITER` instance.
/// Prints the given formatted string to the VGA text buffer through the global `WRITER` instance.
#[doc(hidden)]
pub fn _print(args: fmt::Arguments) {
use core::fmt::Write;
use x86_64::instructions::interrupts;
interrupts::without_interrupts(|| {
WRITER.lock().write_fmt(args).unwrap();
});
}
#[cfg(test)]
mod test {
use super::*;
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());
}
}
}
}
WRITER.lock().write_fmt(args).unwrap();
}

View File

@@ -1,15 +1,16 @@
{
"llvm-target": "x86_64-unknown-none",
"data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
"arch": "x86_64",
"target-endian": "little",
"target-pointer-width": "64",
"target-c-int-width": "32",
"target-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"
"features": "-mmx,-sse,+soft-float",
"rustc-abi": "x86-softfloat"
}