Add placeholders for all new macOS 10.12 syscalls. Related to bz#365327.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16184

diff --git a/coregrind/m_syswrap/priv_syswrap-darwin.h b/coregrind/m_syswrap/priv_syswrap-darwin.h
index 62784e9a9a023d17faa80e0aad7c1301723c1f53..37144276be9fefa262bdb3fc18eb605061aff966 100644 (file)
--- a/coregrind/m_syswrap/priv_syswrap-darwin.h
+++ b/coregrind/m_syswrap/priv_syswrap-darwin.h
@@ -234,7 +234,9 @@ DECL_TEMPLATE(darwin, csops);                   // 169
 // old getdents
 // old gc_control
 // NYI add_profil 176
-// 177
+#if DARWIN_VERS >= DARWIN_10_12
+// NYI kdebug_typefilter                        // 177
+#endif /* DARWIN_VERS >= DARWIN_10_12 */
 // 178
 // 179
 DECL_TEMPLATE(darwin, kdebug_trace);            // 180
@@ -555,7 +557,11 @@ DECL_TEMPLATE(darwin, disconnectx);              // 448
 // NYI coalition_info  // 459
 DECL_TEMPLATE(darwin, necp_match_policy);        // 460
 DECL_TEMPLATE(darwin, getattrlistbulk);          // 461
-// 462
+#endif /* DARWIN_VERS >= DARWIN_10_10 */
+#if DARWIN_VERS >= DARWIN_10_12
+// NYI clonefileat     // 462
+#endif /* DARWIN_VERS >= DARWIN_10_12 */
+#if DARWIN_VERS >= DARWIN_10_10
 // NYI openat          // 463
 // NYI openat_nocancel // 464
 // NYI renameat        // 465
@@ -581,9 +587,33 @@ DECL_TEMPLATE(darwin, guarded_open_dprotected_np);  // 484
 DECL_TEMPLATE(darwin, guarded_write_np);            // 485
 DECL_TEMPLATE(darwin, guarded_pwrite_np);           // 486
 DECL_TEMPLATE(darwin, guarded_writev_np);           // 487
-// NYI rename_ext      // 488
+// NYI renameatx_np                                 // 488
 // NYI mremap_encrypted  // 489
 #endif /* DARWIN_VERS >= DARWIN_10_10 */
+#if DARWIN_VERS >= DARWIN_10_12
+// NYI getentropy                                   // 500
+// NYI necp_open                                    // 501
+// NYI necp_client_action                           // 502
+// 503
+// 504
+// 505
+// 506
+// 507
+// 508
+// 509
+// 510
+// 511
+// 512
+// 513
+// 514
+// NYI ulock_wait                                   // 515
+// NYI ulock_wake                                   // 516
+// NYI fclonefileat                                 // 517
+// NYI fs_snapshot                                  // 518
+// 519
+// NYI terminate_with_payload                       // 520
+// NYI abort_with_payload                           // 521
+#endif /* DARWIN_VERS >= DARWIN_10_12 */
 
 // Mach message helpers
 DECL_TEMPLATE(darwin, mach_port_set_context);

diff --git a/coregrind/m_syswrap/syswrap-darwin.c b/coregrind/m_syswrap/syswrap-darwin.c
index 8dc20bba7abc4e933bfca2d5ca665d88625c9309..729a73bd2c682730e4f11a2a2e9ec0909bc0bc04 100644 (file)
--- a/coregrind/m_syswrap/syswrap-darwin.c
+++ b/coregrind/m_syswrap/syswrap-darwin.c
@@ -10296,9 +10296,35 @@ const SyscallTableEntry ML_(syscall_table)[] = {
    MACX_(__NR_guarded_write_np, guarded_write_np),      // 485
    MACX_(__NR_guarded_pwrite_np, guarded_pwrite_np),    // 486
    MACX_(__NR_guarded_writev_np, guarded_writev_np),    // 487
-// _____(__NR___rename_ext),                            // 488
 // _____(__NR___mremap_encrypted),                      // 489
 #endif
+#if DARWIN_VERS >= DARWIN_10_12
+// _____(__NR_kdebug_typefilter),                       // 177
+// _____(__NR_clonefileat),                             // 462
+// _____(__NR_renameatx_np),                            // 488
+// _____(__NR_getentropy),                              // 500
+// _____(__NR_necp_open),                               // 501
+// _____(__NR_necp_client_action),                      // 502
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(503)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(504)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(505)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(506)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(507)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(508)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(509)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(510)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(511)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(512)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(513)),        // ???
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(514)),        // ???
+// _____(__NR_ulock_wait),                              // 515
+// _____(__NR_ulock_wake),                              // 516
+// _____(__NR_fclonefileat),                            // 517
+// _____(__NR_fs_snapshot),                             // 518
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(519)),        // ???
+// _____(__NR_terminate_with_payload),                  // 520
+// _____(__NR_abort_with_payload),                      // 521
+#endif
 // _____(__NR_MAXSYSCALL)
    MACX_(__NR_DARWIN_FAKE_SIGRETURN, FAKE_SIGRETURN)
 };

