[PATCH, obvious?] Fix incorrect reference to source files

[PATCH, obvious?] Fix incorrect reference to source files

[Luis Machado]

These auto-generated register source files have been renamed back in 2010.

It took me a while to find these due to the mismatch.

gdb/gdbserver/ChangeLog:

2016-12-06  Luis Machado  <lgustavo@codesourcery.com>

	* win32-i386-low.c: Fix incorrect reference to a couple source files.
---
 gdb/gdbserver/win32-i386-low.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c
index 5daa863..edae9bb 100644
--- a/gdb/gdbserver/win32-i386-low.c
+++ b/gdb/gdbserver/win32-i386-low.c
@@ -29,11 +29,11 @@
 #define FLAG_TRACE_BIT 0x100
 
 #ifdef __x86_64__
-/* Defined in auto-generated file reg-amd64.c.  */
+/* Defined in auto-generated file amd64.c.  */
 void init_registers_amd64 (void);
 extern const struct target_desc *tdesc_amd64;
 #else
-/* Defined in auto-generated file reg-i386.c.  */
+/* Defined in auto-generated file i386.c.  */
 void init_registers_i386 (void);
 extern const struct target_desc *tdesc_i386;
 #endif
-- 
2.7.4

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Simon Marchi]

On 2016-12-06 11:15, Luis Machado wrote:
> These auto-generated register source files have been renamed back in 
> 2010.
> 
> It took me a while to find these due to the mismatch.
> 
> gdb/gdbserver/ChangeLog:
> 
> 2016-12-06  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	* win32-i386-low.c: Fix incorrect reference to a couple source files.
> ---
>  gdb/gdbserver/win32-i386-low.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gdb/gdbserver/win32-i386-low.c 
> b/gdb/gdbserver/win32-i386-low.c
> index 5daa863..edae9bb 100644
> --- a/gdb/gdbserver/win32-i386-low.c
> +++ b/gdb/gdbserver/win32-i386-low.c
> @@ -29,11 +29,11 @@
>  #define FLAG_TRACE_BIT 0x100
> 
>  #ifdef __x86_64__
> -/* Defined in auto-generated file reg-amd64.c.  */
> +/* Defined in auto-generated file amd64.c.  */
>  void init_registers_amd64 (void);
>  extern const struct target_desc *tdesc_amd64;
>  #else
> -/* Defined in auto-generated file reg-i386.c.  */
> +/* Defined in auto-generated file i386.c.  */
>  void init_registers_i386 (void);
>  extern const struct target_desc *tdesc_i386;
>  #endif

You could also put the full path to the file, either 
features/i386/amd64.c or gdb/features/i386/amd64.c, since it's not 
obvious where those files are located (although a "find" finds it 
quickly).

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Luis Machado]

On 12/06/2016 12:54 PM, Simon Marchi wrote:
> On 2016-12-06 11:15, Luis Machado wrote:
>> These auto-generated register source files have been renamed back in
>> 2010.
>>
>> It took me a while to find these due to the mismatch.
>>
>> gdb/gdbserver/ChangeLog:
>>
>> 2016-12-06  Luis Machado  <lgustavo@codesourcery.com>
>>
>>     * win32-i386-low.c: Fix incorrect reference to a couple source files.
>> ---
>>  gdb/gdbserver/win32-i386-low.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/gdb/gdbserver/win32-i386-low.c
>> b/gdb/gdbserver/win32-i386-low.c
>> index 5daa863..edae9bb 100644
>> --- a/gdb/gdbserver/win32-i386-low.c
>> +++ b/gdb/gdbserver/win32-i386-low.c
>> @@ -29,11 +29,11 @@
>>  #define FLAG_TRACE_BIT 0x100
>>
>>  #ifdef __x86_64__
>> -/* Defined in auto-generated file reg-amd64.c.  */
>> +/* Defined in auto-generated file amd64.c.  */
>>  void init_registers_amd64 (void);
>>  extern const struct target_desc *tdesc_amd64;
>>  #else
>> -/* Defined in auto-generated file reg-i386.c.  */
>> +/* Defined in auto-generated file i386.c.  */
>>  void init_registers_i386 (void);
>>  extern const struct target_desc *tdesc_i386;
>>  #endif
>
> You could also put the full path to the file, either
> features/i386/amd64.c or gdb/features/i386/amd64.c, since it's not
> obvious where those files are located (although a "find" finds it quickly).
>

