* PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
@ 2012-05-11 19:30 H.J. Lu
2012-05-11 20:20 ` Mark Kettenis
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: H.J. Lu @ 2012-05-11 19:30 UTC (permalink / raw)
To: GDB
Hi,
This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
on Linux/x86-64. OK to install?
Thanks.
H.J.
---
* amd64-linux-tdep.c: Include features/i386/x32-linux.c
and features/i386/x32-avx-linux.c.
(amd64_linux_init_abi): Check bfd_mach_x64_32 for x32 process.
(_initialize_amd64_linux_tdep): Register bfd_mach_x64_32. Call
initialize_tdesc_x32_linux and initialize_tdesc_x32_avx_linux.
* amd64-linux-tdep.h (tdesc_x32_linux): New.
(tdesc_x32_avx_linux): Likewise.
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index acc7303..601ce20 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -42,6 +42,8 @@
#include "features/i386/amd64-linux.c"
#include "features/i386/amd64-avx-linux.c"
+#include "features/i386/x32-linux.c"
+#include "features/i386/x32-avx-linux.c"
/* The syscall's XML filename for i386. */
#define XML_SYSCALL_FILENAME_AMD64 "syscalls/amd64-linux.xml"
@@ -1273,9 +1290,15 @@ amd64_linux_core_read_description (struct gdbarch *gdbarch,
switch ((xcr0 & I386_XSTATE_AVX_MASK))
{
case I386_XSTATE_AVX_MASK:
- return tdesc_amd64_avx_linux;
+ if (gdbarch_ptr_bit (gdbarch) == 32)
+ return tdesc_x32_avx_linux;
+ else
+ return tdesc_amd64_avx_linux;
default:
- return tdesc_amd64_linux;
+ if (gdbarch_ptr_bit (gdbarch) == 32)
+ return tdesc_x32_linux;
+ else
+ return tdesc_amd64_linux;
}
}
@@ -1302,7 +1325,13 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
if (! tdesc_has_registers (tdesc))
- tdesc = tdesc_amd64_linux;
+ {
+ if (info.abfd != NULL
+ && (info.bfd_arch_info->mach & bfd_mach_x64_32))
+ tdesc = tdesc_x32_linux;
+ else
+ tdesc = tdesc_amd64_linux;
+ }
tdep->tdesc = tdesc;
feature = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.linux");
@@ -1323,8 +1352,12 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
/* GNU/Linux uses SVR4-style shared libraries. */
- set_solib_svr4_fetch_link_map_offsets
- (gdbarch, svr4_lp64_fetch_link_map_offsets);
+ if (tdesc_architecture (tdesc)->mach & bfd_mach_x64_32)
+ set_solib_svr4_fetch_link_map_offsets
+ (gdbarch, svr4_ilp32_fetch_link_map_offsets);
+ else
+ set_solib_svr4_fetch_link_map_offsets
+ (gdbarch, svr4_lp64_fetch_link_map_offsets);
/* Add the %orig_rax register used for syscall restarting. */
set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
@@ -1545,8 +1578,12 @@ _initialize_amd64_linux_tdep (void)
{
gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
GDB_OSABI_LINUX, amd64_linux_init_abi);
+ gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
+ GDB_OSABI_LINUX, amd64_linux_init_abi);
/* Initialize the Linux target description. */
initialize_tdesc_amd64_linux ();
initialize_tdesc_amd64_avx_linux ();
+ initialize_tdesc_x32_linux ();
+ initialize_tdesc_x32_avx_linux ();
}
diff --git a/gdb/amd64-linux-tdep.h b/gdb/amd64-linux-tdep.h
index 0338b6e..49bb95e 100644
--- a/gdb/amd64-linux-tdep.h
+++ b/gdb/amd64-linux-tdep.h
@@ -34,6 +34,8 @@
/* Linux target description. */
extern struct target_desc *tdesc_amd64_linux;
extern struct target_desc *tdesc_amd64_avx_linux;
+extern struct target_desc *tdesc_x32_linux;
+extern struct target_desc *tdesc_x32_avx_linux;
/* Enum that defines the syscall identifiers for amd64 linux.
Used for process record/replay, these will be translated into
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
2012-05-11 19:30 PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary H.J. Lu
@ 2012-05-11 20:20 ` Mark Kettenis
2012-05-11 23:13 ` H.J. Lu
2012-05-11 20:31 ` Mark Kettenis
2012-05-12 1:38 ` Yao Qi
2 siblings, 1 reply; 9+ messages in thread
From: Mark Kettenis @ 2012-05-11 20:20 UTC (permalink / raw)
To: hjl.tools; +Cc: gdb-patches
> Hi,
>
> This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
> on Linux/x86-64. OK to install?
>
> Thanks.
>
>
> H.J.
> ---
> * amd64-linux-tdep.c: Include features/i386/x32-linux.c
> and features/i386/x32-avx-linux.c.
> (amd64_linux_init_abi): Check bfd_mach_x64_32 for x32 process.
> (_initialize_amd64_linux_tdep): Register bfd_mach_x64_32. Call
> initialize_tdesc_x32_linux and initialize_tdesc_x32_avx_linux.
>
> * amd64-linux-tdep.h (tdesc_x32_linux): New.
> (tdesc_x32_avx_linux): Likewise.
>
> diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
> index acc7303..601ce20 100644
> --- a/gdb/amd64-linux-tdep.c
> +++ b/gdb/amd64-linux-tdep.c
> @@ -1545,8 +1578,12 @@ _initialize_amd64_linux_tdep (void)
> {
> gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
> GDB_OSABI_LINUX, amd64_linux_init_abi);
> + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
> + GDB_OSABI_LINUX, amd64_linux_init_abi);
Instead of doing this, you should introduce an
amd64_x32_linux_init_abi() function, make that call amd64_linix_init_abi() and ovverride the bits that are different for X32.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
2012-05-11 19:30 PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary H.J. Lu
2012-05-11 20:20 ` Mark Kettenis
@ 2012-05-11 20:31 ` Mark Kettenis
2012-05-11 20:56 ` H.J. Lu
2012-05-12 1:38 ` Yao Qi
2 siblings, 1 reply; 9+ messages in thread
From: Mark Kettenis @ 2012-05-11 20:31 UTC (permalink / raw)
To: hjl.tools; +Cc: gdb-patches
> Date: Fri, 11 May 2012 12:29:49 -0700
> From: "H.J. Lu" <hongjiu.lu@intel.com>
>
> This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
> on Linux/x86-64. OK to install?
>
> Thanks.
>
> * amd64-linux-tdep.h (tdesc_x32_linux): New.
> (tdesc_x32_avx_linux): Likewise.
You should commit this bit seperately.
> diff --git a/gdb/amd64-linux-tdep.h b/gdb/amd64-linux-tdep.h
> index 0338b6e..49bb95e 100644
> --- a/gdb/amd64-linux-tdep.h
> +++ b/gdb/amd64-linux-tdep.h
> @@ -34,6 +34,8 @@
> /* Linux target description. */
> extern struct target_desc *tdesc_amd64_linux;
> extern struct target_desc *tdesc_amd64_avx_linux;
> +extern struct target_desc *tdesc_x32_linux;
> +extern struct target_desc *tdesc_x32_avx_linux;
>
> /* Enum that defines the syscall identifiers for amd64 linux.
> Used for process record/replay, these will be translated into
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
2012-05-11 20:31 ` Mark Kettenis
@ 2012-05-11 20:56 ` H.J. Lu
0 siblings, 0 replies; 9+ messages in thread
From: H.J. Lu @ 2012-05-11 20:56 UTC (permalink / raw)
To: Mark Kettenis; +Cc: gdb-patches
On Fri, May 11, 2012 at 1:31 PM, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
>> Date: Fri, 11 May 2012 12:29:49 -0700
>> From: "H.J. Lu" <hongjiu.lu@intel.com>
>>
>> This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
>> on Linux/x86-64. OK to install?
>>
>> Thanks.
>>
>> * amd64-linux-tdep.h (tdesc_x32_linux): New.
>> (tdesc_x32_avx_linux): Likewise.
>
> You should commit this bit seperately.
>
>> diff --git a/gdb/amd64-linux-tdep.h b/gdb/amd64-linux-tdep.h
>> index 0338b6e..49bb95e 100644
>> --- a/gdb/amd64-linux-tdep.h
>> +++ b/gdb/amd64-linux-tdep.h
>> @@ -34,6 +34,8 @@
>> /* Linux target description. */
>> extern struct target_desc *tdesc_amd64_linux;
>> extern struct target_desc *tdesc_amd64_avx_linux;
>> +extern struct target_desc *tdesc_x32_linux;
>> +extern struct target_desc *tdesc_x32_avx_linux;
>>
>> /* Enum that defines the syscall identifiers for amd64 linux.
>> Used for process record/replay, these will be translated into
>>
I will do that. Thanks.
--
H.J.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
2012-05-11 20:20 ` Mark Kettenis
@ 2012-05-11 23:13 ` H.J. Lu
2012-05-14 18:10 ` H.J. Lu
2012-05-14 18:42 ` Mark Kettenis
0 siblings, 2 replies; 9+ messages in thread
From: H.J. Lu @ 2012-05-11 23:13 UTC (permalink / raw)
To: Mark Kettenis; +Cc: gdb-patches
On Fri, May 11, 2012 at 1:20 PM, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
>> Hi,
>>
>> This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
>> on Linux/x86-64. OK to install?
>>
>> Thanks.
>>
>>
>> H.J.
>> ---
>> * amd64-linux-tdep.c: Include features/i386/x32-linux.c
>> and features/i386/x32-avx-linux.c.
>> (amd64_linux_init_abi): Check bfd_mach_x64_32 for x32 process.
>> (_initialize_amd64_linux_tdep): Register bfd_mach_x64_32. Call
>> initialize_tdesc_x32_linux and initialize_tdesc_x32_avx_linux.
>>
>> * amd64-linux-tdep.h (tdesc_x32_linux): New.
>> (tdesc_x32_avx_linux): Likewise.
>>
>> diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
>> index acc7303..601ce20 100644
>> --- a/gdb/amd64-linux-tdep.c
>> +++ b/gdb/amd64-linux-tdep.c
>> @@ -1545,8 +1578,12 @@ _initialize_amd64_linux_tdep (void)
>> {
>> gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
>> GDB_OSABI_LINUX, amd64_linux_init_abi);
>> + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
>> + GDB_OSABI_LINUX, amd64_linux_init_abi);
>
> Instead of doing this, you should introduce an
> amd64_x32_linux_init_abi() function, make that call amd64_linix_init_abi() and ovverride the bits that are different for X32.
I don't think I should override tdep->tdesc. Here is a different approach.
I updated amd64_linux_init_abi to take amd64_linux_tdesc and fetch_func.
I also added amd64_lp64_linux_init_abi and amd64_ilp32_linux_init_abi
to pass the right ones to amd64_linux_init_abi. Tested on Linux/x86-64.
OK to install?
Thanks.
--
H.J.
--
* amd64-linux-tdep.c (amd64_linux_init_abi): Add 2 arguments,
amd64_linux_tdesc and fetch_func. Replace tdesc_amd64_linux
with amd64_linux_tdesc and svr4_lp64_fetch_link_map_offsets
with fetch_func.
(amd64_lp64_linux_init_abi): New function.
(amd64_ilp32_linux_init_abi): Likewise.
(_initialize_amd64_linux_tdep): Replace amd64_linux_init_abi
with amd64_lp64_linux_init_abi. Register bfd_mach_x64_32 with
amd64_ilp32_linux_init_abi. Call initialize_tdesc_x32_linux
and initialize_tdesc_x32_avx_linux.
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index cfe6e4b..e68d70f 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -1288,7 +1288,9 @@ amd64_linux_core_read_description (struct
gdbarch *gdbarch,
}
static void
-amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch,
+ const struct target_desc *amd64_linux_tdesc,
+ struct link_map_offsets *(*fetch_func) (void))
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
const struct target_desc *tdesc = info.target_desc;
@@ -1310,7 +1312,7 @@ amd64_linux_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch)
set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
if (! tdesc_has_registers (tdesc))
- tdesc = tdesc_amd64_linux;
+ tdesc = amd64_linux_tdesc;
tdep->tdesc = tdesc;
feature = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.linux");
@@ -1331,8 +1333,7 @@ amd64_linux_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch)
tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
/* GNU/Linux uses SVR4-style shared libraries. */
- set_solib_svr4_fetch_link_map_offsets
- (gdbarch, svr4_lp64_fetch_link_map_offsets);
+ set_solib_svr4_fetch_link_map_offsets (gdbarch, fetch_func);
/* Add the %orig_rax register used for syscall restarting. */
set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
@@ -1543,6 +1544,22 @@ amd64_linux_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch)
tdep->i386_syscall_record = amd64_linux_syscall_record;
}
+
+static void
+amd64_lp64_linux_init_abi (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ amd64_linux_init_abi (info, gdbarch, tdesc_amd64_linux,
+ svr4_lp64_fetch_link_map_offsets);
+}
+
+static void
+amd64_ilp32_linux_init_abi (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ amd64_linux_init_abi (info, gdbarch, tdesc_x32_linux,
+ svr4_ilp32_fetch_link_map_offsets);
+}
/* Provide a prototype to silence -Wmissing-prototypes. */
@@ -1552,9 +1569,13 @@ void
_initialize_amd64_linux_tdep (void)
{
gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
- GDB_OSABI_LINUX, amd64_linux_init_abi);
+ GDB_OSABI_LINUX, amd64_lp64_linux_init_abi);
+ gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
+ GDB_OSABI_LINUX, amd64_ilp32_linux_init_abi);
/* Initialize the Linux target description. */
initialize_tdesc_amd64_linux ();
initialize_tdesc_amd64_avx_linux ();
+ initialize_tdesc_x32_linux ();
+ initialize_tdesc_x32_avx_linux ();
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
2012-05-11 19:30 PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary H.J. Lu
2012-05-11 20:20 ` Mark Kettenis
2012-05-11 20:31 ` Mark Kettenis
@ 2012-05-12 1:38 ` Yao Qi
2 siblings, 0 replies; 9+ messages in thread
From: Yao Qi @ 2012-05-12 1:38 UTC (permalink / raw)
To: H.J. Lu; +Cc: H.J. Lu, GDB
On 05/12/2012 03:29 AM, H.J. Lu wrote:
> Hi,
>
> This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
> on Linux/x86-64. OK to install?
>
> Thanks.
>
>
> H.J.
> ---
> * amd64-linux-tdep.c: Include features/i386/x32-linux.c
> and features/i386/x32-avx-linux.c.
You committed this part first, and cause a build failure on x86_64.
cc1: warnings being treated as errors
/home/yqi/source/gdb/cvs_write/src/gdb/features/i386/x32-linux.c:10:
error: 'initialize_tdesc_x32_linux' defined but not used
/home/yqi/source/gdb/cvs_write/src/gdb/features/i386/x32-avx-linux.c:10:
error: 'initialize_tdesc_x32_avx_linux' defined but not used
--
Yao (é½å°§)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
2012-05-11 23:13 ` H.J. Lu
@ 2012-05-14 18:10 ` H.J. Lu
2012-05-14 18:42 ` Mark Kettenis
1 sibling, 0 replies; 9+ messages in thread
From: H.J. Lu @ 2012-05-14 18:10 UTC (permalink / raw)
To: Mark Kettenis; +Cc: gdb-patches
On Fri, May 11, 2012 at 4:13 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Fri, May 11, 2012 at 1:20 PM, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
>>> Hi,
>>>
>>> This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
>>> on Linux/x86-64. OK to install?
>>>
>>> Thanks.
>>>
>>>
>>> H.J.
>>> ---
>>> * amd64-linux-tdep.c: Include features/i386/x32-linux.c
>>> and features/i386/x32-avx-linux.c.
>>> (amd64_linux_init_abi): Check bfd_mach_x64_32 for x32 process.
>>> (_initialize_amd64_linux_tdep): Register bfd_mach_x64_32. Call
>>> initialize_tdesc_x32_linux and initialize_tdesc_x32_avx_linux.
>>>
>>> * amd64-linux-tdep.h (tdesc_x32_linux): New.
>>> (tdesc_x32_avx_linux): Likewise.
>>>
>>> diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
>>> index acc7303..601ce20 100644
>>> --- a/gdb/amd64-linux-tdep.c
>>> +++ b/gdb/amd64-linux-tdep.c
>>> @@ -1545,8 +1578,12 @@ _initialize_amd64_linux_tdep (void)
>>> {
>>> gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
>>> GDB_OSABI_LINUX, amd64_linux_init_abi);
>>> + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
>>> + GDB_OSABI_LINUX, amd64_linux_init_abi);
>>
>> Instead of doing this, you should introduce an
>> amd64_x32_linux_init_abi() function, make that call amd64_linix_init_abi() and ovverride the bits that are different for X32.
>
> I don't think I should override tdep->tdesc. Here is a different approach.
> I updated amd64_linux_init_abi to take amd64_linux_tdesc and fetch_func.
> I also added amd64_lp64_linux_init_abi and amd64_ilp32_linux_init_abi
> to pass the right ones to amd64_linux_init_abi. Tested on Linux/x86-64.
> OK to install?
>
> Thanks.
>
> --
> H.J.
> --
> * amd64-linux-tdep.c (amd64_linux_init_abi): Add 2 arguments,
> amd64_linux_tdesc and fetch_func. Replace tdesc_amd64_linux
> with amd64_linux_tdesc and svr4_lp64_fetch_link_map_offsets
> with fetch_func.
> (amd64_lp64_linux_init_abi): New function.
> (amd64_ilp32_linux_init_abi): Likewise.
> (_initialize_amd64_linux_tdep): Replace amd64_linux_init_abi
> with amd64_lp64_linux_init_abi. Register bfd_mach_x64_32 with
> amd64_ilp32_linux_init_abi. Call initialize_tdesc_x32_linux
> and initialize_tdesc_x32_avx_linux.
>
An updated patch to remove the change which are already in
trunk. OK to install?
Thanks.
--
H.J.
---
* amd64-linux-tdep.c (amd64_linux_init_abi): Add 2 arguments,
amd64_linux_tdesc and fetch_func. Replace tdesc_amd64_linux
with amd64_linux_tdesc and svr4_lp64_fetch_link_map_offsets
with fetch_func.
(amd64_lp64_linux_init_abi): New function.
(amd64_ilp32_linux_init_abi): Likewise.
(_initialize_amd64_linux_tdep): Replace amd64_linux_init_abi
with amd64_lp64_linux_init_abi. Register bfd_mach_x64_32 with
amd64_ilp32_linux_init_abi.
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index cfe6e4b..e68d70f 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -1288,7 +1288,9 @@ amd64_linux_core_read_description (struct
gdbarch *gdbarch,
}
static void
-amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch,
+ const struct target_desc *amd64_linux_tdesc,
+ struct link_map_offsets *(*fetch_func) (void))
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
const struct target_desc *tdesc = info.target_desc;
@@ -1310,7 +1312,7 @@ amd64_linux_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch)
set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
if (! tdesc_has_registers (tdesc))
- tdesc = tdesc_amd64_linux;
+ tdesc = amd64_linux_tdesc;
tdep->tdesc = tdesc;
feature = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.linux");
@@ -1331,8 +1333,7 @@ amd64_linux_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch)
tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
/* GNU/Linux uses SVR4-style shared libraries. */
- set_solib_svr4_fetch_link_map_offsets
- (gdbarch, svr4_lp64_fetch_link_map_offsets);
+ set_solib_svr4_fetch_link_map_offsets (gdbarch, fetch_func);
/* Add the %orig_rax register used for syscall restarting. */
set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
@@ -1543,6 +1544,22 @@ amd64_linux_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch)
tdep->i386_syscall_record = amd64_linux_syscall_record;
}
+
+static void
+amd64_lp64_linux_init_abi (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ amd64_linux_init_abi (info, gdbarch, tdesc_amd64_linux,
+ svr4_lp64_fetch_link_map_offsets);
+}
+
+static void
+amd64_ilp32_linux_init_abi (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ amd64_linux_init_abi (info, gdbarch, tdesc_x32_linux,
+ svr4_ilp32_fetch_link_map_offsets);
+}
/* Provide a prototype to silence -Wmissing-prototypes. */
@@ -1552,7 +1589,9 @@ void
_initialize_amd64_linux_tdep (void)
{
gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
- GDB_OSABI_LINUX, amd64_linux_init_abi);
+ GDB_OSABI_LINUX, amd64_lp64_linux_init_abi);
+ gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
+ GDB_OSABI_LINUX, amd64_ilp32_linux_init_abi);
/* Initialize the Linux target description. */
initialize_tdesc_amd64_linux ();
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
2012-05-11 23:13 ` H.J. Lu
2012-05-14 18:10 ` H.J. Lu
@ 2012-05-14 18:42 ` Mark Kettenis
2012-05-14 19:02 ` H.J. Lu
1 sibling, 1 reply; 9+ messages in thread
From: Mark Kettenis @ 2012-05-14 18:42 UTC (permalink / raw)
To: hjl.tools; +Cc: gdb-patches
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5411 bytes --]
> Date: Fri, 11 May 2012 16:13:04 -0700
> From: "H.J. Lu" <hjl.tools@gmail.com>
>
> On Fri, May 11, 2012 at 1:20 PM, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
> >> Hi,
> >>
> >> This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
> >> on Linux/x86-64. OK to install?
> >>
> >> Thanks.
> >>
> >>
> >> H.J.
> >> ---
> >> * amd64-linux-tdep.c: Include features/i386/x32-linux.c
> >> and features/i386/x32-avx-linux.c.
> >> (amd64_linux_init_abi): Check bfd_mach_x64_32 for x32 process.
> >> (_initialize_amd64_linux_tdep): Register bfd_mach_x64_32. Call
> >> initialize_tdesc_x32_linux and initialize_tdesc_x32_avx_linux.
> >>
> >> * amd64-linux-tdep.h (tdesc_x32_linux): New.
> >> (tdesc_x32_avx_linux): Likewise.
> >>
> >> diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
> >> index acc7303..601ce20 100644
> >> --- a/gdb/amd64-linux-tdep.c
> >> +++ b/gdb/amd64-linux-tdep.c
> >> @@ -1545,8 +1578,12 @@ _initialize_amd64_linux_tdep (void)
> >> {
> >> gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
> >> GDB_OSABI_LINUX, amd64_linux_init_abi);
> >> + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
> >> + GDB_OSABI_LINUX, amd64_linux_init_abi);
> >
> > Instead of doing this, you should introduce an
> > amd64_x32_linux_init_abi() function, make that call amd64_linix_init_abi() and ovverride the bits that are different for X32.
>
> I don't think I should override tdep->tdesc. Here is a different approach.
> I updated amd64_linux_init_abi to take amd64_linux_tdesc and fetch_func.
> I also added amd64_lp64_linux_init_abi and amd64_ilp32_linux_init_abi
> to pass the right ones to amd64_linux_init_abi. Tested on Linux/x86-64.
> OK to install?
No. Sorry, but you missed my point. I want you to introduce a
seperate function such that it will be easy to override stuff
specifically for x32 without adding lots of if statements that turn
the code into spaghetti.
> --
> H.J.
> --
> * amd64-linux-tdep.c (amd64_linux_init_abi): Add 2 arguments,
> amd64_linux_tdesc and fetch_func. Replace tdesc_amd64_linux
> with amd64_linux_tdesc and svr4_lp64_fetch_link_map_offsets
> with fetch_func.
> (amd64_lp64_linux_init_abi): New function.
> (amd64_ilp32_linux_init_abi): Likewise.
> (_initialize_amd64_linux_tdep): Replace amd64_linux_init_abi
> with amd64_lp64_linux_init_abi. Register bfd_mach_x64_32 with
> amd64_ilp32_linux_init_abi. Call initialize_tdesc_x32_linux
> and initialize_tdesc_x32_avx_linux.
>
> diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
> index cfe6e4b..e68d70f 100644
> --- a/gdb/amd64-linux-tdep.c
> +++ b/gdb/amd64-linux-tdep.c
> @@ -1288,7 +1288,9 @@ amd64_linux_core_read_description (struct
> gdbarch *gdbarch,
> }
>
> static void
> -amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
> +amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch,
> + const struct target_desc *amd64_linux_tdesc,
> + struct link_map_offsets *(*fetch_func) (void))
> {
> struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
> const struct target_desc *tdesc = info.target_desc;
> @@ -1310,7 +1312,7 @@ amd64_linux_init_abi (struct gdbarch_info info,
> struct gdbarch *gdbarch)
> set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS);
>
> if (! tdesc_has_registers (tdesc))
> - tdesc = tdesc_amd64_linux;
> + tdesc = amd64_linux_tdesc;
> tdep->tdesc = tdesc;
>
> feature = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.linux");
> @@ -1331,8 +1333,7 @@ amd64_linux_init_abi (struct gdbarch_info info,
> struct gdbarch *gdbarch)
> tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
>
> /* GNU/Linux uses SVR4-style shared libraries. */
> - set_solib_svr4_fetch_link_map_offsets
> - (gdbarch, svr4_lp64_fetch_link_map_offsets);
> + set_solib_svr4_fetch_link_map_offsets (gdbarch, fetch_func);
>
> /* Add the %orig_rax register used for syscall restarting. */
> set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
> @@ -1543,6 +1544,22 @@ amd64_linux_init_abi (struct gdbarch_info info,
> struct gdbarch *gdbarch)
>
> tdep->i386_syscall_record = amd64_linux_syscall_record;
> }
> +
> +static void
> +amd64_lp64_linux_init_abi (struct gdbarch_info info,
> + struct gdbarch *gdbarch)
> +{
> + amd64_linux_init_abi (info, gdbarch, tdesc_amd64_linux,
> + svr4_lp64_fetch_link_map_offsets);
> +}
> +
> +static void
> +amd64_ilp32_linux_init_abi (struct gdbarch_info info,
> + struct gdbarch *gdbarch)
> +{
> + amd64_linux_init_abi (info, gdbarch, tdesc_x32_linux,
> + svr4_ilp32_fetch_link_map_offsets);
> +}
>
>
>
> /* Provide a prototype to silence -Wmissing-prototypes. */
> @@ -1552,9 +1569,13 @@ void
> _initialize_amd64_linux_tdep (void)
> {
> gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
> - GDB_OSABI_LINUX, amd64_linux_init_abi);
> + GDB_OSABI_LINUX, amd64_lp64_linux_init_abi);
> + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
> + GDB_OSABI_LINUX, amd64_ilp32_linux_init_abi);
>
> /* Initialize the Linux target description. */
> initialize_tdesc_amd64_linux ();
> initialize_tdesc_amd64_avx_linux ();
> + initialize_tdesc_x32_linux ();
> + initialize_tdesc_x32_avx_linux ();
> }
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary
2012-05-14 18:42 ` Mark Kettenis
@ 2012-05-14 19:02 ` H.J. Lu
0 siblings, 0 replies; 9+ messages in thread
From: H.J. Lu @ 2012-05-14 19:02 UTC (permalink / raw)
To: Mark Kettenis; +Cc: gdb-patches
On Mon, May 14, 2012 at 11:42 AM, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
>> Date: Fri, 11 May 2012 16:13:04 -0700
>> From: "H.J. Lu" <hjl.tools@gmail.com>
>>
>> On Fri, May 11, 2012 at 1:20 PM, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
>> >> Hi,
>> >>
>> >> This patch checks bfd_mach_x64_32 to set tdesc for x32 binary. Tested
>> >> on Linux/x86-64. OK to install?
>> >>
>> >> Thanks.
>> >>
>> >>
>> >> H.J.
>> >> ---
>> >> * amd64-linux-tdep.c: Include features/i386/x32-linux.c
>> >> and features/i386/x32-avx-linux.c.
>> >> (amd64_linux_init_abi): Check bfd_mach_x64_32 for x32 process.
>> >> (_initialize_amd64_linux_tdep): Register bfd_mach_x64_32. Call
>> >> initialize_tdesc_x32_linux and initialize_tdesc_x32_avx_linux.
>> >>
>> >> * amd64-linux-tdep.h (tdesc_x32_linux): New.
>> >> (tdesc_x32_avx_linux): Likewise.
>> >>
>> >> diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
>> >> index acc7303..601ce20 100644
>> >> --- a/gdb/amd64-linux-tdep.c
>> >> +++ b/gdb/amd64-linux-tdep.c
>> >> @@ -1545,8 +1578,12 @@ _initialize_amd64_linux_tdep (void)
>> >> {
>> >> gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
>> >> GDB_OSABI_LINUX, amd64_linux_init_abi);
>> >> + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
>> >> + GDB_OSABI_LINUX, amd64_linux_init_abi);
>> >
>> > Instead of doing this, you should introduce an
>> > amd64_x32_linux_init_abi() function, make that call amd64_linix_init_abi() and ovverride the bits that are different for X32.
>>
>> I don't think I should override tdep->tdesc. Here is a different approach.
>> I updated amd64_linux_init_abi to take amd64_linux_tdesc and fetch_func.
>> I also added amd64_lp64_linux_init_abi and amd64_ilp32_linux_init_abi
>> to pass the right ones to amd64_linux_init_abi. Tested on Linux/x86-64.
>> OK to install?
>
> No. Sorry, but you missed my point. I want you to introduce a
> seperate function such that it will be easy to override stuff
> specifically for x32 without adding lots of if statements that turn
> the code into spaghetti.
>
The current amd64_linux_init_abi has
if (! tdesc_has_registers (tdesc))
tdesc = tdesc_amd64_linux;
tdep->tdesc = tdesc;
If tdesc_has_registers is false, and tdesc field is set to
tdesc_amd64_linux, how can x32 override it safely since it
can be set to something else if tdesc_has_registers is
true?
Thanks.
--
H.J.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-05-14 19:02 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-11 19:30 PATCH: Check bfd_mach_x64_32 to set tdesc for x32 binary H.J. Lu
2012-05-11 20:20 ` Mark Kettenis
2012-05-11 23:13 ` H.J. Lu
2012-05-14 18:10 ` H.J. Lu
2012-05-14 18:42 ` Mark Kettenis
2012-05-14 19:02 ` H.J. Lu
2012-05-11 20:31 ` Mark Kettenis
2012-05-11 20:56 ` H.J. Lu
2012-05-12 1:38 ` Yao Qi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox