use rustc_target::abi::{Align, Size};
use crate::*;
-use helpers::{check_arg_count, immty_from_int_checked, immty_from_uint_checked};
+use helpers::check_arg_count;
use shims::os_str::os_str_to_bytes;
use shims::time::system_time_to_duration;
let (created_sec, created_nsec) = metadata.created.unwrap_or((0, 0));
let (modified_sec, modified_nsec) = metadata.modified.unwrap_or((0, 0));
- let dev_t_layout = this.libc_ty_layout("dev_t")?;
- let mode_t_layout = this.libc_ty_layout("mode_t")?;
- let nlink_t_layout = this.libc_ty_layout("nlink_t")?;
- let ino_t_layout = this.libc_ty_layout("ino_t")?;
- let uid_t_layout = this.libc_ty_layout("uid_t")?;
- let gid_t_layout = this.libc_ty_layout("gid_t")?;
- let time_t_layout = this.libc_ty_layout("time_t")?;
- let long_layout = this.libc_ty_layout("c_long")?;
- let off_t_layout = this.libc_ty_layout("off_t")?;
- let blkcnt_t_layout = this.libc_ty_layout("blkcnt_t")?;
- let blksize_t_layout = this.libc_ty_layout("blksize_t")?;
- let uint32_t_layout = this.libc_ty_layout("uint32_t")?;
-
- let imms = [
- immty_from_uint_checked(0u128, dev_t_layout)?, // st_dev
- immty_from_uint_checked(mode, mode_t_layout)?, // st_mode
- immty_from_uint_checked(0u128, nlink_t_layout)?, // st_nlink
- immty_from_uint_checked(0u128, ino_t_layout)?, // st_ino
- immty_from_uint_checked(0u128, uid_t_layout)?, // st_uid
- immty_from_uint_checked(0u128, gid_t_layout)?, // st_gid
- immty_from_uint_checked(0u128, dev_t_layout)?, // st_rdev
- immty_from_uint_checked(0u128, uint32_t_layout)?, // padding
- immty_from_uint_checked(access_sec, time_t_layout)?, // st_atime
- immty_from_uint_checked(access_nsec, long_layout)?, // st_atime_nsec
- immty_from_uint_checked(modified_sec, time_t_layout)?, // st_mtime
- immty_from_uint_checked(modified_nsec, long_layout)?, // st_mtime_nsec
- immty_from_uint_checked(0u128, time_t_layout)?, // st_ctime
- immty_from_uint_checked(0u128, long_layout)?, // st_ctime_nsec
- immty_from_uint_checked(created_sec, time_t_layout)?, // st_birthtime
- immty_from_uint_checked(created_nsec, long_layout)?, // st_birthtime_nsec
- immty_from_uint_checked(metadata.size, off_t_layout)?, // st_size
- immty_from_uint_checked(0u128, blkcnt_t_layout)?, // st_blocks
- immty_from_uint_checked(0u128, blksize_t_layout)?, // st_blksize
- immty_from_uint_checked(0u128, uint32_t_layout)?, // st_flags
- immty_from_uint_checked(0u128, uint32_t_layout)?, // st_gen
- ];
-
let buf = this.deref_operand(buf_op)?;
- this.write_packed_immediates(&buf, &imms)?;
+ this.write_int_fields_named(
+ &[
+ ("st_dev", 0),
+ ("st_mode", mode.into()),
+ ("st_nlink", 0),
+ ("st_ino", 0),
+ ("st_uid", 0),
+ ("st_gid", 0),
+ ("st_rdev", 0),
+ ("st_atime", access_sec.into()),
+ ("st_atime_nsec", access_nsec.into()),
+ ("st_mtime", modified_sec.into()),
+ ("st_mtime_nsec", modified_nsec.into()),
+ ("st_ctime", 0),
+ ("st_ctime_nsec", 0),
+ ("st_birthtime", created_sec.into()),
+ ("st_birthtime_nsec", created_nsec.into()),
+ ("st_size", metadata.size.into()),
+ ("st_blocks", 0),
+ ("st_blksize", 0),
+ ("st_flags", 0),
+ ("st_gen", 0),
+ ],
+ &buf,
+ )?;
Ok(0)
}
// `syscall` function is untyped. This means that all the `statx` parameters are provided
// as `isize`s instead of having the proper types. Thus, we have to recover the layout of
// `statxbuf_op` by using the `libc::statx` struct type.
- let statxbuf_place = {
+ let statxbuf = {
// FIXME: This long path is required because `libc::statx` is an struct and also a
// function and `resolve_path` is returning the latter.
let statx_ty = this
})
.unwrap_or(Ok((0, 0)))?;
- let __u32_layout = this.libc_ty_layout("__u32")?;
- let __u64_layout = this.libc_ty_layout("__u64")?;
- let __u16_layout = this.libc_ty_layout("__u16")?;
-
- // Now we transform all this fields into `ImmTy`s and write them to `statxbuf`. We write a
- // zero for the unavailable fields.
- let imms = [
- immty_from_uint_checked(mask, __u32_layout)?, // stx_mask
- immty_from_uint_checked(0u128, __u32_layout)?, // stx_blksize
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_attributes
- immty_from_uint_checked(0u128, __u32_layout)?, // stx_nlink
- immty_from_uint_checked(0u128, __u32_layout)?, // stx_uid
- immty_from_uint_checked(0u128, __u32_layout)?, // stx_gid
- immty_from_uint_checked(mode, __u16_layout)?, // stx_mode
- immty_from_uint_checked(0u128, __u16_layout)?, // statx padding
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_ino
- immty_from_uint_checked(metadata.size, __u64_layout)?, // stx_size
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_blocks
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_attributes
- immty_from_uint_checked(access_sec, __u64_layout)?, // stx_atime.tv_sec
- immty_from_uint_checked(access_nsec, __u32_layout)?, // stx_atime.tv_nsec
- immty_from_uint_checked(0u128, __u32_layout)?, // statx_timestamp padding
- immty_from_uint_checked(created_sec, __u64_layout)?, // stx_btime.tv_sec
- immty_from_uint_checked(created_nsec, __u32_layout)?, // stx_btime.tv_nsec
- immty_from_uint_checked(0u128, __u32_layout)?, // statx_timestamp padding
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_ctime.tv_sec
- immty_from_uint_checked(0u128, __u32_layout)?, // stx_ctime.tv_nsec
- immty_from_uint_checked(0u128, __u32_layout)?, // statx_timestamp padding
- immty_from_uint_checked(modified_sec, __u64_layout)?, // stx_mtime.tv_sec
- immty_from_uint_checked(modified_nsec, __u32_layout)?, // stx_mtime.tv_nsec
- immty_from_uint_checked(0u128, __u32_layout)?, // statx_timestamp padding
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_rdev_major
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_rdev_minor
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_dev_major
- immty_from_uint_checked(0u128, __u64_layout)?, // stx_dev_minor
- ];
-
- this.write_packed_immediates(&statxbuf_place, &imms)?;
+ // Now we write everything to `statxbuf`. We write a zero for the unavailable fields.
+ this.write_int_fields_named(
+ &[
+ ("stx_mask", mask.into()),
+ ("stx_blksize", 0),
+ ("stx_attributes", 0),
+ ("stx_nlink", 0),
+ ("stx_uid", 0),
+ ("stx_gid", 0),
+ ("stx_mode", mode.into()),
+ ("stx_ino", 0),
+ ("stx_size", metadata.size.into()),
+ ("stx_blocks", 0),
+ ("stx_attributes_mask", 0),
+ ("stx_rdev_major", 0),
+ ("stx_rdev_minor", 0),
+ ("stx_dev_major", 0),
+ ("stx_dev_minor", 0),
+ ],
+ &statxbuf,
+ )?;
+ this.write_int_fields(
+ &[
+ access_sec.into(), // stx_atime.tv_sec
+ access_nsec.into(), // stx_atime.tv_nsec
+ ],
+ &this.mplace_field_named(&statxbuf, "stx_atime")?,
+ )?;
+ this.write_int_fields(
+ &[
+ created_sec.into(), // stx_btime.tv_sec
+ created_nsec.into(), // stx_btime.tv_nsec
+ ],
+ &this.mplace_field_named(&statxbuf, "stx_btime")?,
+ )?;
+ this.write_int_fields(
+ &[
+ 0.into(), // stx_ctime.tv_sec
+ 0.into(), // stx_ctime.tv_nsec
+ ],
+ &this.mplace_field_named(&statxbuf, "stx_ctime")?,
+ )?;
+ this.write_int_fields(
+ &[
+ modified_sec.into(), // stx_mtime.tv_sec
+ modified_nsec.into(), // stx_mtime.tv_nsec
+ ],
+ &this.mplace_field_named(&statxbuf, "stx_mtime")?,
+ )?;
Ok(0)
}
Some(Ok(dir_entry)) => {
// Write the directory entry into a newly allocated buffer.
// The name is written with write_bytes, while the rest of the
- // dirent64 struct is written using write_packed_immediates.
+ // dirent64 struct is written using write_int_fields.
// For reference:
// pub struct dirent64 {
let file_type = this.file_type_to_d_type(dir_entry.file_type())?;
- let entry_place = MPlaceTy::from_aligned_ptr(entry, dirent64_layout);
- this.write_uint(ino, &this.mplace_field(&entry_place, 0)?.into())?; // d_ino
- this.write_uint(0u128, &this.mplace_field(&entry_place, 1)?.into())?; // d_off
- this.write_uint(size, &this.mplace_field(&entry_place, 2)?.into())?; // d_reclen
- this.write_int(file_type, &this.mplace_field(&entry_place, 3)?.into())?; // d_type
+ this.write_int_fields(
+ &[
+ ino.into(), // d_ino
+ 0, // d_off
+ size.into(), // d_reclen
+ file_type.into(), // d_type
+ ],
+ &MPlaceTy::from_aligned_ptr(entry, dirent64_layout),
+ )?;
let name_ptr = entry.offset(Size::from_bytes(d_name_offset), this)?;
this.memory.write_bytes(name_ptr, name_bytes.iter().copied())?;
Some(Ok(dir_entry)) => {
// Write into entry, write pointer to result, return 0 on success.
// The name is written with write_os_str_to_c_str, while the rest of the
- // dirent struct is written using write_packed_Immediates.
+ // dirent struct is written using write_int_fields.
// For reference:
// pub struct dirent {
}
let entry_place = this.deref_operand(entry_op)?;
- let ino_t_layout = this.libc_ty_layout("ino_t")?;
- let off_t_layout = this.libc_ty_layout("off_t")?;
- let c_ushort_layout = this.libc_ty_layout("c_ushort")?;
- let c_uchar_layout = this.libc_ty_layout("c_uchar")?;
// If the host is a Unix system, fill in the inode number with its real value.
// If not, use 0 as a fallback value.
let file_type = this.file_type_to_d_type(dir_entry.file_type())?;
- let imms = [
- immty_from_uint_checked(ino, ino_t_layout)?, // d_ino
- immty_from_uint_checked(0u128, off_t_layout)?, // d_seekoff
- immty_from_uint_checked(0u128, c_ushort_layout)?, // d_reclen
- immty_from_uint_checked(file_name_len, c_ushort_layout)?, // d_namlen
- immty_from_int_checked(file_type, c_uchar_layout)?, // d_type
- ];
- this.write_packed_immediates(&entry_place, &imms)?;
+ this.write_int_fields(
+ &[
+ ino.into(), // d_ino
+ 0, // d_seekoff
+ 0, // d_reclen
+ file_name_len.into(), // d_namlen
+ file_type.into(), // d_type
+ ],
+ &entry_place,
+ )?;
let result_place = this.deref_operand(result_op)?;
this.write_scalar(this.read_scalar(entry_op)?, &result_place.into())?;
projects / rust.git / blobdiff