netbsd adding mcontext related data for riscv64 by devnexen · Pull Request #3468 · rust-lang/libc

devnexen · 2023-12-09T13:15:46Z

ref: https://github.com/NetBSD/src/blob/0465e5c825effb130eca95499f5ac6454fe0d5ab/sys/arch/riscv/include/mcontext.h#L44

rustbot · 2023-12-09T13:15:51Z

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

bors · 2024-01-08T09:06:42Z

☔ The latest upstream changes (presumably #3525) made this pull request unmergeable. Please resolve the merge conflicts.

JohnTitor · 2024-01-08T15:15:08Z

Could you resolve conflicts and remove libc_union cfg?

JohnTitor · 2024-01-20T14:24:59Z

+        #[cfg(not(libc_union))]
+        pub __qregs: [u128; 1],


The main branch doesn't need cfg anymore.

JohnTitor · 2024-01-20T14:25:33Z

+    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;
+    }


pub(crate) can be used I think.

tgross35 · 2024-08-29T11:23:50Z

This probably needs a rebase at this point, but otherwise seems like it was waiting for review.

@rustbot review

tgross35 · 2024-08-29T18:46:19Z

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

devnexen · 2024-08-29T20:27:01Z

well ucontext could possibly be make common but not mcontext which is very architecture dependent.

tgross35

I think the trait should be dropped as mentioned. Otherwise lgtm, please add sources to the PR description.

tgross35 · 2024-11-14T00:44:18Z

+        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 {}


These should probably just be dropped, it would be weird to use float equality to compare integers.

devnexen · 2024-11-16T21:48:27Z

@rustbot review

tgross35 · 2024-11-19T04:01:33Z

+    pub union __c_anonymous__fpreg {
+        pub u_u64: u64,
+        pub u_d: ::c_double,
+    }


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

tgross35

Thanks!

ref: https://github.com/NetBSD/src/blob/0465e5c825effb130eca95499f5ac6454fe0d5ab/sys/arch/riscv/include/mcontext.h#L44

ref: https://github.com/NetBSD/src/blob/0465e5c825effb130eca95499f5ac6454fe0d5ab/sys/arch/riscv/include/mcontext.h#L44 (backport <rust-lang#3468>) (cherry picked from commit fb52c7a)

rustbot assigned JohnTitor Dec 9, 2023

rustbot added the S-waiting-on-review label Dec 9, 2023

devnexen force-pushed the netbsd_reg_update2 branch from 5befa04 to bbe2b2f Compare December 9, 2023 13:27

JohnTitor approved these changes Jan 4, 2024

View reviewed changes

JohnTitor added S-blocked and removed S-waiting-on-review labels Jan 4, 2024

JohnTitor added S-waiting-on-author and removed S-blocked labels Jan 8, 2024

devnexen force-pushed the netbsd_reg_update2 branch from bbe2b2f to 44fcc99 Compare January 8, 2024 15:20

JohnTitor reviewed Jan 20, 2024

View reviewed changes

devnexen force-pushed the netbsd_reg_update2 branch 3 times, most recently from 21e8f49 to 0b726ea Compare January 20, 2024 15:33

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Aug 29, 2024

devnexen force-pushed the netbsd_reg_update2 branch from 0b726ea to 966d3dd Compare August 29, 2024 12:11

devnexen force-pushed the netbsd_reg_update2 branch 3 times, most recently from c4957c2 to 0cf7b81 Compare August 29, 2024 22:49

tgross35 requested changes Nov 14, 2024

View reviewed changes

tgross35 added S-waiting-on-author and removed S-waiting-on-review labels Nov 14, 2024

devnexen force-pushed the netbsd_reg_update2 branch from 0cf7b81 to fd6dd02 Compare November 16, 2024 21:02

rustbot added O-riscv O-unix labels Nov 16, 2024

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Nov 16, 2024

tgross35 reviewed Nov 19, 2024

View reviewed changes

devnexen force-pushed the netbsd_reg_update2 branch from fd6dd02 to 4660303 Compare November 19, 2024 05:55

tgross35 approved these changes Nov 19, 2024

View reviewed changes

tgross35 enabled auto-merge November 19, 2024 05:58

netbsd adding mcontext related data for riscv64

fb52c7a

ref: https://github.com/NetBSD/src/blob/0465e5c825effb130eca95499f5ac6454fe0d5ab/sys/arch/riscv/include/mcontext.h#L44

tgross35 force-pushed the netbsd_reg_update2 branch from 4660303 to fb52c7a Compare November 19, 2024 05:58

tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 19, 2024

tgross35 added this pull request to the merge queue Nov 19, 2024

Merged via the queue into rust-lang:main with commit 0569274 Nov 19, 2024

tgross35 mentioned this pull request Nov 21, 2024

[0.2] Backports #4131

Merged

tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Nov 21, 2024

andrewdavidmackenzie mentioned this pull request Nov 26, 2024

Bump libc from 0.2.164 to 0.2.165 andrewdavidmackenzie/pigg#667

Closed

shadow3aaa mentioned this pull request Dec 1, 2024

build(deps): bump libc from 0.2.164 to 0.2.166 shadow3aaa/fas-rs#111

Merged

Conversation

devnexen commented Dec 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Dec 9, 2023

Uh oh!

bors commented Jan 8, 2024

Uh oh!

JohnTitor commented Jan 8, 2024

Uh oh!

JohnTitor Jan 20, 2024

Choose a reason for hiding this comment

Uh oh!

JohnTitor Jan 20, 2024

Choose a reason for hiding this comment

Uh oh!

tgross35 commented Aug 29, 2024

Uh oh!

tgross35 commented Aug 29, 2024

Uh oh!

devnexen commented Aug 29, 2024

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

tgross35 Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

devnexen commented Nov 16, 2024

Uh oh!

tgross35 Nov 19, 2024

Choose a reason for hiding this comment

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

devnexen commented Dec 9, 2023 •

edited

Loading