diff --git a/Cargo.lock b/Cargo.lock index b76c57f..7db8632 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,10 +36,10 @@ dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "goblin 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "linked_list_allocator 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "raw-cpuid 8.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.2.1", + "redox_syscall 0.2.4", "rmm 0.1.0", "rustc-demangle 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "slab_allocator 0.3.1", @@ -73,7 +73,7 @@ dependencies = [ [[package]] name = "log" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -128,7 +128,7 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.1" +version = "0.2.4" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -218,7 +218,7 @@ dependencies = [ "checksum linked_list_allocator 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "47de1a43fad0250ee197e9e124e5b5deab3d7b39d4428ae8a6d741ceb340c362" "checksum linked_list_allocator 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "822add9edb1860698b79522510da17bef885171f75aa395cff099d770c609c24" "checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +"checksum log 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" "checksum paste 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" "checksum paste-impl 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" diff --git a/src/arch/x86_64/interrupt/handler.rs b/src/arch/x86_64/interrupt/handler.rs index b061989..9e75a22 100644 --- a/src/arch/x86_64/interrupt/handler.rs +++ b/src/arch/x86_64/interrupt/handler.rs @@ -1,5 +1,6 @@ use core::mem; -use syscall::IntRegisters; + +use crate::syscall::IntRegisters; use super::super::flags::*; diff --git a/src/context/arch/x86_64.rs b/src/context/arch/x86_64.rs index 9a68dce..64b0268 100644 --- a/src/context/arch/x86_64.rs +++ b/src/context/arch/x86_64.rs @@ -1,6 +1,7 @@ use core::mem; use core::sync::atomic::{AtomicBool, Ordering}; -use syscall::data::FloatRegisters; + +use crate::syscall::FloatRegisters; /// This must be used by the kernel to ensure that context switches are done atomically /// Compare and exchange this to true when beginning a context switch on any CPU diff --git a/src/scheme/proc.rs b/src/scheme/proc.rs index 29809da..4fd7fc1 100644 --- a/src/scheme/proc.rs +++ b/src/scheme/proc.rs @@ -4,7 +4,9 @@ use crate::{ ptrace, scheme::{AtomicSchemeId, SchemeId}, syscall::{ - data::{FloatRegisters, IntRegisters, PtraceEvent, Stat}, + FloatRegisters, + IntRegisters, + data::{PtraceEvent, Stat}, error::*, flag::*, scheme::{calc_seek_offset_usize, Scheme}, diff --git a/src/syscall/mod.rs b/src/syscall/mod.rs index af2bc0b..e164dcf 100644 --- a/src/syscall/mod.rs +++ b/src/syscall/mod.rs @@ -4,7 +4,17 @@ extern crate syscall; -pub use self::syscall::{data, error, flag, io, number, ptrace_event, scheme}; +pub use self::syscall::{ + FloatRegisters, + IntRegisters, + data, + error, + flag, + io, + number, + ptrace_event, + scheme, +}; pub use self::driver::*; pub use self::fs::*; diff --git a/syscall b/syscall index 45c7ca8..ee9a923 160000 --- a/syscall +++ b/syscall @@ -1 +1 @@ -Subproject commit 45c7ca85b14fd64f9a1b5a465ad13390fb233f94 +Subproject commit ee9a92367e6f2b174c45b47a57141b3941447600