Skip to content

Commit 1e755f9

Browse files
borsbors
committed
Auto merge of #3467 - devnexen:netbsd_context_update, r=JohnTitor
netbsd arm* registers and reorder per architecture.
2 parents 497ac42 + 70e2e5e commit 1e755f9

File tree

6 files changed

+226
-27
lines changed

6 files changed

+226
-27
lines changed

‎libc-test/semver/netbsd-aarch64.txt‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,60 @@
1+
_REG_CPSR
2+
_REG_ELR
3+
_REG_FP
4+
_REG_LR
5+
_REG_PC
6+
_REG_R0
7+
_REG_R1
8+
_REG_R10
9+
_REG_R11
10+
_REG_R12
11+
_REG_R13
12+
_REG_R14
13+
_REG_R15
14+
_REG_R2
15+
_REG_R3
16+
_REG_R4
17+
_REG_R5
18+
_REG_R6
19+
_REG_R7
20+
_REG_R8
21+
_REG_R9
22+
_REG_RV
23+
_REG_SP
24+
_REG_SPSR
25+
_REG_TIPDR
26+
_REG_X0
27+
_REG_X1
28+
_REG_X2
29+
_REG_X3
30+
_REG_X4
31+
_REG_X5
32+
_REG_X6
33+
_REG_X7
34+
_REG_X8
35+
_REG_X9
36+
_REG_X10
37+
_REG_X11
38+
_REG_X12
39+
_REG_X13
40+
_REG_X14
41+
_REG_X15
42+
_REG_X16
43+
_REG_X17
44+
_REG_X18
45+
_REG_X19
46+
_REG_X20
47+
_REG_X21
48+
_REG_X22
49+
_REG_X23
50+
_REG_X24
51+
_REG_X25
52+
_REG_X26
53+
_REG_X27
54+
_REG_X28
55+
_REG_X29
56+
_REG_X30
57+
_REG_X31
158
PT_GETFPREGS
259
PT_GETREGS
360
PT_SETFPREGS

‎libc-test/semver/netbsd-x86_64.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
Aux64Info
2+
_REG_DS
3+
_REG_ERR
4+
_REG_ES
5+
_REG_FS
6+
_REG_GS
7+
_REG_R10
8+
_REG_R11
9+
_REG_R12
10+
_REG_R13
11+
_REG_R14
12+
_REG_R15
13+
_REG_R8
14+
_REG_R9
15+
_REG_RAX
16+
_REG_RBP
17+
_REG_RBX
18+
_REG_RCX
19+
_REG_RDI
20+
_REG_RFLAGS
21+
_REG_RIP
22+
_REG_RSI
23+
_REG_RSP
24+
_REG_SS
25+
_REG_TRAPNO
226
PT_GETFPREGS
327
PT_GETREGS
428
PT_SETFPREGS

‎src/unix/bsd/netbsdlike/netbsd/aarch64.rs‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,62 @@ pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
101101
pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
102102
pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;
103103
pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 3;
104+
105+
pub const _REG_R0: ::c_int = 0;
106+
pub const _REG_R1: ::c_int = 1;
107+
pub const _REG_R2: ::c_int = 2;
108+
pub const _REG_R3: ::c_int = 3;
109+
pub const _REG_R4: ::c_int = 4;
110+
pub const _REG_R5: ::c_int = 5;
111+
pub const _REG_R6: ::c_int = 6;
112+
pub const _REG_R7: ::c_int = 7;
113+
pub const _REG_R8: ::c_int = 8;
114+
pub const _REG_R9: ::c_int = 9;
115+
pub const _REG_R10: ::c_int = 10;
116+
pub const _REG_R11: ::c_int = 11;
117+
pub const _REG_R12: ::c_int = 12;
118+
pub const _REG_R13: ::c_int = 13;
119+
pub const _REG_R14: ::c_int = 14;
120+
pub const _REG_R15: ::c_int = 15;
121+
pub const _REG_CPSR: ::c_int = 16;
122+
pub const _REG_X0: ::c_int = 0;
123+
pub const _REG_X1: ::c_int = 1;
124+
pub const _REG_X2: ::c_int = 2;
125+
pub const _REG_X3: ::c_int = 3;
126+
pub const _REG_X4: ::c_int = 4;
127+
pub const _REG_X5: ::c_int = 5;
128+
pub const _REG_X6: ::c_int = 6;
129+
pub const _REG_X7: ::c_int = 7;
130+
pub const _REG_X8: ::c_int = 8;
131+
pub const _REG_X9: ::c_int = 9;
132+
pub const _REG_X10: ::c_int = 10;
133+
pub const _REG_X11: ::c_int = 11;
134+
pub const _REG_X12: ::c_int = 12;
135+
pub const _REG_X13: ::c_int = 13;
136+
pub const _REG_X14: ::c_int = 14;
137+
pub const _REG_X15: ::c_int = 15;
138+
pub const _REG_X16: ::c_int = 16;
139+
pub const _REG_X17: ::c_int = 17;
140+
pub const _REG_X18: ::c_int = 18;
141+
pub const _REG_X19: ::c_int = 19;
142+
pub const _REG_X20: ::c_int = 20;
143+
pub const _REG_X21: ::c_int = 21;
144+
pub const _REG_X22: ::c_int = 22;
145+
pub const _REG_X23: ::c_int = 23;
146+
pub const _REG_X24: ::c_int = 24;
147+
pub const _REG_X25: ::c_int = 25;
148+
pub const _REG_X26: ::c_int = 26;
149+
pub const _REG_X27: ::c_int = 27;
150+
pub const _REG_X28: ::c_int = 28;
151+
pub const _REG_X29: ::c_int = 29;
152+
pub const _REG_X30: ::c_int = 30;
153+
pub const _REG_X31: ::c_int = 31;
154+
pub const _REG_ELR: ::c_int = 32;
155+
pub const _REG_SPSR: ::c_int = 33;
156+
pub const _REG_TIPDR: ::c_int = 34;
157+
158+
pub const _REG_RV: ::c_int = _REG_X0;
159+
pub const _REG_FP: ::c_int = _REG_X29;
160+
pub const _REG_LR: ::c_int = _REG_X30;
161+
pub const _REG_SP: ::c_int = _REG_X31;
162+
pub const _REG_PC: ::c_int = _REG_ELR;

