Attachment #186198 for bug #219715

Lines 369-375 Int VG_(fstat) ( Int fd, struct vg_stat* vgbuf ) Link Here

(-)b/coregrind/m_libcfile.c (-1 / +1 lines)
369	# if defined(VGO_linux) \|\| defined(VGO_darwin) \|\| defined(VGO_freebsd)	369	# if defined(VGO_linux) \|\| defined(VGO_darwin) \|\| defined(VGO_freebsd)
370	/* First try with fstat64. If that doesn't work out, fall back to	370	/* First try with fstat64. If that doesn't work out, fall back to
371	the vanilla version. */	371	the vanilla version. */
372	# if defined(__NR_fstat64)	372	# if defined(__NR_fstat64) && 0
373	{ struct vki_stat64 buf64;	373	{ struct vki_stat64 buf64;
374	res = VG_(do_syscall2)(__NR_fstat64, (UWord)fd, (UWord)&buf64);	374	res = VG_(do_syscall2)(__NR_fstat64, (UWord)fd, (UWord)&buf64);
375	if (!(sr_isError(res) && sr_Err(res) == VKI_ENOSYS)) {	375	if (!(sr_isError(res) && sr_Err(res) == VKI_ENOSYS)) {




DECL_TEMPLATE(freebsd, sys_seteuid);
DECL_TEMPLATE(freebsd, sys_stat);
DECL_TEMPLATE(freebsd, sys_fstat);
DECL_TEMPLATE(freebsd, sys_fstat64);
DECL_TEMPLATE(freebsd, sys_lstat);
DECL_TEMPLATE(freebsd, sys_pathconf);
DECL_TEMPLATE(freebsd, sys_fpathconf);
DECL_TEMPLATE(freebsd, sys_getdirentries);
DECL_TEMPLATE(freebsd, sys_getdirentries64);
DECL_TEMPLATE(freebsd, sys_mmap);
DECL_TEMPLATE(freebsd, sys___syscall);
DECL_TEMPLATE(freebsd, sys_lseek);

DECL_TEMPLATE(freebsd, sys_sendfile);
DECL_TEMPLATE(freebsd, sys_statfs6);
DECL_TEMPLATE(freebsd, sys_fstatfs6);
DECL_TEMPLATE(freebsd, sys_fstatfs64);
DECL_TEMPLATE(freebsd, sys_fhstatfs6);
DECL_TEMPLATE(freebsd, sys_thr_exit);
DECL_TEMPLATE(freebsd, sys_thr_self);

DECL_TEMPLATE(freebsd, sys_fchownat);
DECL_TEMPLATE(freebsd, sys_fexecve);
DECL_TEMPLATE(freebsd, sys_fstatat);
DECL_TEMPLATE(freebsd, sys_fstatat64);
DECL_TEMPLATE(freebsd, sys_futimesat);
DECL_TEMPLATE(freebsd, sys_linkat);
DECL_TEMPLATE(freebsd, sys_mkdirat);

Lines 885-890 POST(sys_fstat) Link Here

(-)b/coregrind/m_syswrap/syswrap-freebsd.c (+65 lines)
885	POST_MEM_WRITE( ARG2, sizeof(struct vki_stat) );	885	POST_MEM_WRITE( ARG2, sizeof(struct vki_stat) );
886	}	886	}
887		887
		888	PRE(sys_fstat64)
		889	{
		890	PRINT("sys_fstat64 ( %ld, %#lx )", ARG1, ARG2);
		891	PRE_REG_READ2(long, "fstat", unsigned long, fd, struct stat32 *, buf);
		892	PRE_MEM_WRITE( "fstat(buf)", ARG2, sizeof(struct vki_stat64) );
		893	}
		894
		895	POST(sys_fstat64)
		896	{
		897	POST_MEM_WRITE( ARG2, sizeof(struct vki_stat64) );
		898	}
		899
888	PRE(sys_pathconf)	900	PRE(sys_pathconf)
889	{	901	{
890	PRINT("sys_pathconf ( %#lx(%s), %ld )",ARG1,(char *)ARG1,ARG2);	902	PRINT("sys_pathconf ( %#lx(%s), %ld )",ARG1,(char *)ARG1,ARG2);
Lines 1029-1034 POST(sys_getdirentries) Link Here
1029	}	1041	}
1030	}	1042	}
1031		1043
		1044	PRE(sys_getdirentries64)
		1045	{
		1046	*flags \|= SfMayBlock;
		1047	PRINT("sys_getdents ( %ld, %#lx, %ld )", ARG1,ARG2,ARG3);
		1048	PRE_REG_READ3(vki_ssize_t, "getdirentries",
		1049	unsigned int, fd, struct dirent *, dirp,
		1050	vki_size_t, count);
		1051	PRE_MEM_WRITE( "getdirentries(dirp)", ARG2, ARG3 );
		1052	}
		1053
		1054	POST(sys_getdirentries64)
		1055	{
		1056	vg_assert(SUCCESS);
		1057	if (RES > 0) {
		1058	POST_MEM_WRITE( ARG2, RES );
		1059	if ( ARG4 != 0 )
		1060	POST_MEM_WRITE( ARG4, sizeof (vki_off_t));
		1061	}
		1062	}
		1063
