user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nanosleep: fix argument name and add a missing argument read

Browse source
This commit is contained in:
Ralf Jung 2025-07-03 17:47:34 +02:00
parent 3c3f1e461c
commit 7ea812fd54
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tools/miri/src/shims/time.rs
View file

@ -330,18 +330,15 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
interp_ok(Scalar::from_i32(0)) // KERN_SUCCESS
}
fn nanosleep(
&mut self,
req_op: &OpTy<'tcx>,
_rem: &OpTy<'tcx>, // Signal handlers are not supported, so rem will never be written to.
) -> InterpResult<'tcx, Scalar> {
fn nanosleep(&mut self, duration: &OpTy<'tcx>, rem: &OpTy<'tcx>) -> InterpResult<'tcx, Scalar> {
let this = self.eval_context_mut();
this.assert_target_os_is_unix("nanosleep");
let req = this.deref_pointer_as(req_op, this.libc_ty_layout("timespec"))?;
let duration = this.deref_pointer_as(duration, this.libc_ty_layout("timespec"))?;
let _rem = this.read_pointer(rem)?; // Signal handlers are not supported, so rem will never be written to.
let duration = match this.read_timespec(&req)? {
let duration = match this.read_timespec(&duration)? {
Some(duration) => duration,
None => {
return this.set_last_error_and_return_i32(LibcError("EINVAL"));

4
src/tools/miri/src/shims/unix/foreign_items.rs
View file

@ -963,8 +963,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
this.write_null(dest)?;
}
"nanosleep" => {
let [req, rem] = this.check_shim(abi, CanonAbi::C, link_name, args)?;
let result = this.nanosleep(req, rem)?;
let [duration, rem] = this.check_shim(abi, CanonAbi::C, link_name, args)?;
let result = this.nanosleep(duration, rem)?;
this.write_scalar(result, dest)?;
}
"sched_getaffinity" => {