PERFORCE change 167733 for review

[Stanislav Sedov]

http://perforce.freebsd.org/chv.cgi?CH=167733

Change 167733 by stas at stas_yandex on 2009/08/24 14:04:49

	- Rename sigaction6 to sigaction, and sigaction to sigaction4 respectively
	  to reflect reality.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcsignal.c#12 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#19 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#38 edit
.. //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#12 (text+ko) ====

@@ -276,14 +276,8 @@
    return sr_isError(res) ? -1 : 0;
 
 #  elif defined(VGO_freebsd)
-#    if __FreeBSD__ >= 5
-   SysRes res = VG_(do_syscall3)(__NR_sigaction6,
-                                 signum, (UWord)act, (UWord)oldact);
-#    else
    SysRes res = VG_(do_syscall3)(__NR_sigaction,
                                  signum, (UWord)act, (UWord)oldact);
-#    endif
-
    return sr_isError(res) ? -1 : 0;
 
 #  else

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#19 (text+ko) ====

@@ -222,7 +222,7 @@
 DECL_TEMPLATE(freebsd, sys_lkmnosys6);
 DECL_TEMPLATE(freebsd, sys_lkmnosys7);
 DECL_TEMPLATE(freebsd, sys_lkmnosys8);
-DECL_TEMPLATE(freebsd, sys_sigaction6);
+DECL_TEMPLATE(freebsd, sys_sigaction4);
 DECL_TEMPLATE(freebsd, sys_mmap7);
 DECL_TEMPLATE(freebsd, sys_lseek7);
 DECL_TEMPLATE(freebsd, sys_truncate7);

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#38 (text+ko) ====

@@ -2208,7 +2208,7 @@
 
 static int sigformat[_VKI_NSIG];
 
-PRE(sys_sigaction)
+PRE(sys_sigaction4)
 {
    PRINT("sys_sigaction ( %ld, %#lx, %#lx )", ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "sigaction",
@@ -2232,7 +2232,7 @@
                             (vki_sigaction_fromK_t *)ARG3)
    );
 }
-POST(sys_sigaction)
+POST(sys_sigaction4)
 {
    vg_assert(SUCCESS);
    if (RES == 0 && ARG3 != 0)
@@ -2240,7 +2240,7 @@
 }
 
 /* Identical, but warns the signal handler to expect the different sigframe */
-PRE(sys_sigaction6)
+PRE(sys_sigaction)
 {
    PRINT("sys_sigaction6 ( %ld, %#lx, %#lx )", ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "sigaction6",
@@ -2263,7 +2263,7 @@
                             (vki_sigaction_fromK_t *)ARG3)
    );
 }
-POST(sys_sigaction6)
+POST(sys_sigaction)
 {
    vg_assert(SUCCESS);
    if (RES == 0 && ARG3 != 0)
@@ -3585,7 +3585,7 @@
 
    BSDXY(__NR_sigprocmask,		sys_sigprocmask),		// 340
    BSDX_(__NR_sigsuspend,		sys_sigsuspend),		// 341
-   BSDXY(__NR_sigaction,		sys_sigaction),			// 342
+   BSDXY(__NR_sigaction4,		sys_sigaction4),		// 342
    BSDXY(__NR_sigpending,		sys_sigpending),		// 343
 
    BSDX_(__NR_sigreturn,		sys_sigreturn),			// 344
@@ -3678,7 +3678,7 @@
    // extattr_delete_link						   414
    // __mac_execve							   415
 
-   BSDXY(__NR_sigaction6,		sys_sigaction6),		// 416
+   BSDXY(__NR_sigaction,		sys_sigaction),			// 416
    //!sigreturn								   417
    // __xstat								   418
    // __xfstat								   419

==== //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#7 (text+ko) ====

@@ -254,7 +254,7 @@
 #define	__NR_jail		338
 #define	__NR_sigprocmask	340
 #define	__NR_sigsuspend		341
-#define	__NR_sigaction		342
+#define	__NR_sigaction4		342
 #define	__NR_sigpending		343
 #define	__NR_sigreturn		344
 #define	__NR_sigtimedwait	345
@@ -319,7 +319,7 @@
 #define	__NR_extattr_get_link	413
 #define	__NR_extattr_delete_link	414
 #define	__NR___mac_execve	415
-#define	__NR_sigaction6		416
+#define	__NR_sigaction		416
 #define	__NR_sigreturn6		417
 #define	__NR_getcontext		421
 #define	__NR_setcontext		422