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

[macOS] Implement mach_timebase_info

Browse source 
Since we return nanoseceonds instead of ticks from
`mach_absolute_time`, we don't need to scale the absolute time
This commit is contained in:
Samrat Man Singh 2020-04-13 21:18:34 +05:30
parent 4545effbcf
commit 5f6d250b30
3 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/shims/foreign_items/posix/macos.rs
View file

@ -60,6 +60,11 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
this.write_scalar(Scalar::from_u64(result), dest)?;
}
"mach_timebase_info" => {
let result = this.mach_timebase_info(args[0])?;
this.write_scalar(Scalar::from_i32(result), dest)?;
},
// Access to command-line arguments
"_NSGetArgc" => {
this.write_scalar(this.machine.argc.expect("machine must be initialized"), dest)?;

22
src/shims/time.rs
View file

@ -13,6 +13,7 @@ pub fn system_time_to_duration<'tcx>(time: &SystemTime) -> InterpResult<'tcx, Du
.map_err(|_| err_unsup_format!("times before the Unix epoch are not supported").into())
}
impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
fn clock_gettime(
@ -159,4 +160,25 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
u64::try_from(duration.as_nanos())
.map_err(|_| err_unsup_format!("programs running longer than 2^64 nanoseconds are not supported").into())
}
fn mach_timebase_info(&mut self, info_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> {
let this = self.eval_context_mut();
this.assert_target_os("macos", "mach_timebase_info");
this.check_no_isolation("mach_timebase_info")?;
let info = this.deref_operand(info_op)?;
// Since we return nanoseceonds instead of ticks from
// `mach_absolute_time`, we don't need to scale the absolute
// time.
let (numer, denom) = (1,1);
let imms = [
immty_from_int_checked(numer, this.libc_ty_layout("uint32_t")?)?,
immty_from_int_checked(denom, this.libc_ty_layout("uint32_t")?)?
];
this.write_packed_immediates(info, &imms)?;
Ok(0)
}
}

15
tests/run-pass/time.rs
View file

@ -25,13 +25,10 @@ fn main() {
let now2 = Instant::now();
assert!(now2 > now1);
#[cfg(not(target_os = "macos"))] // TODO: macOS does not support Instant subtraction
{
let diff = now2.duration_since(now1);
assert_eq!(now1 + diff, now2);
assert_eq!(now2 - diff, now1);
// Sanity-check the difference we got.
assert!(diff.as_micros() > 1);
assert!(diff.as_micros() < 1_000_000);
}
let diff = now2.duration_since(now1);
assert_eq!(now1 + diff, now2);
assert_eq!(now2 - diff, now1);
// Sanity-check the difference we got.
assert!(diff.as_micros() > 1);
assert!(diff.as_micros() < 1_000_000);
}