Skip to content

aix(powerpc64): clean up module #5380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dybucc wants to merge 6 commits into
base: main
Choose a base branch
from
Open

aix(powerpc64): clean up module #5380

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36da88e
aix(powerpc64): correct padding and reorganize
dybucc Aug 6, 2026
6c6fcfa
aix(powerpc64): deprecate `_kernel_simple_lock`
dybucc Aug 6, 2026
04f5c3e
aix(powerpc64): correct `fileops_t` field
dybucc Aug 11, 2026
0ecaad7
aix(powerpc64): annotate `unsafe` fn ptrs
dybucc Aug 11, 2026
32c3eba
aix(powerpc64): add align. req. to type `file`
dybucc Aug 12, 2026
00d56b2
aix(powerpc64): add system header comments
dybucc Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 98 additions & 86 deletions src/unix/aix/powerpc64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use crate::off_t;
use crate::prelude::*;

// Define lock_data_instrumented as an empty enum
extern_ty! {
pub type lock_data_instrumented;
}

pub type simple_lock_data = c_int;

s! {
pub struct sigset_t {
pub ss_set: [c_ulong; 4],
Expand All @@ -21,8 +22,8 @@ s! {
pub l_sysid: c_uint,
pub l_pid: crate::pid_t,
pub l_vfs: c_int,
pub l_start: off_t,
pub l_len: off_t,
pub l_start: crate::off_t,
pub l_len: crate::off_t,
}

pub struct statvfs {
Expand All @@ -34,7 +35,7 @@ s! {
pub f_files: crate::fsfilcnt_t,
pub f_ffree: crate::fsfilcnt_t,
pub f_favail: crate::fsfilcnt_t,
pub f_fsid: c_ulong,
pub f_fsid: crate::fsid_t,
pub f_basetype: [c_char; 16],
pub f_flag: c_ulong,
pub f_namemax: c_ulong,
Expand Down Expand Up @@ -78,8 +79,8 @@ s! {
pub st_type: c_uint,
pub st_gen: c_uint,
st_reserved: Padding<[c_uint; 9]>,
pub st_padto_ll: c_uint,
pub st_size: off_t,
st_padto_ll: Padding<c_uint>,
pub st_size: crate::off_t,
}

pub struct statfs {
Expand Down Expand Up @@ -107,7 +108,7 @@ s! {
pub aio_lio_opcode: c_int,
pub aio_fildes: c_int,
pub aio_word1: c_int,
pub aio_offset: off_t,
pub aio_offset: crate::off_t,
pub aio_buf: *mut c_void,
pub aio_return: ssize_t,
pub aio_errno: c_int,
Expand All @@ -126,20 +127,20 @@ s! {
}

pub struct __vmx_context_t {
pub __vr: [crate::__vmxreg_t; 32],
pub __pad1: [c_uint; 3],
pub __vr: [__vmxreg_t; 32],
__pad1: Padding<[c_uint; 3]>,
pub __vscr: c_uint,
pub __vrsave: c_uint,
pub __pad2: [c_uint; 3],
__pad2: Padding<[c_uint; 3]>,
}

pub struct __vsx_context_t {
pub __vsr_dw1: [c_ulonglong; 32],
}

pub struct __tm_context_t {
pub vmx: crate::__vmx_context_t,
pub vsx: crate::__vsx_context_t,
pub vmx: __vmx_context_t,
pub vsx: __vsx_context_t,
pub gpr: [c_ulonglong; 32],
pub lr: c_ulonglong,
pub ctr: c_ulonglong,
Expand All @@ -158,7 +159,7 @@ s! {
pub tmcontext: c_char,
pub tmstate: c_char,
pub prevowner: c_char,
pub pad: [c_char; 5],
pad: Padding<[c_char; 5]>,
}

pub struct __context64 {
Expand All @@ -176,7 +177,7 @@ s! {
pub fpeu: c_char,
pub fpinfo: c_char,
pub fpscr24_31: c_char,
pub pad: [c_char; 1],
pad: Padding<[c_char; 1]>,
pub excp_type: c_int,
}

Expand All @@ -187,24 +188,24 @@ s! {
pub struct __extctx_t {
pub __flags: c_uint,
pub __rsvd1: [c_uint; 3],
pub __vmx: crate::__vmx_context_t,
pub __vmx: __vmx_context_t,
pub __ukeys: [c_uint; 2],
pub __vsx: crate::__vsx_context_t,
pub __tm: crate::__tm_context_t,
pub __vsx: __vsx_context_t,
pub __tm: __tm_context_t,
__reserved: Padding<[c_char; 1860]>,
pub __extctx_magic: c_int,
}

pub struct ucontext_t {
pub __sc_onstack: c_int,
pub uc_sigmask: crate::sigset_t,
pub __sc_uerror: c_int,
pub uc_mcontext: crate::mcontext_t,
__sc_onstack: c_int,
pub uc_sigmask: sigset_t,
__sc_uerror: c_int,
pub uc_mcontext: mcontext_t,
pub uc_link: *mut ucontext_t,
pub uc_stack: crate::stack_t,
pub __extctx: *mut crate::__extctx_t,
pub __extctx_magic: c_int,
pub __pad: [c_int; 1],
__extctx: *mut __extctx_t,
__extctx_magic: c_int,
__pad: Padding<[c_int; 1]>,
}

pub struct utmpx {
Expand All @@ -215,17 +216,17 @@ s! {
pub ut_type: c_short,
pub ut_tv: crate::timeval,
pub ut_host: [c_char; 256],
pub __dbl_word_pad: c_int,
pub __reservedA: [c_int; 2],
pub __reservedV: [c_int; 6],
__dbl_word_pad: Padding<c_int>,
__reservedA: Padding<[c_int; 2]>,
__reservedV: Padding<[c_int; 6]>,
}

pub struct pthread_spinlock_t {
pub __sp_word: [c_long; 3],
__sp_word: [c_long; 3],
}

pub struct pthread_barrier_t {
pub __br_word: [c_long; 5],
__br_word: [c_long; 5],
}

pub struct msqid_ds {
Expand Down Expand Up @@ -255,88 +256,120 @@ s! {
pub si_addr: *mut c_void,
pub si_band: c_long,
pub si_value: crate::sigval,
pub __si_flags: c_int,
pub __pad: [c_int; 3],
__si_flags: c_int,
__pad: Padding<[c_int; 3]>,
}

pub struct pollfd_ext {
pub struct pollfd_ext_t {
pub fd: c_int,
pub events: c_short,
pub revents: c_short,
pub data: __pollfd_ext_u,
pub u: __c_anonymous_pollfd_ext_t_u,
}
}

impl siginfo_t {
pub unsafe fn si_addr(&self) -> *mut c_void {
self.si_addr
}

pub unsafe fn si_value(&self) -> crate::sigval {
self.si_value
}

pub unsafe fn si_pid(&self) -> crate::pid_t {
self.si_pid
}

pub unsafe fn si_uid(&self) -> crate::uid_t {
self.si_uid
}

pub unsafe fn si_status(&self) -> c_int {
self.si_status
}
}

s_no_extra_traits! {
pub union _simple_lock {
_slock: simple_lock_data,
_slockp: *mut lock_data_instrumented,
}

#[deprecated(
since = "0.2.187",
note = "Use `_simple_lock` instead. This type doesn't exist upstream."
)]
pub union _kernel_simple_lock {
pub _slock: c_long,
pub _slockp: *mut lock_data_instrumented,
}

pub struct fileops_t {
pub fo_rw: Option<
extern "C" fn(
file: *mut file,
rw: crate::uio_rw,
io: *mut c_void,
ext: c_long,
secattr: *mut c_void,
unsafe extern "C" fn(
*mut file,
crate::uio_rw,
*mut c_void,
c_long,
*mut c_void,
) -> c_int,
>,
pub fo_ioctl: Option<
extern "C" fn(
file: *mut file,
a: c_long,
b: crate::caddr_t,
c: c_long,
d: c_long,
) -> c_int,
unsafe extern "C" fn(*mut file, c_long, crate::caddr_t, c_long, c_long) -> c_int,
>,
pub fo_select: Option<
extern "C" fn(file: *mut file, a: c_int, b: *mut c_ushort, c: extern "C" fn()) -> c_int,
unsafe extern "C" fn(
*mut file,
c_int,
c_ushort,
*mut c_ushort,
Option<unsafe extern "C" fn()>,
) -> c_int,
Comment on lines 321 to +328

@tgross35 tgross35 Aug 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"aix(powerpc64): deprecate fileops_t type": If you're updating the fields, it would be best to also mark the function pointers unsafe. Also the commit summary should mention there's more than just a deprecation.

@dybucc dybucc Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. I also split that commit into more isolated patches.

>,
pub fo_close: Option<extern "C" fn(file: *mut file) -> c_int>,
pub fo_fstat: Option<extern "C" fn(file: *mut file, sstat: *mut crate::stat) -> c_int>,
}

#[repr(align(256))]
pub struct file {
pub f_flag: c_long,
pub f_count: c_int,
pub f_options: c_short,
pub f_type: c_short,
// Should be pointer to 'vnode'
pub f_data: *mut c_void,
pub f_offset: c_longlong,
pub f_dir_off: c_long,
pub f_offset: crate::offset_t,
pub f_dir_off: crate::off_t,
// Should be pointer to 'cred'
pub f_cred: *mut c_void,
pub f_lock: _kernel_simple_lock,
pub f_offset_lock: _kernel_simple_lock,
pub f_lock: _simple_lock,
pub f_offset_lock: _simple_lock,
pub f_vinfo: crate::caddr_t,
pub f_ops: *mut fileops_t,
pub f_parentp: crate::caddr_t,
pub f_fnamep: crate::caddr_t,
pub f_fdata: [c_char; 160],
}

pub union __ld_info_file {
pub _ldinfo_fd: c_int,
pub _ldinfo_fp: *mut file,
pub _core_offset: c_long,
}

pub struct ld_info {
pub ldinfo_next: c_uint,
pub ldinfo_flags: c_uint,
pub _file: __ld_info_file,
pub _file: __c_anonymous_ld_info__file,
pub ldinfo_textorg: *mut c_void,
pub ldinfo_textsize: c_ulong,
pub ldinfo_dataorg: *mut c_void,
pub ldinfo_datasize: c_ulong,
pub ldinfo_filename: [c_char; 2],
}

pub union __pollfd_ext_u {
pub union __c_anonymous_ld_info__file {
pub _ldinfo_fd: c_int,
pub _ldinfo_fp: *mut file,
pub _core_offset: c_long,
}

pub union __c_anonymous_pollfd_ext_t_u {
pub addr: *mut c_void,
pub data32: u32,
pub data: u64,
Expand All @@ -347,41 +380,19 @@ s_no_extra_traits! {
}
}

impl siginfo_t {
pub unsafe fn si_addr(&self) -> *mut c_void {
self.si_addr
}

pub unsafe fn si_value(&self) -> crate::sigval {
self.si_value
}

pub unsafe fn si_pid(&self) -> crate::pid_t {
self.si_pid
}

pub unsafe fn si_uid(&self) -> crate::uid_t {
self.si_uid
}

pub unsafe fn si_status(&self) -> c_int {
self.si_status
}
}

cfg_if! {
if #[cfg(feature = "extra_traits")] {
impl PartialEq for __pollfd_ext_u {
fn eq(&self, other: &__pollfd_ext_u) -> bool {
impl PartialEq for __c_anonymous_pollfd_ext_t_u {
fn eq(&self, other: &__c_anonymous_pollfd_ext_t_u) -> bool {
unsafe {
self.addr == other.addr
&& self.data32 == other.data32
&& self.data == other.data
}
}
}
impl Eq for __pollfd_ext_u {}
impl hash::Hash for __pollfd_ext_u {
impl Eq for __c_anonymous_pollfd_ext_t_u {}
impl hash::Hash for __c_anonymous_pollfd_ext_t_u {
fn hash<H: hash::Hasher>(&self, state: &mut H) {
unsafe {
self.addr.hash(state);
Expand All @@ -406,6 +417,7 @@ cfg_if! {
}
}

// pthread.h
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
__mt_word: [0, 2, 0, 0, 0, 0, 0, 0],
};
Expand All @@ -415,11 +427,11 @@ pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t {
pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
__rw_word: [2, 0, 0, 0, 0, 0, 0, 0, 0, 0],
};

pub const PTHREAD_ONCE_INIT: pthread_once_t = pthread_once_t {
__on_word: [0, 0, 0, 0, 0, 2, 0, 0, 0],
};

// sys/resource.h
pub const RLIM_INFINITY: c_ulong = 0x7fffffffffffffff;

extern "C" {
Expand Down