[patch] Re: Can't set architecture to m32c on m32c-elf-gdb.

[Masaki Muranaka <monaka@monami-software.com>]

[-- Attachment #1: Type: text/plain, Size: 2332 bytes --]

Hello maintainers,

This is another plan to fix the issue.
I think it is better than in the past because it is similar to cpu-arm.c.

I attach the patch. I made sure If this issue is fixed by my patch.
- - - 
This GDB was configured as "--host=x86_64-apple-darwin10.2.0 --target=m32c-elf".
For bug reporting instructions, please see:
<http://www.gnu.org/software/gdb/bugs/>.
(gdb) show architecture
The target architecture is set automatically (currently m16c)
(gdb) print $dma0
$1 = void
(gdb) set architecture m32c
The target architecture is assumed to be m32c
(gdb) print $dma0
No registers.
(gdb) set architecture m16c
The target architecture is assumed to be m16c
(gdb) print $dma0
$2 = void
(gdb) 
- - -

ChangeLog:
2010-01-05  Masaki Muranaka  <monaka@monami-software.com>

        * cpu-m32c.c (scan): New function.
	(arch_info_struct): Use scan() instead of bfd_default_scan().
	(bfd_m32c_arch): Ditto.



On 2010/01/03, at 9:00, Masaki Muranaka wrote:

> Hello Nick,
> 
> Really did you try them? Here is a log of my GDB.
> 
> (gdb) show architecture
> The target architecture is set automatically (currently m16c)
> (gdb) set architecture m32c:m32c
> Undefined item: "m32c:m32c".
> (gdb) set architecture m32c:m16c
> Undefined item: "m32c:m16c".
> 
> I got their sources via official git repository.
> 
> Thanks,
> 
> On 2009/12/31, at 21:22, Nick Clifton wrote:
> 
>> Hi Masaki,
>> 
>>> I figured out the reason about this issue.
>>> This is caused by a bug in bfd/cpu-m32c.c.
>>> The condision is like this:
>>> He expects to select arch_info_struct[0] when he puts "set architecture m32c".
>>> But bfd_m32c_arch is selected bfd_default_scan(). So he always gets
>>> configuration for m16c instead of m32c.
>> 
>> But as Daniel pointed out, if the user enters the command:
>> 
>> set architecture m32c:m32c
>> 
>> then the code in bfd_default_scan() will select the m32c architecture and if the user enters:
>> 
>> set architecture m32c:m16c
>> 
>> then bfd_default_scan() will select the m16c architecture.
>> 
>>> I think printable names in bfd/cpu-m32.c should be changed to "m32c:m16c", "m32c:m32c".
>> 
>> There is no need for this, and in fact it will stop bfd_default_scan from working as intended.
>> 
>> Cheers
>> Nick
>> 
> 
> 

[-- Attachment #2: m32c-set-architecture-fix.patch --]
[-- Type: application/octet-stream, Size: 1453 bytes --]

diff --git a/bfd/cpu-m32c.c b/bfd/cpu-m32c.c
index aa2e28d..dde8c61 100644
--- a/bfd/cpu-m32c.c
+++ b/bfd/cpu-m32c.c
@@ -1,5 +1,5 @@
 /* BFD support for the M16C/M32C processors.
-   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -22,6 +22,16 @@
 #include "bfd.h"
 #include "libbfd.h"
 
+static bfd_boolean
+scan (const struct bfd_arch_info *info, const char *string)
+{
+  /* First test for an exact match.  */
+  if (strcasecmp (string, info->printable_name) == 0)
+    return TRUE;
+
+  return FALSE;
+}
+
 static const bfd_arch_info_type arch_info_struct[] =
 {
   {
@@ -35,7 +45,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     3,				/* section align power */
     FALSE,			/* the default ? */
     bfd_default_compatible,	/* architecture comparison fn */
-    bfd_default_scan,		/* string to architecture convert fn */
+    scan,			/* string to architecture convert fn */
     NULL			/* next in list */
   },
 };
@@ -52,6 +62,6 @@ const bfd_arch_info_type bfd_m32c_arch =
   4,				/* Section align power.  */
   TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
-  bfd_default_scan,		/* String to architecture convert fn.  */
+  scan,				/* String to architecture convert fn.  */
   &arch_info_struct[0],		/* Next in list.  */
 };