mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dirent layout for macOS

Browse Source
This commit is contained in:
David Cook 2020-01-30 18:57:01 -06:00
parent a82049587c
commit 515d29aa2c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/shims/fs.rs
View File

@ -950,7 +950,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let c_ushort_layout = this.libc_ty_layout("c_ushort")?; let c_ushort_layout = this.libc_ty_layout("c_ushort")?;
let c_uchar_layout = this.libc_ty_layout("c_uchar")?; let c_uchar_layout = this.libc_ty_layout("c_uchar")?;
let name_offset = dirent_layout.details.fields.offset(4); let name_offset = dirent_layout.details.fields.offset(5);
let name_ptr = entry_ptr.offset(name_offset, this)?; let name_ptr = entry_ptr.offset(name_offset, this)?;
#[cfg(unix)] #[cfg(unix)]
@ -969,8 +969,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let imms = [ let imms = [
immty_from_uint_checked(ino, ino_t_layout)?, // d_ino immty_from_uint_checked(ino, ino_t_layout)?, // d_ino
immty_from_uint_checked(0u128, off_t_layout)?, // d_off immty_from_uint_checked(0u128, off_t_layout)?, // d_seekoff
immty_from_uint_checked(0u128, c_ushort_layout)?, // d_reclen immty_from_uint_checked(0u128, c_ushort_layout)?, // d_reclen
immty_from_uint_checked(file_name.len() as u128, c_ushort_layout)?, // d_namlen
immty_from_uint_checked(file_type, c_uchar_layout)?, // d_type immty_from_uint_checked(file_type, c_uchar_layout)?, // d_type
]; ];
this.write_packed_immediates(entry_place, &imms)?; this.write_packed_immediates(entry_place, &imms)?;