X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=instrumentation%2Fsyscalls%2Fheaders%2Farm-32-syscalls-3.4.25_integers_override.h;h=e6b52878b67f6708abe78a8505172fed6d7a86c2;hb=9143c6d5444e809b9d411c07a8dae94c151668ae;hp=f0e031acaff1ef89ba45059f345aa184fe613aad;hpb=e0976e2bafb3e060f1c2f1282f99144c7f63e380;p=deliverable%2Flttng-modules.git

diff --git a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
index f0e031ac..e6b52878 100644
--- a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
+++ b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
@@ -1,29 +1,127 @@
+#ifndef CONFIG_UID16
 
+#define OVERRIDE_32_getuid16
+#define OVERRIDE_32_getgid16
+#define OVERRIDE_32_geteuid16
+#define OVERRIDE_32_getegid16
+#define OVERRIDE_32_setuid16
+#define OVERRIDE_32_setgid16
+#define OVERRIDE_32_setfsuid16
+#define OVERRIDE_32_setfsgid16
+#define OVERRIDE_32_setreuid16
+#define OVERRIDE_32_setregid16
+#define OVERRIDE_32_fchown16
+#define OVERRIDE_32_setresuid16
+#define OVERRIDE_32_setresgid16
 
-#define OVERRIDE_TABLE_32_arm_fadvise64_64
-#define OVERRIDE_TABLE_32_sync_file_range2
+#define OVERRIDE_TABLE_32_getuid16
+#define OVERRIDE_TABLE_32_getgid16
+#define OVERRIDE_TABLE_32_geteuid16
+#define OVERRIDE_TABLE_32_getegid16
+#define OVERRIDE_TABLE_32_setuid16
+#define OVERRIDE_TABLE_32_setgid16
+#define OVERRIDE_TABLE_32_setreuid16
+#define OVERRIDE_TABLE_32_setregid16
+#define OVERRIDE_TABLE_32_fchown16
+#define OVERRIDE_TABLE_32_setfsuid16
+#define OVERRIDE_TABLE_32_setfsgid16
+#define OVERRIDE_TABLE_32_setresuid16
+#define OVERRIDE_TABLE_32_setresgid16
+
+#endif
 
 #ifndef CREATE_SYSCALL_TABLE
 
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+
+#define OVERRIDE_32_arm_fadvise64_64
+SC_LTTNG_TRACEPOINT_EVENT(arm_fadvise64_64,
+	TP_PROTO(sc_exit(long ret,) int fd, int advice,
+		int32_t offset_low, int32_t offset_high,
+		int32_t len_low, int32_t len_high),
+	TP_ARGS(sc_exit(ret,) fd, advice, offset_low, offset_high,
+		len_low, len_high),
+	TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+		sc_in(ctf_integer(int, fd, fd))
+		sc_in(ctf_integer(int, advice, advice))
+		sc_in(ctf_integer(loff_t, offset,
+			((loff_t) offset_high << 32) | offset_low))
+		sc_in(ctf_integer(loff_t, len,
+			((loff_t) len_high << 32) | len_low))
+	)
+)
+
+#define OVERRIDE_32_sync_file_range2
+SC_LTTNG_TRACEPOINT_EVENT(sync_file_range2,
+	TP_PROTO(sc_exit(long ret,) int fd,
+		unsigned int flags,
+		int32_t offset_low, int32_t offset_high,
+		int32_t nbytes_low, int32_t nbytes_high),
+	TP_ARGS(sc_exit(ret,) fd, flags, offset_low, offset_high,
+		nbytes_low, nbytes_high),
+	TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+		sc_in(ctf_integer(int, fd, fd))
+		sc_in(ctf_integer(unsigned int, flags, flags))
+		sc_in(ctf_integer(loff_t, offset,
+			((loff_t) offset_high << 32) | offset_low))
+		sc_in(ctf_integer(loff_t, nbytes,
+			((loff_t) nbytes_high << 32) | nbytes_low))
+	)
+)
+
+#else	/* __BIG_ENDIAN */
+
+#define OVERRIDE_32_arm_fadvise64_64
 SC_LTTNG_TRACEPOINT_EVENT(arm_fadvise64_64,
-	TP_PROTO(int fd, int advice, loff_t offset, loff_t len),
-	TP_ARGS(fd, advice, offset, len),
-	TP_FIELDS(
-		ctf_integer_hex(int, fd, fd)
-		ctf_integer_hex(int, advice, advice)
-		ctf_integer_hex(loff_t, offset, offset)
-		ctf_integer_hex(loff_t, len, len)
+	TP_PROTO(sc_exit(long ret,) int fd, int advice,
+		int32_t offset_high, int32_t offset_low,
+		int32_t len_high, int32_t len_low),
+	TP_ARGS(sc_exit(ret,) fd, advice, offset_high, offset_low,
+		len_high, len_low),
+	TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+		sc_in(ctf_integer(int, fd, fd))
+		sc_in(ctf_integer(int, advice, advice))
+		sc_in(ctf_integer(loff_t, offset,
+			((loff_t) offset_high << 32) | offset_low))
+		sc_in(ctf_integer(loff_t, len,
+			((loff_t) len_high << 32) | len_low))
 	)
 )
 
