diff --git a/Cargo.lock b/Cargo.lock index 9739747..2c2a8eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,9 @@ dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "multiboot2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "once 0.1.0", "rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sparkle_bump_alloc 0.1.0", "spin 0.4.5 (git+https://github.com/messense/spin-rs?rev=020f1b3)", "volatile 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "x86 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -125,6 +127,10 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "once" +version = "0.1.0" + +[[package]] name = "phf" version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -207,6 +213,10 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "sparkle_bump_alloc" +version = "0.1.0" + +[[package]] name = "spin" version = "0.4.5" source = "git+https://github.com/messense/spin-rs?rev=020f1b3#020f1b3f160a1facf54355278af14cbf6a1613fd" diff --git a/Cargo.toml b/Cargo.toml index d5a16b7..ca17b8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,3 +20,9 @@ rev = "020f1b3" [dependencies.log] version = "0.3" default-features = false + +[dependencies.once] +path = "lib/once" + +[dependencies.sparkle_bump_alloc] +path = "lib/alloc/bump" diff --git a/src/lib.rs b/src/lib.rs index 389c589..2695f68 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,6 +3,9 @@ #![feature(const_fn)] #![feature(lang_items)] #![feature(const_unique_new)] +#![feature(alloc)] +#![feature(allocator_api)] +#![feature(global_allocator)] #![no_std] #[macro_use] @@ -17,6 +20,10 @@ extern crate bitflags; extern crate x86; extern crate multiboot2; + +// sparkle-* libs +extern crate sparkle_bump_alloc; + #[macro_use] pub mod macros; mod misc;