1032	PRE(sys_seteuid)	1064	PRE(sys_seteuid)
1033	{	1065	{
1034	PRINT("sys_seteuid ( %ld )", ARG1);	1066	PRINT("sys_seteuid ( %ld )", ARG1);
Lines 1251-1256 POST(sys_fstatfs6) Link Here
1251	POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs6) );	1283	POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs6) );
1252	}	1284	}
1253		1285
		1286	PRE(sys_fstatfs64)
		1287	{
		1288	PRINT("sys_fstatfs64 ( %ld, %#lx )", ARG1, ARG2);
		1289	PRE_REG_READ2(long, "fstatfs6",
		1290	unsigned int, fd, struct statfs *, buf);
		1291	PRE_MEM_WRITE( "fstatfs6(buf)", ARG2, sizeof(struct vki_statfs64) );
		1292	}
		1293
		1294	POST(sys_fstatfs64)
		1295	{
		1296	POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs64) );
		1297	}
		1298
1254	PRE(sys_statfs6)	1299	PRE(sys_statfs6)
1255	{	1300	{
1256	PRINT("sys_statfs6 ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2);	1301	PRINT("sys_statfs6 ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2);
Lines 3132-3137 POST(sys_fstatat) Link Here
3132	POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) );	3177	POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) );
3133	}	3178	}
3134		3179
		3180	PRE(sys_fstatat64)
		3181	{
		3182	PRINT("sys_fstatat ( %ld, %#lx(%s), %#lx )", ARG1,ARG2,(char*)ARG2,ARG3);
		3183	PRE_REG_READ3(long, "fstatat",
		3184	int, dfd, char , file_name, struct stat , buf);
		3185	PRE_MEM_RASCIIZ( "fstatat(file_name)", ARG2 );
		3186	PRE_MEM_WRITE( "fstatat(buf)", ARG3, sizeof(struct vki_stat) );
		3187	}
		3188
		3189	POST(sys_fstatat64)
		3190	{
		3191	POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) );
		3192	}
		3193
3135	PRE(sys_unlinkat)	3194	PRE(sys_unlinkat)
3136	{	3195	{
3137	*flags \|= SfMayBlock;	3196	*flags \|= SfMayBlock;
Lines 4427-4432 const SyscallTableEntry ML_(syscall_table)[] = { Link Here
4427	BSDXY(__NR_accept4, sys_accept4), //541	4486	BSDXY(__NR_accept4, sys_accept4), //541
4428	BSDXY(__NR_pipe2, sys_pipe2), // 542	4487	BSDXY(__NR_pipe2, sys_pipe2), // 542
4429		4488
		4489	// ino64
		4490	BSDXY(__NR_fstat64, sys_fstat64), // 551
		4491	BSDXY(__NR_fstatat64, sys_fstatat64), // 552
		4492	BSDXY(__NR_getdirentries64, sys_getdirentries64), // 554
		4493	GENXY(__NR_fstatfs64, sys_fstatfs), // 556
		4494
4430	BSDX_(__NR_fake_sigreturn, sys_fake_sigreturn), // 1000, fake sigreturn	4495	BSDX_(__NR_fake_sigreturn, sys_fake_sigreturn), // 1000, fake sigreturn
4431		4496
4432	};	4497	};




	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
};

struct vki_stat64 {
	vki_uint64_t	st_dev;
	vki_uint64_t	st_ino;
	vki_mode_t	st_mode;
	vki_uint64_t	st_nlink;
	vki_uid_t	st_uid;
	vki_gid_t	st_gid;
	vki_uint64_t	st_rdev;
#if 0
	struct vki_timespec	st_atimespec;
	struct vki_timespec	st_mtimespec;
	struct vki_timespec	st_ctimespec;
#else
	vki_time_t	st_atime;
	long		st_atime_nsec;
	vki_time_t	st_mtime;
	long		st_mtime_nsec;
	vki_time_t	st_ctime;
	long		st_ctime_nsec;
#endif
	vki_off_t	st_size;
	vki_blkcnt_t	st_blocks;
	vki_blksize_t	st_blksize;
	vki_fflags_t	st_flags;
	vki_uint32_t	st_gen;
	vki_int32_t	st_lspare;
	struct vki_timespec	st_birthtimespec;
	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
};

