Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* simple typo with cache_ovly_table
@ 2015-10-21 19:47 Mike Stump
  2015-10-21 20:00 ` Simon Marchi
  0 siblings, 1 reply; 3+ messages in thread
From: Mike Stump @ 2015-10-21 19:47 UTC (permalink / raw)
  To: gdb-patches

So our port causes a warning on failure of the types in question to be the same.  This fixes it.  Our CORE_ADDR is 64-bits, our ints are 32-bits.

Could someone shepherd it in?


diff --git a/gdb/symfile.c b/gdb/symfile.c
index f03fca7..e63a1c5 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -3613,7 +3613,7 @@ simple_read_overlay_table (void)
  cache_novlys = read_memory_integer (BMSYMBOL_VALUE_ADDRESS (novlys_msym),
				      4, byte_order);
  cache_ovly_table
-    = (unsigned int (*)[4]) xmalloc (cache_novlys * sizeof (*cache_ovly_table));
+    = (CORE_ADDR (*)[4]) xmalloc (cache_novlys * sizeof (*cache_ovly_table));
  cache_ovly_table_base = BMSYMBOL_VALUE_ADDRESS (ovly_table_msym);
  read_target_long_array (cache_ovly_table_base,
                          (CORE_ADDR *) cache_ovly_table,


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: simple typo with cache_ovly_table
  2015-10-21 19:47 simple typo with cache_ovly_table Mike Stump
@ 2015-10-21 20:00 ` Simon Marchi
  2015-10-22  9:59   ` Mike Stump
  0 siblings, 1 reply; 3+ messages in thread
From: Simon Marchi @ 2015-10-21 20:00 UTC (permalink / raw)
  To: Mike Stump, gdb-patches

On 15-10-21 01:51 PM, Mike Stump wrote:
> So our port causes a warning on failure of the types in question to be the same.  This fixes it.  Our CORE_ADDR is 64-bits, our ints are 32-bits.
> 
> Could someone shepherd it in?
> 
> 
> diff --git a/gdb/symfile.c b/gdb/symfile.c
> index f03fca7..e63a1c5 100644
> --- a/gdb/symfile.c
> +++ b/gdb/symfile.c
> @@ -3613,7 +3613,7 @@ simple_read_overlay_table (void)
>   cache_novlys = read_memory_integer (BMSYMBOL_VALUE_ADDRESS (novlys_msym),
> 				      4, byte_order);
>   cache_ovly_table
> -    = (unsigned int (*)[4]) xmalloc (cache_novlys * sizeof (*cache_ovly_table));
> +    = (CORE_ADDR (*)[4]) xmalloc (cache_novlys * sizeof (*cache_ovly_table));
>   cache_ovly_table_base = BMSYMBOL_VALUE_ADDRESS (ovly_table_msym);
>   read_target_long_array (cache_ovly_table_base,
>                           (CORE_ADDR *) cache_ovly_table,
> 

Hi Mike,

cache_ovly_table seems to be a

  unsigned (*cache_ovly_table)[4]

so why does it make sense to cast it to a

  CORE_ADDR (*)[4]

?

Simon


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: simple typo with cache_ovly_table
  2015-10-21 20:00 ` Simon Marchi
