Tidy the shim a bit

Author: saethlin

src/shims/unix/mem.rs

@@ -1,10 +1,8 @@
-use crate::machine::Mapping;
+use crate::machine::{Mapping, PAGE_SIZE};
 use crate::shims::unix::fs::EvalContextExt as _;
 use crate::*;
 use rustc_target::abi::{Align, Size};
 
-const PAGE_SIZE: u64 = 4096;
-
 impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
 pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
     fn mmap(
@@ -25,12 +23,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let fd = this.read_scalar(fd)?.to_i32()?;
         let offset = this.read_scalar(offset)?.to_machine_usize(this)?;
 
-        let print_args = || {
-            eprintln!(
-                "mmap(addr: {addr}, length: {length}, prot: {prot:x}, flags: {flags:0x}, fd: {fd}, offset: {offset})"
-            );
-        };
-
         let prot_read = this.eval_libc_i32("PROT_READ")?;
         let prot_write = this.eval_libc_i32("PROT_WRITE")?;
         let map_private = this.eval_libc_i32("MAP_PRIVATE")?;
@@ -46,22 +38,18 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         }
 
         if prot & this.eval_libc_i32("PROT_EXEC")? > 0 {
-            print_args();
             throw_unsup_format!("Miri does not support mapping executable pages");
         }
 
         if offset != 0 {
-            print_args();
             throw_unsup_format!("Miri does not support non-zero offsets to mmap (yet)");
         }
 
         if !this.ptr_is_null(addr)? {
-            print_args();
             throw_unsup_format!("Miri does not support non-null pointers to mmap");
         }
 
         if length == 0 {
-            print_args();
             this.set_last_error(Scalar::from_i32(this.eval_libc_i32("EINVAL")?))?;
             return Ok(Pointer::null());
         }