Merge pull request #55 from JohnTitor/feat/sync-existing-mod

Author: JohnTitor

mach-test/test/main.rs

@@ -8,10 +8,13 @@ use mach2::clock_reply::*;
 use mach2::clock_types::*;
 use mach2::dyld::*;
 use mach2::dyld_kernel::*;
+use mach2::error::*;
 use mach2::exc::*;
 use mach2::exception_types::*;
 use mach2::kern_return::*;
 use mach2::loader::*;
+use mach2::mach_debug::ipc_info::*;
+use mach2::mach_debug::zone_info::*;
 use mach2::mach_init::*;
 use mach2::mach_port::*;
 use mach2::mach_time::*;
@@ -31,6 +34,7 @@ use mach2::structs::*;
 use mach2::sync_policy::*;
 use mach2::task::*;
 use mach2::task_info::*;
+use mach2::task_inspect::*;
 use mach2::task_special_ports::*;
 use mach2::thread_act::*;
 use mach2::thread_policy::*;

src/error.rs

@@ -0,0 +1,57 @@
+//! This module corresponds to `mach/error.h`.
+
+use crate::kern_return::kern_return_t;
+use libc::c_int;
+
+pub type mach_error_t = kern_return_t;
+pub type mach_error_fn_t = Option<unsafe extern "C" fn() -> mach_error_t>;
+
+pub const err_none: mach_error_t = 0;
+pub const ERR_SUCCESS: mach_error_t = err_none;
+pub const ERR_ROUTINE_NIL: mach_error_fn_t = None;
+
+#[inline]
+pub const fn err_system(x: c_int) -> mach_error_t {
+    (((x as u32) & 0x3f) << 26) as mach_error_t
+}
+
+#[inline]
+pub const fn err_sub(x: c_int) -> mach_error_t {
+    (((x as u32) & 0xfff) << 14) as mach_error_t
+}
+
+#[inline]
+pub const fn err_get_system(err: mach_error_t) -> c_int {
+    (((err as u32) >> 26) & 0x3f) as c_int
+}
+
+#[inline]
+pub const fn err_get_sub(err: mach_error_t) -> c_int {
+    (((err as u32) >> 14) & 0xfff) as c_int
+}
+
+#[inline]
+pub const fn err_get_code(err: mach_error_t) -> c_int {
+    ((err as u32) & 0x3fff) as c_int
+}
+
+pub const system_emask: mach_error_t = err_system(0x3f);
+pub const sub_emask: mach_error_t = err_sub(0xfff);
+pub const code_emask: mach_error_t = 0x3fff;
+
+pub const err_kern: mach_error_t = err_system(0x0);
+pub const err_us: mach_error_t = err_system(0x1);
+pub const err_server: mach_error_t = err_system(0x2);
+pub const err_ipc: mach_error_t = err_system(0x3);
+pub const err_mach_ipc: mach_error_t = err_system(0x4);
+pub const err_dipc: mach_error_t = err_system(0x7);
+pub const err_vm: mach_error_t = err_system(0x8);
+pub const err_local: mach_error_t = err_system(0x3e);
+pub const err_ipc_compat: mach_error_t = err_system(0x3f);
+
+pub const err_max_system: c_int = 0x3f;
+
+#[inline]
+pub const fn unix_err(errno: mach_error_t) -> mach_error_t {
+    err_kern | err_sub(3) | errno
+}

src/lib.rs

@@ -21,13 +21,15 @@ pub mod bootstrap;
 pub mod clock;
 pub mod clock_priv;
 pub mod clock_reply;
-pub mod clock_types; // TODO: test
+pub mod clock_types;
 pub mod dyld;
 pub mod dyld_kernel;
+pub mod error;
 pub mod exc;
 pub mod exception_types;
 pub mod kern_return;
 pub mod loader;
+pub mod mach_debug;
 pub mod mach_init;
 pub mod mach_port;
 pub mod mach_time;
@@ -45,6 +47,7 @@ pub mod structs;
 pub mod sync_policy;
 pub mod task;
 pub mod task_info;
+pub mod task_inspect;
 pub mod task_special_ports;
 pub mod thread_act;
 pub mod thread_policy;

src/mach_debug/ipc_info.rs

