Only support libffi on unix for now

This commit is contained in:
Oli Scherer 2022-09-21 09:49:30 +00:00
parent 369efd0d8e
commit 4f357956b8
5 changed files with 9 additions and 6 deletions

View file

@ -20,8 +20,6 @@ doctest = false # and no doc tests
[dependencies]
getrandom = { version = "0.2", features = ["std"] }
env_logger = "0.9"
libffi = "3.0.0"
libloading = "0.7"
log = "0.4"
shell-escape = "0.1.4"
rand = "0.8"
@ -33,10 +31,10 @@ smallvec = "1.7"
rustc-workspace-hack = "1.0.0"
measureme = "10.0.0"
# Enable some feature flags that dev-dependencies need but dependencies
# do not. This makes `./miri install` after `./miri build` faster.
[target."cfg(unix)".dependencies]
libc = "0.2"
libffi = "3.0.0"
libloading = "0.7"
[dev-dependencies]
colored = "2"

View file

@ -360,7 +360,7 @@ to Miri failing to detect cases of undefined behavior in a program.
file descriptors will be mixed up.
This is **work in progress**; currently, only integer arguments and return values are
supported (and no, pointer/integer casts to work around this limitation will not work;
they will fail horribly).
they will fail horribly). It also only works on unix hosts for now.
Follow [the discussion on supporting other types](https://github.com/rust-lang/miri/issues/2365).
* `-Zmiri-measureme=<name>` enables `measureme` profiling for the interpreted program.
This can be used to find which parts of your program are executing slowly under Miri.

View file

@ -400,6 +400,7 @@ pub struct MiriMachine<'mir, 'tcx> {
pub(crate) basic_block_count: u64,
/// Handle of the optional shared object file for external functions.
#[cfg(unix)]
pub external_so_lib: Option<(libloading::Library, std::path::PathBuf)>,
/// Run a garbage collector for SbTags every N basic blocks.
@ -410,7 +411,6 @@ pub struct MiriMachine<'mir, 'tcx> {
impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {
pub(crate) fn new(config: &MiriConfig, layout_cx: LayoutCx<'tcx, TyCtxt<'tcx>>) -> Self {
let target_triple = &layout_cx.tcx.sess.opts.target_triple.to_string();
let local_crates = helpers::get_local_crates(layout_cx.tcx);
let layouts =
PrimitiveLayouts::new(layout_cx).expect("Couldn't get layouts of primitive types");
@ -462,7 +462,9 @@ pub(crate) fn new(config: &MiriConfig, layout_cx: LayoutCx<'tcx, TyCtxt<'tcx>>)
report_progress: config.report_progress,
basic_block_count: 0,
clock: Clock::new(config.isolated_op == IsolatedOp::Allow),
#[cfg(unix)]
external_so_lib: config.external_so_file.as_ref().map(|lib_file_path| {
let target_triple = &layout_cx.tcx.sess.opts.target_triple.to_string();
// Check if host target == the session target.
if env!("TARGET") != target_triple {
panic!(

View file

@ -23,6 +23,7 @@
use super::backtrace::EvalContextExt as _;
use crate::helpers::{convert::Truncate, target_os_is_unix};
#[cfg(unix)]
use crate::shims::ffi_support::EvalContextExt as _;
use crate::*;
@ -371,6 +372,7 @@ fn emulate_foreign_item_by_name(
let this = self.eval_context_mut();
// First deal with any external C functions in linked .so file.
#[cfg(unix)]
if this.machine.external_so_lib.as_ref().is_some() {
// An Ok(false) here means that the function being called was not exported
// by the specified `.so` file; we should continue and check if it corresponds to

View file

@ -1,6 +1,7 @@
#![warn(clippy::integer_arithmetic)]
mod backtrace;
#[cfg(unix)]
pub mod ffi_support;
pub mod foreign_items;
pub mod intrinsics;