ishan/neptune
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated dependencies, Resuming work

Browse Source
This commit is contained in:
Ishan Jain 2019-05-02 12:04:52 +05:30
parent 5bc759f3e4
commit 9035a4f095
3 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Cargo.lock generated
View File

@ -1,38 +1,39 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
version = "1.1.0" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"spin 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "os_boot" name = "neptune"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"spin 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"volatile 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "spin" name = "spin"
version = "0.4.9" version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "version_check" name = "spin"
version = "0.1.4" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "volatile" name = "volatile"
version = "0.2.4" version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata] [metadata]
"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7" "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
"checksum spin 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "37b5646825922b96b5d7d676b5bb3458a54498e96ed7b0ce09dc43a07038fea4" "checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f"
"checksum version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7716c242968ee87e5542f8021178248f267f295a5c4803beae8b8b7fd9bc6051" "checksum spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55"
"checksum volatile 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "54d4343a2df2d65144a874f95950754ee7b7e8594f6027aae8c7d0f4858a3fe8" "checksum volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29"

9
Cargo.toml
View File

@ -1,7 +1,8 @@
[package] [package]
name = "os_boot" name = "neptune"
version = "0.1.0" version = "0.1.0"
authors = ["ishanjain28 <ishanjain28@gmail.com>"] authors = ["ishanjain28 <ishanjain28@gmail.com>"]
edition = "2018"
[dependencies] [dependencies]
volatile = "0.2.3" volatile = "0.2.3"
@ -13,3 +14,9 @@ features = ["spin_no_std"]
[package.metadata.bootimage] [package.metadata.bootimage]
default-target = "x86_64-os.json" default-target = "x86_64-os.json"
[profile.dev]
panic = "abort"
[profile.release]
panic = "abort"

14
src/main.rs
View File

@ -1,9 +1,8 @@
#![feature(panic_implementation)] // required to define panic handler
#![no_std] // don't include rust std lib #![no_std] // don't include rust std lib
#![no_main] // disable all rust entry point #![no_main] // disable all rust entry point
extern crate volatile;
extern crate spin; extern crate spin;
extern crate volatile;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
@ -15,7 +14,7 @@ use core::panic::PanicInfo;
use vga_buffer::{Buffer, Color, ColorCode, Writer}; use vga_buffer::{Buffer, Color, ColorCode, Writer};
/// This function is called on panic. /// This function is called on panic.
#[panic_implementation] #[panic_handler]
#[no_mangle] #[no_mangle]
pub fn panic(_info: &PanicInfo) -> ! { pub fn panic(_info: &PanicInfo) -> ! {
loop {} loop {}
@ -25,8 +24,13 @@ pub fn panic(_info: &PanicInfo) -> ! {
pub extern "C" fn _start() -> ! { pub extern "C" fn _start() -> ! {
use core::fmt::Write; use core::fmt::Write;
vga_buffer::WRITER.lock().write_str("Hello again").unwrap(); vga_buffer::WRITER.lock().write_str("Hello again").unwrap();
write!(vga_buffer::WRITER.lock(), ", some numbers: {} {}", 42, 1.337).unwrap(); write!(
vga_buffer::WRITER.lock(),
", some numbers: {} {}",
42,
1.337
)
.unwrap();
loop {} loop {}
} }