‎src/unix/bsd/netbsdlike/netbsd/arm.rs‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,62 @@ pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
2020
pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;
2121
pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 3;
2222
pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 4;
23+
24+
pub const _REG_R0: ::c_int = 0;
25+
pub const _REG_R1: ::c_int = 1;
26+
pub const _REG_R2: ::c_int = 2;
27+
pub const _REG_R3: ::c_int = 3;
28+
pub const _REG_R4: ::c_int = 4;
29+
pub const _REG_R5: ::c_int = 5;
30+
pub const _REG_R6: ::c_int = 6;
31+
pub const _REG_R7: ::c_int = 7;
32+
pub const _REG_R8: ::c_int = 8;
33+
pub const _REG_R9: ::c_int = 9;
34+
pub const _REG_R10: ::c_int = 10;
35+
pub const _REG_R11: ::c_int = 11;
36+
pub const _REG_R12: ::c_int = 12;
37+
pub const _REG_R13: ::c_int = 13;
38+
pub const _REG_R14: ::c_int = 14;
39+
pub const _REG_R15: ::c_int = 15;
40+
pub const _REG_CPSR: ::c_int = 16;
41+
pub const _REG_X0: ::c_int = 0;
42+
pub const _REG_X1: ::c_int = 1;
43+
pub const _REG_X2: ::c_int = 2;
44+
pub const _REG_X3: ::c_int = 3;
45+
pub const _REG_X4: ::c_int = 4;
46+
pub const _REG_X5: ::c_int = 5;
47+
pub const _REG_X6: ::c_int = 6;
48+
pub const _REG_X7: ::c_int = 7;
49+
pub const _REG_X8: ::c_int = 8;
50+
pub const _REG_X9: ::c_int = 9;
51+
pub const _REG_X10: ::c_int = 10;
52+
pub const _REG_X11: ::c_int = 11;
53+
pub const _REG_X12: ::c_int = 12;
54+
pub const _REG_X13: ::c_int = 13;
55+
pub const _REG_X14: ::c_int = 14;
56+
pub const _REG_X15: ::c_int = 15;
57+
pub const _REG_X16: ::c_int = 16;
58+
pub const _REG_X17: ::c_int = 17;
59+
pub const _REG_X18: ::c_int = 18;
60+
pub const _REG_X19: ::c_int = 19;
61+
pub const _REG_X20: ::c_int = 20;
62+
pub const _REG_X21: ::c_int = 21;
63+
pub const _REG_X22: ::c_int = 22;
64+
pub const _REG_X23: ::c_int = 23;
65+
pub const _REG_X24: ::c_int = 24;
66+
pub const _REG_X25: ::c_int = 25;
67+
pub const _REG_X26: ::c_int = 26;
68+
pub const _REG_X27: ::c_int = 27;
69+
pub const _REG_X28: ::c_int = 28;
70+
pub const _REG_X29: ::c_int = 29;
71+
pub const _REG_X30: ::c_int = 30;
72+
pub const _REG_X31: ::c_int = 31;
73+
pub const _REG_ELR: ::c_int = 32;
74+
pub const _REG_SPSR: ::c_int = 33;
75+
pub const _REG_TIPDR: ::c_int = 34;
76+
77+
pub const _REG_RV: ::c_int = _REG_R0;
78+
pub const _REG_FP: ::c_int = _REG_R11;
79+
pub const _REG_LR: ::c_int = _REG_R13;
80+
pub const _REG_SP: ::c_int = _REG_R14;
81+
pub const _REG_PC: ::c_int = _REG_R15;

