From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-13887-listarch-gdb-patches=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 20813 invoked by alias); 4 Apr 2002 13:13:28 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 20806 invoked from network); 4 Apr 2002 13:13:26 -0000
Received: from unknown (HELO kerberos.suse.cz) (195.47.106.10)
  by sources.redhat.com with SMTP; 4 Apr 2002 13:13:26 -0000
Received: from chimera.suse.cz (chimera.suse.cz [10.20.0.2])
	by kerberos.suse.cz (SuSE SMTP server) with ESMTP id 3155159D349
	for <gdb-patches@sources.redhat.com>; Thu,  4 Apr 2002 15:13:25 +0200 (CEST)
Received: from suse.cz (leviathan.suse.cz [10.20.1.56])
	by chimera.suse.cz (8.11.0/8.11.0/SuSE Linux 8.11.0-0.4) with ESMTP id g34DDPf10083
	for <gdb-patches@sources.redhat.com>; Thu, 4 Apr 2002 15:13:25 +0200
X-Authentication-Warning: chimera.suse.cz: Host leviathan.suse.cz [10.20.1.56] claimed to be suse.cz
Message-ID: <3CAC5172.6040301@suse.cz>
Date: Thu, 04 Apr 2002 05:13:00 -0000
From: Michal Ludvig <mludvig@suse.cz>
Organization: SuSE CR
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:0.9.9+) Gecko/20020327
X-Accept-Language: cs, cz, en
MIME-Version: 1.0
To: gdb-patches@sources.redhat.com
Subject: [patch] x86-64 ptrace() ABI change sync
Content-Type: text/plain; charset=ISO-8859-2; format=flowed
Content-Transfer-Encoding: 7bit
X-SW-Source: 2002-04/txt/msg00108.txt.bz2

Hi all,
I've committed this obvious patch which synces gdb with changed glibc to 
both mainline and 5.2-branch.

Michal Ludvig

Index: ChangeLog
	* x86-64-linux-nat.c (child_xfer_memory): x86-64 ptrace() ABI
	change sync

Index: x86-64-linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/x86-64-linux-nat.c,v
retrieving revision 1.7
diff -c -3 -p -r1.7 x86-64-linux-nat.c
*** x86-64-linux-nat.c  2002/03/27 10:21:26     1.7
--- x86-64-linux-nat.c  2002/04/04 13:01:24
*************** child_xfer_memory (CORE_ADDR memaddr, ch
*** 441,456 ****
         if (addr != memaddr || len < (int) sizeof (PTRACE_XFER_TYPE))
         {
           /* Need part of initial word -- fetch it.  */
!         ptrace (PT_READ_I, PIDGET (inferior_ptid),
!                 (PTRACE_ARG3_TYPE) addr, buffer);
         }

         if (count > 1)          /* FIXME, avoid if even boundary */
         {
!         ptrace (PT_READ_I, PIDGET (inferior_ptid),
                   ((PTRACE_ARG3_TYPE)
                    (addr + (count - 1) * sizeof (PTRACE_XFER_TYPE))),
!                 buffer + count - 1);
         }

         /* Copy data to be written over corresponding part of buffer */
--- 441,456 ----
         if (addr != memaddr || len < (int) sizeof (PTRACE_XFER_TYPE))
         {
           /* Need part of initial word -- fetch it.  */
!         buffer[0] = ptrace (PT_READ_I, PIDGET (inferior_ptid),
!                 (PTRACE_ARG3_TYPE) addr, 0);
         }

         if (count > 1)          /* FIXME, avoid if even boundary */
         {
!         buffer[count-1] = ptrace (PT_READ_I, PIDGET (inferior_ptid),
                   ((PTRACE_ARG3_TYPE)
                    (addr + (count - 1) * sizeof (PTRACE_XFER_TYPE))),
!                  0);
         }

         /* Copy data to be written over corresponding part of buffer */
*************** child_xfer_memory (CORE_ADDR memaddr, ch
*** 486,493 ****
         for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
         {
           errno = 0;
!         ptrace (PT_READ_I, PIDGET (inferior_ptid),
!                 (PTRACE_ARG3_TYPE) addr, buffer + i);
           if (errno)
             return 0;
         }
--- 486,493 ----
         for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
         {
           errno = 0;
!         buffer[i] = ptrace (PT_READ_I, PIDGET (inferior_ptid),
!                 (PTRACE_ARG3_TYPE) addr, 0);
           if (errno)
             return 0;
         }