Menu
▾
▴
[Valgrind-developers] valgrind: r5474 - trunk/coregrind/m_syswrap
|
From: <sv...@va...> - 2006-01-02 16:25:35
|
Author: sewardj
Date: 2006-01-02 16:25:31 +0000 (Mon, 02 Jan 2006)
New Revision: 5474
Log:
Fun n games making sys_clone() work.
Modified:
trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c
Modified: trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c 2006-01-02 16:24:51 U=
TC (rev 5473)
+++ trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c 2006-01-02 16:25:31 U=
TC (rev 5474)
@@ -140,6 +140,7 @@
pid_t* parent_tid in r8
void* ??? in r9
=20
+ Note: r3 contains fn ptr, not fn entry ptr -- needs toc deref
System call requires:
=20
int $__NR_clone in r0 (sc number)
@@ -183,8 +184,8 @@
" mr 31,6\n" // preserve arg
=20
// setup child stack
-" rlwinm 4,4,0,~0xf\n" // trim sp to multiple of 16 bytes
-" li 0,0\n"
+" rldicr 4,4, 0,59\n" // trim sp to multiple of 16 bytes
+" li 0,0\n" // (r4 &=3D ~0xF)
" stdu 0,-32(4)\n" // make initial stack frame
" mr 29,4\n" // preserve sp
=20
@@ -193,7 +194,7 @@
" mr 3,5\n" // syscall arg1: flags
// r4 already setup // syscall arg2: child_stack
" mr 5,8\n" // syscall arg3: parent_tid
-" mr 6,2\n" // syscall arg4: REAL THREAD tls
+" mr 6,13\n" // syscall arg4: REAL THREAD tls
" mr 7,7\n" // syscall arg5: child_tid
" mr 8,8\n" // syscall arg6: ????
" mr 9,9\n" // syscall arg7: ????
@@ -201,15 +202,15 @@
" sc\n" // clone()
=20
" mfcr 4\n" // CR now in low half r4
-" slwi 4,4,16\n"
-" slwi 4,4,16\n" // CR now in hi half r4
+" sldi 4,4,16\n"
+" sldi 4,4,16\n" // CR now in hi half r4
=20
-" slwi 3,3,16\n"
-" slwi 3,3,16\n"
-" srwi 3,3,16\n"
-" srwi 3,3,16\n" // zero out hi half r3
+" sldi 3,3,16\n"
+" sldi 3,3,16\n"
+" srdi 3,3,16\n"
+" srdi 3,3,16\n" // zero out hi half r3
=20
-" and 3,3,4\n" // r3 =3D CR : syscall-retval
+" or 3,3,4\n" // r3 =3D CR : syscall-retval
" cmpwi 3,0\n" // child if retval =3D=3D 0 (note, =
cmpw)
" bne 1f\n" // jump if !child
=20
@@ -219,6 +220,7 @@
That does leave a small window for a signal to be delivered
on the wrong stack, unfortunately. */
" mr 1,29\n"
+" ld 30, 0(30)\n" // convert fn ptr to fn entry
" mtctr 30\n" // ctr reg =3D fn
" mr 3,31\n" // r3 =3D arg
" bctrl\n" // call fn()
@@ -354,13 +356,15 @@
=20
/* Create the new thread */
word64 =3D do_syscall_clone_ppc64_linux(
- ML_(start_thread_NORETURN), stack, flags, &VG_(threads)[c=
tid],
+ ML_(start_thread_NORETURN),
+ stack, flags, &VG_(threads)[ctid],
child_tidptr, parent_tidptr, NULL
);
+
/* Low half word64 is syscall return value. Hi half is
the entire CR, from which we need to extract CR0.SO. */
/* VG_(printf)("word64 =3D 0x%llx\n", word64); */
- res =3D VG_(mk_SysRes_ppc32_linux)(=20
+ res =3D VG_(mk_SysRes_ppc64_linux)(=20
/*val*/(UInt)(word64 & 0xFFFFFFFFULL),=20
/*errflag*/ (UInt)((word64 >> (32+28)) & 1)
);
@@ -416,7 +420,7 @@
//zz DECL_TEMPLATE(ppc64_linux, sys_lstat64);
//zz DECL_TEMPLATE(ppc64_linux, sys_fstat64);
//zz DECL_TEMPLATE(ppc64_linux, sys_ipc);
-//zz DECL_TEMPLATE(ppc64_linux, sys_clone);
+DECL_TEMPLATE(ppc64_linux, sys_clone);
//zz DECL_TEMPLATE(ppc64_linux, sys_sigreturn);
//zz DECL_TEMPLATE(ppc64_linux, sys_rt_sigreturn);
//zz DECL_TEMPLATE(ppc64_linux, sys_sigaction);
@@ -912,92 +916,92 @@
//zz break; /*NOTREACHED*/
//zz }
//zz }
-//zz=20
-//zz PRE(sys_clone)
-//zz {
-//zz UInt cloneflags;
-//zz=20
-//zz PRINT("sys_clone ( %x, %p, %p, %p, %p )",ARG1,ARG2,ARG3,ARG4,ARG=
5);
-//zz PRE_REG_READ5(int, "clone",
-//zz unsigned long, flags,
-//zz void *, child_stack,
-//zz int *, parent_tidptr,
-//zz void *, child_tls,
-//zz int *, child_tidptr);
-//zz=20
-//zz if (ARG1 & VKI_CLONE_PARENT_SETTID) {
-//zz PRE_MEM_WRITE("clone(parent_tidptr)", ARG3, sizeof(Int));
-//zz if (!VG_(am_is_valid_for_client)(ARG3, sizeof(Int),=20
-//zz VKI_PROT_WRITE)) {
-//zz SET_STATUS_Failure( VKI_EFAULT );
-//zz return;
-//zz }
-//zz }
-//zz if (ARG1 & (VKI_CLONE_CHILD_SETTID | VKI_CLONE_CHILD_CLEARTID)) =
{
-//zz PRE_MEM_WRITE("clone(child_tidptr)", ARG5, sizeof(Int));
-//zz if (!VG_(am_is_valid_for_client)(ARG5, sizeof(Int),=20
-//zz VKI_PROT_WRITE)) {
-//zz SET_STATUS_Failure( VKI_EFAULT );
-//zz return;
-//zz }
-//zz }
-//zz=20
-//zz cloneflags =3D ARG1;
-//zz=20
-//zz if (!ML_(client_signal_OK)(ARG1 & VKI_CSIGNAL)) {
-//zz SET_STATUS_Failure( VKI_EINVAL );
-//zz return;
-//zz }
-//zz=20
-//zz /* Only look at the flags we really care about */
-//zz switch (cloneflags & (VKI_CLONE_VM | VKI_CLONE_FS=20
-//zz | VKI_CLONE_FILES | VKI_CLONE_VFORK)) {
-//zz case VKI_CLONE_VM | VKI_CLONE_FS | VKI_CLONE_FILES:
-//zz /* thread creation */
-//zz SET_STATUS_from_SysRes(
-//zz do_clone(tid,
-//zz ARG1, /* flags */
-//zz (Addr)ARG2, /* child SP */
-//zz (Int *)ARG3, /* parent_tidptr */
-//zz (Int *)ARG5, /* child_tidptr */
-//zz (Addr)ARG4)); /* child_tls */
-//zz break;
-//zz=20
-//zz case VKI_CLONE_VFORK | VKI_CLONE_VM: /* vfork */
-//zz /* FALLTHROUGH - assume vfork =3D=3D fork */
-//zz cloneflags &=3D ~(VKI_CLONE_VFORK | VKI_CLONE_VM);
-//zz=20
-//zz case 0: /* plain fork */
-//zz SET_STATUS_from_SysRes(
-//zz ML_(do_fork_clone)(tid,
-//zz cloneflags, /* flags */
-//zz (Int *)ARG3, /* parent_tidptr */
-//zz (Int *)ARG5)); /* child_tidptr */
-//zz break;
-//zz=20
-//zz default:
-//zz /* should we just ENOSYS? */
-//zz VG_(message)(Vg_UserMsg, "Unsupported clone() flags: 0x%x", A=
RG1);
-//zz VG_(message)(Vg_UserMsg, "");
-//zz VG_(message)(Vg_UserMsg, "The only supported clone() uses are=
:");
-//zz VG_(message)(Vg_UserMsg, " - via a threads library (LinuxThre=
ads or NPTL)");
-//zz VG_(message)(Vg_UserMsg, " - via the implementation of fork o=
r vfork");
-//zz VG_(unimplemented)
-//zz ("Valgrind does not support general clone().");
-//zz }
-//zz=20
-//zz if (SUCCESS) {
-//zz if (ARG1 & VKI_CLONE_PARENT_SETTID)
-//zz POST_MEM_WRITE(ARG3, sizeof(Int));
-//zz if (ARG1 & (VKI_CLONE_CHILD_SETTID | VKI_CLONE_CHILD_CLEARTID=
))
-//zz POST_MEM_WRITE(ARG5, sizeof(Int));
-//zz=20
-//zz /* Thread creation was successful; let the child have the cha=
nce
-//zz to run */
-//zz *flags |=3D SfYieldAfter;
-//zz }
-//zz }
-//zz=20
+
+PRE(sys_clone)
+{
+ UInt cloneflags;
+
+ PRINT("sys_clone ( %x, %p, %p, %p, %p )",ARG1,ARG2,ARG3,ARG4,ARG5);
+ PRE_REG_READ5(int, "clone",
+ unsigned long, flags,
+ void *, child_stack,
+ int *, parent_tidptr,
+ void *, child_tls,
+ int *, child_tidptr);
+
+ if (ARG1 & VKI_CLONE_PARENT_SETTID) {
+ PRE_MEM_WRITE("clone(parent_tidptr)", ARG3, sizeof(Int));
+ if (!VG_(am_is_valid_for_client)(ARG3, sizeof(Int),=20
+ VKI_PROT_WRITE)) {
+ SET_STATUS_Failure( VKI_EFAULT );
+ return;
+ }
+ }
+ if (ARG1 & (VKI_CLONE_CHILD_SETTID | VKI_CLONE_CHILD_CLEARTID)) {
+ PRE_MEM_WRITE("clone(child_tidptr)", ARG5, sizeof(Int));
+ if (!VG_(am_is_valid_for_client)(ARG5, sizeof(Int),=20
+ VKI_PROT_WRITE)) {
+ SET_STATUS_Failure( VKI_EFAULT );
+ return;
+ }
+ }
+
+ cloneflags =3D ARG1;
+
+ if (!ML_(client_signal_OK)(ARG1 & VKI_CSIGNAL)) {
+ SET_STATUS_Failure( VKI_EINVAL );
+ return;
+ }
+
+ /* Only look at the flags we really care about */
+ switch (cloneflags & (VKI_CLONE_VM | VKI_CLONE_FS=20
+ | VKI_CLONE_FILES | VKI_CLONE_VFORK)) {
+ case VKI_CLONE_VM | VKI_CLONE_FS | VKI_CLONE_FILES:
+ /* thread creation */
+ SET_STATUS_from_SysRes(
+ do_clone(tid,
+ ARG1, /* flags */
+ (Addr)ARG2, /* child SP */
+ (Int *)ARG3, /* parent_tidptr */
+ (Int *)ARG5, /* child_tidptr */
+ (Addr)ARG4)); /* child_tls */
+ break;
+
+ case VKI_CLONE_VFORK | VKI_CLONE_VM: /* vfork */
+ /* FALLTHROUGH - assume vfork =3D=3D fork */
+ cloneflags &=3D ~(VKI_CLONE_VFORK | VKI_CLONE_VM);
+
+ case 0: /* plain fork */
+ SET_STATUS_from_SysRes(
+ ML_(do_fork_clone)(tid,
+ cloneflags, /* flags */
+ (Int *)ARG3, /* parent_tidptr */
+ (Int *)ARG5)); /* child_tidptr */
+ break;
+
+ default:
+ /* should we just ENOSYS? */
+ VG_(message)(Vg_UserMsg, "Unsupported clone() flags: 0x%x", ARG1);
+ VG_(message)(Vg_UserMsg, "");
+ VG_(message)(Vg_UserMsg, "The only supported clone() uses are:");
+ VG_(message)(Vg_UserMsg, " - via a threads library (LinuxThreads o=
r NPTL)");
+ VG_(message)(Vg_UserMsg, " - via the implementation of fork or vfo=
rk");
+ VG_(unimplemented)
+ ("Valgrind does not support general clone().");
+ }
+
+ if (SUCCESS) {
+ if (ARG1 & VKI_CLONE_PARENT_SETTID)
+ POST_MEM_WRITE(ARG3, sizeof(Int));
+ if (ARG1 & (VKI_CLONE_CHILD_SETTID | VKI_CLONE_CHILD_CLEARTID))
+ POST_MEM_WRITE(ARG5, sizeof(Int));
+
+ /* Thread creation was successful; let the child have the chance
+ to run */
+ *flags |=3D SfYieldAfter;
+ }
+}
+
//zz PRE(sys_sigreturn)
//zz {
//zz ThreadState* tst;
@@ -1314,7 +1318,7 @@
// _____(__NR_fsync, sys_fsync), // 118
// _____(__NR_sigreturn, sys_sigreturn), // 119
=20
-// _____(__NR_clone, sys_clone), // 120
+ PLAX_(__NR_clone, sys_clone), // 120
// _____(__NR_setdomainname, sys_setdomainname), // 121
GENXY(__NR_uname, sys_newuname), // 122
// _____(__NR_modify_ldt, sys_modify_ldt), // 123
@@ -1398,7 +1402,7 @@
// _____(__NR_putpmsg, sys_putpmsg), // 188
// _____(__NR_vfork, sys_vfork), // 189
=20
-// _____(__NR_ugetrlimit, sys_ugetrlimit), // 190
+ GENXY(__NR_ugetrlimit, sys_getrlimit), // 190
// _____(__NR_readahead, sys_readahead), // 191
// /* #define __NR_mmap2 192 32bit only */
// /* #define __NR_truncate64 193 32bit only */
@@ -1435,7 +1439,7 @@
// _____(__NR_lremovexattr, sys_lremovexattr), // 219
=20
// _____(__NR_fremovexattr, sys_fremovexattr), // 220
-// _____(__NR_futex, sys_futex), // 221
+ LINXY(__NR_futex, sys_futex), // 221
// _____(__NR_sched_setaffinity, sys_sched_setaffinity), // 222
// _____(__NR_sched_getaffinity, sys_sched_getaffinity), // 223
// /* 224 currently unused */
@@ -1448,7 +1452,7 @@
=20
// _____(__NR_io_submit, sys_io_submit), // 230
// _____(__NR_io_cancel, sys_io_cancel), // 231
-// _____(__NR_set_tid_address, sys_set_tid_address), // 232
+ LINX_(__NR_set_tid_address, sys_set_tid_address), // 232
// _____(__NR_fadvise64, sys_fadvise64), // 233
LINX_(__NR_exit_group, sys_exit_group), // 234
=20
|
