Replace write_scalar with write_int if possible

Author: tiif

src/shims/unix/fd.rs

@@ -591,7 +591,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let Ok(offset) = u64::try_from(offset) else {
                     let einval = this.eval_libc("EINVAL");
                     this.set_last_error(einval)?;
-                    this.write_scalar(Scalar::from_target_isize(-1, this), dest)?;
+                    this.write_int(-1, dest)?;
                     return Ok(());
                 };
                 fd.pread(communicate, &mut bytes, offset, buf, dest, this)?
@@ -636,8 +636,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let Ok(offset) = u64::try_from(offset) else {
                     let einval = this.eval_libc("EINVAL");
                     this.set_last_error(einval)?;
-                    let res = Scalar::from_target_isize(-1, this);
-                    this.write_scalar(res, dest)?;
+                    this.write_int(-1, dest)?;
                     return Ok(());
                 };
                 fd.pwrite(communicate, &bytes, offset, dest, this)?
@@ -668,12 +667,12 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     buf,
                     bytes[..usize::try_from(read_bytes).unwrap()].iter().copied(),
                 )?;
-                this.write_scalar(Scalar::from_target_isize(read_bytes, this), dest)?;
+                this.write_int(read_bytes, dest)?;
                 return Ok(());
             }
             Err(e) => {
                 this.set_last_error_from_io_error(e)?;
-                this.write_scalar(Scalar::from_target_isize(-1, this), dest)?;
+                this.write_int(-1, dest)?;
                 return Ok(());
             }
         }
@@ -686,7 +685,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
         let result = this.try_unwrap_io_result(result?.map(|c| i64::try_from(c).unwrap()))?;
-        this.write_scalar(Scalar::from_target_isize(result, this), dest)?;
+        this.write_int(result, dest)?;
         Ok(())
     }
 }