Compare commits

..

613 Commits

Author SHA1 Message Date
Philipp Oppermann
0df06162c8 Merge branch 'post-09' into post-10 2025-09-03 17:58:33 +02:00
Philipp Oppermann
cb66922dfa Merge branch 'post-08' into post-09 2025-09-03 17:58:33 +02:00
Philipp Oppermann
43f767cfa4 Merge branch 'post-07' into post-08 2025-09-03 17:58:33 +02:00
Philipp Oppermann
e12866e19b Merge branch 'post-06' into post-07 2025-09-03 17:58:33 +02:00
Philipp Oppermann
18ec73ebf0 Merge branch 'post-05' into post-06 2025-09-03 17:58:33 +02:00
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
a9f5ed6e74 Merge branch 'post-09' into post-10 2025-08-26 16:41:45 +02:00
Philipp Oppermann
9e2562c7c8 Merge branch 'post-08' into post-09 2025-08-26 16:41:45 +02:00
Philipp Oppermann
53cec5e822 Merge branch 'post-07' into post-08 2025-08-26 16:41:45 +02:00
Philipp Oppermann
8002474616 Merge branch 'post-06' into post-07 2025-08-26 16:41:45 +02:00
Philipp Oppermann
aaaa58d1ab Merge branch 'post-05' into post-06 2025-08-26 16:41:45 +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
360a40b5a7 Run cargo update 2025-08-18 09:49:11 +02:00
Philipp Oppermann
86a3c7065e Merge branch 'post-09' into post-10 2025-08-18 09:48:14 +02:00
Philipp Oppermann
be2b2db06d Merge branch 'post-08' into post-09 2025-08-18 09:47:01 +02:00
Philipp Oppermann
45122f09c9 Merge branch 'post-07' into post-08 2025-08-18 09:47:01 +02:00
Philipp Oppermann
8c7e0127db Run cargo update 2025-08-18 09:46:59 +02:00
Philipp Oppermann
28b6a96eed Merge branch 'post-06' into post-07 2025-08-18 09:46:48 +02:00
Philipp Oppermann
7172bed760 Merge branch 'post-09' into post-10 2025-08-07 13:09:45 +02:00
Philipp Oppermann
4f48a36887 Merge branch 'post-08' into post-09 2025-08-07 13:09:45 +02:00
Philipp Oppermann
f090d8b01b Merge branch 'post-07' into post-08 2025-08-07 13:09:45 +02:00
Philipp Oppermann
2f06d875da Merge branch 'post-06' into post-07 2025-08-07 13:09:45 +02:00
Philipp Oppermann
5ef9960d51 Merge branch 'post-09' into post-10 2025-08-07 13:08:03 +02:00
Philipp Oppermann
99432ab712 Merge branch 'post-08' into post-09 2025-08-07 13:08:03 +02:00
Philipp Oppermann
0eb93f9325 Merge branch 'post-07' into post-08 2025-08-07 13:08:03 +02:00
Philipp Oppermann
f8c6732c88 Merge branch 'post-06' into post-07 2025-08-07 13:08:03 +02:00
Philipp Oppermann
569232322e Run cargo fmt for post-10 2025-03-27 16:14:35 +01:00
Philipp Oppermann
27b56832c1 Merge branch 'post-08' into post-09 2025-03-27 16:13:38 +01:00
Philipp Oppermann
48dfc6d027 Merge branch 'post-07' into post-08 2025-03-27 16:13:38 +01:00
Philipp Oppermann
34195ec8b7 Merge branch 'post-09' into post-10 2025-03-27 16:13:38 +01:00
Philipp Oppermann
e9e75e759e Run cargo fmt for post-07 2025-03-27 16:13:37 +01:00
Philipp Oppermann
a7c5741ab5 Merge branch 'post-08' into post-09 2025-03-27 16:13:24 +01:00
Philipp Oppermann
65d8ef5478 Merge branch 'post-07' into post-08 2025-03-27 16:13:24 +01:00
Philipp Oppermann
9799487962 Merge branch 'post-09' into post-10 2025-03-27 16:13:24 +01:00
Philipp Oppermann
c6c0e1a7f0 Merge branch 'post-06' into post-07 2025-03-27 16:13:24 +01:00
Philipp Oppermann
d43aa8aebf Merge branch 'post-09' into post-10 2025-03-27 15:51:56 +01:00
Philipp Oppermann
2049f23abb Merge branch 'post-08' into post-09 2025-03-27 15:51:38 +01:00
Philipp Oppermann
0dab4b7ec2 Merge branch 'post-07' into post-08 2025-03-27 15:51:28 +01:00
Philipp Oppermann
3e814722d0 Merge branch 'post-06' into post-07 2025-03-27 15:51:19 +01:00
Philipp Oppermann
dc03bde076 Merge branch 'post-09' into post-10 2025-03-27 15:23:08 +01:00
Philipp Oppermann
3a988748de Unsafe operations in unsafe functions require an unsafe block since Rust 2024 2025-03-27 15:21:52 +01:00
Philipp Oppermann
e8f6e7300d Merge branch 'post-09' into post-10 2025-03-27 15:15:29 +01:00
Philipp Oppermann
889ceba24a Merge branch 'post-08' into post-09 2025-03-27 15:14:37 +01:00
Philipp Oppermann
1489b0aa06 Merge branch 'post-07' into post-08 2025-03-27 15:13:48 +01:00
Philipp Oppermann
08831b4ba1 Merge branch 'post-06' into post-07 2025-03-27 15:13:48 +01:00
Philipp Oppermann
d849a7dea5 Merge branch 'post-09' into post-10 2025-03-24 11:09:24 +01:00
Philipp Oppermann
bb2c57e1b4 Merge branch 'post-08' into post-09 2025-03-24 11:09:24 +01:00
Philipp Oppermann
18fd90b7a7 Merge branch 'post-07' into post-08 2025-03-24 11:09:24 +01:00
Philipp Oppermann
d83ab74e53 Merge branch 'post-06' into post-07 2025-03-24 11:09:24 +01:00
Philipp Oppermann
722093e2c4 Merge branch 'post-09' into post-10 2025-02-10 12:36:07 +01:00
Philipp Oppermann
ba7b36aa21 Merge branch 'post-08' into post-09 2025-02-10 12:36:07 +01:00
Philipp Oppermann
8b5ae877b8 Merge branch 'post-07' into post-08 2025-02-10 12:36:07 +01:00
Philipp Oppermann
2a0126b9d2 Merge branch 'post-06' into post-07 2025-02-10 12:36:07 +01:00
Philipp Oppermann
4dd9c6bce7 Merge branch 'post-09' into post-10 2025-02-10 11:16:22 +01:00
Philipp Oppermann
28c9558a7a Merge branch 'post-08' into post-09 2025-02-10 11:16:22 +01:00
Philipp Oppermann
96af1fdc88 Merge branch 'post-07' into post-08 2025-02-10 11:16:22 +01:00
Philipp Oppermann
0422be52fa Merge branch 'post-06' into post-07 2025-02-10 11:16:21 +01:00
Philipp Oppermann
f63e0dacca Merge branch 'post-09' into post-10 2025-01-15 19:58:30 +01:00
Philipp Oppermann
bb3beb22da Merge branch 'post-08' into post-09 2025-01-15 19:58:30 +01:00
Philipp Oppermann
b20e62e86b Merge branch 'post-07' into post-08 2025-01-15 19:58:30 +01:00
Philipp Oppermann
8d067be8ac Merge branch 'post-06' into post-07 2025-01-15 19:58:30 +01:00
Philipp Oppermann
3743997479 Merge branch 'post-09' into post-10 2024-05-30 11:00:16 +02:00
Philipp Oppermann
2870ac4e13 Merge branch 'post-08' into post-09 2024-05-30 10:59:56 +02:00
Philipp Oppermann
aa13e0388c Merge branch 'post-07' into post-08 2024-05-30 10:59:56 +02:00
Philipp Oppermann
1edd07c3fd Update to pc_keyboard v0.7.0 2024-05-30 10:59:39 +02:00
Philipp Oppermann
486975e4dc Merge branch 'post-09' into post-10 2024-04-30 15:39:16 +02:00
Philipp Oppermann
c250dd0a91 Merge branch 'post-08' into post-09 2024-04-30 15:39:16 +02:00
Philipp Oppermann
1deebed468 Merge branch 'post-07' into post-08 2024-04-30 15:39:16 +02:00
Philipp Oppermann
7a0597192c Merge branch 'post-06' into post-07 2024-04-30 15:39:16 +02:00
Philipp Oppermann
268b5b6856 Merge branch 'post-09' into post-10 2024-02-16 15:59:40 +01:00
Philipp Oppermann
2fdc7c3b5c Merge branch 'post-08' into post-09 2024-02-16 15:59:40 +01:00
Philipp Oppermann
d909d2456e Merge branch 'post-07' into post-08 2024-02-16 15:59:40 +01:00
Philipp Oppermann
0b51e0a320 Merge branch 'post-06' into post-07 2024-02-16 15:59:40 +01:00
Philipp Oppermann
d54e691261 Merge branch 'post-09' into post-10 2024-02-16 13:23:46 +01:00
Philipp Oppermann
be58db8907 Merge branch 'post-08' into post-09 2024-02-16 13:22:33 +01:00
Philipp Oppermann
614ae005a2 Merge branch 'post-07' into post-08 2024-02-16 13:22:06 +01:00
Philipp Oppermann
bd12d5b8e1 Merge branch 'post-06' into post-07 2024-02-16 13:22:06 +01:00
Philipp Oppermann
1550e83094 Merge branch 'post-09' into post-10 2024-02-16 13:14:09 +01:00
Philipp Oppermann
b654651a85 Merge branch 'post-08' into post-09 2024-02-16 13:14:09 +01:00
Philipp Oppermann
7bd3ecb9dc Merge branch 'post-07' into post-08 2024-02-16 13:14:09 +01:00
Philipp Oppermann
d830e5db29 Merge branch 'post-06' into post-07 2024-02-16 13:14:09 +01:00
Philipp Oppermann
cd244cc604 Merge branch 'post-09' into post-10 2024-02-16 12:39:56 +01:00
Philipp Oppermann
bf7cf4c65d Merge branch 'post-08' into post-09 2024-02-16 12:39:56 +01:00
Philipp Oppermann
1f6c000970 Merge branch 'post-07' into post-08 2024-02-16 12:39:56 +01:00
Philipp Oppermann
6b7bb6f7a8 Merge branch 'post-06' into post-07 2024-02-16 12:39:56 +01:00
Philipp Oppermann
6b51fa467e Merge branch 'post-09' into post-10 2024-01-28 11:45:38 +01:00
Philipp Oppermann
4343f9be6a Merge branch 'post-08' into post-09 2024-01-28 11:45:38 +01:00
Philipp Oppermann
e738b599e0 Merge branch 'post-07' into post-08 2024-01-28 11:45:38 +01:00
Philipp Oppermann
4877991587 Merge branch 'post-06' into post-07 2024-01-28 11:45:38 +01:00
Philipp Oppermann
92f197c2e5 Merge pull request #1216 from phil-opp/remove-alloc-error-handler
The `#[alloc_error_handler]` attribute was removed
2023-04-29 12:20:26 +02:00
Philipp Oppermann
af909cab1e The #[alloc_error_handler] attribute was removed
Allocation errors now always panic.
2023-04-29 12:13:06 +02:00
Philipp Oppermann
b6437c5cc1 Merge branch 'post-08' into post-09 2022-09-25 11:32:07 +02:00
Philipp Oppermann
5db0a55172 Merge branch 'post-07' into post-08 2022-09-25 11:32:07 +02:00
Philipp Oppermann
929739932f Merge branch 'post-06' into post-07 2022-09-25 11:32:07 +02:00
Philipp Oppermann
5fc6566d45 Merge branch 'post-09' into post-10 2022-09-25 11:32:07 +02:00
Philipp Oppermann
ee550a64e0 Merge branch 'post-08' into post-09 2022-04-08 10:07:31 +02:00
Philipp Oppermann
cce1bfd387 Merge branch 'post-07' into post-08 2022-04-08 10:07:31 +02:00
Philipp Oppermann
511686c054 Merge branch 'post-06' into post-07 2022-04-08 10:07:31 +02:00
Philipp Oppermann
f0149947cf Merge branch 'post-09' into post-10 2022-04-08 10:07:31 +02:00
Philipp Oppermann
a249900aed Merge branch 'post-08' into post-09 2022-01-18 10:06:44 +01:00
Philipp Oppermann
709c389e96 Merge branch 'post-07' into post-08 2022-01-18 10:06:44 +01:00
Philipp Oppermann
ec967eeecb Merge branch 'post-06' into post-07 2022-01-18 10:06:44 +01:00
Philipp Oppermann
09a3ac4f80 Merge branch 'post-09' into post-10 2022-01-18 10:06:44 +01:00
Philipp Oppermann
e56cd71689 Merge branch 'post-08' into post-09 2021-12-22 09:27:53 +01:00
Philipp Oppermann
87799fad74 Merge branch 'post-07' into post-08 2021-12-22 09:27:53 +01:00
Philipp Oppermann
007f32cd57 Merge branch 'post-06' into post-07 2021-12-22 09:27:53 +01:00
Philipp Oppermann
506a1d1961 Merge branch 'post-09' into post-10 2021-12-22 09:27:53 +01:00
Philipp Oppermann
17e1ae2508 Merge branch 'post-08' into post-09 2021-12-21 13:56:10 +01:00
Philipp Oppermann
541b2211bb Merge branch 'post-07' into post-08 2021-12-21 13:56:10 +01:00
Philipp Oppermann
72ae0fd857 Merge branch 'post-06' into post-07 2021-12-21 13:56:10 +01:00
Philipp Oppermann
e41ff18ea0 Merge branch 'post-09' into post-10 2021-12-21 13:56:10 +01:00
Philipp Oppermann
f345162ee5 Merge branch 'post-08' into post-09 2021-08-22 14:44:44 +02:00
Philipp Oppermann
7123daa4a5 Merge branch 'post-07' into post-08 2021-08-22 14:44:44 +02:00
Philipp Oppermann
3f54394eab Merge branch 'post-06' into post-07 2021-08-22 14:44:44 +02:00
Philipp Oppermann
0af790efa6 Merge branch 'post-09' into post-10 2021-08-22 14:44:44 +02:00
Philipp Oppermann
8452f2617a Merge branch 'post-09' into post-10
# Conflicts:
#	README.md
2021-05-21 19:57:58 +02:00
Philipp Oppermann
01f42c65e8 Merge branch 'post-08' into post-09
# Conflicts:
#	README.md
2021-05-21 19:57:31 +02:00
Philipp Oppermann
020e91c111 Merge branch 'post-07' into post-08
# Conflicts:
#	README.md
2021-05-21 19:57:05 +02:00
Philipp Oppermann
b74740aeb9 Merge branch 'post-06' into post-07
# Conflicts:
#	README.md
2021-05-21 19:56:29 +02:00
Philipp Oppermann
71e6fb1c40 Merge branch 'post-09' into post-10 2021-05-20 14:33:10 +02:00
Philipp Oppermann
3c1db5e79f Merge branch 'post-08' into post-09 2021-05-20 14:33:10 +02:00
Philipp Oppermann
4285dd4488 Merge branch 'post-07' into post-08 2021-05-20 14:33:10 +02:00
Philipp Oppermann
f3e93c399f Merge branch 'post-06' into post-07 2021-05-20 14:33:10 +02:00
Philipp Oppermann
f2d93a4e27 Update linked_list_allocator dependency to v0.9.0 2021-05-17 12:50:29 +02:00
Philipp Oppermann
0e1efb591c Merge branch 'post-08' into post-09 2021-05-17 12:47:38 +02:00
Philipp Oppermann
31d907a1f2 Merge branch 'post-09' into post-10 2021-05-17 12:47:38 +02:00
Philipp Oppermann
bf19acea61 Adjust post-08 to take InterruptStackFrame by value 2021-05-17 12:46:46 +02:00
Philipp Oppermann
6c161ff3e0 Merge branch 'post-08' into post-09 2021-05-17 12:45:11 +02:00
Philipp Oppermann
62378b25df Merge branch 'post-09' into post-10 2021-05-17 12:45:11 +02:00
Philipp Oppermann
c3d3b132b3 Merge branch 'post-07' into post-08 2021-05-17 12:45:11 +02:00
Philipp Oppermann
26ee93c81a Merge branch 'post-07-switch-pic-crate' into post-07 2021-05-17 12:43:49 +02:00
Philipp Oppermann
75abc110d4 Adjust post-07 to take InterruptStackFrame by value 2021-05-17 12:40:11 +02:00
Philipp Oppermann
3aa979ebe0 Switch to forked pic8259 crate to fix nightly build error 2021-05-17 12:39:57 +02:00
Philipp Oppermann
66d0d5d11c Merge branch 'post-08' into post-09 2021-05-17 11:47:14 +02:00
Philipp Oppermann
51caf33232 Merge branch 'post-09' into post-10 2021-05-17 11:47:14 +02:00
Philipp Oppermann
80e52e4e99 Merge branch 'post-07' into post-08 2021-05-17 11:47:14 +02:00
Philipp Oppermann
ad4b2a2e64 Merge branch 'post-06' into post-07 2021-05-17 11:47:14 +02:00
Philipp Oppermann
b5d4b9b212 Merge branch 'post-08' into post-09 2021-05-17 11:44:50 +02:00
Philipp Oppermann
7653ffcb40 Merge branch 'post-09' into post-10 2021-05-17 11:44:50 +02:00
Philipp Oppermann
d61e579799 Merge branch 'post-07' into post-08 2021-05-17 11:44:50 +02:00
Philipp Oppermann
1e22d287e3 Merge branch 'post-06' into post-07 2021-05-17 11:44:50 +02:00
Philipp Oppermann
3c2b79b1f0 Merge branch 'post-08' into post-09 2021-05-17 11:41:30 +02:00
Philipp Oppermann
20dce91c5b Merge branch 'post-09' into post-10 2021-05-17 11:41:30 +02:00
Philipp Oppermann
d008e26592 Merge branch 'post-07' into post-08 2021-05-17 11:41:30 +02:00
Philipp Oppermann
62fe2321cd Merge branch 'post-06' into post-07 2021-05-17 11:41:30 +02:00
Philipp Oppermann
b19100a021 Run cargo update for linked_list_allocator crate 2021-05-17 11:30:58 +02:00
Philipp Oppermann
8f20817ea3 Merge branch 'post-08' into post-09 2021-05-17 11:30:02 +02:00
Philipp Oppermann
45347e819f Merge branch 'post-07' into post-08 2021-05-17 11:30:02 +02:00
Philipp Oppermann
ab5f8a8516 Merge branch 'post-06' into post-07 2021-05-17 11:30:02 +02:00
Philipp Oppermann
abb90be792 Merge branch 'post-09' into post-10 2021-05-17 11:30:02 +02:00
Philipp Oppermann
d21dbc7c58 Merge branch 'post-08' into post-09 2021-05-17 11:29:23 +02:00
Philipp Oppermann
4718be3507 Merge branch 'post-07' into post-08 2021-05-17 11:29:23 +02:00
Philipp Oppermann
c7ea97cbde Merge branch 'post-06' into post-07 2021-05-17 11:29:23 +02:00
Philipp Oppermann
98c9de82b5 Merge branch 'post-09' into post-10 2021-05-17 11:29:23 +02:00
Philipp Oppermann
3532a12264 Merge branch 'post-08' into post-09 2021-03-10 09:23:02 +01:00
Philipp Oppermann
1c7c81cf98 Merge branch 'post-07' into post-08 2021-03-10 09:23:02 +01:00
Philipp Oppermann
28cca0f4e3 Merge branch 'post-06' into post-07 2021-03-10 09:23:02 +01:00
Philipp Oppermann
ffd34a58f9 Merge branch 'post-09' into post-10 2021-03-10 09:23:02 +01:00
Philipp Oppermann
4bcfdf4b03 Merge branch 'post-08' into post-09 2021-03-10 09:15:58 +01:00
Philipp Oppermann
00c14bca69 Merge branch 'post-07' into post-08 2021-03-10 09:15:58 +01:00
Philipp Oppermann
3caf517bfd Merge branch 'post-06' into post-07 2021-03-10 09:15:58 +01:00
Philipp Oppermann
2e5107d6e8 Merge branch 'post-09' into post-10 2021-03-10 09:15:58 +01:00
Philipp Oppermann
c79bf064c8 Merge branch 'post-08' into post-09 2021-03-10 09:13:39 +01:00
Philipp Oppermann
be44d4d5c1 Merge branch 'post-07' into post-08 2021-03-10 09:13:39 +01:00
Philipp Oppermann
5b9affa696 Merge branch 'post-06' into post-07 2021-03-10 09:13:39 +01:00
Philipp Oppermann
9783bf99ca Merge branch 'post-09' into post-10 2021-03-10 09:13:39 +01:00
Philipp Oppermann
71a70a3b95 Merge branch 'post-08' into post-09 2021-03-10 08:53:42 +01:00
Philipp Oppermann
62235e4ba2 Merge branch 'post-07' into post-08 2021-03-10 08:53:42 +01:00
Philipp Oppermann
971fcb4470 Merge branch 'post-06' into post-07 2021-03-10 08:53:42 +01:00
Philipp Oppermann
ccc507a243 Merge branch 'post-09' into post-10 2021-03-10 08:53:42 +01:00
Philipp Oppermann
722c5579de Merge branch 'post-08' into post-09 2021-02-02 11:06:38 +01:00
Philipp Oppermann
a046cb6ed0 Merge branch 'post-07' into post-08 2021-02-02 11:06:38 +01:00
Philipp Oppermann
4e22effcde Merge branch 'post-06' into post-07 2021-02-02 11:06:38 +01:00
Philipp Oppermann
8ca3aa3846 Merge branch 'post-09' into post-10 2021-02-02 11:06:38 +01:00
Philipp Oppermann
31d3eef0da Merge branch 'post-08' into post-09 2021-02-02 10:52:06 +01:00
Philipp Oppermann
b200b6eae6 Merge branch 'post-07' into post-08 2021-02-02 10:52:06 +01:00
Philipp Oppermann
9326f80114 Merge branch 'post-06' into post-07 2021-02-02 10:52:06 +01:00
Philipp Oppermann
0404f437f9 Merge branch 'post-09' into post-10 2021-02-02 10:52:06 +01:00
Philipp Oppermann
ce20cc8661 Merge branch 'post-08' into post-09 2020-11-22 13:46:58 +01:00
Philipp Oppermann
c5fbae25e6 Merge branch 'post-07' into post-08 2020-11-22 13:46:58 +01:00
Philipp Oppermann
38c937c9b3 Merge branch 'post-06' into post-07 2020-11-22 13:46:58 +01:00
Philipp Oppermann
162071d611 Merge branch 'post-09' into post-10 2020-11-22 13:46:58 +01:00
Philipp Oppermann
3a230d0624 Remove dangerous create_example_mapping test function 2020-10-08 17:01:55 +02:00
Philipp Oppermann
76282b9981 Merge branch 'post-09' into post-10 2020-10-02 23:37:44 +02:00
Philipp Oppermann
93844bee41 Merge branch 'post-08' into post-09 2020-10-02 23:36:43 +02:00
Philipp Oppermann
a280600fae Merge branch 'post-07' into post-08 2020-10-02 23:36:30 +02:00
Philipp Oppermann
4cfb94cf18 Merge branch 'post-06' into post-07 2020-10-02 23:35:40 +02:00
Philipp Oppermann
c1133b0948 Merge branch 'post-09' into post-10 2020-09-29 12:22:06 +02:00
Philipp Oppermann
92238b15b0 Merge branch 'post-08' into post-09 2020-09-29 12:22:06 +02:00
Philipp Oppermann
8823313fe1 Merge branch 'post-07' into post-08 2020-09-29 12:22:06 +02:00
Philipp Oppermann
a76e65a326 Merge branch 'post-06' into post-07 2020-09-29 12:22:06 +02:00
Philipp Oppermann
6742a16d50 Merge branch 'post-09' into post-10 2020-09-29 12:19:54 +02:00
Philipp Oppermann
624596adf1 Merge branch 'post-08' into post-09 2020-09-29 12:19:54 +02:00
Philipp Oppermann
0464c6e180 Merge branch 'post-07' into post-08 2020-09-29 12:19:54 +02:00
Philipp Oppermann
a233b79462 Merge branch 'post-06' into post-07 2020-09-29 12:19:54 +02:00
Philipp Oppermann
4e08f97310 Run cargo update for linked-list-allocator
To fix build on latest nightly.
2020-09-24 10:34:22 +02:00
Philipp Oppermann
ff72429a55 Merge branch 'post-08' into post-09 2020-09-24 10:28:11 +02:00
Philipp Oppermann
137422b9ab Merge branch 'post-07' into post-08 2020-09-24 10:28:11 +02:00
Philipp Oppermann
aa800ddc83 Merge branch 'post-09' into post-10 2020-09-24 10:28:11 +02:00
Philipp Oppermann
c2b284c2f2 Merge branch 'post-06' into post-07 2020-09-24 10:27:44 +02:00
Philipp Oppermann
deb95c5ead Run cargo update for post-10 2020-09-24 09:10:53 +02:00
Philipp Oppermann
d820839541 Merge branch 'post-09' into post-10 2020-09-24 09:10:36 +02:00
Philipp Oppermann
df3a464cec Merge branch 'post-08' into post-09 2020-09-24 09:10:19 +02:00
Philipp Oppermann
7ccb43fafa Merge branch 'post-07' into post-08 2020-09-24 09:10:08 +02:00
Philipp Oppermann
f264928602 Run cargo update for post-07 2020-09-24 09:10:02 +02:00
Philipp Oppermann
8f3fb45625 Merge branch 'post-06' into post-07 2020-09-24 09:09:51 +02:00
Philipp Oppermann
6ebeb28fdb Merge branch 'post-09' into post-10 2020-08-16 18:03:09 +02:00
Philipp Oppermann
c2ef594a78 Merge branch 'post-08' into post-09 2020-08-16 18:03:09 +02:00
Philipp Oppermann
01c9f7439d Merge branch 'post-07' into post-08 2020-08-16 18:03:09 +02:00
Philipp Oppermann
39450af43a Merge branch 'post-06' into post-07 2020-08-16 18:03:09 +02:00
Philipp Oppermann
f48eed487c Merge branch 'post-09' into post-10 2020-08-16 17:59:56 +02:00
Philipp Oppermann
d2e7a4a970 Merge branch 'post-08' into post-09 2020-08-16 17:59:56 +02:00
Philipp Oppermann
988e248a6f Merge branch 'post-07' into post-08 2020-08-16 17:59:56 +02:00
Philipp Oppermann
56652b79fb Merge branch 'post-06' into post-07 2020-08-16 17:59:56 +02:00
Philipp Oppermann
287fed94ef Merge branch 'post-09' into post-10 2020-07-17 15:57:35 +02:00
Philipp Oppermann
6bbaf9de16 Merge branch 'post-08' into post-09 2020-07-17 15:57:35 +02:00
Philipp Oppermann
9a7dc7f053 Merge branch 'post-07' into post-08 2020-07-17 15:57:35 +02:00
Philipp Oppermann
fc81448c1a Merge branch 'post-06' into post-07 2020-07-17 15:57:35 +02:00
Philipp Oppermann
9af48bae17 Merge branch 'post-09' into post-10 2020-07-17 11:48:35 +02:00
Philipp Oppermann
4cec056568 Merge branch 'post-08' into post-09 2020-07-17 11:48:35 +02:00
Philipp Oppermann
03d9bee072 Merge branch 'post-07' into post-08 2020-07-17 11:48:35 +02:00
Philipp Oppermann
ee5cd18080 Merge branch 'post-06' into post-07 2020-07-17 11:48:35 +02:00
Philipp Oppermann
d215eb07c2 Add alloc crate to build-std crates 2020-07-17 11:29:11 +02:00
Philipp Oppermann
69c7df8a30 Merge branch 'post-09' into post-10 2020-07-17 11:28:30 +02:00
Philipp Oppermann
b7835f3976 Merge branch 'post-08' into post-09 2020-07-17 11:28:04 +02:00
Philipp Oppermann
6d2b8f3f6c Merge branch 'post-07' into post-08 2020-07-17 11:28:04 +02:00
Philipp Oppermann
7361740ecb Merge branch 'post-06' into post-07 2020-07-17 11:28:04 +02:00
Philipp Oppermann
472ddcc696 Merge branch 'post-08' into post-09 2020-07-17 11:25:03 +02:00
Philipp Oppermann
5d355277db Merge branch 'post-07' into post-08 2020-07-17 11:24:40 +02:00
Philipp Oppermann
5309361224 Merge branch 'post-06' into post-07 2020-07-17 11:24:00 +02:00
Philipp Oppermann
e68f7a1d31 Merge branch 'post-09' into post-10 2020-06-08 12:30:28 +02:00
Philipp Oppermann
832ab43bdd Merge branch 'post-08' into post-09 2020-06-08 12:30:28 +02:00
Philipp Oppermann
2a88224080 Merge branch 'post-07' into post-08 2020-06-08 12:30:28 +02:00
Philipp Oppermann
96a02c441e Merge branch 'post-06' into post-07 2020-06-08 12:30:28 +02:00
Philipp Oppermann
e7fd27b648 Remove superfluous printing from heap_allocation tests 2020-06-08 12:08:25 +02:00
Philipp Oppermann
cecab1a310 Merge branch 'post-08' into post-09 2020-06-08 12:06:37 +02:00
Philipp Oppermann
d26577ad86 Merge branch 'post-07' into post-08 2020-06-08 12:06:37 +02:00
Philipp Oppermann
9809ea57ae Merge branch 'post-09' into post-10 2020-06-08 12:06:37 +02:00
Philipp Oppermann
95612c1d3c Merge branch 'post-06' into post-07 2020-06-08 12:05:05 +02:00
Philipp Oppermann
b567d06108 Improve simple_allocation test
Proposed in https://github.com/phil-opp/blog_os/issues/627#issuecomment-632578270.
2020-05-22 10:54:49 +02:00
Philipp Oppermann
8b90c04c62 Merge branch 'post-08' into post-09 2020-05-21 09:29:56 +02:00
Philipp Oppermann
b9f5b43c04 Merge branch 'post-07' into post-08 2020-05-21 09:29:56 +02:00
Philipp Oppermann
384902502c Merge branch 'post-09' into post-10 2020-05-21 09:29:56 +02:00
Philipp Oppermann
93b96f21ac Update pic8259_simple to v0.2.0 2020-05-21 09:29:49 +02:00
Philipp Oppermann
5e510e41ee Merge branch 'post-08' into post-09 2020-05-20 14:56:19 +02:00
Philipp Oppermann
729c56d4ae Merge branch 'post-07' into post-08 2020-05-20 14:56:19 +02:00
Philipp Oppermann
0db15e5ee5 Merge branch 'post-09' into post-10 2020-05-20 14:56:19 +02:00
Philipp Oppermann
22b49dea49 Merge branch 'post-06' into post-07 2020-05-20 14:56:19 +02:00
Philipp Oppermann
44ab90f92d Update allocator code for x86_64 v0.11.0 2020-05-20 14:30:48 +02:00
Philipp Oppermann
7a5d91cb96 Merge branch 'post-09' into post-10 2020-05-20 14:29:43 +02:00
Philipp Oppermann
491889a237 Update paging code for x86_64 v0.11.0 2020-05-20 14:29:36 +02:00
Philipp Oppermann
a2f07828e4 Merge branch 'post-08' into post-09 2020-05-20 14:27:06 +02:00
Philipp Oppermann
8d5aade432 Merge branch 'post-07' into post-08 2020-05-20 14:26:48 +02:00
Philipp Oppermann
067f2c9b39 Merge branch 'post-06' into post-07 2020-05-20 14:26:29 +02:00
Philipp Oppermann
1eab81f58d Merge branch 'post-09' into post-10 2020-05-20 14:09:09 +02:00
Philipp Oppermann
d94b9513e7 Merge branch 'post-08' into post-09 2020-05-20 14:08:32 +02:00
Philipp Oppermann
50853609d1 Merge branch 'post-07' into post-08 2020-05-20 14:07:29 +02:00
Philipp Oppermann
122bc99766 Merge branch 'post-06' into post-07 2020-05-20 14:06:59 +02:00
Philipp Oppermann
02c36bae29 Merge branch 'post-09' into post-10 2020-03-08 14:39:38 +01:00
Philipp Oppermann
70deb3168e Merge branch 'post-08' into post-09 2020-03-08 14:39:38 +01:00
Philipp Oppermann
9d4a960bcb Merge branch 'post-07' into post-08 2020-03-08 14:39:38 +01:00
Philipp Oppermann
564ba9f9ac Merge branch 'post-06' into post-07 2020-03-08 14:39:38 +01:00
Philipp Oppermann
7b0d8f05ba Fix code for x86_64 v0.9.5 update 2020-03-08 14:30:33 +01:00
Philipp Oppermann
f230ee4258 Merge branch 'post-09' into post-10 2020-03-08 14:29:00 +01:00
Philipp Oppermann
a5d409b777 Merge branch 'post-08' into post-09 2020-03-08 14:28:03 +01:00
Philipp Oppermann
33df0bb2a3 Merge branch 'post-07' into post-08 2020-03-08 14:28:03 +01:00
Philipp Oppermann
9a61e1724b Merge branch 'post-06' into post-07 2020-03-08 14:27:58 +01:00
Philipp Oppermann
39f14b6d0b Merge pull request #763 from phil-opp/post-10-update-linked-list-alloc
Update linked_list_allocator to v0.8.0
2020-03-06 11:58:23 +01:00
Philipp Oppermann
dd1daf2652 Update linked_list_allocator to v0.8.0 2020-03-06 11:47:49 +01:00
Philipp Oppermann
9a415c85b9 Merge branch 'post-09' into post-10 2020-02-26 12:47:51 +01:00
Philipp Oppermann
79a0172ace Merge branch 'post-08' into post-09 2020-02-26 12:47:32 +01:00
Philipp Oppermann
9af6337f67 Merge branch 'post-07' into post-08 2020-02-26 12:47:23 +01:00
Philipp Oppermann
725e03b5c5 Merge branch 'post-06' into post-07 2020-02-26 12:47:07 +01:00
Philipp Oppermann
c7cc718ae3 Merge branch 'post-09' into post-10 2020-02-26 12:22:06 +01:00
Philipp Oppermann
8fc746555d Merge branch 'post-08' into post-09 2020-02-26 12:21:28 +01:00
Philipp Oppermann
9324ea45a5 Merge branch 'post-07' into post-08 2020-02-26 12:21:28 +01:00
Philipp Oppermann
d35ab51629 Merge pull request #756 from RKennedy9064/post-07
Updated pc-keyboard to `0.5.0`
2020-02-26 12:18:13 +01:00
Ryan Kennedy
de509e058f Switched to HandleControl::Ignore 2020-02-25 10:32:39 -06:00
Ryan Kennedy
2a8f499f73 Might help if I use cargo fmt 2020-02-22 19:02:57 -06:00
Ryan Kennedy
2634bb2d37 Updated pc-keyboard to 0.5.0 2020-02-22 18:55:21 -06:00
Philipp Oppermann
5ed04baab0 Update linked_list_allocator dependency 2020-02-04 09:38:52 +01:00
Philipp Oppermann
882c83f9de Update many_boxes test to scale with heap size (#716)
Instead of using a hardcoded number of boxes, use the HEAP_SIZE constant. This ensures that we get a test failure because of an out-of-memory error when the allocator does not reuse freed memory.
2020-01-09 12:58:29 +01:00
Philipp Oppermann
869a69e531 Move #[global_allocator] into allocator module (#714)
The Rust issue that the #[global_allocator] cannot be defined in submodules was fixed.
2020-01-08 12:38:06 +01:00
Philipp Oppermann
817267e51c Update Github Actions badge for post-10 2019-12-12 09:32:59 +01:00
Philipp Oppermann
9e75078dab Merge branch 'post-09' into post-10 2019-12-12 09:32:46 +01:00
Philipp Oppermann
ed3af8e984 Update Github Actions badge for post-09 2019-12-12 09:32:30 +01:00
Philipp Oppermann
1d1075b35e Merge branch 'post-08' into post-09 2019-12-12 09:32:16 +01:00
Philipp Oppermann
00f39aaccb Update Github Actions badge for post-08 2019-12-12 09:31:56 +01:00
Philipp Oppermann
f815a1742a Merge branch 'post-07' into post-08 2019-12-12 09:31:42 +01:00
Philipp Oppermann
2bf70751bf Update Github Actions badge for post-07 2019-12-12 09:31:24 +01:00
Philipp Oppermann
ad2590068d Merge branch 'post-06' into post-07 2019-12-12 09:31:07 +01:00
Philipp Oppermann
41f38d92f2 Merge branch 'post-09' into post-10 2019-12-12 09:23:31 +01:00
Philipp Oppermann
8eb44dcbd5 Merge branch 'post-08' into post-09 2019-12-12 09:23:31 +01:00
Philipp Oppermann
1f771a6820 Merge branch 'post-07' into post-08 2019-12-12 09:23:31 +01:00
Philipp Oppermann
36b8fd402f Merge branch 'post-06' into post-07 2019-12-12 09:23:31 +01:00
Philipp Oppermann
3ac5318c94 Remove now unneeded unsafe block
The `map_to` method is safe since x86_64 0.8.1.
2019-12-11 16:47:45 +01:00
Philipp Oppermann
e94a489a31 Merge branch 'post-09' into post-10 2019-12-11 16:38:08 +01:00
Philipp Oppermann
f392d8a7f5 Merge pull request #703 from phil-opp/post-09-fix
Update frame allocation code to x86_64 0.8.1
2019-12-11 16:37:49 +01:00
Philipp Oppermann
c7bc26d8ee Update frame allocation code to x86_64 0.8.1 2019-12-11 16:26:38 +01:00
Philipp Oppermann
3171ab584b Merge branch 'post-07' into post-08 2019-12-10 17:31:24 +01:00
Philipp Oppermann
dfd65d579c Merge branch 'post-06' into post-07 2019-12-10 17:31:24 +01:00
Philipp Oppermann
9da9ecb515 Merge branch 'post-09' into post-10 2019-12-10 17:31:24 +01:00
Philipp Oppermann
6c1594ea24 Merge branch 'post-08' into post-09 2019-12-10 17:31:24 +01:00
Philipp Oppermann
9d31eb8aa8 Merge branch 'post-07' into post-08 2019-12-10 17:17:53 +01:00
Philipp Oppermann
3ffd71723f Merge branch 'post-06' into post-07 2019-12-10 17:17:53 +01:00
Philipp Oppermann
f226ba0c3f Merge branch 'post-09' into post-10 2019-12-10 17:17:53 +01:00
Philipp Oppermann
94aa2c4093 Merge branch 'post-08' into post-09 2019-12-10 17:17:53 +01:00
Philipp Oppermann
2436801a05 Merge branch 'post-07' into post-08 2019-12-10 16:55:41 +01:00
Philipp Oppermann
617d0e6db6 Merge branch 'post-06' into post-07 2019-12-10 16:55:41 +01:00
Philipp Oppermann
c1fc7171fb Merge branch 'post-09' into post-10 2019-12-10 16:55:41 +01:00
Philipp Oppermann
259742a5e3 Merge branch 'post-08' into post-09 2019-12-10 16:55:41 +01:00
Philipp Oppermann
cf527e9ce7 Update post-10 to new lockfile format 2019-11-28 14:08:28 +01:00
Philipp Oppermann
c891acb234 Merge branch 'post-09' into post-10 2019-11-28 14:08:08 +01:00
Philipp Oppermann
6876e82fc5 Merge branch 'post-08' into post-09 2019-11-28 14:07:43 +01:00
Philipp Oppermann
1b1953678c Merge branch 'post-07' into post-08 2019-11-28 14:07:29 +01:00
Philipp Oppermann
d4c256c653 Update post-07 to new lockfile format 2019-11-28 14:07:23 +01:00
Philipp Oppermann
9e5ff8dd78 Merge branch 'post-06' into post-07 2019-11-28 14:07:03 +01:00
Philipp Oppermann
b9a0702bc0 Merge branch 'post-09' into post-10 2019-11-25 13:35:20 +01:00
Philipp Oppermann
84ddda6a3f Merge branch 'post-08' into post-09 2019-11-25 13:35:20 +01:00
Philipp Oppermann
37b8b42cba Add missing hlt_loop import 2019-11-25 13:35:18 +01:00
Philipp Oppermann
2919cbdefc Merge branch 'post-09' into post-10 2019-11-25 13:25:15 +01:00
Philipp Oppermann
f85664fd6b Merge branch 'post-08' into post-09 2019-11-25 13:25:15 +01:00
Philipp Oppermann
1e86c9f5f0 Merge branch 'post-07' into post-08 2019-11-25 13:25:15 +01:00
Philipp Oppermann
084a77775f Merge branch 'post-06' into post-07 2019-11-25 13:25:02 +01:00
Philipp Oppermann
059ea76848 Merge branch 'post-09' into post-10 2019-11-22 16:33:23 +01:00
Philipp Oppermann
a65573b061 Merge branch 'post-08' into post-09 2019-11-22 16:33:23 +01:00
Philipp Oppermann
723776f852 Merge branch 'post-07' into post-08 2019-11-22 16:33:23 +01:00
Philipp Oppermann
1bf2a49526 Merge pull request #689 from phil-opp/post-07-new
post-07: Use panic instead of println + hlt_loop for double fault handler
2019-11-22 16:33:00 +01:00
Philipp Oppermann
b5b37d6e2b Remove unused crate::hlt_loop import 2019-11-22 16:12:28 +01:00
Philipp Oppermann
c3f76cf1f0 Use panic instead of println + hlt_loop for double fault handler 2019-11-22 16:06:56 +01:00
Philipp Oppermann
2f085b7310 Merge branch 'post-09' into post-10 2019-11-22 16:05:13 +01:00
Philipp Oppermann
385004cab2 Merge branch 'post-08' into post-09 2019-11-22 16:05:13 +01:00
Philipp Oppermann
fab00675e1 Merge branch 'post-07' into post-08 2019-11-22 16:05:13 +01:00
Philipp Oppermann
12eed472ba Merge branch 'post-06' into post-07 2019-11-22 16:05:10 +01:00
Philipp Oppermann
cc713e4570 Merge branch 'post-09' into post-10 2019-11-22 15:57:18 +01:00
Philipp Oppermann
9696612b2b Merge branch 'post-08' into post-09 2019-11-22 15:57:18 +01:00
Philipp Oppermann
b0b0ebda06 Merge branch 'post-07' into post-08 2019-11-22 15:57:18 +01:00
Philipp Oppermann
1e8720b4ff Merge branch 'post-06' into post-07 2019-11-22 15:57:18 +01:00
Philipp Oppermann
b3066e9a78 Merge branch 'post-09' into post-10 2019-10-08 19:44:38 +02:00
Philipp Oppermann
d5d7db0de6 Merge branch 'post-08' into post-09 2019-10-08 19:44:38 +02:00
Philipp Oppermann
271f65e21c Merge branch 'post-07' into post-08 2019-10-08 19:44:38 +02:00
Philipp Oppermann
c83160554e Merge branch 'post-06' into post-07 2019-10-08 19:44:38 +02:00
Philipp Oppermann
66c3a0de76 Merge branch 'post-09' into post-10 2019-09-25 13:21:18 +02:00
Philipp Oppermann
45375d1f1b Merge branch 'post-08' into post-09 2019-09-25 13:21:06 +02:00
Philipp Oppermann
9cab6fb659 Merge branch 'post-07' into post-08 2019-09-25 13:20:55 +02:00
Philipp Oppermann
e7446d2df6 Merge branch 'post-06' into post-07 2019-09-25 13:20:38 +02:00
Philipp Oppermann
96d9de76b0 Fix: memory::init expects a VirtAddr 2019-09-15 10:56:15 +02:00
Philipp Oppermann
f56e4d24e3 Add missing import 2019-09-14 19:08:53 +02:00
Philipp Oppermann
8d3d712cef Merge branch 'post-09' into post-10 2019-09-14 19:06:30 +02:00
Philipp Oppermann
4897e9c4d5 Merge pull request #667 from phil-opp/post-09-offset_page_table
Update post-09 branch for improved Paging Implementation Post
2019-09-14 19:04:53 +02:00
Philipp Oppermann
5cced71fb0 Directly use OffsetPageTable for create_example_mapping instead of impl trait 2019-09-14 18:33:37 +02:00
Philipp Oppermann
7ec727f69f Update comment 2019-09-14 18:33:16 +02:00
Philipp Oppermann
e75c623985 Merge branch 'post-07' into post-08 2019-09-13 17:43:25 +02:00
Philipp Oppermann
27a0ae6000 Merge branch 'post-06' into post-07 2019-09-13 17:43:25 +02:00
Philipp Oppermann
5f66b437d5 Merge branch 'post-09' into post-10 2019-09-13 17:43:25 +02:00
Philipp Oppermann
8059c229c5 Merge branch 'post-08' into post-09 2019-09-13 17:43:25 +02:00
Philipp Oppermann
dce26ede7e Merge branch 'post-07' into post-08 2019-09-13 10:53:50 +02:00
Philipp Oppermann
cfe2e23a9c Merge branch 'post-06' into post-07 2019-09-13 10:53:50 +02:00
Philipp Oppermann
0694f29946 Merge branch 'post-09' into post-10 2019-09-13 10:53:50 +02:00
Philipp Oppermann
bc2099d31d Merge branch 'post-08' into post-09 2019-09-13 10:53:50 +02:00
Philipp Oppermann
211ec3898b Use OffsetPageTable instead of MappedPageTable 2019-09-11 13:40:36 +02:00
Philipp Oppermann
889c0771d6 Merge branch 'post-09' into post-10 2019-09-11 13:33:07 +02:00
Philipp Oppermann
2227fa434f Merge branch 'post-08' into post-09 2019-09-11 13:29:14 +02:00
Philipp Oppermann
20ffda14f4 Merge branch 'post-07' into post-08 2019-09-11 13:28:53 +02:00
Philipp Oppermann
e4ce277ca9 Merge branch 'post-06' into post-07 2019-09-11 13:19:01 +02:00
Philipp Oppermann
e74d9753f2 Merge branch 'post-09' into post-10 2019-09-11 11:21:15 +02:00
Philipp Oppermann
23d554548a Merge branch 'post-08' into post-09 2019-09-11 11:21:15 +02:00
Philipp Oppermann
0cd7d4cbcc Merge branch 'post-07' into post-08 2019-09-11 11:21:15 +02:00
Philipp Oppermann
a9bcf44012 Merge branch 'post-06' into post-07 2019-09-11 11:21:15 +02:00
Philipp Oppermann
9fc71547d7 Run cargo update 2019-09-11 10:59:31 +02:00
Philipp Oppermann
caa9d8b0e4 Merge branch 'post-09' into post-10 2019-09-11 10:59:18 +02:00
Philipp Oppermann
091f7ef153 Merge branch 'post-08' into post-09 2019-09-11 10:58:56 +02:00
Philipp Oppermann
76d03974fe Merge branch 'post-07' into post-08 2019-09-11 10:58:40 +02:00
Philipp Oppermann
881ad152a0 Merge branch 'post-06' into post-07 2019-09-11 10:58:19 +02:00
Philipp Oppermann
29512ddd31 Merge branch 'post-09' into post-10 2019-09-11 10:32:57 +02:00
Philipp Oppermann
38d606b4d1 Merge branch 'post-08' into post-09 2019-09-11 10:32:57 +02:00
Philipp Oppermann
3dcc43b374 Merge branch 'post-07' into post-08 2019-09-11 10:32:57 +02:00
Philipp Oppermann
0c713b9978 Merge branch 'post-06' into post-07 2019-09-11 10:32:57 +02:00
Philipp Oppermann
a7943e7e55 Merge branch 'post-09' into post-10 2019-09-11 10:12:46 +02:00
Philipp Oppermann
ae75d8b209 Merge branch 'post-08' into post-09 2019-09-11 10:12:46 +02:00
Philipp Oppermann
f7fc89fd31 Merge branch 'post-07' into post-08 2019-09-11 10:12:46 +02:00
Philipp Oppermann
1427993cac Merge branch 'post-06' into post-07 2019-09-11 10:12:46 +02:00
Philipp Oppermann
bcdadec5b6 Merge branch 'post-09' into post-10 2019-09-11 10:11:25 +02:00
Philipp Oppermann
e0d5cdd625 Merge branch 'post-08' into post-09 2019-09-11 10:11:25 +02:00
Philipp Oppermann
db92a921b8 Merge branch 'post-07' into post-08 2019-09-11 10:11:25 +02:00
Philipp Oppermann
84eb8632f5 Merge branch 'post-06' into post-07 2019-09-11 10:11:25 +02:00
Philipp Oppermann
17f8866264 Merge branch 'post-09' into post-10 2019-09-11 10:02:41 +02:00
Philipp Oppermann
3f95494ae8 Merge branch 'post-08' into post-09 2019-09-11 10:02:41 +02:00
Philipp Oppermann
80686ded94 Merge branch 'post-07' into post-08 2019-09-11 10:02:41 +02:00
Philipp Oppermann
cefa607569 Merge branch 'post-06' into post-07 2019-09-11 10:02:41 +02:00
Philipp Oppermann
a7ef4012d0 Merge branch 'post-09' into post-10 2019-09-10 11:12:54 +02:00
Philipp Oppermann
cabbbec72f Merge branch 'post-08' into post-09 2019-09-10 11:12:54 +02:00
Philipp Oppermann
5a67b64d20 Merge branch 'post-07' into post-08 2019-09-10 11:12:54 +02:00
Philipp Oppermann
c2431ecf63 Merge branch 'post-06' into post-07 2019-09-10 11:12:54 +02:00
Philipp Oppermann
6f07c2b666 Merge branch 'post-09' into post-10 2019-09-10 10:21:14 +02:00
Philipp Oppermann
1dd7f03a7a Merge branch 'post-08' into post-09 2019-09-10 10:21:14 +02:00
Philipp Oppermann
1a74b36c99 Merge branch 'post-07' into post-08 2019-09-10 10:21:14 +02:00
Philipp Oppermann
c87b221f5e Merge branch 'post-06' into post-07 2019-09-10 10:21:14 +02:00
Philipp Oppermann
e89c77398d Merge branch 'post-09' into post-10 2019-08-07 12:40:04 +02:00
Philipp Oppermann
66c4eae9cf Merge branch 'post-08' into post-09 2019-08-07 12:40:04 +02:00
Philipp Oppermann
175065ca2f Merge branch 'post-07' into post-08 2019-08-07 12:40:04 +02:00
Philipp Oppermann
6ab4b0170f Merge branch 'post-06' into post-07 2019-08-07 12:40:04 +02:00
Philipp Oppermann
f3a7689f33 Merge branch 'post-09' into post-10 2019-07-22 10:46:35 +02:00
Philipp Oppermann
e721878e4b Merge branch 'post-08' into post-09 2019-07-22 10:46:35 +02:00
Philipp Oppermann
7020999ab8 The error code issue is fixed, so let's print it (#643)
See https://github.com/phil-opp/blog_os/issues/513 for more information.
2019-07-22 10:46:19 +02:00
Philipp Oppermann
14d0e07b3e Merge branch 'post-09' into post-10 2019-07-22 10:36:58 +02:00
Philipp Oppermann
f2eb6cec9a Merge branch 'post-08' into post-09 2019-07-22 10:36:51 +02:00
Philipp Oppermann
30e0b16a81 Merge branch 'post-07' into post-08 2019-07-22 10:36:51 +02:00
Philipp Oppermann
05248fe322 Merge branch 'post-06' into post-07 2019-07-22 10:36:37 +02:00
Philipp Oppermann
9651eb7a3b Merge branch 'post-09' into post-10 2019-07-18 10:17:50 +02:00
Philipp Oppermann
bc4ddcef05 Merge branch 'post-08' into post-09 2019-07-18 10:17:37 +02:00
Philipp Oppermann
d7d63af4cc Merge branch 'post-07' into post-08 2019-07-18 10:17:20 +02:00
Philipp Oppermann
ac2b6b1307 Merge branch 'post-06' into post-07 2019-07-18 10:17:10 +02:00
Philipp Oppermann
89e3e2b190 Use correct build badge in post-10 Readme 2019-07-07 11:26:15 +02:00
Philipp Oppermann
004282138c Merge branch 'post-09' into post-10 2019-07-07 11:25:48 +02:00
Philipp Oppermann
4580b85fe2 Use correct build badge in post-09 Readme 2019-07-07 11:25:40 +02:00
Philipp Oppermann
8c575388cf Merge pull request #626 from phil-opp/code-heap
Code for new heap allocation post
2019-06-26 21:30:42 +02:00
Philipp Oppermann
4792ec41b1 Adjust comments to be equal with post 2019-06-26 21:08:08 +02:00
Philipp Oppermann
df75f7f4e8 Add an integration test for heap allocation 2019-06-26 17:45:32 +02:00
Philipp Oppermann
5cf3884396 Run cargo fmt 2019-06-26 16:59:38 +02:00
Philipp Oppermann
e5b6ba38ac Update Readme for new post 2019-06-26 16:33:20 +02:00
Philipp Oppermann
f429a8ab03 Example use of Box, Vec, and Rc in kernel_main 2019-06-26 15:06:40 +02:00
Philipp Oppermann
d7484ab48b Use linked_list_allocator crate instead of dummy allocator 2019-06-26 15:05:57 +02:00
Philipp Oppermann
06fc63028a Create a heap memory area 2019-06-26 13:14:56 +02:00
Philipp Oppermann
d4623419b0 Try to use Box type in main.rs
This causes an allocation error because the Dummy::alloc function always returns a null pointer.
2019-06-26 12:34:57 +02:00
Philipp Oppermann
417c44159e Add a alloc_error_handler function 2019-06-26 12:34:57 +02:00
Philipp Oppermann
ebbc6d55d2 Use dummy allocator as global allocator 2019-06-26 12:34:57 +02:00
Philipp Oppermann
c0367074ac Create an allocator module with a dummy allocator 2019-06-26 12:34:57 +02:00
Philipp Oppermann
48e2175bac Add a dependency on the alloc crate 2019-06-26 12:34:57 +02:00
Philipp Oppermann
954cfe977a Merge branch 'post-07' into post-08 2019-06-23 18:07:34 +02:00
Philipp Oppermann
262f56c9e2 Merge branch 'post-06' into post-07 2019-06-23 18:07:34 +02:00
Philipp Oppermann
45e1e99390 Merge branch 'post-08' into post-09 2019-06-23 18:07:34 +02:00
Philipp Oppermann
eb86565308 Merge branch 'post-07' into post-08 2019-06-17 17:28:32 +02:00
Philipp Oppermann
061dee44eb Merge branch 'post-06' into post-07 2019-06-17 17:28:32 +02:00
Philipp Oppermann
b5793c34c6 Merge branch 'post-08' into post-09 2019-06-17 17:28:32 +02:00
Philipp Oppermann
bbeb63ec3d Merge branch 'post-07' into post-08 2019-05-23 12:39:35 +02:00
Philipp Oppermann
fe35a21965 Merge branch 'post-06' into post-07 2019-05-23 12:39:35 +02:00
Philipp Oppermann
67ee45090d Merge branch 'post-08' into post-09 2019-05-23 12:39:35 +02:00
Philipp Oppermann
a4a7b5e8d6 Merge branch 'post-07' into post-08 2019-05-09 15:38:47 +02:00
Philipp Oppermann
64d1a587e7 Merge branch 'post-08' into post-09 2019-05-09 15:38:47 +02:00
Philipp Oppermann
13923c59f2 Fix: Make keyboard port mutable
This is required because of the update to x86_64 0.7.0 (see #606).
2019-05-09 15:38:34 +02:00
Philipp Oppermann
189ab7d0d8 Merge branch 'post-07' into post-08 2019-05-09 14:59:55 +02:00
Philipp Oppermann
fbe279831e Merge branch 'post-08' into post-09 2019-05-09 14:59:55 +02:00
Philipp Oppermann
09be8647d5 Merge branch 'post-06' into post-07 2019-05-09 14:59:55 +02:00
Philipp Oppermann
375d4d0479 Merge pull request #599 from phil-opp/post-09-new
Update `post-09` branch for version 0.6.0 of `x86_64` crate
2019-05-03 19:41:29 +02:00
Philipp Oppermann
7796d4c14a FrameAllocator is an unsafe trait now
Make `BootInfoFrameAllocator` unsafe because the caller must guarantee that the given memory map is valid.
2019-05-03 19:29:14 +02:00
Philipp Oppermann
a2beb9d2a6 Merge branch 'post-07' into post-08 2019-05-03 18:36:45 +02:00
Philipp Oppermann
a2d36342c1 Merge branch 'post-06' into post-07 2019-05-03 18:36:45 +02:00
Philipp Oppermann
78e4b22a2f Merge branch 'post-08' into post-09 2019-05-03 18:36:45 +02:00
Philipp Oppermann
a867450e3b Merge pull request #595 from phil-opp/redesign-frame-allocator
Avoid generic impl trait parameters in BootInfoFrameAllocator
2019-04-30 13:24:43 +02:00
Philipp Oppermann
b5ee44621c Use an import for initializing BootInfoFrameAllocator 2019-04-30 13:10:53 +02:00
Philipp Oppermann
24a9e7abd2 Simplify FrameAllocator implementation using Iterator::nth 2019-04-30 12:47:45 +02:00
Philipp Oppermann
180c77d1f4 Avoid generic impl trait parameters in BootInfoFrameAllocator 2019-04-30 11:14:23 +02:00
Philipp Oppermann
247af45791 Merge branch 'post-08-new' into post-09-new 2019-04-26 15:50:18 +02:00
Philipp Oppermann
667c093594 Merge branch 'post-07-new' into post-08-new 2019-04-26 15:50:02 +02:00
Philipp Oppermann
abf640254a Merge branch 'post-06-new' into post-07-new 2019-04-26 15:49:43 +02:00
Philipp Oppermann
fd0646fecf Improve formatting 2019-04-26 15:29:43 +02:00
Philipp Oppermann
c8821cb226 Use entry_point macro in lib.rs too 2019-04-26 15:29:43 +02:00
Philipp Oppermann
2e531850b8 Remove redundant import 2019-04-26 15:29:43 +02:00
Philipp Oppermann
65dbb5ac48 Merge branch 'post-08-new' into post-09-new 2019-04-26 15:28:56 +02:00
Philipp Oppermann
62f913facc Move test_main call to end of _start 2019-04-26 15:27:48 +02:00
Philipp Oppermann
d6f48d72aa Remove duplicated import 2019-04-26 15:27:48 +02:00
Philipp Oppermann
2784998301 Update post number for Readme badge 2019-04-26 15:27:05 +02:00
Philipp Oppermann
6099fddd54 Merge branch 'post-07-new' into post-08-new 2019-04-26 15:26:47 +02:00
Philipp Oppermann
8854b6b751 Move hlt_loop up to keep cfg(test) functions together 2019-04-26 15:25:41 +02:00
Philipp Oppermann
51cdc4db8b Use hlt_loop in lib.rs too 2019-04-26 15:25:41 +02:00
Philipp Oppermann
ae93dc18c3 Fix race condition in test_println_output test 2019-04-26 15:25:41 +02:00
Philipp Oppermann
acfdf929ad Move PIC initialization and interrupt::enable to blog_os::init 2019-04-26 15:25:41 +02:00
Philipp Oppermann
3e6f242b52 Update post number for Readme badge 2019-04-26 15:24:38 +02:00
Philipp Oppermann
ad6cb02d5c Merge branch 'post-06-new' into post-07-new-rebased 2019-04-26 15:24:28 +02:00
Philipp Oppermann
16cf7e8e42 Merge branch 'post-09' into post-10 2019-04-25 11:08:11 +02:00
Philipp Oppermann
9c7faf92ed Merge branch 'post-08' into post-09 2019-04-25 11:08:11 +02:00
Philipp Oppermann
db0489403a Merge branch 'post-07' into post-08 2019-04-25 11:08:11 +02:00
Philipp Oppermann
19556d9e68 Merge branch 'post-09' into post-10 2019-04-11 15:32:21 +02:00
Philipp Oppermann
22ba71a3f6 Merge branch 'post-08' into post-09 2019-04-11 15:32:21 +02:00
Philipp Oppermann
25c6640c62 Merge branch 'post-07' into post-08 2019-04-11 15:32:21 +02:00
Philipp Oppermann
338833262c Merge branch 'post-09' into post-10 2019-04-06 17:35:17 +02:00
Philipp Oppermann
59d0a267d6 Merge branch 'post-08' into post-09 2019-04-06 17:35:17 +02:00
Philipp Oppermann
2053c59d2a Merge branch 'post-07' into post-08 2019-04-06 17:35:17 +02:00
Philipp Oppermann
77800d9212 Merge branch 'post-09' into post-10 2019-04-06 17:33:49 +02:00
Philipp Oppermann
71b3d0431f Merge branch 'post-08' into post-09 2019-04-06 17:33:29 +02:00
Philipp Oppermann
823bc3c5a3 Merge branch 'post-07' into post-08 2019-04-06 17:31:55 +02:00
Philipp Oppermann
be618df7f5 Merge branch 'post-09' into post-10 2019-04-06 16:49:18 +02:00
Philipp Oppermann
0ca216d4fe Merge branch 'post-08' into post-09 2019-04-06 16:49:02 +02:00
Philipp Oppermann
37a2c925d6 Merge branch 'post-07' into post-08 2019-04-06 16:49:02 +02:00
Philipp Oppermann
ff85a2e502 Merge branch 'post-09' into post-10
# Conflicts:
#	README.md
2019-04-03 10:47:15 +02:00
Philipp Oppermann
80d4065b4c Merge branch 'post-08' into post-09
# Conflicts:
#	README.md
2019-04-03 10:47:04 +02:00
Philipp Oppermann
6a44f51eaa Merge branch 'post-07' into post-08
# Conflicts:
#	README.md
2019-04-03 10:46:54 +02:00
Philipp Oppermann
74675346c9 Merge branch 'post-09' into post-10 2019-03-26 13:26:56 +01:00
Philipp Oppermann
d36d1dc18b Merge branch 'post-08' into post-09 2019-03-26 13:26:56 +01:00
Philipp Oppermann
a0420c229e Merge branch 'post-07' into post-08 2019-03-26 13:26:56 +01:00
Philipp Oppermann
e9344ae046 Remove unneeded into_iter() in init_frame_allocator 2019-03-14 13:20:26 +01:00
Philipp Oppermann
4acf12bb69 Merge branch 'post-09' into post-10 2019-03-14 11:18:40 +01:00
Philipp Oppermann
6f25c34d46 Merge branch 'post-08' into post-09 2019-03-14 11:18:22 +01:00
Philipp Oppermann
23e45b5b13 Merge branch 'post-07' into post-08 2019-03-14 11:18:22 +01:00
Philipp Oppermann
161d5fe7be Merge pull request #569 from phil-opp/post-10-new
Update post-10 branch for new "Paging Implementation" post
2019-03-14 10:49:55 +01:00
Philipp Oppermann
9bf4ea7341 Use BootInfoFrameAllocator to create a 0xdeadbeaf000 mapping 2019-03-14 10:30:37 +01:00
Philipp Oppermann
a1bf5651fc Create an init_frame_allocator function 2019-03-14 10:30:37 +01:00
Philipp Oppermann
763228c859 Create a generic BootInfoFrameAllocator type 2019-03-14 10:30:37 +01:00
Philipp Oppermann
770af27d75 Create a new mapping and write through it to the screen 2019-03-14 10:30:37 +01:00
Philipp Oppermann
3e59283c19 Create an EmptyFrameAllocator 2019-03-14 10:30:37 +01:00
Philipp Oppermann
6146ccba2d Add a memory::create_example_mapping function 2019-03-14 10:30:37 +01:00
Philipp Oppermann
b0e1527a95 Delete our memory::translate_addr function again 2019-03-14 10:30:37 +01:00
Philipp Oppermann
cb4410c84e Update kernel_main to use MapperAllSizes::translate_addr 2019-03-14 10:30:37 +01:00
Philipp Oppermann
98b5976656 Create a memory::init function that initializes a MappedPageTable 2019-03-14 10:30:37 +01:00
Philipp Oppermann
9335386928 Add and test a memory::translate_addr function 2019-03-14 10:30:37 +01:00
Philipp Oppermann
7c30d62f33 Also show non-empty level 3 table entries 2019-03-14 10:30:37 +01:00
Philipp Oppermann
61683bccda Print non-empty level 4 table entries 2019-03-14 10:30:37 +01:00
Philipp Oppermann
e1ec5159b8 Add boot info argument and use entry_point macro 2019-03-14 10:30:37 +01:00
Philipp Oppermann
7b7d19592f Enable map_physical_memory feature of bootloader 2019-03-14 10:30:37 +01:00
Philipp Oppermann
e387c0b6b8 Create a memory::active_level_4_table function 2019-03-14 10:30:37 +01:00
Philipp Oppermann
d5abc119f3 Update Readme for Paging Implementation post 2019-03-14 10:30:37 +01:00
Philipp Oppermann
59da6e5620 Update bootloader to version 0.4.0 2019-03-14 10:30:37 +01:00
Philipp Oppermann
ef1cc0ed4f Reset code to post-09 branch for new 'Paging Implementation' post 2019-03-14 10:20:46 +01:00
Philipp Oppermann
90f0caec1a Merge branch 'post-09' into post-10 2019-03-14 10:17:37 +01:00
Philipp Oppermann
7198a4d110 The code for reading the level 4 table was moved to the next post 2019-03-12 17:49:31 +01:00
Philipp Oppermann
5c0fb63f33 Merge branch 'post-09' into post-10 2019-03-12 17:48:43 +01:00
Philipp Oppermann
6ffcb2cf1a Merge branch 'post-08' into post-09 2019-03-12 17:48:43 +01:00
Philipp Oppermann
1c72107cb1 Merge branch 'post-07' into post-08 2019-03-12 17:48:24 +01:00
Philipp Oppermann
036a8e7608 Merge branch 'post-09' into post-10 2019-03-09 14:21:12 +01:00
Philipp Oppermann
3b960751f4 Merge branch 'post-08' into post-09 2019-03-09 14:21:12 +01:00
Philipp Oppermann
0ff6334026 Merge branch 'post-07' into post-08 2019-03-09 14:21:12 +01:00
Philipp Oppermann
10c4d0509d Update post-10 code for changes in x86_64 0.5.0
We no longer need a custom translate function as we can directly use MapperAllSizes::translate_addr.
2019-03-09 12:40:27 +01:00
Philipp Oppermann
57998ea4f8 Merge branch 'post-09' into post-10 2019-03-09 12:39:25 +01:00
Philipp Oppermann
f05aaeb0ac Update post-09 code for changes in x86_64 0.5.0 2019-03-09 12:39:14 +01:00
Philipp Oppermann
78a30984bc Merge branch 'post-08' into post-09 2019-03-09 12:38:25 +01:00
Philipp Oppermann
09dd68a1a2 Update post-08 code for changes in x86_64 0.5.0 2019-03-09 12:37:45 +01:00
Philipp Oppermann
81e4eec055 Merge branch 'post-07' into post-08 2019-03-09 12:36:39 +01:00
Philipp Oppermann
ef9a629ddc Merge branch 'post-09' into post-10 2019-02-25 17:04:56 +01:00
Philipp Oppermann
18d8d311cb Merge branch 'post-08' into post-09 2019-02-25 17:04:40 +01:00
Philipp Oppermann
7b61da94a0 Run cargo fmt 2019-02-25 17:04:25 +01:00
Philipp Oppermann
d974cf5200 Merge branch 'post-09' into post-10 2019-02-25 16:37:31 +01:00
Philipp Oppermann
94447af25a Merge branch 'post-08' into post-09 2019-02-25 16:37:30 +01:00
Philipp Oppermann
a7f487f206 Merge branch 'post-07' into post-08 2019-02-25 16:37:30 +01:00
Philipp Oppermann
36d6c6d0e9 Merge branch 'post-09' into post-10 2019-02-12 19:31:09 +01:00
Philipp Oppermann
76d3715eef Merge branch 'post-08' into post-09 2019-02-12 19:31:09 +01:00
Antoine
babf9d8cce Introduce an InterruptIndex enum (#557)
The following modifications aim to group the hardware interrupts' indexes in an easily accessible structure, while being more friendly to eventual evolutions.
* the hardware interrupts' indexes `TIMER_INTERRUPT_ID` and `KEYBOARD_INTERRUPT_ID` have been replaced by the attributes `Timer` and `Keyboard` contained in `enum InterruptIndex`.
* only the first attribute `Timer` is explicitly declared, the following as inferred by the compiler.
* the functions `as_u8` and `as_usize` avoid the need of casts to `u8` or `usize`.
2019-02-12 19:28:24 +01:00
Philipp Oppermann
ff49104764 Merge branch 'post-09' into post-10 2019-02-07 18:48:39 +01:00
Philipp Oppermann
bda1b8929c Merge branch 'post-08' into post-09 2019-02-07 18:48:39 +01:00
Philipp Oppermann
09ff2e01b1 Merge branch 'post-07' into post-08 2019-02-07 18:46:32 +01:00
Philipp Oppermann
03e43da9f9 Merge branch 'post-09' into post-10 2019-02-07 16:17:54 +01:00
Philipp Oppermann
58e171cce7 Merge branch 'post-08' into post-09 2019-02-07 16:15:10 +01:00
Philipp Oppermann
901a1630eb Merge branch 'post-07' into post-08 2019-02-07 16:15:10 +01:00
Philipp Oppermann
e696d65b60 Merge branch 'post-09' into post-10 2019-02-05 15:23:49 +01:00
Philipp Oppermann
ef09418cbf Merge branch 'post-08' into post-09 2019-02-05 15:23:49 +01:00
Philipp Oppermann
28f37da07d Merge branch 'post-07' into post-08 2019-02-05 15:23:49 +01:00
Philipp Oppermann
ebf626061f Merge branch 'post-09' into post-10 2019-02-05 14:59:15 +01:00
Philipp Oppermann
4c9352d898 Merge branch 'post-08' into post-09 2019-02-05 14:59:15 +01:00
Philipp Oppermann
a41a007039 Merge branch 'post-07' into post-08 2019-02-05 14:59:15 +01:00
Philipp Oppermann
c3d023ad40 Merge branch 'post-09' into post-10 2019-02-05 10:46:08 +01:00
Philipp Oppermann
f3cf5b51de Merge branch 'post-08' into post-09 2019-02-05 10:46:08 +01:00
Philipp Oppermann
26be4cb84d Merge branch 'post-07' into post-08 2019-02-05 10:46:08 +01:00
Philipp Oppermann
0a10b3e784 Merge branch 'post-09' into post-10 2019-02-05 10:45:12 +01:00
Philipp Oppermann
9617680e45 Merge branch 'post-08' into post-09 2019-02-05 10:45:12 +01:00
Philipp Oppermann
8f18fb4282 Merge branch 'post-07' into post-08 2019-02-05 10:45:12 +01:00
Philipp Oppermann
e0f66a8196 Merge branch 'post-09' into post-10 2019-01-29 12:16:54 +01:00
Philipp Oppermann
ba54fd2503 Merge branch 'post-08' into post-09 2019-01-29 12:16:54 +01:00
Philipp Oppermann
6b9d275c2d Merge branch 'post-07' into post-08 2019-01-29 12:16:54 +01:00
Philipp Oppermann
e5dfbd4b23 Merge branch 'post-09' into post-10 2019-01-28 11:51:35 +01:00
Philipp Oppermann
4e6ce8d16e Merge branch 'post-08' into post-09 2019-01-28 11:51:23 +01:00
Philipp Oppermann
519f47286c Merge branch 'post-07' into post-08 2019-01-28 11:51:03 +01:00
Philipp Oppermann
5ad2962389 Merge branch 'post-09' into post-10 2019-01-28 11:44:14 +01:00
Philipp Oppermann
82e6c4b066 Merge branch 'post-08' into post-09 2019-01-28 11:44:14 +01:00
Philipp Oppermann
d564dc208f Merge branch 'post-07' into post-08 2019-01-28 11:44:14 +01:00
Philipp Oppermann
a56e22b6fc Use BootInfoFrameAllocator instead of EmptyFrameAllocator 2019-01-28 11:30:27 +01:00
Philipp Oppermann
67f536d7c6 Add a BootInfoFrameAllocator 2019-01-28 11:28:51 +01:00
Philipp Oppermann
741224411b Use the BootInfo struct passed by the bootloader 2019-01-28 11:24:16 +01:00
Philipp Oppermann
818417d119 Try to create example mapping for page 0xdeadbeaf000 2019-01-28 11:23:46 +01:00
Philipp Oppermann
f272785861 Create example mapping for page 0x1000 2019-01-28 11:19:46 +01:00
Philipp Oppermann
5d807ee622 Run rustfmt 2019-01-28 11:19:34 +01:00
Philipp Oppermann
90c3cdf0f3 Update Readme for Advanced Paging post 2019-01-27 17:14:58 +01:00
Philipp Oppermann
2bc233b2f6 Merge branch 'post-09' into post-10 2019-01-27 17:14:12 +01:00
Philipp Oppermann
0df629df47 Update Readme for Introduction to Paging post 2019-01-27 17:13:57 +01:00
Philipp Oppermann
cca85de5ed Merge branch 'post-08' into post-09 2019-01-27 17:13:21 +01:00
Philipp Oppermann
1da81c6f84 Update Readme for Hardware Interrupts post 2019-01-27 17:13:00 +01:00
Philipp Oppermann
42d89c1030 Merge branch 'post-07' into post-08 2019-01-27 17:12:28 +01:00
Philipp Oppermann
051b23f577 Merge branch 'post-09' into post-10 2019-01-27 16:33:54 +01:00
Philipp Oppermann
97e884e6a3 Merge branch 'post-08' into post-09 2019-01-27 16:33:54 +01:00
Philipp Oppermann
954c0bcfbb Merge branch 'post-07' into post-08 2019-01-27 16:33:54 +01:00
Philipp Oppermann
bd1f5345da Merge branch 'z_post_08' into z_post_09 2019-01-27 15:46:59 +01:00
Philipp Oppermann
662faa8dd0 Merge branch 'z_post_07' into z_post_08 2019-01-27 15:46:59 +01:00
Philipp Oppermann
f2bc2d33f0 Rewrite translation function on top of RecursivePageTable 2019-01-27 14:38:49 +01:00
Philipp Oppermann
38a121a887 Test translate_addr by translating some virtual addresses 2019-01-27 14:38:49 +01:00
Philipp Oppermann
8b380f0692 Create a new memory module with a translate_addr function 2019-01-27 14:38:49 +01:00
Philipp Oppermann
f23ee04161 Merge branch 'z_post_08' into z_post_09 2019-01-27 14:30:32 +01:00
Philipp Oppermann
2031a8dc81 Merge branch 'z_post_07' into z_post_08 2019-01-27 14:29:25 +01:00
Philipp Oppermann
b184f7d996 Move the testing code to the end of _start 2019-01-26 12:57:32 +01:00
Philipp Oppermann
7c07a67bf5 Merge branch 'z_post_08' into z_post_09 2019-01-25 14:47:46 +01:00
Philipp Oppermann
ec2da4bebd Merge branch 'z_post_07' into z_post_08 2019-01-25 14:47:32 +01:00
Philipp Oppermann
abaf5bd862 Use PageTable struct of x86_64 crate for accessing entries 2019-01-25 14:29:50 +01:00
Philipp Oppermann
b7005b766f Print first 10 entries of level 4 page table 2019-01-25 14:29:04 +01:00
Philipp Oppermann
91ca04e8c2 Retrieve address of level 4 page table 2019-01-25 14:28:23 +01:00
Philipp Oppermann
ada45c6e52 Provoke page fault 2019-01-25 14:27:31 +01:00
Philipp Oppermann
207a466707 Add a page fault handler 2019-01-25 14:26:35 +01:00
Philipp Oppermann
a954c02fbe Use pc-keyboard crate to translate all scancodes 2019-01-25 14:23:23 +01:00
Philipp Oppermann
895991fee3 Translate keycodes for keys 0-9 2019-01-25 14:22:25 +01:00
Philipp Oppermann
25796110f3 Read and print scancodes in keyboard interrupt handler 2019-01-25 14:21:49 +01:00
Philipp Oppermann
1d153d694e Add a keyboard interrupt handler 2019-01-25 14:21:12 +01:00
Philipp Oppermann
c2e4e8c96f Add and use hlt_loop function 2019-01-25 14:21:12 +01:00
Philipp Oppermann
599a643d97 Remove deadlock provoking code again
This reverts commit 1a39774ead.
2019-01-25 14:14:45 +01:00
Philipp Oppermann
5efcecc2f2 Avoid deadlock by disabling interrupts in print! and serial_print! macros 2019-01-25 14:14:26 +01:00
Philipp Oppermann
1a39774ead Provoke a print! deadlock 2019-01-25 14:12:14 +01:00
Philipp Oppermann
1ea8cf6ed1 Send end of interrupt signal 2019-01-25 14:09:47 +01:00
Philipp Oppermann
4060ac558c Add a timer interrupt handler 2019-01-25 14:09:12 +01:00
Philipp Oppermann
28a11e47bc Enable hardware interrupts 2019-01-25 14:05:20 +01:00
Philipp Oppermann
6504bed810 Initialize the PIC 2019-01-25 14:04:55 +01:00
13 changed files with 442 additions and 37 deletions

View File

@@ -1,5 +1,5 @@
[unstable]
build-std = ["core", "compiler_builtins"]
build-std = ["core", "compiler_builtins", "alloc"]
build-std-features = ["compiler-builtins-mem"]
[build]

62
Cargo.lock generated
View File

@@ -2,6 +2,12 @@
# It is not intended for manual editing.
version = 4
[[package]]
name = "autocfg"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "bit_field"
version = "0.10.2"
@@ -26,6 +32,9 @@ version = "0.1.0"
dependencies = [
"bootloader",
"lazy_static",
"linked_list_allocator",
"pc-keyboard",
"pic8259",
"spin 0.5.2",
"uart_16550",
"volatile 0.2.7",
@@ -34,9 +43,9 @@ dependencies = [
[[package]]
name = "bootloader"
version = "0.9.32"
version = "0.9.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ea119c3ed05625c179e09d17d0914570a3753ca09c890a73d98f6b72aea00d2"
checksum = "7bdfddac270bbdd45903296bc1caf29a7fdce6b326aaf0bbab7f04c5f98b7447"
[[package]]
name = "lazy_static"
@@ -47,12 +56,52 @@ dependencies = [
"spin 0.9.8",
]
[[package]]
name = "linked_list_allocator"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "549ce1740e46b291953c4340adcd74c59bcf4308f4cac050fd33ba91b7168f4a"
dependencies = [
"spinning_top",
]
[[package]]
name = "lock_api"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "pc-keyboard"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed089a1fbffe3337a1a345501c981f1eb1e47e69de5a40e852433e12953c3174"
[[package]]
name = "pic8259"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb844b5b01db1e0b17938685738f113bfc903846f18932b378bc0eabfa40e194"
dependencies = [
"x86_64",
]
[[package]]
name = "rustversion"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "spin"
version = "0.5.2"
@@ -65,6 +114,15 @@ version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
[[package]]
name = "spinning_top"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0"
dependencies = [
"lock_api",
]
[[package]]
name = "uart_16550"
version = "0.2.19"

View File

@@ -13,11 +13,14 @@ name = "stack_overflow"
harness = false
[dependencies]
bootloader = "0.9"
bootloader = { version = "0.9", features = ["map_physical_memory"] }
volatile = "0.2.6"
spin = "0.5.2"
x86_64 = "0.14.2"
uart_16550 = "0.2.0"
pic8259 = "0.10.1"
pc-keyboard = "0.7.0"
linked_list_allocator = "0.9.0"
[dependencies.lazy_static]
version = "1.0"
@@ -25,7 +28,7 @@ features = ["spin_no_std"]
[[bin]]
name = "blog_os"
test = false
test = true
bench = false

View File

@@ -1,10 +1,10 @@
# Blog OS (Double Faults)
# Blog OS (Heap Allocation)
[![Build Status](https://github.com/phil-opp/blog_os/workflows/Code/badge.svg?branch=post-06)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Code%22+branch%3Apost-06)
[![Build Status](https://github.com/phil-opp/blog_os/workflows/Code/badge.svg?branch=post-10)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Code%22+branch%3Apost-10)
This repository contains the source code for the [Double Faults][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.
This repository contains the source code for the [Heap Allocation][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.
[post]: https://os.phil-opp.com/double-fault-exceptions/
[post]: https://os.phil-opp.com/heap-allocation/
**Check out the [master branch](https://github.com/phil-opp/blog_os) for more information.**

54
src/allocator.rs Normal file
View File

@@ -0,0 +1,54 @@
use alloc::alloc::{GlobalAlloc, Layout};
use core::ptr::null_mut;
use linked_list_allocator::LockedHeap;
use x86_64::{
VirtAddr,
structures::paging::{
FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB, mapper::MapToError,
},
};
pub const HEAP_START: usize = 0x_4444_4444_0000;
pub const HEAP_SIZE: usize = 100 * 1024; // 100 KiB
#[global_allocator]
static ALLOCATOR: LockedHeap = LockedHeap::empty();
pub fn init_heap(
mapper: &mut impl Mapper<Size4KiB>,
frame_allocator: &mut impl FrameAllocator<Size4KiB>,
) -> Result<(), MapToError<Size4KiB>> {
let page_range = {
let heap_start = VirtAddr::new(HEAP_START as u64);
let heap_end = heap_start + HEAP_SIZE - 1u64;
let heap_start_page = Page::containing_address(heap_start);
let heap_end_page = Page::containing_address(heap_end);
Page::range_inclusive(heap_start_page, heap_end_page)
};
for page in page_range {
let frame = frame_allocator
.allocate_frame()
.ok_or(MapToError::FrameAllocationFailed)?;
let flags = PageTableFlags::PRESENT | PageTableFlags::WRITABLE;
unsafe { mapper.map_to(page, frame, flags, frame_allocator)?.flush() };
}
unsafe {
ALLOCATOR.lock().init(HEAP_START, HEAP_SIZE);
}
Ok(())
}
pub struct Dummy;
unsafe impl GlobalAlloc for Dummy {
unsafe fn alloc(&self, _layout: Layout) -> *mut u8 {
null_mut()
}
unsafe fn dealloc(&self, _ptr: *mut u8, _layout: Layout) {
panic!("dealloc should be never called")
}
}

View File

@@ -1,16 +1,44 @@
use crate::{gdt, println};
use crate::{gdt, hlt_loop, print, println};
use lazy_static::lazy_static;
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
use pic8259::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
};
}
@@ -23,6 +51,19 @@ extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
}
extern "x86-interrupt" fn page_fault_handler(
stack_frame: InterruptStackFrame,
error_code: PageFaultErrorCode,
) {
use x86_64::registers::control::Cr2;
println!("EXCEPTION: PAGE FAULT");
println!("Accessed Address: {:?}", Cr2::read());
println!("Error Code: {:?}", error_code);
println!("{:#?}", stack_frame);
hlt_loop();
}
extern "x86-interrupt" fn double_fault_handler(
stack_frame: InterruptStackFrame,
_error_code: u64,
@@ -30,6 +71,47 @@ extern "x86-interrupt" fn double_fault_handler(
panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
}
extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFrame) {
print!(".");
unsafe {
PICS.lock()
.notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
}
}
extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStackFrame) {
use pc_keyboard::{DecodedKey, HandleControl, Keyboard, ScancodeSet1, layouts};
use spin::Mutex;
use x86_64::instructions::port::Port;
lazy_static! {
static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
Mutex::new(Keyboard::new(
ScancodeSet1::new(),
layouts::Us104Key,
HandleControl::Ignore
));
}
let mut keyboard = KEYBOARD.lock();
let mut 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());
}
}
#[test_case]
fn test_breakpoint_exception() {
// invoke a breakpoint exception

View File

@@ -5,16 +5,21 @@
#![test_runner(crate::test_runner)]
#![reexport_test_harness_main = "test_main"]
extern crate alloc;
use core::panic::PanicInfo;
pub mod allocator;
pub mod gdt;
pub mod interrupts;
pub mod memory;
pub mod serial;
pub mod vga_buffer;
pub fn init() {
gdt::init();
interrupts::init_idt();
unsafe { interrupts::PICS.lock().initialize() };
x86_64::instructions::interrupts::enable();
}
pub trait Testable {
fn run(&self) -> ();
@@ -43,7 +48,7 @@ pub fn test_panic_handler(info: &PanicInfo) -> ! {
serial_println!("[failed]\n");
serial_println!("Error: {}\n", info);
exit_qemu(QemuExitCode::Failed);
loop {}
hlt_loop();
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -62,13 +67,24 @@ pub fn exit_qemu(exit_code: QemuExitCode) {
}
}
pub fn hlt_loop() -> ! {
loop {
x86_64::instructions::hlt();
}
}
#[cfg(test)]
use bootloader::{BootInfo, entry_point};
#[cfg(test)]
entry_point!(test_kernel_main);
/// Entry point for `cargo xtest`
#[cfg(test)]
#[unsafe(no_mangle)]
pub extern "C" fn _start() -> ! {
fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
init();
test_main();
loop {}
hlt_loop();
}
#[cfg(test)]

View File

@@ -4,27 +4,58 @@
#![test_runner(blog_os::test_runner)]
#![reexport_test_harness_main = "test_main"]
extern crate alloc;
use alloc::{boxed::Box, rc::Rc, vec, vec::Vec};
use blog_os::println;
use bootloader::{BootInfo, entry_point};
use core::panic::PanicInfo;
#[unsafe(no_mangle)]
pub extern "C" fn _start() -> ! {
println!("Hello World{}", "!");
entry_point!(kernel_main);
fn kernel_main(boot_info: &'static BootInfo) -> ! {
use blog_os::allocator;
use blog_os::memory::{self, BootInfoFrameAllocator};
use x86_64::VirtAddr;
println!("Hello World{}", "!");
blog_os::init();
fn stack_overflow() {
stack_overflow(); // for each recursion, the return address is pushed
}
let phys_mem_offset = VirtAddr::new(boot_info.physical_memory_offset);
let mut mapper = unsafe { memory::init(phys_mem_offset) };
let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_map) };
// uncomment line below to trigger a stack overflow
// stack_overflow();
allocator::init_heap(&mut mapper, &mut frame_allocator).expect("heap initialization failed");
// allocate a number on the heap
let heap_value = Box::new(41);
println!("heap_value at {:p}", heap_value);
// create a dynamically sized vector
let mut vec = Vec::new();
for i in 0..500 {
vec.push(i);
}
println!("vec at {:p}", vec.as_slice());
// create a reference counted vector -> will be freed when count reaches 0
let reference_counted = Rc::new(vec![1, 2, 3]);
let cloned_reference = reference_counted.clone();
println!(
"current reference count is {}",
Rc::strong_count(&cloned_reference)
);
core::mem::drop(reference_counted);
println!(
"reference count is {} now",
Rc::strong_count(&cloned_reference)
);
#[cfg(test)]
test_main();
println!("It did not crash!");
loop {}
blog_os::hlt_loop();
}
/// This function is called on panic.
@@ -32,7 +63,7 @@ pub extern "C" fn _start() -> ! {
#[panic_handler]
fn panic(info: &PanicInfo) -> ! {
println!("{}", info);
loop {}
blog_os::hlt_loop();
}
#[cfg(test)]

86
src/memory.rs Normal file
View File

@@ -0,0 +1,86 @@
use bootloader::bootinfo::{MemoryMap, MemoryRegionType};
use x86_64::{
PhysAddr, VirtAddr,
structures::paging::{FrameAllocator, OffsetPageTable, PageTable, PhysFrame, Size4KiB},
};
/// Initialize a new OffsetPageTable.
///
/// This function is unsafe because the caller must guarantee that the
/// complete physical memory is mapped to virtual memory at the passed
/// `physical_memory_offset`. Also, this function must be only called once
/// to avoid aliasing `&mut` references (which is undefined behavior).
pub unsafe fn init(physical_memory_offset: VirtAddr) -> OffsetPageTable<'static> {
unsafe {
let level_4_table = active_level_4_table(physical_memory_offset);
OffsetPageTable::new(level_4_table, physical_memory_offset)
}
}
/// Returns a mutable reference to the active level 4 table.
///
/// This function is unsafe because the caller must guarantee that the
/// complete physical memory is mapped to virtual memory at the passed
/// `physical_memory_offset`. Also, this function must be only called once
/// to avoid aliasing `&mut` references (which is undefined behavior).
unsafe fn active_level_4_table(physical_memory_offset: VirtAddr) -> &'static mut PageTable {
use x86_64::registers::control::Cr3;
let (level_4_table_frame, _) = Cr3::read();
let phys = level_4_table_frame.start_address();
let virt = physical_memory_offset + phys.as_u64();
let page_table_ptr: *mut PageTable = virt.as_mut_ptr();
unsafe { &mut *page_table_ptr }
}
/// A FrameAllocator that always returns `None`.
pub struct EmptyFrameAllocator;
unsafe impl FrameAllocator<Size4KiB> for EmptyFrameAllocator {
fn allocate_frame(&mut self) -> Option<PhysFrame> {
None
}
}
/// A FrameAllocator that returns usable frames from the bootloader's memory map.
pub struct BootInfoFrameAllocator {
memory_map: &'static MemoryMap,
next: usize,
}
impl BootInfoFrameAllocator {
/// Create a FrameAllocator from the passed memory map.
///
/// This function is unsafe because the caller must guarantee that the passed
/// memory map is valid. The main requirement is that all frames that are marked
/// as `USABLE` in it are really unused.
pub unsafe fn init(memory_map: &'static MemoryMap) -> Self {
BootInfoFrameAllocator {
memory_map,
next: 0,
}
}
/// Returns an iterator over the usable frames specified in the memory map.
fn usable_frames(&self) -> impl Iterator<Item = PhysFrame> {
// get usable regions from memory map
let regions = self.memory_map.iter();
let usable_regions = regions.filter(|r| r.region_type == MemoryRegionType::Usable);
// map each region to its address range
let addr_ranges = usable_regions.map(|r| r.range.start_addr()..r.range.end_addr());
// transform to an iterator of frame start addresses
let frame_addresses = addr_ranges.flat_map(|r| r.step_by(4096));
// create `PhysFrame` types from the start addresses
frame_addresses.map(|addr| PhysFrame::containing_address(PhysAddr::new(addr)))
}
}
unsafe impl FrameAllocator<Size4KiB> for BootInfoFrameAllocator {
fn allocate_frame(&mut self) -> Option<PhysFrame> {
let frame = self.usable_frames().nth(self.next);
self.next += 1;
frame
}
}

View File

@@ -13,10 +13,14 @@ lazy_static! {
#[doc(hidden)]
pub fn _print(args: ::core::fmt::Arguments) {
use core::fmt::Write;
SERIAL1
.lock()
.write_fmt(args)
.expect("Printing to serial failed");
use x86_64::instructions::interrupts;
interrupts::without_interrupts(|| {
SERIAL1
.lock()
.write_fmt(args)
.expect("Printing to serial failed");
});
}
/// Prints to the host through the serial interface.

View File

@@ -163,11 +163,16 @@ macro_rules! println {
($($arg:tt)*) => ($crate::print!("{}\n", format_args!($($arg)*)));
}
/// Prints the given formatted string to the VGA text buffer through the global `WRITER` instance.
/// Prints the given formatted string to the VGA text buffer
/// through the global `WRITER` instance.
#[doc(hidden)]
pub fn _print(args: fmt::Arguments) {
use core::fmt::Write;
WRITER.lock().write_fmt(args).unwrap();
use x86_64::instructions::interrupts;
interrupts::without_interrupts(|| {
WRITER.lock().write_fmt(args).unwrap();
});
}
#[test_case]
@@ -184,10 +189,16 @@ fn test_println_many() {
#[test_case]
fn test_println_output() {
use core::fmt::Write;
use x86_64::instructions::interrupts;
let s = "Some test string that fits on a single line";
println!("{}", s);
for (i, c) in s.chars().enumerate() {
let screen_char = WRITER.lock().buffer.chars[BUFFER_HEIGHT - 2][i].read();
assert_eq!(char::from(screen_char.ascii_character), c);
}
interrupts::without_interrupts(|| {
let mut writer = WRITER.lock();
writeln!(writer, "\n{}", s).expect("writeln failed");
for (i, c) in s.chars().enumerate() {
let screen_char = writer.buffer.chars[BUFFER_HEIGHT - 2][i].read();
assert_eq!(char::from(screen_char.ascii_character), c);
}
});
}

60
tests/heap_allocation.rs Normal file
View File

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

View File

@@ -3,7 +3,7 @@
"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-pointer-width": 64,
"target-c-int-width": 32,
"os": "none",
"executables": true,