Good one. That sounds better.

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Luis Machado]

How about the following? I also fixed another occurrences of the same mistake
in another source file.

----

gdb/gdbserver/ChangeLog:

2016-12-06  Luis Machado  <lgustavo@codesourcery.com>

	* win32-i386-low.c: Fix incorrect reference to a couple source files.
	* nto-x86-low.c: Likewise.
---
 gdb/gdbserver/nto-x86-low.c    | 2 +-
 gdb/gdbserver/win32-i386-low.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c
index da77c54..c7303ab 100644
--- a/gdb/gdbserver/nto-x86-low.c
+++ b/gdb/gdbserver/nto-x86-low.c
@@ -25,7 +25,7 @@
 #include <x86/context.h>
 
 
-/* Definition auto generated from reg-i386.dep.  */
+/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
 extern void init_registers_i386 ();
 extern struct reg *regs_i386;
 extern const struct target_desc *tdesc_i386;
diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c
index 5daa863..dc20d68 100644
--- a/gdb/gdbserver/win32-i386-low.c
+++ b/gdb/gdbserver/win32-i386-low.c
@@ -29,11 +29,11 @@
 #define FLAG_TRACE_BIT 0x100
 
 #ifdef __x86_64__
-/* Defined in auto-generated file reg-amd64.c.  */
+/* Defined in auto-generated build-time file gdb/gdbserver/amd64.c.  */
 void init_registers_amd64 (void);
 extern const struct target_desc *tdesc_amd64;
 #else
-/* Defined in auto-generated file reg-i386.c.  */
+/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
 void init_registers_i386 (void);
 extern const struct target_desc *tdesc_i386;
 #endif
-- 
2.7.4

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Simon Marchi]

On 2016-12-06 17:55, Luis Machado wrote:
> How about the following? I also fixed another occurrences of the same 
> mistake
> in another source file.
> 
> ----
> 
> gdb/gdbserver/ChangeLog:
> 
> 2016-12-06  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	* win32-i386-low.c: Fix incorrect reference to a couple source files.
> 	* nto-x86-low.c: Likewise.
> ---
>  gdb/gdbserver/nto-x86-low.c    | 2 +-
>  gdb/gdbserver/win32-i386-low.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c
> index da77c54..c7303ab 100644
> --- a/gdb/gdbserver/nto-x86-low.c
> +++ b/gdb/gdbserver/nto-x86-low.c
> @@ -25,7 +25,7 @@
>  #include <x86/context.h>
> 
> 
> -/* Definition auto generated from reg-i386.dep.  */
> +/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
>  extern void init_registers_i386 ();
>  extern struct reg *regs_i386;
>  extern const struct target_desc *tdesc_i386;
> diff --git a/gdb/gdbserver/win32-i386-low.c 
> b/gdb/gdbserver/win32-i386-low.c
> index 5daa863..dc20d68 100644
> --- a/gdb/gdbserver/win32-i386-low.c
> +++ b/gdb/gdbserver/win32-i386-low.c
> @@ -29,11 +29,11 @@
>  #define FLAG_TRACE_BIT 0x100
> 
>  #ifdef __x86_64__
> -/* Defined in auto-generated file reg-amd64.c.  */
> +/* Defined in auto-generated build-time file gdb/gdbserver/amd64.c.  
> */
>  void init_registers_amd64 (void);
>  extern const struct target_desc *tdesc_amd64;
>  #else
> -/* Defined in auto-generated file reg-i386.c.  */
> +/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
>  void init_registers_i386 (void);
>  extern const struct target_desc *tdesc_i386;
>  #endif

You used the wrong directory :).

gdb/gdbserver -> gdb/features/i386

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Luis Machado]

