From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23319 invoked by alias); 16 May 2013 10:34:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 23301 invoked by uid 89); 16 May 2013 10:34:06 -0000 X-Spam-SWARE-Status: No, score=-4.8 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 16 May 2013 10:34:05 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1UcvVb-0002vC-31 from Luis_Gustavo@mentor.com ; Thu, 16 May 2013 03:34:03 -0700 Received: from NA1-MAIL.mgc.mentorg.com ([147.34.98.181]) by svr-orw-fem-01.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 16 May 2013 03:34:02 -0700 Received: from [172.30.8.147] ([172.30.8.147]) by NA1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 16 May 2013 03:34:02 -0700 Message-ID: <5194B618.60706@codesourcery.com> Date: Thu, 16 May 2013 10:34:00 -0000 From: Luis Machado Reply-To: lgustavo@codesourcery.com User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Pedro Alves CC: "'gdb-patches@sourceware.org'" , Mike Frysinger Subject: Re: [RFC, gdbserver] Avoid defining linux_read_offsets when the target does not need it References: <519370AE.50908@codesourcery.com> <5193984F.6010102@redhat.com> In-Reply-To: <5193984F.6010102@redhat.com> Content-Type: multipart/mixed; boundary="------------000905030500000209030604" X-Virus-Found: No X-SW-Source: 2013-05/txt/msg00586.txt.bz2 This is a multi-part message in MIME format. --------------000905030500000209030604 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1094 On 05/15/2013 04:14 PM, Pedro Alves wrote: > On 05/15/2013 12:25 PM, Luis Machado wrote: > >> * linux-low.c: Move definition checks upwards for PT_TEXT_ADDR, >> PT_DATA_ADDR and PT_TEXT_END_ADDR. Update comments. >> (linux_read_offsets): Remove PT_TEXT_ADDR, PT_DATA_ADDR and >> PT_TEXT_END_ADDR guards. Update comments. >> (linux_target_op) > linux_read_offsets if the target is UCLIBC and if it defines >> PT_TEXT_ADDR, PT_DATA_ADDR and PT_TEXT_END_ADDR. > > This is OK. > >> +#if defined(__mcoldfire__) >> +/* These are still undefined in recent (3.10) kernels. */ >> +#define PT_TEXT_ADDR 49*4 >> +#define PT_DATA_ADDR 50*4 >> +#define PT_TEXT_END_ADDR 51*4 >> +/* BFIN already defines these constants in recent (3.10) kernels. */ >> +#elif defined(BFIN) >> +#define PT_TEXT_ADDR 220 >> +#define PT_TEXT_END_ADDR 224 >> +#define PT_DATA_ADDR 228 >> +/* These are still undefined in recent (3.10) kernels. */ > > But please avoid "recent" "new", etc. in code. Those get old fast. > > Thanks, > Thanks. Here is what i checked in. Luis --------------000905030500000209030604 Content-Type: text/x-patch; name="0001-qoffsets_uclinux.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-qoffsets_uclinux.diff" Content-length: 3651 2013-05-16 Luis Machado * linux-low.c: Move definition checks upwards for PT_TEXT_ADDR, PT_DATA_ADDR and PT_TEXT_END_ADDR. Update comments. (linux_read_offsets): Remove PT_TEXT_ADDR, PT_DATA_ADDR and PT_TEXT_END_ADDR guards. Update comments. (linux_target_op) : Conditionally define to linux_read_offsets if the target is UCLIBC and if it defines PT_TEXT_ADDR, PT_DATA_ADDR and PT_TEXT_END_ADDR. Index: gdb-head/gdb/gdbserver/linux-low.c =================================================================== --- gdb-head.orig/gdb/gdbserver/linux-low.c 2013-04-17 10:24:52.859499119 +0200 +++ gdb-head/gdb/gdbserver/linux-low.c 2013-05-16 12:29:32.822525610 +0200 @@ -84,6 +84,30 @@ #endif #endif +/* Some targets did not define these ptrace constants from the start, + so gdbserver defines them locally here. In the future, these may + be removed after they are added to asm/ptrace.h. */ +#if !(defined(PT_TEXT_ADDR) \ + || defined(PT_DATA_ADDR) \ + || defined(PT_TEXT_END_ADDR)) +#if defined(__mcoldfire__) +/* These are still undefined in 3.10 kernels. */ +#define PT_TEXT_ADDR 49*4 +#define PT_DATA_ADDR 50*4 +#define PT_TEXT_END_ADDR 51*4 +/* BFIN already defines these since at least 2.6.32 kernels. */ +#elif defined(BFIN) +#define PT_TEXT_ADDR 220 +#define PT_TEXT_END_ADDR 224 +#define PT_DATA_ADDR 228 +/* These are still undefined in 3.10 kernels. */ +#elif defined(__TMS320C6X__) +#define PT_TEXT_ADDR (0x10000*4) +#define PT_DATA_ADDR (0x10004*4) +#define PT_TEXT_END_ADDR (0x10008*4) +#endif +#endif + #ifdef HAVE_LINUX_BTRACE # include "linux-btrace.h" #endif @@ -4833,25 +4857,14 @@ linux_stopped_data_address (void) return lwp->stopped_data_address; } -#if defined(__UCLIBC__) && defined(HAS_NOMMU) -#if ! (defined(PT_TEXT_ADDR) \ - || defined(PT_DATA_ADDR) \ - || defined(PT_TEXT_END_ADDR)) -#if defined(__mcoldfire__) -/* These should really be defined in the kernel's ptrace.h header. */ -#define PT_TEXT_ADDR 49*4 -#define PT_DATA_ADDR 50*4 -#define PT_TEXT_END_ADDR 51*4 -#elif defined(BFIN) -#define PT_TEXT_ADDR 220 -#define PT_TEXT_END_ADDR 224 -#define PT_DATA_ADDR 228 -#elif defined(__TMS320C6X__) -#define PT_TEXT_ADDR (0x10000*4) -#define PT_DATA_ADDR (0x10004*4) -#define PT_TEXT_END_ADDR (0x10008*4) -#endif -#endif +#if defined(__UCLIBC__) && defined(HAS_NOMMU) \ + && defined(PT_TEXT_ADDR) && defined(PT_DATA_ADDR) \ + && defined(PT_TEXT_END_ADDR) + +/* This is only used for targets that define PT_TEXT_ADDR, + PT_DATA_ADDR and PT_TEXT_END_ADDR. If those are not defined, supposedly + the target has different ways of acquiring this information, like + loadmaps. */ /* Under uClinux, programs are loaded at non-zero offsets, which we need to tell gdb about. */ @@ -4859,7 +4872,6 @@ linux_stopped_data_address (void) static int linux_read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p) { -#if defined(PT_TEXT_ADDR) && defined(PT_DATA_ADDR) && defined(PT_TEXT_END_ADDR) unsigned long text, text_end, data; int pid = lwpid_of (get_thread_lwp (current_inferior)); @@ -4888,7 +4900,6 @@ linux_read_offsets (CORE_ADDR *text_p, C return 1; } -#endif return 0; } #endif @@ -5887,7 +5898,9 @@ static struct target_ops linux_target_op linux_remove_point, linux_stopped_by_watchpoint, linux_stopped_data_address, -#if defined(__UCLIBC__) && defined(HAS_NOMMU) +#if defined(__UCLIBC__) && defined(HAS_NOMMU) \ + && defined(PT_TEXT_ADDR) && defined(PT_DATA_ADDR) \ + && defined(PT_TEXT_END_ADDR) linux_read_offsets, #else NULL, --------------000905030500000209030604--