Attachment #200925 for bug #234759

Lines 4-10 Link Here

(-)Makefile (-1 / +1 lines)
4	PORTNAME= valgrind	4	PORTNAME= valgrind
5	PORTVERSION= 3.10.1.20160113	5	PORTVERSION= 3.10.1.20160113
6	DISTVERSIONPREFIX= freebsd-	6	DISTVERSIONPREFIX= freebsd-
7	PORTREVISION= 6	7	PORTREVISION= 7
8	PORTEPOCH= 1	8	PORTEPOCH= 1
9	CATEGORIES= devel	9	CATEGORIES= devel
10	MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \	10	MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \





---
 coregrind/m_syswrap/priv_syswrap-freebsd.h |  4 ++
 coregrind/m_syswrap/syswrap-freebsd.c      | 65 ++++++++++++++++++++++
 include/vki/vki-freebsd.h                  | 54 ++++++++++++++++++
 include/vki/vki-scnums-freebsd.h           |  4 ++
 4 files changed, 127 insertions(+)

diff --git a/coregrind/m_syswrap/priv_syswrap-freebsd.h b/coregrind/m_syswrap/priv_syswrap-freebsd.h
index 63d122f..715ad48 100644

+PRE(sys_fstat64)
+{
+   PRINT("sys_fstat64 ( %ld, %#lx )", ARG1, ARG2);
+   PRE_REG_READ2(long, "fstat", unsigned long, fd, struct stat64 *, buf);
+   PRE_MEM_WRITE( "fstat(buf)", ARG2, sizeof(struct vki_stat64) );
+}
+

 
 };
diff --git a/include/vki/vki-freebsd.h b/include/vki/vki-freebsd.h
index aee453e..318a207 100644
--- a/include/vki/vki-freebsd.h
+++ b/include/vki/vki-freebsd.h
@@ -367,6 +367,36 @@ struct vki_stat {
 	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
 };
 

+	vki_time_t	st_ctime;
+	long		st_ctime_nsec;
+#endif
+	struct vki_timespec	st_birthtim;
+	vki_off_t	st_size;
+	vki_blkcnt_t	st_blocks;
+	vki_blksize_t	st_blksize;

+	vki_fflags_t	st_flags;
+	vki_uint64_t	st_gen;
+	vki_int64_t	st_spare[10];
+//	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
@@ -941,6 +971,30 @@ struct vki_statfs {
 	char		f_mntonname[VKI_MNAMELEN];
 };
 

Line 0 Link Here

(-)files/patch-coregrind-m_debuglog.c (+13 lines)
	1	--- coregrind/m_debuglog.c.orig 2019-01-08 21:35:12.953178000 +0400
	2	+++ coregrind/m_debuglog.c 2019-01-08 21:36:10.940827000 +0400
	3	@@ -482,8 +482,8 @@
	4	"popq %%r15\n" /* restore r15 */
	5	"addq $256, %%rsp\n" /* restore stack ptr */
	6	: /wr/
	7	- : /rd/ "g" (block)
	8	- : /trash/ "rax", "rdi", "rsi", "rdx", "memory", "cc"
	9	+ : /rd/ "r" (block)
	10	+ : /trash/ "rax", "rdi", "rsi", "rdx", "memory", "cc", "rcx", "r11"
	11	);
	12	if (block[0] < 0)
	13	block[0] = -1;

Return to bug 234759

Lines 5-14 Link Here

