diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Cargo.lock | 26 | ||||
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | kernel/Cargo.lock | 267 | ||||
| -rw-r--r-- | kernel/Cargo.toml | 12 | ||||
| -rw-r--r-- | kernel/src/lib.rs | 2 | ||||
| -rw-r--r-- | kernel/src/pm/panic.rs | 5 |
7 files changed, 311 insertions, 5 deletions
@@ -1 +1,2 @@ /target +*/target @@ -180,6 +180,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" [[package]] +name = "const_fn" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413d67b29ef1021b4d60f4aa1e925ca031751e213832b4b1d588fae623c05c60" + +[[package]] name = "cpufeatures" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -391,6 +397,7 @@ dependencies = [ "spin", "strum", "uart_16550", + "x86_64", ] [[package]] @@ -886,6 +893,12 @@ dependencies = [ ] [[package]] +name = "volatile" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793" + +[[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1052,6 +1065,19 @@ dependencies = [ ] [[package]] +name = "x86_64" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4ec631e1a81d50e46c35a4a00322bd076c47491b64c2fb10a7ffa89002c697" +dependencies = [ + "bit_field", + "bitflags 2.13.1", + "const_fn", + "rustversion", + "volatile", +] + +[[package]] name = "xattr" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1,4 +1,5 @@ [workspace] resolver = "3" -members = ["kernel", "x"] +members = ["x"] +exclude = ["kernel"] default-members = ["x"] diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock new file mode 100644 index 0000000..413afb7 --- /dev/null +++ b/kernel/Cargo.lock @@ -0,0 +1,267 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "acpi" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b763acdc1d85c36d61acf97a59938f23202d0e8efe45e8759de10c02db242744" +dependencies = [ + "bit_field", + "bitflags", + "byteorder", + "log", + "pci_types", + "spinning_top", +] + +[[package]] +name = "atomic" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "bit_field" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" + +[[package]] +name = "bitflags" +version = "2.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" + +[[package]] +name = "bootloader_api" +version = "0.11.17" +source = "git+https://github.com/rust-osdev/bootloader#3d7f72e36d4101ecf78b70cef2475d700bb01721" + +[[package]] +name = "bytemuck" +version = "1.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0e56a716f1e132ff6bf4bdac1c944a3fcdc1cae65f70a4a2a1ac3b401d2d1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.5", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "const_fn" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413d67b29ef1021b4d60f4aa1e925ca031751e213832b4b1d588fae623c05c60" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "kernel" +version = "0.1.0" +dependencies = [ + "acpi", + "atomic", + "bitflags", + "bootloader_api", + "bytemuck", + "linkme", + "spin", + "strum", + "uart_16550", + "x86_64", +] + +[[package]] +name = "linkme" +version = "0.3.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3045e122bd98aef8ec3ad58ce84f0791f64e70163d1a02710af4aa11a4d54cc5" +dependencies = [ + "linkme-impl", +] + +[[package]] +name = "linkme-impl" +version = "0.3.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77060ebe535362c3da75682cd17b0431017b6e7c5661e714fc69a7ad017d1301" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.5", +] + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" + +[[package]] +name = "pci_types" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c2a105c657261a938ff68ee231c199a3d80eef33976004829de761ef5b1a9b" +dependencies = [ + "bit_field", + "bitflags", +] + +[[package]] +name = "proc-macro2" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustversion" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "spin" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0134f9043ed38b087ac4f7d4af44c79e2c9e5094421fe3164f435ce585953b10" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + +[[package]] +name = "strum" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "syn" +version = "2.0.119" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "3.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "uart_16550" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c24d1751f909d9e2d192475ca5527964e13dbc3126ce20c288dfa8f3a3e734" +dependencies = [ + "bitflags", +] + +[[package]] +name = "unicode-ident" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "volatile" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793" + +[[package]] +name = "x86_64" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4ec631e1a81d50e46c35a4a00322bd076c47491b64c2fb10a7ffa89002c697" +dependencies = [ + "bit_field", + "bitflags", + "const_fn", + "rustversion", + "volatile", +] diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index d44911c..c0fc3ba 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -3,16 +3,26 @@ name = "kernel" version = "0.1.0" edition = "2024" +[lib] +bench = false +test = false + +[[bin]] +bench = false +name = "kernel" +test = false + [dependencies] acpi = "6.1.1" atomic = "0.6.1" -bitflags = "2.13.1" +bitflags = { version = "2.13.1", default-features = false } bootloader_api = { git = "https://github.com/rust-osdev/bootloader" } bytemuck = { version = "1.25.2", features = ["derive"] } linkme = "0.3.37" spin = "0.12.3" strum = { version = "0.28.0", default-features = false, features = ["derive", "strum_macros"] } uart_16550 = "0.8.0" +x86_64 = "0.15.5" [profile.dev] debug = true diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index eb1ab68..614e8cb 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![feature(array_try_from_fn)] +#![feature(array_try_from_fn, abi_x86_interrupt)] pub mod init; pub mod io; diff --git a/kernel/src/pm/panic.rs b/kernel/src/pm/panic.rs index 6446cd9..d2f1bb2 100644 --- a/kernel/src/pm/panic.rs +++ b/kernel/src/pm/panic.rs @@ -1,8 +1,9 @@ use core::panic::PanicInfo; -use crate::pm::hcf; +use crate::{pm::hcf, printlnk}; #[panic_handler] -fn panic(_info: &PanicInfo) -> ! { +fn panic(info: &PanicInfo) -> ! { + _ = printlnk!("{info}"); hcf() } |