+#define OVERRIDE_32_sync_file_range2
 SC_LTTNG_TRACEPOINT_EVENT(sync_file_range2,
-	TP_PROTO(int fd, loff_t offset, loff_t nbytes, unsigned int flags),
-	TP_ARGS(fd, offset, nbytes, flags),
-	TP_FIELDS(
-		ctf_integer_hex(int, fd, fd)
-		ctf_integer_hex(loff_t, offset, offset)
-		ctf_integer_hex(loff_t, nbytes, nbytes)
-		ctf_integer_hex(unsigned int, flags), flags)
+	TP_PROTO(sc_exit(long ret,) int fd,
+		unsigned int flags,
+		int32_t offset_high, int32_t offset_low,
+		int32_t nbytes_high, int32_t nbytes_low),
+	TP_ARGS(sc_exit(ret,) fd, flags, offset_high, offset_low,
+		nbytes_high, nbytes_low),
+	TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+		sc_in(ctf_integer(int, fd, fd))
+		sc_in(ctf_integer(unsigned int, flags, flags))
+		sc_in(ctf_integer(loff_t, offset,
+			((loff_t) offset_high << 32) | offset_low))
+		sc_in(ctf_integer(loff_t, nbytes,
+			((loff_t) nbytes_high << 32) | nbytes_low))
+	)
+)
+
+#endif
+
+#define OVERRIDE_32_mmap2
+SC_LTTNG_TRACEPOINT_EVENT(mmap2,
+	TP_PROTO(sc_exit(unsigned long ret,)
+		unsigned long addr, unsigned long len,
+		unsigned long prot, unsigned long flags,
+		unsigned long fd, unsigned long pgoff),
+	TP_ARGS(sc_exit(ret,) addr, len, prot, flags, fd, pgoff),
+	TP_FIELDS(sc_exit(ctf_integer_hex(unsigned long, ret, ret))
+		sc_in(ctf_integer_hex(unsigned long, addr, addr))
+		sc_in(ctf_integer(size_t, len, len))
+		sc_in(ctf_integer(int, prot, prot))
+		sc_in(ctf_integer(int, flags, flags))
+		sc_in(ctf_integer(int, fd, fd))
+		sc_in(ctf_integer(off_t, pgoff, pgoff))
 	)
 )
 
@@ -31,11 +129,12 @@ SC_LTTNG_TRACEPOINT_EVENT(sync_file_range2,
 
 #define OVERRIDE_TABLE_32_mmap
 TRACE_SYSCALL_TABLE(mmap, mmap, 90, 6)
-
+#define OVERRIDE_TABLE_32_mmap2
+TRACE_SYSCALL_TABLE(mmap2, mmap2, 192, 6)
 #define OVERRIDE_TABLE_32_arm_fadvise64_64
-TRACE_SYSCALL_TABLE(arm_fadvise64_64, arm_fadvise64_64, 270, 4)
+TRACE_SYSCALL_TABLE(arm_fadvise64_64, arm_fadvise64_64, 270, 6)
 #define OVERRIDE_TABLE_32_sync_file_range2
-TRACE_SYSCALL_TABLE(sync_file_range2, sync_file_range2, 341, 4)
+TRACE_SYSCALL_TABLE(sync_file_range2, sync_file_range2, 341, 6)
 
 #endif /* CREATE_SYSCALL_TABLE */