netbsd adding mcontext related data for riscv64 #3468
Conversation
|
r? @JohnTitor (rustbot has picked a reviewer for you, use r? to override) |
devnexen
force-pushed
the
netbsd_reg_update2
branch
from
5befa04
to
bbe2b2f
Compare
|
☔ The latest upstream changes (presumably #3525) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Could you resolve conflicts and remove libc_union cfg? |
devnexen
force-pushed
the
netbsd_reg_update2
branch
from
bbe2b2f
to
44fcc99
Compare
| #[cfg(not(libc_union))] | ||
| pub __qregs: [u128; 1], |
There was a problem hiding this comment.
The main branch doesn't need cfg anymore.
| if #[cfg(libc_const_size_of)] { | ||
| #[doc(hidden)] | ||
| pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1; | ||
| } else { | ||
| #[doc(hidden)] | ||
| pub const _ALIGNBYTES: usize = 8 - 1; | ||
| } |
There was a problem hiding this comment.
pub(crate) can be used I think.
devnexen
force-pushed
the
netbsd_reg_update2
branch
3 times, most recently
from
21e8f49
to
0b726ea
Compare
|
This probably needs a rebase at this point, but otherwise seems like it was waiting for review. @rustbot review |
devnexen
force-pushed
the
netbsd_reg_update2
branch
from
0b726ea
to
966d3dd
Compare
|
Can this just be moved to netbsd/mod.rs? I'm not sure what is platform-specific here, if you have a header link that would help. This should also get the semver test |
|
well ucontext could possibly be make common but not mcontext which is very architecture dependent. |
devnexen
force-pushed
the
netbsd_reg_update2
branch
3 times, most recently
from
c4957c2
to
0cf7b81
Compare
| impl PartialEq for __c_anonymous__fpreg { | ||
| fn eq(&self, other: &__c_anonymous__fpreg) -> bool { | ||
| unsafe { | ||
| self.u_u64 == other.u_u64 | ||
| || self.u_ud == other.u_ud | ||
| } | ||
| } | ||
| } | ||
| impl Eq for __c_anonymous__fpreg {} |
There was a problem hiding this comment.
These should probably just be dropped, it would be weird to use float equality to compare integers.
devnexen
force-pushed
the
netbsd_reg_update2
branch
from
0cf7b81
to
fd6dd02
Compare
|
@rustbot review |
| pub union __c_anonymous__fpreg { | ||
| pub u_u64: u64, | ||
| pub u_d: ::c_double, | ||
| } |
There was a problem hiding this comment.
Sorry, one other thing - should this just be called __fpreg? From https://github.com/NetBSD/src/blob/0465e5c825effb130eca95499f5ac6454fe0d5ab/sys/arch/riscv/include/mcontext.h#L44C7-L47.
It would probably also be good to define
pub const _NGREG: usize = 32;
pub const _NFREG: usize = 33;
pub type __gregset_t = [__greg_t; _NGREG];
pub type __fregset_t = [__fpreg; _NFREG];and then use those in mcontext
devnexen
force-pushed
the
netbsd_reg_update2
branch
from
fd6dd02
to
4660303
Compare
tgross35
force-pushed
the
netbsd_reg_update2
branch
from
4660303
to
fb52c7a
Compare
tgross35
added
the
stable-nominated
ref: https://github.com/NetBSD/src/blob/0465e5c825effb130eca95499f5ac6454fe0d5ab/sys/arch/riscv/include/mcontext.h#L44 (backport <rust-lang#3468>) (cherry picked from commit fb52c7a)
tgross35
added
stable-applied
ref: https://github.com/NetBSD/src/blob/0465e5c825effb130eca95499f5ac6454fe0d5ab/sys/arch/riscv/include/mcontext.h#L44