On 12/06/2016 05:02 PM, Simon Marchi wrote:
> On 2016-12-06 17:55, Luis Machado wrote:
>> How about the following? I also fixed another occurrences of the same
>> mistake
>> in another source file.
>>
>> ----
>>
>> gdb/gdbserver/ChangeLog:
>>
>> 2016-12-06  Luis Machado  <lgustavo@codesourcery.com>
>>
>>     * win32-i386-low.c: Fix incorrect reference to a couple source files.
>>     * nto-x86-low.c: Likewise.
>> ---
>>  gdb/gdbserver/nto-x86-low.c    | 2 +-
>>  gdb/gdbserver/win32-i386-low.c | 4 ++--
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c
>> index da77c54..c7303ab 100644
>> --- a/gdb/gdbserver/nto-x86-low.c
>> +++ b/gdb/gdbserver/nto-x86-low.c
>> @@ -25,7 +25,7 @@
>>  #include <x86/context.h>
>>
>>
>> -/* Definition auto generated from reg-i386.dep.  */
>> +/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
>>  extern void init_registers_i386 ();
>>  extern struct reg *regs_i386;
>>  extern const struct target_desc *tdesc_i386;
>> diff --git a/gdb/gdbserver/win32-i386-low.c
>> b/gdb/gdbserver/win32-i386-low.c
>> index 5daa863..dc20d68 100644
>> --- a/gdb/gdbserver/win32-i386-low.c
>> +++ b/gdb/gdbserver/win32-i386-low.c
>> @@ -29,11 +29,11 @@
>>  #define FLAG_TRACE_BIT 0x100
>>
>>  #ifdef __x86_64__
>> -/* Defined in auto-generated file reg-amd64.c.  */
>> +/* Defined in auto-generated build-time file gdb/gdbserver/amd64.c.  */
>>  void init_registers_amd64 (void);
>>  extern const struct target_desc *tdesc_amd64;
>>  #else
>> -/* Defined in auto-generated file reg-i386.c.  */
>> +/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
>>  void init_registers_i386 (void);
>>  extern const struct target_desc *tdesc_i386;
>>  #endif
>
> You used the wrong directory :).
>
> gdb/gdbserver -> gdb/features/i386
>

The files don't live inside gdb/features/, they are auto-generated based 
on the .dat files from gdb/regformats/ and put inside 
<build>/gdb/gdbserver/, no?

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Simon Marchi]

On 2016-12-06 18:06, Luis Machado wrote:
> The files don't live inside gdb/features/, they are auto-generated
> based on the .dat files from gdb/regformats/ and put inside
> <build>/gdb/gdbserver/, no?

Oh ok I got confused with the other files named the same way, sorry.  
Then if they're all in the same directory, my initial comment may not 
apply, it might be obvious enough.

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Luis Machado]

On 12/06/2016 05:14 PM, Simon Marchi wrote:
> On 2016-12-06 18:06, Luis Machado wrote:
>> The files don't live inside gdb/features/, they are auto-generated
>> based on the .dat files from gdb/regformats/ and put inside
>> <build>/gdb/gdbserver/, no?
>
> Oh ok I got confused with the other files named the same way, sorry.
> Then if they're all in the same directory, my initial comment may not
> apply, it might be obvious enough.

I'm still happy with the last patch. I think it clarifies things a bit 
or at least points the user toward the right direction (build directory).

Does anyone have objections?

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Pedro Alves]

On 12/07/2016 06:57 PM, Luis Machado wrote:
> On 12/06/2016 05:14 PM, Simon Marchi wrote:
>> On 2016-12-06 18:06, Luis Machado wrote:
>>> The files don't live inside gdb/features/, they are auto-generated
>>> based on the .dat files from gdb/regformats/ and put inside
>>> <build>/gdb/gdbserver/, no?
>>
>> Oh ok I got confused with the other files named the same way, sorry.
>> Then if they're all in the same directory, my initial comment may not
>> apply, it might be obvious enough.
> 
> I'm still happy with the last patch. I think it clarifies things a bit
> or at least points the user toward the right direction (build directory).
> 
> Does anyone have objections?

Fine with me.

Thanks,
Pedro Alves

Re: [PATCH, obvious?] Fix incorrect reference to source files

[Luis Machado]

On 12/09/2016 11:02 AM, Pedro Alves wrote:
> On 12/07/2016 06:57 PM, Luis Machado wrote:
>> On 12/06/2016 05:14 PM, Simon Marchi wrote:
>>> On 2016-12-06 18:06, Luis Machado wrote:
>>>> The files don't live inside gdb/features/, they are auto-generated
>>>> based on the .dat files from gdb/regformats/ and put inside
>>>> <build>/gdb/gdbserver/, no?
>>>
>>> Oh ok I got confused with the other files named the same way, sorry.
>>> Then if they're all in the same directory, my initial comment may not
>>> apply, it might be obvious enough.
>>
>> I'm still happy with the last patch. I think it clarifies things a bit
>> or at least points the user toward the right direction (build directory).
>>
>> Does anyone have objections?
>
> Fine with me.
>
> Thanks,
> Pedro Alves
>
>

Thanks. Pushed now.