‎src/unix/bsd/netbsdlike/netbsd/mod.rs‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,33 +2396,6 @@ pub const LSZOMB: ::c_int = 5;
23962396
pub const LSONPROC: ::c_int = 7;
23972397
pub const LSSUSPENDED: ::c_int = 8;
23982398

2399-
pub const _REG_RDI: ::c_int = 0;
2400-
pub const _REG_RSI: ::c_int = 1;
2401-
pub const _REG_RDX: ::c_int = 2;
2402-
pub const _REG_RCX: ::c_int = 3;
2403-
pub const _REG_R8: ::c_int = 4;
2404-
pub const _REG_R9: ::c_int = 5;
2405-
pub const _REG_R10: ::c_int = 6;
2406-
pub const _REG_R11: ::c_int = 7;
2407-
pub const _REG_R12: ::c_int = 8;
2408-
pub const _REG_R13: ::c_int = 9;
2409-
pub const _REG_R14: ::c_int = 10;
2410-
pub const _REG_R15: ::c_int = 11;
2411-
pub const _REG_RBP: ::c_int = 12;
2412-
pub const _REG_RBX: ::c_int = 13;
2413-
pub const _REG_RAX: ::c_int = 14;
2414-
pub const _REG_GS: ::c_int = 15;
2415-
pub const _REG_FS: ::c_int = 16;
2416-
pub const _REG_ES: ::c_int = 17;
2417-
pub const _REG_DS: ::c_int = 18;
2418-
pub const _REG_TRAPNO: ::c_int = 19;
2419-
pub const _REG_ERR: ::c_int = 20;
2420-
pub const _REG_RIP: ::c_int = 21;
2421-
pub const _REG_CS: ::c_int = 22;
2422-
pub const _REG_RFLAGS: ::c_int = 23;
2423-
pub const _REG_RSP: ::c_int = 24;
2424-
pub const _REG_SS: ::c_int = 25;
2425-
24262399
// sys/xattr.h
24272400
pub const XATTR_CREATE: ::c_int = 0x01;
24282401
pub const XATTR_REPLACE: ::c_int = 0x02;

‎src/unix/bsd/netbsdlike/netbsd/x86_64.rs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,30 @@ pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
3838
pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;
3939
pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 3;
4040
pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 4;
41+
42+
pub const _REG_RDI: ::c_int = 0;
43+
pub const _REG_RSI: ::c_int = 1;
44+
pub const _REG_RDX: ::c_int = 2;
45+
pub const _REG_RCX: ::c_int = 3;
46+
pub const _REG_R8: ::c_int = 4;
47+
pub const _REG_R9: ::c_int = 5;
48+
pub const _REG_R10: ::c_int = 6;
49+
pub const _REG_R11: ::c_int = 7;
50+
pub const _REG_R12: ::c_int = 8;
51+
pub const _REG_R13: ::c_int = 9;
52+
pub const _REG_R14: ::c_int = 10;
53+
pub const _REG_R15: ::c_int = 11;
54+
pub const _REG_RBP: ::c_int = 12;
55+
pub const _REG_RBX: ::c_int = 13;
56+
pub const _REG_RAX: ::c_int = 14;
57+
pub const _REG_GS: ::c_int = 15;
58+
pub const _REG_FS: ::c_int = 16;
59+
pub const _REG_ES: ::c_int = 17;
60+
pub const _REG_DS: ::c_int = 18;
61+
pub const _REG_TRAPNO: ::c_int = 19;
62+
pub const _REG_ERR: ::c_int = 20;
63+
pub const _REG_RIP: ::c_int = 21;
64+
pub const _REG_CS: ::c_int = 22;
65+
pub const _REG_RFLAGS: ::c_int = 23;
66+
pub const _REG_RSP: ::c_int = 24;
67+
pub const _REG_SS: ::c_int = 25;

0 commit comments

Comments
 (0)