//----------------------------------------------------------------------
// From linux-2.6.8.1/include/linux/sched.h

	char		f_mntonname[VKI_MNAMELEN];
};

struct vki_statfs64 {
	vki_uint32_t	f_version;
	vki_uint32_t	f_type;
	vki_uint64_t	f_flags;
	vki_uint64_t	f_bsize;
	vki_uint64_t	f_iosize;
	vki_uint64_t	f_blocks;
	vki_uint64_t	f_bfree;
	vki_int64_t	f_bavail;
	vki_uint64_t	f_files;
	vki_int64_t	f_ffree;
	vki_uint64_t	f_syncwrites;
	vki_uint64_t	f_asyncwrites;
	vki_uint64_t	f_syncreads;
	vki_uint64_t	f_asyncreads;
	vki_uint64_t	f_spare[10];
	vki_uint32_t	f_namemax;
	vki_uid_t	f_owner;
	vki_fsid_t	f_fsid;
	char		f_charspare[80];
	char		f_fstypename[VKI_MFSNAMELEN];
	char		f_mntfromnname[VKI_MNAMELEN];
	char		f_mntonname[VKI_MNAMELEN];
};
#define MAXFIDSZ        16

struct vki_fid {

Lines 412-417 Link Here

(-)b/include/vki/vki-scnums-freebsd.h (-1 / +4 lines)
412	#define __NR_shmctl 512	412	#define __NR_shmctl 512
413	#define __NR_accept4 541	413	#define __NR_accept4 541
414	#define __NR_pipe2 542	414	#define __NR_pipe2 542
		415	#define __NR_fstat64 551
		416	#define __NR_fstatat64 552
		417	#define __NR_getdirentries64 554
		418	#define __NR_fstatfs64 556
415		419
416	#define __NR_fake_sigreturn 1000	420	#define __NR_fake_sigreturn 1000
417		421
418	-

Return to bug 219715

Lines 97-106 DECL_TEMPLATE(freebsd, sys_setegid); Link Here

(-)b/coregrind/m_syswrap/priv_syswrap-freebsd.h (+4 lines)
97	DECL_TEMPLATE(freebsd, sys_seteuid);	97	DECL_TEMPLATE(freebsd, sys_seteuid);
98	DECL_TEMPLATE(freebsd, sys_stat);	98	DECL_TEMPLATE(freebsd, sys_stat);
99	DECL_TEMPLATE(freebsd, sys_fstat);	99	DECL_TEMPLATE(freebsd, sys_fstat);
		100	DECL_TEMPLATE(freebsd, sys_fstat64);
100	DECL_TEMPLATE(freebsd, sys_lstat);	101	DECL_TEMPLATE(freebsd, sys_lstat);
101	DECL_TEMPLATE(freebsd, sys_pathconf);	102	DECL_TEMPLATE(freebsd, sys_pathconf);
102	DECL_TEMPLATE(freebsd, sys_fpathconf);	103	DECL_TEMPLATE(freebsd, sys_fpathconf);
103	DECL_TEMPLATE(freebsd, sys_getdirentries);	104	DECL_TEMPLATE(freebsd, sys_getdirentries);
		105	DECL_TEMPLATE(freebsd, sys_getdirentries64);
104	DECL_TEMPLATE(freebsd, sys_mmap);	106	DECL_TEMPLATE(freebsd, sys_mmap);
105	DECL_TEMPLATE(freebsd, sys___syscall);	107	DECL_TEMPLATE(freebsd, sys___syscall);
106	DECL_TEMPLATE(freebsd, sys_lseek);	108	DECL_TEMPLATE(freebsd, sys_lseek);
Lines 208-213 DECL_TEMPLATE(freebsd, sys_kevent); Link Here
208	DECL_TEMPLATE(freebsd, sys_sendfile);	210	DECL_TEMPLATE(freebsd, sys_sendfile);
209	DECL_TEMPLATE(freebsd, sys_statfs6);	211	DECL_TEMPLATE(freebsd, sys_statfs6);
210	DECL_TEMPLATE(freebsd, sys_fstatfs6);	212	DECL_TEMPLATE(freebsd, sys_fstatfs6);
		213	DECL_TEMPLATE(freebsd, sys_fstatfs64);
211	DECL_TEMPLATE(freebsd, sys_fhstatfs6);	214	DECL_TEMPLATE(freebsd, sys_fhstatfs6);
212	DECL_TEMPLATE(freebsd, sys_thr_exit);	215	DECL_TEMPLATE(freebsd, sys_thr_exit);
213	DECL_TEMPLATE(freebsd, sys_thr_self);	216	DECL_TEMPLATE(freebsd, sys_thr_self);
Lines 251-256 DECL_TEMPLATE(freebsd, sys_fchmodat); Link Here
251	DECL_TEMPLATE(freebsd, sys_fchownat);	254	DECL_TEMPLATE(freebsd, sys_fchownat);
252	DECL_TEMPLATE(freebsd, sys_fexecve);	255	DECL_TEMPLATE(freebsd, sys_fexecve);
253	DECL_TEMPLATE(freebsd, sys_fstatat);	256	DECL_TEMPLATE(freebsd, sys_fstatat);
		257	DECL_TEMPLATE(freebsd, sys_fstatat64);
254	DECL_TEMPLATE(freebsd, sys_futimesat);	258	DECL_TEMPLATE(freebsd, sys_futimesat);
255	DECL_TEMPLATE(freebsd, sys_linkat);	259	DECL_TEMPLATE(freebsd, sys_linkat);
256	DECL_TEMPLATE(freebsd, sys_mkdirat);	260	DECL_TEMPLATE(freebsd, sys_mkdirat);

Lines 367-372 struct vki_stat { Link Here

(-)b/include/vki/vki-freebsd.h (+54 lines)
367	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));	367	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
368	};	368	};
369		369
		370	struct vki_stat64 {
		371	vki_uint64_t st_dev;
		372	vki_uint64_t st_ino;
		373	vki_mode_t st_mode;
		374	vki_uint64_t st_nlink;
		375	vki_uid_t st_uid;
		376	vki_gid_t st_gid;
		377	vki_uint64_t st_rdev;
		378	#if 0
		379	struct vki_timespec st_atimespec;
		380	struct vki_timespec st_mtimespec;
		381	struct vki_timespec st_ctimespec;
		382	#else
		383	vki_time_t st_atime;
		384	long st_atime_nsec;
		385	vki_time_t st_mtime;
		386	long st_mtime_nsec;
		387	vki_time_t st_ctime;
		388	long st_ctime_nsec;
		389	#endif
		390	vki_off_t st_size;
		391	vki_blkcnt_t st_blocks;
		392	vki_blksize_t st_blksize;
		393	vki_fflags_t st_flags;
		394	vki_uint32_t st_gen;
		395	vki_int32_t st_lspare;
		396	struct vki_timespec st_birthtimespec;
		397	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
		398	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
		399	};
