diff --git a/src/machine.rs b/src/machine.rs index 6a7cbe58711..369bb92c6f3 100644 --- a/src/machine.rs +++ b/src/machine.rs @@ -28,7 +28,7 @@ use rustc_span::Symbol; use rustc_target::abi::Size; use rustc_target::spec::abi::Abi; -use crate::{shims::posix::FileHandler, *}; +use crate::{shims::unix::FileHandler, *}; // Some global facts about the emulated machine. pub const PAGE_SIZE: u64 = 4 * 1024; // FIXME: adjust to target architecture @@ -266,9 +266,9 @@ pub struct Evaluator<'mir, 'tcx> { pub(crate) enforce_abi: bool, /// The table of file descriptors. - pub(crate) file_handler: shims::posix::FileHandler, + pub(crate) file_handler: shims::unix::FileHandler, /// The table of directory descriptors. - pub(crate) dir_handler: shims::posix::DirHandler, + pub(crate) dir_handler: shims::unix::DirHandler, /// The "time anchor" for this machine's monotone clock (for `Instant` simulation). pub(crate) time_anchor: Instant, diff --git a/src/shims/dlsym.rs b/src/shims/dlsym.rs index 05296d3a4eb..c5081582281 100644 --- a/src/shims/dlsym.rs +++ b/src/shims/dlsym.rs @@ -2,13 +2,13 @@ use rustc_middle::mir; use rustc_target::spec::abi::Abi; use crate::*; -use shims::posix::dlsym as posix; +use shims::unix::dlsym as unix; use shims::windows::dlsym as windows; #[derive(Debug, Copy, Clone)] #[allow(non_camel_case_types)] pub enum Dlsym { - Posix(posix::Dlsym), + Posix(unix::Dlsym), Windows(windows::Dlsym), } @@ -18,7 +18,7 @@ impl Dlsym { pub fn from_str<'tcx>(name: &[u8], target_os: &str) -> InterpResult<'tcx, Option> { let name = &*String::from_utf8_lossy(name); Ok(match target_os { - "linux" | "macos" => posix::Dlsym::from_str(name, target_os)?.map(Dlsym::Posix), + "linux" | "macos" => unix::Dlsym::from_str(name, target_os)?.map(Dlsym::Posix), "windows" => windows::Dlsym::from_str(name)?.map(Dlsym::Windows), os => bug!("dlsym not implemented for target_os {}", os), }) @@ -38,7 +38,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx let this = self.eval_context_mut(); match dlsym { Dlsym::Posix(dlsym) => - posix::EvalContextExt::call_dlsym(this, dlsym, abi, args, dest, ret), + unix::EvalContextExt::call_dlsym(this, dlsym, abi, args, dest, ret), Dlsym::Windows(dlsym) => windows::EvalContextExt::call_dlsym(this, dlsym, abi, args, dest, ret), } diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs index e978391801f..12b5b40e69e 100644 --- a/src/shims/foreign_items.rs +++ b/src/shims/foreign_items.rs @@ -702,7 +702,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx // Platform-specific shims _ => match this.tcx.sess.target.os.as_ref() { - "linux" | "macos" => return shims::posix::foreign_items::EvalContextExt::emulate_foreign_item_by_name(this, link_name, abi, args, dest, ret), + "linux" | "macos" => return shims::unix::foreign_items::EvalContextExt::emulate_foreign_item_by_name(this, link_name, abi, args, dest, ret), "windows" => return shims::windows::foreign_items::EvalContextExt::emulate_foreign_item_by_name(this, link_name, abi, args, dest, ret), target => throw_unsup_format!("the target `{}` is not supported", target), } diff --git a/src/shims/mod.rs b/src/shims/mod.rs index 926fcd5d040..cdffe2f65b4 100644 --- a/src/shims/mod.rs +++ b/src/shims/mod.rs @@ -1,7 +1,7 @@ mod backtrace; pub mod foreign_items; pub mod intrinsics; -pub mod posix; +pub mod unix; pub mod windows; pub mod dlsym; diff --git a/src/shims/posix/dlsym.rs b/src/shims/unix/dlsym.rs similarity index 94% rename from src/shims/posix/dlsym.rs rename to src/shims/unix/dlsym.rs index 339110467c7..578ae488a98 100644 --- a/src/shims/posix/dlsym.rs +++ b/src/shims/unix/dlsym.rs @@ -2,8 +2,8 @@ use rustc_middle::mir; use rustc_target::spec::abi::Abi; use crate::*; -use shims::posix::linux::dlsym as linux; -use shims::posix::macos::dlsym as macos; +use shims::unix::linux::dlsym as linux; +use shims::unix::macos::dlsym as macos; #[derive(Debug, Copy, Clone)] pub enum Dlsym { diff --git a/src/shims/posix/foreign_items.rs b/src/shims/unix/foreign_items.rs similarity index 98% rename from src/shims/posix/foreign_items.rs rename to src/shims/unix/foreign_items.rs index 566befb0efd..32cf7e6f891 100644 --- a/src/shims/posix/foreign_items.rs +++ b/src/shims/unix/foreign_items.rs @@ -10,9 +10,9 @@ use rustc_target::spec::abi::Abi; use crate::*; use shims::foreign_items::EmulateByNameResult; -use shims::posix::fs::EvalContextExt as _; -use shims::posix::sync::EvalContextExt as _; -use shims::posix::thread::EvalContextExt as _; +use shims::unix::fs::EvalContextExt as _; +use shims::unix::sync::EvalContextExt as _; +use shims::unix::thread::EvalContextExt as _; impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {} pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> { @@ -477,8 +477,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx // Platform-specific shims _ => { match this.tcx.sess.target.os.as_ref() { - "linux" => return shims::posix::linux::foreign_items::EvalContextExt::emulate_foreign_item_by_name(this, link_name, abi, args, dest, ret), - "macos" => return shims::posix::macos::foreign_items::EvalContextExt::emulate_foreign_item_by_name(this, link_name, abi, args, dest, ret), + "linux" => return shims::unix::linux::foreign_items::EvalContextExt::emulate_foreign_item_by_name(this, link_name, abi, args, dest, ret), + "macos" => return shims::unix::macos::foreign_items::EvalContextExt::emulate_foreign_item_by_name(this, link_name, abi, args, dest, ret), _ => unreachable!(), } } diff --git a/src/shims/posix/fs.rs b/src/shims/unix/fs.rs similarity index 100% rename from src/shims/posix/fs.rs rename to src/shims/unix/fs.rs diff --git a/src/shims/posix/linux/dlsym.rs b/src/shims/unix/linux/dlsym.rs similarity index 100% rename from src/shims/posix/linux/dlsym.rs rename to src/shims/unix/linux/dlsym.rs diff --git a/src/shims/posix/linux/foreign_items.rs b/src/shims/unix/linux/foreign_items.rs similarity index 98% rename from src/shims/posix/linux/foreign_items.rs rename to src/shims/unix/linux/foreign_items.rs index f966c63b723..7a9c687fcd7 100644 --- a/src/shims/posix/linux/foreign_items.rs +++ b/src/shims/unix/linux/foreign_items.rs @@ -4,10 +4,10 @@ use rustc_target::spec::abi::Abi; use crate::*; use shims::foreign_items::EmulateByNameResult; -use shims::posix::fs::EvalContextExt as _; -use shims::posix::linux::sync::futex; -use shims::posix::sync::EvalContextExt as _; -use shims::posix::thread::EvalContextExt as _; +use shims::unix::fs::EvalContextExt as _; +use shims::unix::linux::sync::futex; +use shims::unix::sync::EvalContextExt as _; +use shims::unix::thread::EvalContextExt as _; impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {} pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> { diff --git a/src/shims/posix/linux/mod.rs b/src/shims/unix/linux/mod.rs similarity index 100% rename from src/shims/posix/linux/mod.rs rename to src/shims/unix/linux/mod.rs diff --git a/src/shims/posix/linux/sync.rs b/src/shims/unix/linux/sync.rs similarity index 100% rename from src/shims/posix/linux/sync.rs rename to src/shims/unix/linux/sync.rs diff --git a/src/shims/posix/macos/dlsym.rs b/src/shims/unix/macos/dlsym.rs similarity index 100% rename from src/shims/posix/macos/dlsym.rs rename to src/shims/unix/macos/dlsym.rs diff --git a/src/shims/posix/macos/foreign_items.rs b/src/shims/unix/macos/foreign_items.rs similarity index 98% rename from src/shims/posix/macos/foreign_items.rs rename to src/shims/unix/macos/foreign_items.rs index 7f6393fd30f..a1adfa0d2fd 100644 --- a/src/shims/posix/macos/foreign_items.rs +++ b/src/shims/unix/macos/foreign_items.rs @@ -4,8 +4,8 @@ use rustc_target::spec::abi::Abi; use crate::*; use shims::foreign_items::EmulateByNameResult; -use shims::posix::fs::EvalContextExt as _; -use shims::posix::thread::EvalContextExt as _; +use shims::unix::fs::EvalContextExt as _; +use shims::unix::thread::EvalContextExt as _; impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {} pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> { diff --git a/src/shims/posix/macos/mod.rs b/src/shims/unix/macos/mod.rs similarity index 100% rename from src/shims/posix/macos/mod.rs rename to src/shims/unix/macos/mod.rs diff --git a/src/shims/posix/mod.rs b/src/shims/unix/mod.rs similarity index 100% rename from src/shims/posix/mod.rs rename to src/shims/unix/mod.rs diff --git a/src/shims/posix/sync.rs b/src/shims/unix/sync.rs similarity index 100% rename from src/shims/posix/sync.rs rename to src/shims/unix/sync.rs diff --git a/src/shims/posix/thread.rs b/src/shims/unix/thread.rs similarity index 100% rename from src/shims/posix/thread.rs rename to src/shims/unix/thread.rs