Line 0
Link Here
|
|
|
1 |
--- coregrind/m_syswrap/syswrap-freebsd.c.orig 2016-01-13 22:20:20.000000000 +0300 |
2 |
+++ coregrind/m_syswrap/syswrap-freebsd.c 2019-03-17 13:06:51.977414000 +0300 |
3 |
@@ -868,6 +868,18 @@ |
4 |
POST_MEM_WRITE( ARG2, sizeof(struct vki_stat) ); |
5 |
} |
6 |
|
7 |
+PRE(sys_fstat64) |
8 |
+{ |
9 |
+ PRINT("sys_fstat64 ( %ld, %#lx )", ARG1, ARG2); |
10 |
+ PRE_REG_READ2(long, "fstat", unsigned long, fd, struct stat *, buf); |
11 |
+ PRE_MEM_WRITE( "fstat(buf)", ARG2, sizeof(struct vki_stat64) ); |
12 |
+} |
13 |
+ |
14 |
+POST(sys_fstat64) |
15 |
+{ |
16 |
+ POST_MEM_WRITE( ARG2, sizeof(struct vki_stat64) ); |
17 |
+} |
18 |
+ |
19 |
PRE(sys_pathconf) |
20 |
{ |
21 |
PRINT("sys_pathconf ( %#lx(%s), %ld )",ARG1,(char *)ARG1,ARG2); |
22 |
@@ -1012,6 +1024,26 @@ |
23 |
} |
24 |
} |
25 |
|
26 |
+PRE(sys_getdirentries64) |
27 |
+{ |
28 |
+ *flags |= SfMayBlock; |
29 |
+ PRINT("sys_getdents ( %ld, %#lx, %ld )", ARG1,ARG2,ARG3); |
30 |
+ PRE_REG_READ3(vki_ssize_t, "getdirentries", |
31 |
+ unsigned int, fd, struct dirent *, dirp, |
32 |
+ vki_size_t, count); |
33 |
+ PRE_MEM_WRITE( "getdirentries(dirp)", ARG2, ARG3 ); |
34 |
+} |
35 |
+ |
36 |
+POST(sys_getdirentries64) |
37 |
+{ |
38 |
+ vg_assert(SUCCESS); |
39 |
+ if (RES > 0) { |
40 |
+ POST_MEM_WRITE( ARG2, RES ); |
41 |
+ if ( ARG4 != 0 ) |
42 |
+ POST_MEM_WRITE( ARG4, sizeof (vki_off_t)); |
43 |
+ } |
44 |
+} |
45 |
+ |
46 |
PRE(sys_seteuid) |
47 |
{ |
48 |
PRINT("sys_seteuid ( %ld )", ARG1); |
49 |
@@ -1070,6 +1102,44 @@ |
50 |
} |
51 |
} |
52 |
|
53 |
+PRE(sys_kevent11) |
54 |
+{ |
55 |
+ /* struct freebsd11_kevent { |
56 |
+ uintptr_t ident; -- identifier for this event |
57 |
+ short filter; -- filter for event |
58 |
+ u_short flags; -- action flags for kqueue |
59 |
+ u_int fflags; -- filter flag value |
60 |
+ intptr_t data; -- filter data value |
61 |
+ void *udata; -- opaque user data identifier |
62 |
+ }; |
63 |
+ int kevent(int kq, const struct kevent *changelist, int nchanges, |
64 |
+ struct kevent *eventlist, int nevents, |
65 |
+ const struct timespec *timeout); |
66 |
+ */ |
67 |
+ *flags |= SfMayBlock; |
68 |
+ PRINT("sys_kevent11 ( %ld, %#lx, %ld, %#lx, %ld, %#lx )\n", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6); |
69 |
+ PRE_REG_READ6(long, "kevent11", |
70 |
+ int, fd, struct vki_kevent11 *, newev, int, num_newev, |
71 |
+ struct vki_kevent11 *, ret_ev, int, num_retev, |
72 |
+ struct timespec *, timeout); |
73 |
+ if (ARG2 != 0 && ARG3 != 0) |
74 |
+ PRE_MEM_READ( "kevent(changeevent)", ARG2, sizeof(struct vki_kevent11)*ARG3 ); |
75 |
+ if (ARG4 != 0 && ARG5 != 0) |
76 |
+ PRE_MEM_WRITE( "kevent(events)", ARG4, sizeof(struct vki_kevent11)*ARG5); |
77 |
+ if (ARG6 != 0) |
78 |
+ PRE_MEM_READ( "kevent(timeout)", |
79 |
+ ARG6, sizeof(struct vki_timespec)); |
80 |
+} |
81 |
+ |
82 |
+POST(sys_kevent11) |
83 |
+{ |
84 |
+ vg_assert(SUCCESS); |
85 |
+ if (RES > 0) { |
86 |
+ if (ARG4 != 0) |
87 |
+ POST_MEM_WRITE( ARG4, sizeof(struct vki_kevent11)*RES) ; |
88 |
+ } |
89 |
+} |
90 |
+ |
91 |
PRE(sys_kevent) |
92 |
{ |
93 |
/* struct kevent { |
94 |
@@ -1077,8 +1147,9 @@ |
95 |
short filter; -- filter for event |
96 |
u_short flags; -- action flags for kqueue |
97 |
u_int fflags; -- filter flag value |
98 |
- intptr_t data; -- filter data value |
99 |
+ int64_t data; -- filter data value |
100 |
void *udata; -- opaque user data identifier |
101 |
+ uint64_t ext[4]; -- extensions |
102 |
}; |
103 |
int kevent(int kq, const struct kevent *changelist, int nchanges, |
104 |
struct kevent *eventlist, int nevents, |
105 |
@@ -1108,6 +1179,7 @@ |
106 |
} |
107 |
} |
108 |
|
109 |
+ |
110 |
PRE(sys___getcwd) |
111 |
{ |
112 |
PRINT("sys___getcwd ( %#lx, %lu )", ARG1,ARG2); |
113 |
@@ -1143,6 +1215,20 @@ |
114 |
} |
115 |
} |
116 |
|
117 |
+PRE(sys_getfsstat11) |
118 |
+{ |
119 |
+ PRINT("sys_getfsstat11 ( %#lx, %ld, %ld )",ARG1,ARG2,ARG3); |
120 |
+ PRE_REG_READ3(long, "getfsstat11", struct vki_statfs11 *, buf, long, len, int, flags); |
121 |
+ PRE_MEM_WRITE( "getfsstat11(buf)", ARG1, ARG2 ); |
122 |
+} |
123 |
+POST(sys_getfsstat11) |
124 |
+{ |
125 |
+ vg_assert(SUCCESS); |
126 |
+ if (RES > 0) { |
127 |
+ POST_MEM_WRITE( ARG1, RES * sizeof(struct vki_statfs11) ); |
128 |
+ } |
129 |
+} |
130 |
+ |
131 |
PRE(sys_getfsstat) |
132 |
{ |
133 |
PRINT("sys_getfsstat ( %#lx, %ld, %ld )",ARG1,ARG2,ARG3); |
134 |
@@ -1234,6 +1320,19 @@ |
135 |
POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs6) ); |
136 |
} |
137 |
|
138 |
+PRE(sys_fstatfs64) |
139 |
+{ |
140 |
+ PRINT("sys_fstatfs64 ( %ld, %#lx )", ARG1, ARG2); |
141 |
+ PRE_REG_READ2(long, "fstatfs6", |
142 |
+ unsigned int, fd, struct statfs *, buf); |
143 |
+ PRE_MEM_WRITE( "fstatfs6(buf)", ARG2, sizeof(struct vki_statfs6) ); |
144 |
+} |
145 |
+ |
146 |
+POST(sys_fstatfs64) |
147 |
+{ |
148 |
+ POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs6) ); |
149 |
+} |
150 |
+ |
151 |
PRE(sys_statfs6) |
152 |
{ |
153 |
PRINT("sys_statfs6 ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2); |
154 |
@@ -1246,7 +1345,19 @@ |
155 |
POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs6) ); |
156 |
} |
157 |
|
158 |
+PRE(sys_statfs11) |
159 |
+{ |
160 |
+ PRINT("sys_statfs11 ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2); |
161 |
+ PRE_REG_READ2(long, "statfs11", const char *, path, struct statfs *, buf); |
162 |
+ PRE_MEM_RASCIIZ( "statfs11(path)", ARG1 ); |
163 |
+ PRE_MEM_WRITE( "statfs11(buf)", ARG2, sizeof(struct vki_statfs11) ); |
164 |
+} |
165 |
+POST(sys_statfs11) |
166 |
+{ |
167 |
+ POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs11) ); |
168 |
+} |
169 |
|
170 |
+ |
171 |
#if 0 |
172 |
/* --------------------------------------------------------------------- |
173 |
aio_* wrappers |
174 |
@@ -1774,6 +1885,20 @@ |
175 |
miscellaneous wrappers |
176 |
------------------------------------------------------------------ */ |
177 |
|
178 |
+PRE(sys_minherit) |
179 |
+{ |
180 |
+ PRINT("minherit ( %#lx, %lu, %ld )" , ARG1, ARG2, ARG3); |
181 |
+ PRE_REG_READ3(long, "minherit", |
182 |
+ void *, addr, vki_size_t, len, int, inherit); |
183 |
+ if (ARG2 != 0) |
184 |
+ PRE_MEM_WRITE( "minherit(addr)", ARG1,ARG2 ); |
185 |
+} |
186 |
+POST(sys_minherit) |
187 |
+{ |
188 |
+ if (ARG2 != 0) |
189 |
+ POST_MEM_WRITE( ARG1, ARG2 ); |
190 |
+} |
191 |
+ |
192 |
PRE(sys_munlockall) |
193 |
{ |
194 |
*flags |= SfMayBlock; |
195 |
@@ -2474,6 +2599,24 @@ |
196 |
POST_MEM_WRITE( ARG2, sizeof(vki_siginfo_t) ); |
197 |
} |
198 |
|
199 |
+PRE(sys_sigwait) |
200 |
+{ |
201 |
+ *flags |= SfMayBlock; |
202 |
+ PRINT("sys_sigwait ( %#lx, %#lx )", |
203 |
+ ARG1,ARG2); |
204 |
+ PRE_REG_READ2(long, "sigwait", |
205 |
+ const vki_sigset_t *, set, int *, sig); |
206 |
+ if (ARG1 != 0) |
207 |
+ PRE_MEM_READ( "sigwait(set)", ARG1, sizeof(vki_sigset_t)); |
208 |
+ if (ARG2 != 0) |
209 |
+ PRE_MEM_WRITE( "sigwait(sig)", ARG2, sizeof(int*)); |
210 |
+} |
211 |
+POST(sys_sigwait) |
212 |
+{ |
213 |
+ if (ARG2 != 0) |
214 |
+ POST_MEM_WRITE( ARG2, sizeof(int*)); |
215 |
+} |
216 |
+ |
217 |
#if 0 /* not on freebsd 4.x */ |
218 |
PRE(sys_rt_sigqueueinfo) |
219 |
{ |
220 |
@@ -3069,6 +3212,20 @@ |
221 |
POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) ); |
222 |
} |
223 |
|
224 |
+PRE(sys_fstatat64) |
225 |
+{ |
226 |
+ PRINT("sys_fstatat ( %ld, %#lx(%s), %#lx )", ARG1,ARG2,(char*)ARG2,ARG3); |
227 |
+ PRE_REG_READ3(long, "fstatat", |
228 |
+ int, dfd, char *, file_name, struct stat *, buf); |
229 |
+ PRE_MEM_RASCIIZ( "fstatat(file_name)", ARG2 ); |
230 |
+ PRE_MEM_WRITE( "fstatat(buf)", ARG3, sizeof(struct vki_stat) ); |
231 |
+} |
232 |
+ |
233 |
+POST(sys_fstatat64) |
234 |
+{ |
235 |
+ POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) ); |
236 |
+} |
237 |
+ |
238 |
PRE(sys_unlinkat) |
239 |
{ |
240 |
*flags |= SfMayBlock; |
241 |
@@ -3374,7 +3531,7 @@ |
242 |
unsigned int, fd, unsigned int, request, unsigned long, arg); |
243 |
|
244 |
/* On FreeBSD, ALL ioctl's are IOR/IOW encoded. Just use the default decoder */ |
245 |
- if (VG_(strstr)(VG_(clo_sim_hints), "lax-ioctls") != NULL) { |
246 |
+ if (SimHintiS(SimHint_lax_ioctls, VG_(clo_sim_hints))) { |
247 |
/* |
248 |
* Be very lax about ioctl handling; the only |
249 |
* assumption is that the size is correct. Doesn't |
250 |
@@ -3655,7 +3812,7 @@ |
251 |
PRE(sys_cpuset_getaffinity) |
252 |
{ |
253 |
|
254 |
- PRINT("sys_cpuset_getaffinity ( %ld, %ld, %lld, %llu, %#lx )", ARG1, ARG2, |
255 |
+ PRINT("sys_cpuset_getaffinity ( %ld, %ld, %ld, %lu, %#lx )", ARG1, ARG2, |
256 |
ARG3, ARG4, ARG5); |
257 |
PRE_REG_READ5(int, "cpuset_getaffinity", |
258 |
int, level, int, which, long, id, |
259 |
@@ -3670,6 +3827,19 @@ |
260 |
POST_MEM_WRITE( ARG5, ARG4 ); |
261 |
} |
262 |
|
263 |
+PRE(sys_getrandom) |
264 |
+{ |
265 |
+ PRINT("sys_getrandom ( %#lx, %ld, %ld )" , ARG1,ARG2,ARG3); |
266 |
+ PRE_REG_READ3(ssize_t, "getrandom", |
267 |
+ void *, buf, size_t, buflen, unsigned int, flags); |
268 |
+ PRE_MEM_WRITE( "getrandom(cpu)", ARG1, ARG2 ); |
269 |
+} |
270 |
+ |
271 |
+POST(sys_getrandom) |
272 |
+{ |
273 |
+ POST_MEM_WRITE( ARG1, ARG2 ); |
274 |
+} |
275 |
+ |
276 |
#undef PRE |
277 |
#undef POST |
278 |
|
279 |
@@ -3870,7 +4040,7 @@ |
280 |
// BSDXY(__NR_nfssvc, sys_nfssvc), // 155 |
281 |
|
282 |
// 4.3 getdirentries 156 |
283 |
- GENXY(__NR_statfs, sys_statfs), // 157 |
284 |
+ BSDXY(__NR_statfs11, sys_statfs11), // 157 |
285 |
GENXY(__NR_fstatfs, sys_fstatfs), // 158 |
286 |
// nosys 159 |
287 |
|
288 |
@@ -3986,7 +4156,7 @@ |
289 |
|
290 |
// BSDXY(__NR_ntp_gettime, sys_ntp_gettime), // 248 |
291 |
// nosys 249 |
292 |
-// BSDXY(__NR_minherit, sys_minherit), // 250 |
293 |
+ BSDXY(__NR_minherit, sys_minherit), // 250 |
294 |
BSDX_(__NR_rfork, sys_rfork), // 251 |
295 |
|
296 |
GENXY(__NR_openbsd_poll, sys_poll), // 252 |
297 |
@@ -4127,7 +4297,7 @@ |
298 |
BSDXY(__NR_getresuid, sys_getresuid), // 360 |
299 |
BSDXY(__NR_getresgid, sys_getresgid), // 361 |
300 |
BSDX_(__NR_kqueue, sys_kqueue), // 362 |
301 |
- BSDXY(__NR_kevent, sys_kevent), // 363 |
302 |
+ BSDXY(__NR_kevent11, sys_kevent11), // 363 |
303 |
|
304 |
// nosys 364 |
305 |
// nosys 365 |
306 |
@@ -4167,7 +4337,7 @@ |
307 |
BSDXY(__NR_uuidgen, sys_uuidgen), // 392 |
308 |
BSDXY(__NR_sendfile, sys_sendfile), // 393 |
309 |
// mac_syscall 394 |
310 |
- BSDXY(__NR_getfsstat, sys_getfsstat), // 395 |
311 |
+ BSDXY(__NR_getfsstat11, sys_getfsstat11), // 395 |
312 |
|
313 |
BSDXY(__NR_statfs6, sys_statfs6), // 396 |
314 |
BSDXY(__NR_fstatfs6, sys_fstatfs6), // 397 |
315 |
@@ -4210,7 +4380,7 @@ |
316 |
BSDX_(__NR___acl_delete_link, sys___acl_delete_link), // 427 |
317 |
|
318 |
BSDX_(__NR___acl_aclcheck_link, sys___acl_aclcheck_link), // 428 |
319 |
- //!sigwait 429 |
320 |
+ BSDXY(__NR_sigwait, sys_sigwait), // 429 |
321 |
// thr_create 430 |
322 |
BSDX_(__NR_thr_exit, sys_thr_exit), // 431 |
323 |
|
324 |
@@ -4309,6 +4479,17 @@ |
325 |
BSDXY(__NR_shmctl, sys_shmctl), // 512 |
326 |
|
327 |
BSDXY(__NR_pipe2, sys_pipe2), // 542 |
328 |
+ |
329 |
+ // ino64 |
330 |
+ BSDXY(__NR_fstat64, sys_fstat64), // 551 |
331 |
+ BSDXY(__NR_fstatat64, sys_fstatat64), // 552 |
332 |
+ BSDXY(__NR_getdirentries64, sys_getdirentries64), // 554 |
333 |
+ GENXY(__NR_statfs, sys_statfs), // 555 |
334 |
+ GENXY(__NR_fstatfs64, sys_fstatfs), // 556 |
335 |
+ BSDXY(__NR_getfsstat, sys_getfsstat), // 557 |
336 |
+ |
337 |
+ BSDXY(__NR_kevent, sys_kevent), // 560 |
338 |
+ BSDXY(__NR_getrandom, sys_getrandom), // 563 |
339 |
|
340 |
BSDX_(__NR_fake_sigreturn, sys_fake_sigreturn), // 1000, fake sigreturn |
341 |
|