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

Fix sign when number of seconds is zero

Browse source
This commit is contained in:
Christian Poveda 2019-10-11 00:03:54 -05:00
parent 8f4d185d1b
commit 87b210df6c
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/shims/time.rs
View file

@ -16,6 +16,7 @@ fn get_time() -> (Duration, i128) {
impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
// Foreign function used by linux
fn clock_gettime(
&mut self,
clk_id_op: OpTy<'tcx, Tag>,
@ -38,12 +39,17 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let (duration, sign) = get_time();
let tv_sec = sign * (duration.as_secs() as i128);
let tv_nsec = duration.subsec_nanos() as i128;
let mut tv_nsec = duration.subsec_nanos() as i128;
// If the number of seconds is zero, we need to put the sign into the second's fraction.
if tv_sec == 0 && sign < 0 {
tv_nsec *= sign;
}
this.write_c_ints(&tp, &[tv_sec, tv_nsec], &["time_t", "c_long"])?;
Ok(0)
}
// Foreign function used by generic unix
fn gettimeofday(
&mut self,
tv_op: OpTy<'tcx, Tag>,
@ -66,7 +72,11 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let (duration, sign) = get_time();
let tv_sec = sign * (duration.as_secs() as i128);
let tv_usec = duration.subsec_micros() as i128;
let mut tv_usec = duration.subsec_micros() as i128;
// If the number of seconds is zero, we need to put the sign into the second's fraction.
if tv_sec == 0 && sign < 0 {
tv_usec *= sign;
}
this.write_c_ints(&tv, &[tv_sec, tv_usec], &["time_t", "suseconds_t"])?;