|
From: <sv...@va...> - 2008-09-13 10:43:12
|
Author: sewardj
Date: 2008-09-13 11:43:20 +0100 (Sat, 13 Sep 2008)
New Revision: 8610
Log:
Track change in type of VG_(set_syscall_return_shadows) committed in
r8609.
Modified:
branches/PTRCHECK/exp-ptrcheck/h_main.c
Modified: branches/PTRCHECK/exp-ptrcheck/h_main.c
===================================================================
--- branches/PTRCHECK/exp-ptrcheck/h_main.c 2008-09-13 03:00:43 UTC (rev 8609)
+++ branches/PTRCHECK/exp-ptrcheck/h_main.c 2008-09-13 10:43:20 UTC (rev 8610)
@@ -2247,7 +2247,10 @@
case __NR_wait4:
case __NR_write:
case __NR_writev:
- VG_(set_syscall_return_shadows)( tid, (UWord)NONPTR, 0 );
+ VG_(set_syscall_return_shadows)(
+ tid, /* retval */ (UWord)NONPTR, 0,
+ /* error */ (UWord)NONPTR, 0
+ );
break;
# if defined(__NR_arch_prctl)
@@ -2258,14 +2261,20 @@
syscall completes. */
post_reg_write_nonptr_or_unknown( tid, PC_OFF_FS_ZERO,
PC_SZB_FS_ZERO );
- VG_(set_syscall_return_shadows)( tid, (UWord)NONPTR, 0 );
+ VG_(set_syscall_return_shadows)(
+ tid, /* retval */ (UWord)NONPTR, 0,
+ /* error */ (UWord)NONPTR, 0
+ );
}
# endif
// With brk(), result (of kernel syscall, not glibc wrapper) is a heap
// pointer. Make the shadow UNKNOWN.
case __NR_brk:
- VG_(set_syscall_return_shadows)( tid, (UWord)UNKNOWN, 0 );
+ VG_(set_syscall_return_shadows)(
+ tid, /* retval */ (UWord)UNKNOWN, 0,
+ /* error */ (UWord)NONPTR, 0
+ );
break;
// With mmap, new_mem_mmap() has already been called and added the
@@ -2277,10 +2286,12 @@
# endif
if (res.isError) {
// mmap() had an error, return value is a small negative integer
- VG_(set_syscall_return_shadows)( tid, (UWord)NONPTR, 0 );
+ VG_(set_syscall_return_shadows)( tid, /*val*/ (UWord)NONPTR, 0,
+ /*err*/ (UWord)NONPTR, 0 );
if (0) VG_(printf)("ZZZZZZZ mmap res -> NONPTR\n");
} else {
- VG_(set_syscall_return_shadows)( tid, (UWord)UNKNOWN, 0 );
+ VG_(set_syscall_return_shadows)( tid, /*val*/ (UWord)UNKNOWN, 0,
+ /*err*/ (UWord)NONPTR, 0 );
if (0) VG_(printf)("ZZZZZZZ mmap res -> UNKNOWN\n");
}
break;
@@ -2290,10 +2301,12 @@
# if defined(__NR_shmat)
case __NR_shmat:
if (res.isError) {
- VG_(set_syscall_return_shadows)( tid, (UWord)NONPTR, 0 );
+ VG_(set_syscall_return_shadows)( tid, /*val*/ (UWord)NONPTR, 0,
+ /*err*/ (UWord)NONPTR, 0 );
if (0) VG_(printf)("ZZZZZZZ shmat res -> NONPTR\n");
} else {
- VG_(set_syscall_return_shadows)( tid, (UWord)UNKNOWN, 0 );
+ VG_(set_syscall_return_shadows)( tid, /*val*/ (UWord)UNKNOWN, 0,
+ /*err*/ (UWord)NONPTR, 0 );
if (0) VG_(printf)("ZZZZZZZ shmat res -> UNKNOWN\n");
}
break;
@@ -2302,7 +2315,8 @@
# if defined(__NR_shmget)
case __NR_shmget:
// FIXME: is this correct?
- VG_(set_syscall_return_shadows)( tid, (UWord)UNKNOWN, 0 );
+ VG_(set_syscall_return_shadows)( tid, /*val*/ (UWord)UNKNOWN, 0,
+ /*err*/ (UWord)NONPTR, 0 );
break;
# endif
|