diff --git a/include/vki/vki-scnums-darwin.h b/include/vki/vki-scnums-darwin.h
index b775849670a19cb9d63635e32e59fc099d29278b..148be91c4ded2a56ead909a88b398166a3854834 100644 (file)
--- a/include/vki/vki-scnums-darwin.h
+++ b/include/vki/vki-scnums-darwin.h
@@ -391,7 +391,10 @@
                        /* 174  old getdents */
                        /* 175  old gc_control */
 #define        __NR_add_profil     VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(176)
-                       /* 177  */
+
+#if DARWIN_VERS >= DARWIN_10_12
+#define __NR_kdebug_typefilter VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(177)
+#endif /* DARWIN_VERS >= DARWIN_10_12 */
                        /* 178  */
                        /* 179  */
 #define        __NR_kdebug_trace   VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(180)
@@ -732,16 +735,26 @@
 #if DARWIN_VERS >= DARWIN_10_10
 #define __NR_necp_match_policy      VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(460)
 #define __NR_getattrlistbulk        VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(461)
+#endif /* DARWIN_VERS >= DARWIN_10_10 */
+
+#if DARWIN_VERS >= DARWIN_10_12
+#define __NR_clonefileat            VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(462)
+#endif /* DARWIN_VERS >= DARWIN_10_12 */
+
+#if DARWIN_VERS >= DARWIN_10_10
 #define __NR_readlinkat             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(473)
 #define __NR_bsdthread_ctl          VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(478)
 #define __NR_guarded_open_dprotected_np VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(484)
 #define __NR_guarded_write_np       VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(485)
 #define __NR_guarded_pwrite_np      VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(486)
 #define __NR_guarded_writev_np      VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(487)
-                       /* 488  */
-                       /* 489  */
 #endif /* DARWIN_VERS >= DARWIN_10_10 */
 
+#if DARWIN_VERS >= DARWIN_10_12
+#define        __NR_renameatx_np           VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(488)
+#endif /* DARWIN_VERS >= DARWIN_10_12 */
+                       /* 489  */
+
 // TODO Update with OS X 10.11 kernel (xnu) source code release
 #if DARWIN_VERS >= DARWIN_10_11
                        /* 490  */
@@ -756,11 +769,10 @@
                        /* 499  */
 #endif /* DARWIN_VERS >= DARWIN_10_11 */
 
-// TODO Update with macOS 10.12 kernel (xnu) source code release
 #if DARWIN_VERS >= DARWIN_10_12
-                       /* 500  */
-                       /* 501  */
-                       /* 502  */
+#define        __NR_getentropy             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(500)
+#define        __NR_necp_open              VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(501)
+#define        __NR_necp_client_action     VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(502)
                        /* 503  */
                        /* 504  */
                        /* 505  */
@@ -773,13 +785,13 @@
                        /* 512  */
                        /* 513  */
                        /* 514  */
-                       /* 515  */
-                       /* 516  */
-                       /* 517  */
-                       /* 518  */
+#define        __NR_ulock_wait             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(515)
+#define        __NR_ulock_wake             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(516)
+#define        __NR_fclonefileat           VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(517)
+#define        __NR_fs_snapshot            VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(518)
                        /* 519  */
-                       /* 520  */
-                       /* 521  */
+#define        __NR_terminate_with_payload VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(520)
+#define        __NR_abort_with_payload     VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(521)
 #endif /* DARWIN_VERS >= DARWIN_10_12 */
 
 #if DARWIN_VERS < DARWIN_10_6
@@ -795,7 +807,6 @@
 #elif DARWIN_VERS == DARWIN_10_11
 #define __NR_MAXSYSCALL             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(500)
 #elif DARWIN_VERS == DARWIN_10_12
-// TODO Confirm against final release
 #define __NR_MAXSYSCALL             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(522)
 #else
 #error unknown darwin version