Skip to content

Commit e35309f

Browse files
committed
??
1 parent 24748b1 commit e35309f

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ ipc-channel = "0.19.0"
4646
serde = { version = "1.0.219", features = ["derive"] }
4747
capstone = "0.13"
4848

49-
[target.'cfg(target_family = "windows")'.dependencies]
50-
windows-sys = { version = "0.59", features = [
51-
"Win32_Foundation",
52-
"Win32_System_IO",
53-
"Win32_Storage_FileSystem",
54-
] }
55-
5649
[dev-dependencies]
5750
ui_test = "0.29.1"
5851
colored = "2"

src/alloc_addresses/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
484484
/// called before the FFI (with `paranoid` set to false) then some of the writes may be
485485
/// lost!
486486
#[cfg(target_os = "linux")]
487-
fn apply_events(&mut self, events: crate::shims::trace::messages::MemEvents) -> InterpResult<'tcx> {
487+
fn apply_events(
488+
&mut self,
489+
events: crate::shims::trace::messages::MemEvents,
490+
) -> InterpResult<'tcx> {
488491
let this = self.eval_context_mut();
489492

490493
let mut reads = vec![];

src/shims/native_lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ use crate::alloc::isolated_alloc::IsolatedAlloc;
1515
use crate::*;
1616

1717
#[cfg(target_os = "linux")]
18-
type CallResult<'tcx> = InterpResult<'tcx, (ImmTy<'tcx>, Option<shims::trace::messages::MemEvents>)>;
18+
type CallResult<'tcx> =
19+
InterpResult<'tcx, (ImmTy<'tcx>, Option<shims::trace::messages::MemEvents>)>;
1920
#[cfg(not(target_os = "linux"))]
2021
type CallResult<'tcx> = InterpResult<'tcx, (ImmTy<'tcx>, Option<!>)>;
2122

src/shims/trace/messages.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub(super) enum TraceRequest {
88
/// Requests that tracing begins. Following this being sent, the child must
99
/// wait to receive a `Confirmation` on the respective channel and then
1010
/// `raise(SIGSTOP)`.
11-
///
11+
///
1212
/// To avoid possible issues while allocating memory for IPC channels, ending
1313
/// the tracing is instead done via `raise(SIGUSR1)`.
1414
StartFfi(super::StartFfiInfo),
@@ -19,14 +19,14 @@ pub(super) enum TraceRequest {
1919

2020
/// A marker type confirming that the supervisor has received the request to begin
2121
/// tracing and is now waiting for a `SIGSTOP`.
22-
///
22+
///
2323
/// The sender for this channel should live on the parent process.
2424
#[derive(serde::Serialize, serde::Deserialize, Debug)]
2525
pub(super) struct Confirmation;
2626

2727
/// The final results of an FFI trace, containing every relevant event detected
2828
/// by the tracer. Sent by the supervisor.
29-
///
29+
///
3030
/// The sender for this channel should live on the parent process.
3131
#[derive(serde::Serialize, serde::Deserialize, Debug)]
3232
pub struct MemEvents {
@@ -36,4 +36,4 @@ pub struct MemEvents {
3636
/// it is reported as whatever would be safest to assume; i.e. a read + maybe-write
3737
/// becomes a read + write, etc.
3838
pub acc_events: Vec<super::AccessEvent>,
39-
}
39+
}

src/shims/trace/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mod child;
2-
mod parent;
32
pub mod messages;
3+
mod parent;
44

55
use std::ops::Range;
66

0 commit comments

Comments
 (0)