370		400
371	//----------------------------------------------------------------------	401	//----------------------------------------------------------------------
372	// From linux-2.6.8.1/include/linux/sched.h	402	// From linux-2.6.8.1/include/linux/sched.h
Lines 941-946 struct vki_statfs { Link Here
941	char f_mntonname[VKI_MNAMELEN];	971	char f_mntonname[VKI_MNAMELEN];
942	};	972	};
943		973
		974	struct vki_statfs64 {
		975	vki_uint32_t f_version;
		976	vki_uint32_t f_type;
		977	vki_uint64_t f_flags;
		978	vki_uint64_t f_bsize;
		979	vki_uint64_t f_iosize;
		980	vki_uint64_t f_blocks;
		981	vki_uint64_t f_bfree;
		982	vki_int64_t f_bavail;
		983	vki_uint64_t f_files;
		984	vki_int64_t f_ffree;
		985	vki_uint64_t f_syncwrites;
		986	vki_uint64_t f_asyncwrites;
		987	vki_uint64_t f_syncreads;
		988	vki_uint64_t f_asyncreads;
		989	vki_uint64_t f_spare[10];
		990	vki_uint32_t f_namemax;
		991	vki_uid_t f_owner;
		992	vki_fsid_t f_fsid;
		993	char f_charspare[80];
		994	char f_fstypename[VKI_MFSNAMELEN];
		995	char f_mntfromnname[VKI_MNAMELEN];
		996	char f_mntonname[VKI_MNAMELEN];
		997	};
944	#define MAXFIDSZ 16	998	#define MAXFIDSZ 16
945		999
946	struct vki_fid {	1000	struct vki_fid {