mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix imports.

Browse Source
This commit is contained in:
Vytautas Astrauskas 2020-04-16 12:22:30 -07:00
parent d9ec0f2b36
commit 552080a5b7
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib.rs
View File

@ -63,7 +63,9 @@
pub use crate::stacked_borrows::{
EvalContextExt as StackedBorEvalContextExt, Item, Permission, PtrId, Stack, Stacks, Tag,
};
pub use crate::threads::EvalContextExt as ThreadsEvalContextExt;
pub use crate::threads::{
EvalContextExt as ThreadsEvalContextExt, ThreadId, ThreadManager, ThreadState,
};
/// Insert rustc arguments at the beginning of the argument list that Miri wants to be
/// set per default, for maximal validation power.

2
src/machine.rs
View File

@ -28,8 +28,6 @@
use crate::*;
pub use crate::threads::{ThreadId, ThreadManager, ThreadState};
// Some global facts about the emulated machine.
pub const PAGE_SIZE: u64 = 4 * 1024; // FIXME: adjust to target architecture
pub const STACK_ADDR: u64 = 32 * PAGE_SIZE; // not really about the "stack", but where we start assigning integer addresses to allocations

6
src/shims/tls.rs
View File

@ -8,8 +8,10 @@
use rustc_middle::ty;
use rustc_target::abi::{Size, HasDataLayout};
use crate::{HelpersEvalContextExt, ThreadsEvalContextExt, InterpResult, MPlaceTy, Scalar, StackPopCleanup, Tag};
use crate::machine::{ThreadId, ThreadState};
use crate::{
HelpersEvalContextExt, InterpResult, MPlaceTy, Scalar, StackPopCleanup, Tag, ThreadId,
ThreadState, ThreadsEvalContextExt,
};
pub type TlsKey = u128;