@@ -0,0 +1,124 @@
+//! This module corresponds to `mach_debug/ipc_info.h`.
+
+use crate::port::{mach_port_name_t, mach_port_type_t, mach_port_urefs_t};
+use crate::vm_types::{integer_t, natural_t};
+
+pub type ipc_info_object_type_t = natural_t;
+
+pub const IPC_OTYPE_NONE: ipc_info_object_type_t = 0;
+pub const IPC_OTYPE_THREAD_CONTROL: ipc_info_object_type_t = 1;
+pub const IPC_OTYPE_TASK_CONTROL: ipc_info_object_type_t = 2;
+pub const IPC_OTYPE_HOST: ipc_info_object_type_t = 3;
+pub const IPC_OTYPE_HOST_PRIV: ipc_info_object_type_t = 4;
+pub const IPC_OTYPE_PROCESSOR: ipc_info_object_type_t = 5;
+pub const IPC_OTYPE_PROCESSOR_SET: ipc_info_object_type_t = 6;
+pub const IPC_OTYPE_PROCESSOR_SET_NAME: ipc_info_object_type_t = 7;
+pub const IPC_OTYPE_TIMER: ipc_info_object_type_t = 8;
+pub const IPC_OTYPE_PORT_SUBST_ONCE: ipc_info_object_type_t = 9;
+pub const IPC_OTYPE_MIG: ipc_info_object_type_t = 10;
+pub const IPC_OTYPE_MEMORY_OBJECT: ipc_info_object_type_t = 11;
+pub const IPC_OTYPE_XMM_PAGER: ipc_info_object_type_t = 12;
+pub const IPC_OTYPE_XMM_KERNEL: ipc_info_object_type_t = 13;
+pub const IPC_OTYPE_XMM_REPLY: ipc_info_object_type_t = 14;
+pub const IPC_OTYPE_UND_REPLY: ipc_info_object_type_t = 15;
+pub const IPC_OTYPE_HOST_NOTIFY: ipc_info_object_type_t = 16;
+pub const IPC_OTYPE_HOST_SECURITY: ipc_info_object_type_t = 17;
+pub const IPC_OTYPE_LEDGER: ipc_info_object_type_t = 18;
+pub const IPC_OTYPE_MAIN_DEVICE: ipc_info_object_type_t = 19;
+pub const IPC_OTYPE_TASK_NAME: ipc_info_object_type_t = 20;
+pub const IPC_OTYPE_SUBSYSTEM: ipc_info_object_type_t = 21;
+pub const IPC_OTYPE_IO_DONE_QUEUE: ipc_info_object_type_t = 22;
+pub const IPC_OTYPE_SEMAPHORE: ipc_info_object_type_t = 23;
+pub const IPC_OTYPE_LOCK_SET: ipc_info_object_type_t = 24;
+pub const IPC_OTYPE_CLOCK: ipc_info_object_type_t = 25;
+pub const IPC_OTYPE_CLOCK_CTRL: ipc_info_object_type_t = 26;
+pub const IPC_OTYPE_IOKIT_IDENT: ipc_info_object_type_t = 27;
+pub const IPC_OTYPE_NAMED_ENTRY: ipc_info_object_type_t = 28;
+pub const IPC_OTYPE_IOKIT_CONNECT: ipc_info_object_type_t = 29;
+pub const IPC_OTYPE_IOKIT_OBJECT: ipc_info_object_type_t = 30;
+pub const IPC_OTYPE_UPL: ipc_info_object_type_t = 31;
+pub const IPC_OTYPE_MEM_OBJ_CONTROL: ipc_info_object_type_t = 32;
+pub const IPC_OTYPE_AU_SESSIONPORT: ipc_info_object_type_t = 33;
+pub const IPC_OTYPE_FILEPORT: ipc_info_object_type_t = 34;
+pub const IPC_OTYPE_LABELH: ipc_info_object_type_t = 35;
+pub const IPC_OTYPE_TASK_RESUME: ipc_info_object_type_t = 36;
+pub const IPC_OTYPE_VOUCHER: ipc_info_object_type_t = 37;
+pub const IPC_OTYPE_VOUCHER_ATTR_CONTROL: ipc_info_object_type_t = 38;
+pub const IPC_OTYPE_WORK_INTERVAL: ipc_info_object_type_t = 39;
+pub const IPC_OTYPE_UX_HANDLER: ipc_info_object_type_t = 40;
+pub const IPC_OTYPE_UEXT_OBJECT: ipc_info_object_type_t = 41;
+pub const IPC_OTYPE_ARCADE_REG: ipc_info_object_type_t = 42;
+pub const IPC_OTYPE_EVENTLINK: ipc_info_object_type_t = 43;
+pub const IPC_OTYPE_TASK_INSPECT: ipc_info_object_type_t = 44;
+pub const IPC_OTYPE_TASK_READ: ipc_info_object_type_t = 45;
+pub const IPC_OTYPE_THREAD_INSPECT: ipc_info_object_type_t = 46;
+pub const IPC_OTYPE_THREAD_READ: ipc_info_object_type_t = 47;
+pub const IPC_OTYPE_SUID_CRED: ipc_info_object_type_t = 48;
+pub const IPC_OTYPE_HYPERVISOR: ipc_info_object_type_t = 49;
+pub const IPC_OTYPE_TASK_ID_TOKEN: ipc_info_object_type_t = 50;
+pub const IPC_OTYPE_TASK_FATAL: ipc_info_object_type_t = 51;
+pub const IPC_OTYPE_KCDATA: ipc_info_object_type_t = 52;
+pub const IPC_OTYPE_EXCLAVES_RESOURCE: ipc_info_object_type_t = 53;
+pub const IPC_OTYPE_UNKNOWN: ipc_info_object_type_t = !0;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Hash, PartialOrd, PartialEq, Eq, Ord)]
+pub struct ipc_info_space {
+    pub iis_genno_mask: natural_t,
+    pub iis_table_size: natural_t,
+    pub iis_table_next: natural_t,
+    pub iis_tree_size: natural_t,
+    pub iis_tree_small: natural_t,
+    pub iis_tree_hash: natural_t,
+}
+
+pub type ipc_info_space_t = ipc_info_space;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Hash, PartialOrd, PartialEq, Eq, Ord)]
+pub struct ipc_info_space_basic {
+    pub iisb_genno_mask: natural_t,
+    pub iisb_table_size: natural_t,
+    pub iisb_table_next: natural_t,
+    pub iisb_table_inuse: natural_t,
+    pub iisb_reserved: [natural_t; 2],
+}
+
+pub type ipc_info_space_basic_t = ipc_info_space_basic;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Hash, PartialOrd, PartialEq, Eq, Ord)]
+pub struct ipc_info_name {
+    pub iin_name: mach_port_name_t,
+    pub iin_collision: integer_t,
+    pub iin_type: mach_port_type_t,
+    pub iin_urefs: mach_port_urefs_t,
+    pub iin_object: natural_t,
+    pub iin_next: natural_t,
+    pub iin_hash: natural_t,
+}
+
+pub type ipc_info_name_t = ipc_info_name;
+pub type ipc_info_name_array_t = *mut ipc_info_name_t;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Hash, PartialOrd, PartialEq, Eq, Ord)]
+pub struct ipc_info_tree_name {
+    pub iitn_name: ipc_info_name_t,
+    pub iitn_lchild: mach_port_name_t,
+    pub iitn_rchild: mach_port_name_t,
+}
+
+pub type ipc_info_tree_name_t = ipc_info_tree_name;
+pub type ipc_info_tree_name_array_t = *mut ipc_info_tree_name_t;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Hash, PartialOrd, PartialEq, Eq, Ord)]
+pub struct ipc_info_port {
+    pub iip_port_object: natural_t,
+    pub iip_receiver_object: natural_t,
+}
+
+pub type ipc_info_port_t = ipc_info_port;
+pub type exception_port_info_array_t = *mut ipc_info_port_t;
+pub type exception_handler_info_array_t = *mut ipc_info_port_t;

