From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22833 invoked by alias); 20 Sep 2004 19:14:44 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 22807 invoked from network); 20 Sep 2004 19:14:43 -0000 Received: from unknown (HELO walton.sibelius.xs4all.nl) (82.92.89.47) by sourceware.org with SMTP; 20 Sep 2004 19:14:43 -0000 Received: from elgar.sibelius.xs4all.nl (elgar.sibelius.xs4all.nl [192.168.0.2]) by walton.sibelius.xs4all.nl (8.13.0/8.13.0) with ESMTP id i8KJEWZd011251; Mon, 20 Sep 2004 21:14:32 +0200 (CEST) Received: from elgar.sibelius.xs4all.nl (localhost [127.0.0.1]) by elgar.sibelius.xs4all.nl (8.12.6p3/8.12.6) with ESMTP id i8KJDpjZ035326; Mon, 20 Sep 2004 21:13:51 +0200 (CEST) (envelope-from kettenis@elgar.sibelius.xs4all.nl) Received: (from kettenis@localhost) by elgar.sibelius.xs4all.nl (8.12.6p3/8.12.6/Submit) id i8KJDosi035323; Mon, 20 Sep 2004 21:13:50 +0200 (CEST) Date: Mon, 20 Sep 2004 19:14:00 -0000 Message-Id: <200409201913.i8KJDosi035323@elgar.sibelius.xs4all.nl> From: Mark Kettenis To: cagney@gnu.org, gdb-patches@sources.redhat.com Subject: [RFA/RFC] Replace call_ptrace and ptrace_wait in inf-ptrace.c X-SW-Source: 2004-09/txt/msg00319.txt.bz2 This is another step in the direction of eliminating the need for both inf-ptrace.c and infptrace.c. It eliminates the calls to call_ptrace and ptrace_wait. Andrew has recently suggested that we'd want debugging support for the ptrace(2) interface, which could be implemented by using call_ptrace() unconditionally. That, however, is a bad idea, since this makes it impossible for the compiler to properly typecheck the arguments to ptrace(). Hence the removal of call_ptrace() usage. In inf_ptrace_kill_inferior, I just replaced ptrace_wait() with wait(). Calling target_post_wait here seems inappropriate. If nobody objetcs, I'll check this in later this week. Mark Index: ChangeLog from Mark Kettenis * inf-ptrace.c (inf_ptrace_kill_inferior): Call ptrace directly instead of call_ptrace. Call wait directly instead of ptrace_wait. (inf_ptrace_me): Call ptrace directly instead of call_ptrace. (inf_ptrace_wait): Inline ptrace_wait call. Index: inf-ptrace.c =================================================================== RCS file: /cvs/src/src/gdb/inf-ptrace.c,v retrieving revision 1.2 diff -u -p -r1.2 inf-ptrace.c --- inf-ptrace.c 16 Sep 2004 19:54:18 -0000 1.2 +++ inf-ptrace.c 20 Sep 2004 18:58:17 -0000 @@ -55,8 +55,8 @@ inf_ptrace_kill_inferior (void) The kill call causes problems under hpux10, so it's been removed; if this causes problems we'll deal with them as they arise. */ - call_ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3) 0, 0); - ptrace_wait (null_ptid, &status); + ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3) 0, 0); + wait (&status); target_mourn_inferior (); } @@ -255,7 +255,8 @@ inf_ptrace_wait (ptid_t ptid, struct tar attached process. */ set_sigio_trap (); - pid = ptrace_wait (inferior_ptid, &status); + pid = wait (&status); + target_post_wait (pid_to_ptid (pid), status); save_errno = errno; @@ -433,7 +434,7 @@ static void inf_ptrace_me (void) { /* "Trace me, Dr. Memory!" */ - call_ptrace (0, 0, (PTRACE_TYPE_ARG3) 0, 0); + ptrace (0, 0, (PTRACE_TYPE_ARG3) 0, 0); } /* Stub function which causes the GDB that runs it, to start ptrace-ing