@@ -37,52 +37,52 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
3737 // File related shims
3838 "readdir64" => {
3939 let [ dirp] =
40- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
40+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
4141 let result = this. linux_readdir64 ( dirp) ?;
4242 this. write_scalar ( result, dest) ?;
4343 }
4444 "sync_file_range" => {
4545 let [ fd, offset, nbytes, flags] =
46- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
46+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
4747 let result = this. sync_file_range ( fd, offset, nbytes, flags) ?;
4848 this. write_scalar ( result, dest) ?;
4949 }
5050 "statx" => {
5151 let [ dirfd, pathname, flags, mask, statxbuf] =
52- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
52+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
5353 let result = this. linux_statx ( dirfd, pathname, flags, mask, statxbuf) ?;
5454 this. write_scalar ( result, dest) ?;
5555 }
5656
5757 // epoll, eventfd
5858 "epoll_create1" => {
5959 let [ flag] =
60- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
60+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
6161 let result = this. epoll_create1 ( flag) ?;
6262 this. write_scalar ( result, dest) ?;
6363 }
6464 "epoll_ctl" => {
6565 let [ epfd, op, fd, event] =
66- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
66+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
6767 let result = this. epoll_ctl ( epfd, op, fd, event) ?;
6868 this. write_scalar ( result, dest) ?;
6969 }
7070 "epoll_wait" => {
7171 let [ epfd, events, maxevents, timeout] =
72- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
72+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
7373 this. epoll_wait ( epfd, events, maxevents, timeout, dest) ?;
7474 }
7575 "eventfd" => {
7676 let [ val, flag] =
77- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
77+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
7878 let result = this. eventfd ( val, flag) ?;
7979 this. write_scalar ( result, dest) ?;
8080 }
8181
8282 // Threading
8383 "pthread_setname_np" => {
8484 let [ thread, name] =
85- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
85+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
8686 let res = match this. pthread_setname_np (
8787 this. read_scalar ( thread) ?,
8888 this. read_scalar ( name) ?,
@@ -98,7 +98,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
9898 }
9999 "pthread_getname_np" => {
100100 let [ thread, name, len] =
101- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
101+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
102102 // The function's behavior isn't portable between platforms.
103103 // In case of glibc, the length of the output buffer must
104104 // be not shorter than TASK_COMM_LEN.
@@ -121,7 +121,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
121121 this. write_scalar ( res, dest) ?;
122122 }
123123 "gettid" => {
124- let [ ] = this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
124+ let [ ] = this. check_shim ( abi, Conv :: C , link_name, args) ?;
125125 let result = this. linux_gettid ( ) ?;
126126 this. write_scalar ( result, dest) ?;
127127 }
@@ -134,29 +134,29 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
134134 // Miscellaneous
135135 "mmap64" => {
136136 let [ addr, length, prot, flags, fd, offset] =
137- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
137+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
138138 let offset = this. read_scalar ( offset) ?. to_i64 ( ) ?;
139139 let ptr = this. mmap ( addr, length, prot, flags, fd, offset. into ( ) ) ?;
140140 this. write_scalar ( ptr, dest) ?;
141141 }
142142 "mremap" => {
143143 let [ old_address, old_size, new_size, flags] =
144- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
144+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
145145 let ptr = this. mremap ( old_address, old_size, new_size, flags) ?;
146146 this. write_scalar ( ptr, dest) ?;
147147 }
148148 "__errno_location" => {
149- let [ ] = this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
149+ let [ ] = this. check_shim ( abi, Conv :: C , link_name, args) ?;
150150 let errno_place = this. last_error_place ( ) ?;
151151 this. write_scalar ( errno_place. to_ref ( this) . to_scalar ( ) , dest) ?;
152152 }
153153 "__libc_current_sigrtmin" => {
154- let [ ] = this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
154+ let [ ] = this. check_shim ( abi, Conv :: C , link_name, args) ?;
155155
156156 this. write_int ( SIGRTMIN , dest) ?;
157157 }
158158 "__libc_current_sigrtmax" => {
159- let [ ] = this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
159+ let [ ] = this. check_shim ( abi, Conv :: C , link_name, args) ?;
160160
161161 this. write_int ( SIGRTMAX , dest) ?;
162162 }
@@ -165,7 +165,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
165165 // These shims are enabled only when the caller is in the standard library.
166166 "pthread_getattr_np" if this. frame_in_std ( ) => {
167167 let [ _thread, _attr] =
168- this. check_shim ( abi, ExternAbi :: C { unwind : false } , link_name, args) ?;
168+ this. check_shim ( abi, Conv :: C , link_name, args) ?;
169169 this. write_null ( dest) ?;
170170 }
171171
0 commit comments