Move write_byte_helper to ecx

Author: tiif

src/shims/unix/fd.rs

@@ -622,7 +622,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             this.write_scalar(Scalar::from_target_isize(res, this), dest)?;
             return Ok(());
         };
-        write_byte_helper(offset, fd, bytes, communicate, dest, this)?;
+        self.write_byte_helper(offset, fd, bytes, communicate, dest)?;
         Ok(())
     }
 
@@ -658,32 +658,34 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             }
         }
     }
-}
 
-fn write_byte_helper<'tcx>(
-    offset: Option<i128>,
-    fd: FileDescriptionRef,
-    bytes: Vec<u8>,
-    communicate: bool,
-    dest: &MPlaceTy<'tcx>,
-    ecx: &mut MiriInterpCx<'tcx>,
-) -> InterpResult<'tcx> {
-    let result = match offset {
-        None => fd.write(&fd, communicate, &bytes, ecx),
-        Some(offset) => {
-            let Ok(offset) = u64::try_from(offset) else {
-                let einval = ecx.eval_libc("EINVAL");
-                ecx.set_last_error(einval)?;
-                let res = Scalar::from_target_isize(-1, ecx);
-                ecx.write_scalar(res, dest)?;
-                return Ok(());
-            };
-            fd.pwrite(communicate, &bytes, offset, ecx)
-        }
-    };
-    // Write the result to the dest place.
-    let result = result?.map(|c| i64::try_from(c).unwrap());
-    let res = Scalar::from_target_isize(ecx.try_unwrap_io_result(result)?, ecx);
-    ecx.write_scalar(res, dest)?;
-    return Ok(());
+    fn write_byte_helper(
+        &mut self,
+        offset: Option<i128>,
+        fd: FileDescriptionRef,
+        bytes: Vec<u8>,
+        communicate: bool,
+        dest: &MPlaceTy<'tcx>,
+    ) -> InterpResult<'tcx> {
+        let this = self.eval_context_mut();
+
+        let result = match offset {
+            None => fd.write(&fd, communicate, &bytes, this),
+            Some(offset) => {
+                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)?;
+                    return Ok(());
+                };
+                fd.pwrite(communicate, &bytes, offset, this)
+            }
+        };
+        // Write the result to the dest place.
+        let result = result?.map(|c| i64::try_from(c).unwrap());
+        let res = Scalar::from_target_isize(this.try_unwrap_io_result(result)?, this);
+        this.write_scalar(res, dest)?;
+        return Ok(());
+    }
 }