(-)files/extra-patch-ino64 (-10 / +8 lines)
5		5
6	---	6	---
7	coregrind/m_syswrap/priv_syswrap-freebsd.h \| 4 ++	7	coregrind/m_syswrap/priv_syswrap-freebsd.h \| 4 ++
8	coregrind/m_syswrap/syswrap-freebsd.c \| 65 ++++++++++++++++++++++++++++++	8	coregrind/m_syswrap/syswrap-freebsd.c \| 65 ++++++++++++++++++++++
9	include/vki/vki-freebsd.h \| 56 +++++++++++++++++++++++++	9	include/vki/vki-freebsd.h \| 54 ++++++++++++++++++
10	include/vki/vki-scnums-freebsd.h \| 4 ++	10	include/vki/vki-scnums-freebsd.h \| 4 ++
11	4 files changed, 129 insertions(+)	11	4 files changed, 127 insertions(+)
12		12
13	diff --git a/coregrind/m_syswrap/priv_syswrap-freebsd.h b/coregrind/m_syswrap/priv_syswrap-freebsd.h	13	diff --git a/coregrind/m_syswrap/priv_syswrap-freebsd.h b/coregrind/m_syswrap/priv_syswrap-freebsd.h
14	index 63d122f..715ad48 100644	14	index 63d122f..715ad48 100644
Lines 54-60 Link Here
54	+PRE(sys_fstat64)	54	+PRE(sys_fstat64)
55	+{	55	+{
56	+ PRINT("sys_fstat64 ( %ld, %#lx )", ARG1, ARG2);	56	+ PRINT("sys_fstat64 ( %ld, %#lx )", ARG1, ARG2);
57	+ PRE_REG_READ2(long, "fstat", unsigned long, fd, struct stat *, buf);	57	+ PRE_REG_READ2(long, "fstat", unsigned long, fd, struct stat64 *, buf);
58	+ PRE_MEM_WRITE( "fstat(buf)", ARG2, sizeof(struct vki_stat64) );	58	+ PRE_MEM_WRITE( "fstat(buf)", ARG2, sizeof(struct vki_stat64) );
59	+}	59	+}
60	+	60	+
Lines 148-157 Link Here
148		148
149	};	149	};
150	diff --git a/include/vki/vki-freebsd.h b/include/vki/vki-freebsd.h	150	diff --git a/include/vki/vki-freebsd.h b/include/vki/vki-freebsd.h
151	index aee453e..f20833a 100644	151	index aee453e..318a207 100644
152	--- a/include/vki/vki-freebsd.h	152	--- a/include/vki/vki-freebsd.h
153	+++ b/include/vki/vki-freebsd.h	153	+++ b/include/vki/vki-freebsd.h
154	@@ -367,6 +367,38 @@ struct vki_stat {	154	@@ -367,6 +367,36 @@ struct vki_stat {
155	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));	155	unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
156	};	156	};
157		157
Lines 177-182 Link Here
177	+ vki_time_t st_ctime;	177	+ vki_time_t st_ctime;
178	+ long st_ctime_nsec;	178	+ long st_ctime_nsec;
179	+#endif	179	+#endif
		180	+ struct vki_timespec st_birthtim;
180	+ vki_off_t st_size;	181	+ vki_off_t st_size;
181	+ vki_blkcnt_t st_blocks;	182	+ vki_blkcnt_t st_blocks;
182	+ vki_blksize_t st_blksize;	183	+ vki_blksize_t st_blksize;
Lines 183-196 Link Here
183	+ vki_fflags_t st_flags;	184	+ vki_fflags_t st_flags;
184	+ vki_uint64_t st_gen;	185	+ vki_uint64_t st_gen;
185	+ vki_int64_t st_spare[10];	186	+ vki_int64_t st_spare[10];
186	+// struct vki_timespec st_birthtimespec;
187	+// unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
188	+// unsigned int :(8 / 2) * (16 - (int)sizeof(struct vki_timespec));
189	+};	187	+};
190		188
191	//----------------------------------------------------------------------	189	//----------------------------------------------------------------------
192	// From linux-2.6.8.1/include/linux/sched.h	190	// From linux-2.6.8.1/include/linux/sched.h
193	@@ -941,6 +973,30 @@ struct vki_statfs {	191	@@ -941,6 +971,30 @@ struct vki_statfs {
194	char f_mntonname[VKI_MNAMELEN];	192	char f_mntonname[VKI_MNAMELEN];
195	};	193	};
196		194