fix cfgs

Author: newpavlov

src/shims/unix/fd.rs

@@ -38,7 +38,6 @@ pub trait FileDescription: std::fmt::Debug + Any {
 
     /// Reads as much as possible into the given buffer from a given offset,
     /// and returns the number of bytes read.
-    #[cfg(unix)]
     fn pread<'tcx>(
         &mut self,
         _communicate_allowed: bool,
@@ -51,7 +50,6 @@ pub trait FileDescription: std::fmt::Debug + Any {
 
     /// Writes as much as possible from the given buffer starting at a given offset,
     /// and returns the number of bytes written.
-    #[cfg(unix)]
     fn pwrite<'tcx>(
         &mut self,
         _communicate_allowed: bool,
@@ -490,7 +488,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         this.try_unwrap_io_result(result)
     }
 
-    #[cfg(unix)]
     fn pread(
         &mut self,
         fd: i32,
@@ -559,7 +556,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         }
     }
 
-    #[cfg(unix)]
     fn pwrite(
         &mut self,
         fd: i32,

src/shims/unix/foreign_items.rs

@@ -105,8 +105,13 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 // Now, `result` is the value we return back to the program.
                 this.write_scalar(Scalar::from_target_isize(result, this), dest)?;
             }
-            #[cfg(unix)]
             "pread" => {
+                if matches!(&*this.tcx.sess.target.os, "windows") {
+                    throw_unsup_format!(
+                        "`pread` is not supported on {}",
+                        this.tcx.sess.target.os
+                    );
+                }
                 let [fd, buf, count, offset] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
                 let fd = this.read_scalar(fd)?.to_i32()?;
                 let buf = this.read_pointer(buf)?;
@@ -115,8 +120,13 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let result = this.pread(fd, buf, count, offset)?;
                 this.write_scalar(Scalar::from_target_isize(result, this), dest)?;
             }
-            #[cfg(unix)]
             "pwrite" => {
+                if matches!(&*this.tcx.sess.target.os, "windows") {
+                    throw_unsup_format!(
+                        "`pwrite` is not supported on {}",
+                        this.tcx.sess.target.os
+                    );
+                }
                 let [fd, buf, n, offset] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
                 let fd = this.read_scalar(fd)?.to_i32()?;
                 let buf = this.read_pointer(buf)?;
@@ -127,12 +137,13 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 // Now, `result` is the value we return back to the program.
                 this.write_scalar(Scalar::from_target_isize(result, this), dest)?;
             }
-            #[cfg(any(
-                all(target_os = "linux", not(target_env = "musl")),
-                target_os = "android",
-                target_os = "hurd"
-            ))]
             "pread64" => {
+                if !matches!(&*this.tcx.sess.target.os, "linux" | "android" | "hurd") {
+                    throw_unsup_format!(
+                        "`pread64` is not supported on {}",
+                        this.tcx.sess.target.os
+                    );
+                }
                 let [fd, buf, count, offset] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
                 let fd = this.read_scalar(fd)?.to_i32()?;
                 let buf = this.read_pointer(buf)?;
@@ -141,12 +152,13 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let result = this.pread(fd, buf, count, offset)?;
                 this.write_scalar(Scalar::from_target_isize(result, this), dest)?;
             }
-            #[cfg(any(
-                all(target_os = "linux", not(target_env = "musl")),
-                target_os = "android",
-                target_os = "hurd"
-            ))]
             "pwrite64" => {
+                if !matches!(&*this.tcx.sess.target.os, "linux" | "android" | "hurd") {
+                    throw_unsup_format!(
+                        "`pwrite64` is not supported on {}",
+                        this.tcx.sess.target.os
+                    );
+                }
                 let [fd, buf, n, offset] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
                 let fd = this.read_scalar(fd)?.to_i32()?;
                 let buf = this.read_pointer(buf)?;