|
Line 0
Link Here
|
|
|
1 |
--- coregrind/m_syswrap/syswrap-freebsd.c.orig 2016-01-13 15:20:20.000000000 -0400 |
| 2 |
+++ coregrind/m_syswrap/syswrap-freebsd.c 2019-01-02 08:27:17.409960000 -0400 |
| 3 |
@@ -868,6 +868,18 @@ POST(sys_fstat) |
| 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 @@ POST(sys_getdirentries) |
| 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 @@ POST(sys_kqueue) |
| 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 @@ PRE(sys_kevent) |
| 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 @@ POST(sys_kevent) |
| 106 |
} |
| 107 |
} |
| 108 |
|
| 109 |
+ |
| 110 |
PRE(sys___getcwd) |
| 111 |
{ |
| 112 |
PRINT("sys___getcwd ( %#lx, %lu )", ARG1,ARG2); |
| 113 |
@@ -1234,6 +1306,19 @@ POST(sys_fstatfs6) |
| 114 |
POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs6) ); |
| 115 |
} |
| 116 |
|
| 117 |
+PRE(sys_fstatfs64) |
| 118 |
+{ |
| 119 |
+ PRINT("sys_fstatfs64 ( %ld, %#lx )", ARG1, ARG2); |
| 120 |
+ PRE_REG_READ2(long, "fstatfs6", |
| 121 |
+ unsigned int, fd, struct statfs *, buf); |
| 122 |
+ PRE_MEM_WRITE( "fstatfs6(buf)", ARG2, sizeof(struct vki_statfs6) ); |
| 123 |
+} |
| 124 |
+ |
| 125 |
+POST(sys_fstatfs64) |
| 126 |
+{ |
| 127 |
+ POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs6) ); |
| 128 |
+} |
| 129 |
+ |
| 130 |
PRE(sys_statfs6) |
| 131 |
{ |
| 132 |
PRINT("sys_statfs6 ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2); |
| 133 |
@@ -1774,6 +1859,20 @@ POST(sys_sched_getaffinity) |
| 134 |
miscellaneous wrappers |
| 135 |
------------------------------------------------------------------ */ |
| 136 |
|
| 137 |
+PRE(sys_minherit) |
| 138 |
+{ |
| 139 |
+ PRINT("minherit ( %#lx, %lu, %ld )" , ARG1, ARG2, ARG3); |
| 140 |
+ PRE_REG_READ3(long, "minherit", |
| 141 |
+ void *, addr, vki_size_t, len, int, inherit); |
| 142 |
+ if (ARG2 != 0) |
| 143 |
+ PRE_MEM_WRITE( "minherit(addr)", ARG1,ARG2 ); |
| 144 |
+} |
| 145 |
+POST(sys_minherit) |
| 146 |
+{ |
| 147 |
+ if (ARG2 != 0) |
| 148 |
+ POST_MEM_WRITE( ARG1, ARG2 ); |
| 149 |
+} |
| 150 |
+ |
| 151 |
PRE(sys_munlockall) |
| 152 |
{ |
| 153 |
*flags |= SfMayBlock; |
| 154 |
@@ -3069,6 +3168,20 @@ POST(sys_fstatat) |
| 155 |
POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) ); |
| 156 |
} |
| 157 |
|
| 158 |
+PRE(sys_fstatat64) |
| 159 |
+{ |
| 160 |
+ PRINT("sys_fstatat ( %ld, %#lx(%s), %#lx )", ARG1,ARG2,(char*)ARG2,ARG3); |
| 161 |
+ PRE_REG_READ3(long, "fstatat", |
| 162 |
+ int, dfd, char *, file_name, struct stat *, buf); |
| 163 |
+ PRE_MEM_RASCIIZ( "fstatat(file_name)", ARG2 ); |
| 164 |
+ PRE_MEM_WRITE( "fstatat(buf)", ARG3, sizeof(struct vki_stat) ); |
| 165 |
+} |
| 166 |
+ |
| 167 |
+POST(sys_fstatat64) |
| 168 |
+{ |
| 169 |
+ POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) ); |
| 170 |
+} |
| 171 |
+ |
| 172 |
PRE(sys_unlinkat) |
| 173 |
{ |
| 174 |
*flags |= SfMayBlock; |
| 175 |
@@ -3374,7 +3487,7 @@ PRE(sys_ioctl) |
| 176 |
unsigned int, fd, unsigned int, request, unsigned long, arg); |
| 177 |
|
| 178 |
/* On FreeBSD, ALL ioctl's are IOR/IOW encoded. Just use the default decoder */ |
| 179 |
- if (VG_(strstr)(VG_(clo_sim_hints), "lax-ioctls") != NULL) { |
| 180 |
+ if (SimHintiS(SimHint_lax_ioctls, VG_(clo_sim_hints))) { |
| 181 |
/* |
| 182 |
* Be very lax about ioctl handling; the only |
| 183 |
* assumption is that the size is correct. Doesn't |
| 184 |
@@ -3655,7 +3768,7 @@ PRE(sys_cpuset_setaffinity) |
| 185 |
PRE(sys_cpuset_getaffinity) |
| 186 |
{ |
| 187 |
|
| 188 |
- PRINT("sys_cpuset_getaffinity ( %ld, %ld, %lld, %llu, %#lx )", ARG1, ARG2, |
| 189 |
+ PRINT("sys_cpuset_getaffinity ( %ld, %ld, %ld, %lu, %#lx )", ARG1, ARG2, |
| 190 |
ARG3, ARG4, ARG5); |
| 191 |
PRE_REG_READ5(int, "cpuset_getaffinity", |
| 192 |
int, level, int, which, long, id, |
| 193 |
@@ -3670,6 +3783,19 @@ POST(sys_cpuset_getaffinity) |
| 194 |
POST_MEM_WRITE( ARG5, ARG4 ); |
| 195 |
} |
| 196 |
|
| 197 |
+PRE(sys_getrandom) |
| 198 |
+{ |
| 199 |
+ PRINT("sys_getrandom ( %#lx, %ld, %ld )" , ARG1,ARG2,ARG3); |
| 200 |
+ PRE_REG_READ3(ssize_t, "getrandom", |
| 201 |
+ void *, buf, size_t, buflen, unsigned int, flags); |
| 202 |
+ PRE_MEM_WRITE( "getrandom(cpu)", ARG1, ARG2 ); |
| 203 |
+} |
| 204 |
+ |
| 205 |
+POST(sys_getrandom) |
| 206 |
+{ |
| 207 |
+ POST_MEM_WRITE( ARG1, ARG2 ); |
| 208 |
+} |
| 209 |
+ |
| 210 |
#undef PRE |
| 211 |
#undef POST |
| 212 |
|
| 213 |
@@ -3986,7 +4112,7 @@ const SyscallTableEntry ML_(syscall_table)[] = { |
| 214 |
|
| 215 |
// BSDXY(__NR_ntp_gettime, sys_ntp_gettime), // 248 |
| 216 |
// nosys 249 |
| 217 |
-// BSDXY(__NR_minherit, sys_minherit), // 250 |
| 218 |
+ BSDXY(__NR_minherit, sys_minherit), // 250 |
| 219 |
BSDX_(__NR_rfork, sys_rfork), // 251 |
| 220 |
|
| 221 |
GENXY(__NR_openbsd_poll, sys_poll), // 252 |
| 222 |
@@ -4127,7 +4253,7 @@ const SyscallTableEntry ML_(syscall_table)[] = { |
| 223 |
BSDXY(__NR_getresuid, sys_getresuid), // 360 |
| 224 |
BSDXY(__NR_getresgid, sys_getresgid), // 361 |
| 225 |
BSDX_(__NR_kqueue, sys_kqueue), // 362 |
| 226 |
- BSDXY(__NR_kevent, sys_kevent), // 363 |
| 227 |
+ BSDXY(__NR_kevent11, sys_kevent11), // 363 |
| 228 |
|
| 229 |
// nosys 364 |
| 230 |
// nosys 365 |
| 231 |
@@ -4309,6 +4435,15 @@ const SyscallTableEntry ML_(syscall_table)[] = { |
| 232 |
BSDXY(__NR_shmctl, sys_shmctl), // 512 |
| 233 |
|
| 234 |
BSDXY(__NR_pipe2, sys_pipe2), // 542 |
| 235 |
+ |
| 236 |
+ // ino64 |
| 237 |
+ BSDXY(__NR_fstat64, sys_fstat64), // 551 |
| 238 |
+ BSDXY(__NR_fstatat64, sys_fstatat64), // 552 |
| 239 |
+ BSDXY(__NR_getdirentries64, sys_getdirentries64), // 554 |
| 240 |
+ GENXY(__NR_fstatfs64, sys_fstatfs), // 556 |
| 241 |
+ |
| 242 |
+ BSDXY(__NR_kevent, sys_kevent), // 560 |
| 243 |
+ BSDXY(__NR_getrandom, sys_getrandom), // 563 |
| 244 |
|
| 245 |
BSDX_(__NR_fake_sigreturn, sys_fake_sigreturn), // 1000, fake sigreturn |
| 246 |
|