Skip to content

Commit

Permalink
Auto merge of #128699 - RalfJung:miri-sync, r=RalfJung
Browse files Browse the repository at this point in the history
Miri subtree update

r? `@ghost`
  • Loading branch information
bors committed Aug 5, 2024
2 parents 6e32da9 + 7e08769 commit 264590c
Show file tree
Hide file tree
Showing 33 changed files with 978 additions and 624 deletions.
237 changes: 135 additions & 102 deletions Cargo.lock

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ default-run = "miri"
edition = "2021"

[lib]
test = true # we have unit tests
test = true # we have unit tests
doctest = false # but no doc tests

[[bin]]
name = "miri"
test = false # we have no unit tests
test = false # we have no unit tests
doctest = false # and no doc tests

[dependencies]
Expand Down Expand Up @@ -42,6 +42,13 @@ libc = "0.2"
libffi = "3.2.0"
libloading = "0.8"

[target.'cfg(target_family = "windows")'.dependencies]
windows-sys = { version = "0.52", features = [
"Win32_Foundation",
"Win32_System_IO",
"Win32_Storage_FileSystem",
] }

[dev-dependencies]
colored = "2"
ui_test = "0.21.1"
Expand Down
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,19 @@ Miri provides some `extern` functions that programs can import to access
Miri-specific functionality. They are declared in
[/tests/utils/miri\_extern.rs](/tests/utils/miri_extern.rs).

## Entry point for no-std binaries

Binaries that do not use the standard library are expected to declare a function like this so that
Miri knows where it is supposed to start execution:

```rust
#[cfg(miri)]
#[no_mangle]
fn miri_start(argc: isize, argv: *const *const u8) -> isize {
// Call the actual start function that your project implements, based on your target's conventions.
}
```

## Contributing and getting help

If you want to contribute to Miri, great! Please check out our
Expand Down
Loading

0 comments on commit 264590c

Please sign in to comment.