src/mach_debug/mod.rs

@@ -0,0 +1,2 @@
+pub mod ipc_info;
+pub mod zone_info;

src/mach_debug/zone_info.rs

@@ -0,0 +1,139 @@
+//! This module corresponds to `mach_debug/zone_info.h`.
+
+use crate::vm_types::{integer_t, vm_size_t};
+use libc::c_char;
+
+pub const ZONE_NAME_MAX_LEN: usize = 80;
+pub const MACH_ZONE_NAME_MAX_LEN: usize = 80;
+pub const MACH_MEMORY_INFO_NAME_MAX_LEN: usize = 80;
+pub const MAX_ZTRACE_DEPTH: usize = 15;
+
+pub const ZOP_ALLOC: u32 = 1;
+pub const ZOP_FREE: u32 = 0;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug)]
+pub struct zone_name {
+    pub zn_name: [c_char; ZONE_NAME_MAX_LEN],
+}
+
+pub type zone_name_t = zone_name;
+pub type zone_name_array_t = *mut zone_name_t;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Hash, PartialOrd, PartialEq, Eq, Ord)]
+pub struct zone_info {
+    pub zi_count: integer_t,
+    pub zi_cur_size: vm_size_t,
+    pub zi_max_size: vm_size_t,
+    pub zi_elem_size: vm_size_t,
+    pub zi_alloc_size: vm_size_t,
+    pub zi_pageable: integer_t,
+    pub zi_sleepable: integer_t,
+    pub zi_exhaustible: integer_t,
+    pub zi_collectable: integer_t,
+}
+
+pub type zone_info_t = zone_info;
+pub type zone_info_array_t = *mut zone_info_t;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug)]
+pub struct mach_zone_name {
+    pub mzn_name: [c_char; ZONE_NAME_MAX_LEN],
+}
+
+pub type mach_zone_name_t = mach_zone_name;
+pub type mach_zone_name_array_t = *mut mach_zone_name_t;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Hash, PartialOrd, PartialEq, Eq, Ord)]
+pub struct mach_zone_info_data {
+    pub mzi_count: u64,
+    pub mzi_cur_size: u64,
+    pub mzi_max_size: u64,
+    pub mzi_elem_size: u64,
+    pub mzi_alloc_size: u64,
+    pub mzi_sum_size: u64,
+    pub mzi_exhaustible: u64,
+    pub mzi_collectable: u64,
+}
+
+pub type mach_zone_info_t = mach_zone_info_data;
+pub type mach_zone_info_array_t = *mut mach_zone_info_t;
+
+#[inline]
+pub const fn get_mzi_collectable_bytes(val: u64) -> u64 {
+    val >> 1
+}
+
+#[inline]
+pub const fn get_mzi_collectable_flag(val: u64) -> u64 {
+    val & 1
+}
+
+#[inline]
+pub fn set_mzi_collectable_bytes(val: &mut u64, size: u64) {
+    *val = (*val & 1) | (size << 1);
+}
+
+#[inline]
+pub fn set_mzi_collectable_flag(val: &mut u64, flag: bool) {
+    if flag {
+        *val |= 1;
+    } else {
+        *val &= !1;
+    }
+}
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Hash, PartialOrd, PartialEq, Eq, Ord)]
+pub struct task_zone_info_data {
+    pub tzi_count: u64,
+    pub tzi_cur_size: u64,
+    pub tzi_max_size: u64,
+    pub tzi_elem_size: u64,
+    pub tzi_alloc_size: u64,
+    pub tzi_sum_size: u64,
+    pub tzi_exhaustible: u64,
+    pub tzi_collectable: u64,
+    pub tzi_caller_acct: u64,
+    pub tzi_task_alloc: u64,
+    pub tzi_task_free: u64,
+}
+
+pub type task_zone_info_t = task_zone_info_data;
+pub type task_zone_info_array_t = *mut task_zone_info_t;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug)]
+#[allow(non_snake_case)]
+pub struct mach_memory_info {
+    pub flags: u64,
+    pub site: u64,
+    pub size: u64,
+    pub free: u64,
+    pub largest: u64,
+    pub collectable_bytes: u64,
+    pub mapped: u64,
+    pub peak: u64,
+    pub tag: u16,
+    pub zone: u16,
+    pub _resvA: [u16; 2],
+    pub _resv: [u64; 3],
+    pub name: [c_char; MACH_MEMORY_INFO_NAME_MAX_LEN],
+}
+
+pub type mach_memory_info_t = mach_memory_info;
+pub type mach_memory_info_array_t = *mut mach_memory_info_t;
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug)]
+pub struct zone_btrecord {
+    pub ref_count: u32,
+    pub operation_type: u32,
+    pub bt: [u64; MAX_ZTRACE_DEPTH],
+}
+
+pub type zone_btrecord_t = zone_btrecord;
+pub type zone_btrecord_array_t = *mut zone_btrecord_t;