//! Main evaluator loop and setting up the initial stack frame.
use std::ffi::OsStr;
+use std::convert::TryFrom;
use rand::rngs::StdRng;
use rand::SeedableRng;
pub seed: Option<u64>,
/// The stacked borrow id to report about
pub tracked_pointer_tag: Option<PtrId>,
+ /// The allocation id to report about.
+ pub tracked_alloc_id: Option<AllocId>,
}
-/// Details of premature program termination.
-pub enum TerminationInfo {
- Exit(i64),
- Abort,
+impl Default for MiriConfig {
+ fn default() -> MiriConfig {
+ MiriConfig {
+ validate: true,
+ stacked_borrows: true,
+ communicate: false,
+ ignore_leaks: false,
+ excluded_env_vars: vec![],
+ args: vec![],
+ seed: None,
+ tracked_pointer_tag: None,
+ tracked_alloc_id: None,
+ }
+ }
}
/// Returns a freshly created `InterpCx`, along with an `MPlaceTy` representing
StdRng::seed_from_u64(config.seed.unwrap_or(0)),
config.stacked_borrows,
config.tracked_pointer_tag,
+ config.tracked_alloc_id,
),
);
// Complete initialization.
- EnvVars::init(&mut ecx, config.excluded_env_vars);
+ EnvVars::init(&mut ecx, config.excluded_env_vars)?;
+ MemoryExtra::init_extern_statics(&mut ecx)?;
// Setup first stack-frame
let main_instance = ty::Instance::mono(tcx, main_id);
// First argument: pointer to `main()`.
let main_ptr = ecx.memory.create_fn_alloc(FnVal::Instance(main_instance));
// Second argument (argc): length of `config.args`.
- let argc = Scalar::from_uint(config.args.len() as u128, ecx.pointer_size());
+ let argc = Scalar::from_uint(u64::try_from(config.args.len()).unwrap(), ecx.pointer_size());
// Third argument (`argv`): created from `config.args`.
let argv = {
// Put each argument in memory, collect pointers.
let mut argvs = Vec::<Scalar<Tag>>::new();
for arg in config.args.iter() {
// Make space for `0` terminator.
- let size = arg.len() as u64 + 1;
+ let size = u64::try_from(arg.len()).unwrap().checked_add(1).unwrap();
let arg_type = tcx.mk_array(tcx.types.u8, size);
- let arg_place = ecx.allocate(ecx.layout_of(arg_type)?, MiriMemoryKind::Env.into());
+ let arg_place = ecx.allocate(ecx.layout_of(arg_type)?, MiriMemoryKind::Machine.into());
ecx.write_os_str_to_c_str(OsStr::new(arg), arg_place.ptr, size)?;
argvs.push(arg_place.ptr);
}
// Make an array with all these pointers, in the Miri memory.
let argvs_layout =
- ecx.layout_of(tcx.mk_array(tcx.mk_imm_ptr(tcx.types.u8), argvs.len() as u64))?;
- let argvs_place = ecx.allocate(argvs_layout, MiriMemoryKind::Env.into());
+ ecx.layout_of(tcx.mk_array(tcx.mk_imm_ptr(tcx.types.u8), u64::try_from(argvs.len()).unwrap()))?;
+ let argvs_place = ecx.allocate(argvs_layout, MiriMemoryKind::Machine.into());
for (idx, arg) in argvs.into_iter().enumerate() {
- let place = ecx.mplace_field(argvs_place, idx as u64)?;
+ let place = ecx.mplace_field(argvs_place, u64::try_from(idx).unwrap())?;
ecx.write_scalar(arg, place.into())?;
}
ecx.memory.mark_immutable(argvs_place.ptr.assert_ptr().alloc_id)?;
// Store `argc` and `argv` for macOS `_NSGetArg{c,v}`.
{
let argc_place =
- ecx.allocate(ecx.layout_of(tcx.types.isize)?, MiriMemoryKind::Env.into());
+ ecx.allocate(ecx.layout_of(tcx.types.isize)?, MiriMemoryKind::Machine.into());
ecx.write_scalar(argc, argc_place.into())?;
ecx.machine.argc = Some(argc_place.ptr);
let argv_place = ecx.allocate(
ecx.layout_of(tcx.mk_imm_ptr(tcx.types.unit))?,
- MiriMemoryKind::Env.into(),
+ MiriMemoryKind::Machine.into(),
);
ecx.write_scalar(argv, argv_place.into())?;
ecx.machine.argv = Some(argv_place.ptr);
cmd.push(std::char::from_u32(0).unwrap());
let cmd_utf16: Vec<u16> = cmd.encode_utf16().collect();
- let cmd_type = tcx.mk_array(tcx.types.u16, cmd_utf16.len() as u64);
- let cmd_place = ecx.allocate(ecx.layout_of(cmd_type)?, MiriMemoryKind::Env.into());
+ let cmd_type = tcx.mk_array(tcx.types.u16, u64::try_from(cmd_utf16.len()).unwrap());
+ let cmd_place = ecx.allocate(ecx.layout_of(cmd_type)?, MiriMemoryKind::Machine.into());
ecx.machine.cmd_line = Some(cmd_place.ptr);
// Store the UTF-16 string. We just allocated so we know the bounds are fine.
let char_size = Size::from_bytes(2);
for (idx, &c) in cmd_utf16.iter().enumerate() {
- let place = ecx.mplace_field(cmd_place, idx as u64)?;
+ let place = ecx.mplace_field(cmd_place, u64::try_from(idx).unwrap())?;
ecx.write_scalar(Scalar::from_uint(c, char_size), place.into())?;
}
}
};
// Return place (in static memory so that it does not count as leak).
- let ret_place = ecx.allocate(ecx.layout_of(tcx.types.isize)?, MiriMemoryKind::Env.into());
+ let ret_place = ecx.allocate(ecx.layout_of(tcx.types.isize)?, MiriMemoryKind::Machine.into());
// Call start function.
ecx.call_function(
start_instance,
// Set the last_error to 0
let errno_layout = ecx.layout_of(tcx.types.u32)?;
- let errno_place = ecx.allocate(errno_layout, MiriMemoryKind::Env.into());
+ let errno_place = ecx.allocate(errno_layout, MiriMemoryKind::Machine.into());
ecx.write_scalar(Scalar::from_u32(0), errno_place.into())?;
ecx.machine.last_error = Some(errno_place);
/// Returns `Some(return_code)` if program executed completed.
/// Returns `None` if an evaluation error occured.
pub fn eval_main<'tcx>(tcx: TyCtxt<'tcx>, main_id: DefId, config: MiriConfig) -> Option<i64> {
- // FIXME: We always ignore leaks on some platforms where we do not
+ // FIXME: We always ignore leaks on some OSs where we do not
// correctly implement TLS destructors.
let target_os = tcx.sess.target.target.target_os.as_str();
let ignore_leaks = config.ignore_leaks || target_os == "windows" || target_os == "macos";
Ok(v) => v,
Err(mut err) => {
err.print_backtrace();
- panic!("Miri initialziation error: {}", err.kind)
+ panic!("Miri initialization error: {}", err.kind)
}
};
}
Some(return_code)
}
- Err(e) => report_diagnostic(&ecx, e),
+ Err(e) => report_error(&ecx, e),
}
}
projects / rust.git / blobdiff