@ 2015-10-22  9:59   ` Mike Stump
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Stump @ 2015-10-22  9:59 UTC (permalink / raw)
  To: Simon Marchi; +Cc: gdb-patches

On Oct 21, 2015, at 11:00 AM, Simon Marchi <simon.marchi@ericsson.com> wrote:
> cache_ovly_table seems to be a
> 
>  unsigned (*cache_ovly_table)[4]
> 
> so why does it make sense to cast it to a
> 
>  CORE_ADDR (*)[4]
> 
> ?

Ah, I think that was a soft merge conflict resolution failure with a local patch that has overlay addresses being 64-bits.  The 32-bit days are over.  I think I’d need to pull the rest of those out of my tree to submit the lot of them.  Anyway, kinda straight forward as I recall.  [ digging ]

My original patch was as below.  Since then I might have resolved a few merge errors from it.  Apparently no one but me has ever done overlays on a 64-bit port and expected it to work.

Author: Mike Stump <mikestump@comcast.net>
Date:   Tue Nov 1 19:50:29 2011 +0000

    Add 64-bit support for the overlay manager code.
    
    
    git-svn-id: svn+ssh://...

diff --git a/binutils/gdb/symfile.c b/binutils/gdb/symfile.c
index 9ebe050..2ded709 100644
--- a/binutils/gdb/symfile.c
+++ b/binutils/gdb/symfile.c
@@ -122,7 +122,7 @@ static void overlay_command (char *, int);
 
 static void simple_free_overlay_table (void);
 
-static void read_target_long_array (CORE_ADDR, unsigned int *, int, int,
+static void read_target_long_array (CORE_ADDR, CORE_ADDR *, int, int,
                                    enum bfd_endian);
 
 static int simple_read_overlay_table (void);
@@ -3307,8 +3307,8 @@ overlay_command (char *args, int from_tty)
    the target (whenever possible).  */
 
 /* Cached, dynamically allocated copies of the target data structures: */
-static unsigned (*cache_ovly_table)[4] = 0;
-static unsigned cache_novlys = 0;
+static CORE_ADDR (*cache_ovly_table)[4] = 0;
+static CORE_ADDR cache_novlys = 0;
 static CORE_ADDR cache_ovly_table_base = 0;
 enum ovly_index
   {
@@ -3329,7 +3329,7 @@ simple_free_overlay_table (void)
 /* Read an array of ints of size SIZE from the target into a local buffer.
    Convert to host order.  int LEN is number of ints.  */
 static void
-read_target_long_array (CORE_ADDR memaddr, unsigned int *myaddr,
+read_target_long_array (CORE_ADDR memaddr, CORE_ADDR *myaddr,
                        int len, int size, enum bfd_endian byte_order)
 {
   /* FIXME (alloca): Not safe if array is very large.  */
@@ -3380,7 +3380,7 @@ simple_read_overlay_table (void)
     = (void *) xmalloc (cache_novlys * sizeof (*cache_ovly_table));
   cache_ovly_table_base = SYMBOL_VALUE_ADDRESS (ovly_table_msym);
   read_target_long_array (cache_ovly_table_base,
-                          (unsigned int *) cache_ovly_table,
+                          (CORE_ADDR *) cache_ovly_table,
                           cache_novlys * 4, word_size, byte_order);
 
   return 1;                    /* SUCCESS */
@@ -3411,7 +3411,7 @@ simple_overlay_update_1 (struct obj_section *osect)
        /* && cache_ovly_table[i][SIZE] == size */ )
       {
        read_target_long_array (cache_ovly_table_base + i * word_size,
-                               (unsigned int *) cache_ovly_table[i],
+                               (CORE_ADDR *) cache_ovly_table[i],
                                4, word_size, byte_order);
        if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect)
            && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect)
From gdb-patches-return-126862-listarch-gdb-patches=sources.redhat.com@sourceware.org Wed Oct 21 18:23:16 2015
Return-Path: <gdb-patches-return-126862-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Delivered-To: listarch-gdb-patches@sources.redhat.com
Received: (qmail 71384 invoked by alias); 21 Oct 2015 18:23:16 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Delivered-To: mailing list gdb-patches@sourceware.org
Received: (qmail 71359 invoked by uid 89); 21 Oct 2015 18:23:15 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2
X-HELO: usevmg21.ericsson.net
Received: from usevmg21.ericsson.net (HELO usevmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 21 Oct 2015 18:23:14 +0000
Received: from EUSAAHC005.ericsson.se (Unknown_Domain [147.117.188.87])	by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id 20.04.26730.55B67265; Wed, 21 Oct 2015 12:39:17 +0200 (CEST)
Received: from [142.133.110.95] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.89) with Microsoft SMTP Server id 14.3.248.2; Wed, 21 Oct 2015 14:23:11 -0400
Subject: Re: [PATCH v3 0/5] Software breakpoints support for ARM linux in GDBServer.
To: Yao Qi <qiyaoltc@gmail.com>, Pedro Alves <palves@redhat.com>
References: <1445359685-2589-1-git-send-email-antoine.tremblay@ericsson.com> <56277562.6090603@redhat.com> <86zizc1dor.fsf@gmail.com> <5627B12A.9050104@ericsson.com>
CC: <gdb-patches@sourceware.org>
From: Antoine Tremblay <antoine.tremblay@ericsson.com>
Message-ID: <5627D80F.50709@ericsson.com>
Date: Thu, 22 Oct 2015 09:59:00 -0000
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0
MIME-Version: 1.0
In-Reply-To: <5627B12A.9050104@ericsson.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
X-SW-Source: 2015-10/txt/msg00426.txt.bz2
Content-length: 578



On 10/21/2015 11:37 AM, Antoine Tremblay wrote:
>
>
> On 10/21/2015 10:47 AM, Yao Qi wrote:
>> Pedro Alves <palves@redhat.com> writes:
>>
>>> I replied to all patches individually, and in general this all LGTM now.
>>> Feel free to push with the nits I pointed out fixed, if Yao is happy
>>> with
>>> it as well.
>>
>> With these things Pedro pointed out fixed, these patches look good to
>> me too.
>>
>
> This is now pushed in.
>
> Thanks for the review!

Hi, I just noticed this breaks tracing in some situations on x86 like
trace-break.exp fails.

Working on a fix now.


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-10-21 19:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-21 19:47 simple typo with cache_ovly_table Mike Stump
2015-10-21 20:00 ` Simon Marchi
2015-10-22  9:59   ` Mike Stump

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox