On 16-01-19 02:02, Ian Lance Taylor wrote:
> On Tue, Dec 11, 2018 at 2:14 AM Tom de Vries <tdevr...@suse.de> wrote:
>>
>> Add an altlink field to struct dwarf_data, and initialize it with the pointer
>> to the struct dwarf_data for the .gnu_debugaltlink.
>>
>> 2018-11-11 Tom de Vries <tdevr...@suse.de>
>>
>> * dwarf.c (struct dwarf_data): Add altlink field.
>> (backtrace_dwarf_add): Add and handle fileline_entry and
>> fileline_altlink parameters.
>> * elf.c (elf_add): Add and handle fileline_entry parameter. Add
>> args to
>> backtrace_dwarf_add call.
>> (phdr_callback, backtrace_initialize): Add arguments to elf_add
>> calls.
>> * internal.h (backtrace_dwarf_add): Add fileline_entry and
>> fileline_altlink parameters.
>> * pecoff.c (coff_add): Add args to backtrace_dwarf_add call.
>> * xcoff.c (xcoff_add): Same.
>
>
>> @@ -2968,7 +2970,7 @@ build_dwarf_data (struct backtrace_state *state,
>> size_t dwarf_str_size,
>> int is_bigendian,
>> backtrace_error_callback error_callback,
>> - void *data)
>> + void *data, struct dwarf_data *altlink)
>> {
>
> error_callback and data should remain the last two parameters, as they
> are for many of the functions in this file.
>
>
Done.
>> @@ -3031,7 +3034,8 @@ backtrace_dwarf_add (struct backtrace_state *state,
>> size_t dwarf_str_size,
>> int is_bigendian,
>> backtrace_error_callback error_callback,
>> - void *data, fileline *fileline_fn)
>> + void *data, fileline *fileline_fn, void
>> **fileline_entry,
>> + void *fileline_altlink)
>
> The new fileline_altlink parameter should come before error_callback,
> as it is not error_callback/data and is not a result parameter.
>
Done.
> What is fileline_entry for?
There are two bits to this patch:
- add fileline_entry parameter to elf_add. This allows the callers of
elf_add access to the struct dwarf_data pointer corresponding to the
added elf.
- add an altlink field to struct dwarf_data, and initialize it with the
pointer to the struct dwarf_data for the .gnu_debugaltlink.
I've split the patch up this way now, hoping it will make things clearer
and/or easier to review.
> Why is it void**?
It's really struct dwarf_data *, but struct dwarf_data is a type
declared in dwarf.c, so it's not known in other files.
Thanks,
- Tom
Here's the first part.
[libbacktrace] Return struct dwarf_data pointer from elf_add
Allow the caller of elf_add access to the struct dwarf_data pointer
corresponding to the added elf.
2018-11-11 Tom de Vries <tdevr...@suse.de>
* internal.h (backtrace_dwarf_add): Add fileline_entry parameter.
* dwarf.c (backtrace_dwarf_add): Add and handle fileline_entry parameter.
* elf.c (elf_add): Add and handle fileline_entry parameter. Add
argument to backtrace_dwarf_add call.
(phdr_callback, backtrace_initialize): Add argument to elf_add calls.
* pecoff.c (coff_add): Add argument to backtrace_dwarf_add call.
* xcoff.c (xcoff_add): Same.
---
libbacktrace/dwarf.c | 6 +++++-
libbacktrace/elf.c | 23 ++++++++++++++---------
libbacktrace/internal.h | 3 ++-
libbacktrace/pecoff.c | 3 ++-
libbacktrace/xcoff.c | 3 ++-
5 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/libbacktrace/dwarf.c b/libbacktrace/dwarf.c
index af864d68b00..c7913f43617 100644
--- a/libbacktrace/dwarf.c
+++ b/libbacktrace/dwarf.c
@@ -3045,7 +3045,8 @@ backtrace_dwarf_add (struct backtrace_state *state,
size_t dwarf_str_size,
int is_bigendian,
backtrace_error_callback error_callback,
- void *data, fileline *fileline_fn)
+ void *data, fileline *fileline_fn,
+ void **fileline_entry)
{
struct dwarf_data *fdata;
@@ -3057,6 +3058,9 @@ backtrace_dwarf_add (struct backtrace_state *state,
if (fdata == NULL)
return 0;
+ if (fileline_entry != NULL)
+ *fileline_entry = fdata;
+
if (!state->threaded)
{
struct dwarf_data **pp;
diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c
index e363e470525..6f99461db84 100644
--- a/libbacktrace/elf.c
+++ b/libbacktrace/elf.c
@@ -2638,8 +2638,8 @@ static int
elf_add (struct backtrace_state *state, const char *filename, int descriptor,
uintptr_t base_address, backtrace_error_callback error_callback,
void *data, fileline *fileline_fn, int *found_sym, int *found_dwarf,
- int exe, int debuginfo, const char *with_buildid_data,
- uint32_t with_buildid_size)
+ void **fileline_entry, int exe, int debuginfo,
+ const char *with_buildid_data, uint32_t with_buildid_size)
{
struct backtrace_view ehdr_view;
b_elf_ehdr ehdr;
@@ -3042,7 +3042,8 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor,
backtrace_release_view (state, &debugaltlink_view, error_callback,
data);
ret = elf_add (state, NULL, d, base_address, error_callback, data,
- fileline_fn, found_sym, found_dwarf, 0, 1, NULL, 0);
+ fileline_fn, found_sym, found_dwarf, NULL, 0, 1, NULL,
+ 0);
if (ret < 0)
backtrace_close (d, error_callback, data);
else
@@ -3080,7 +3081,8 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor,
backtrace_release_view (state, &debugaltlink_view, error_callback,
data);
ret = elf_add (state, NULL, d, base_address, error_callback, data,
- fileline_fn, found_sym, found_dwarf, 0, 1, NULL, 0);
+ fileline_fn, found_sym, found_dwarf, NULL, 0, 1, NULL,
+ 0);
if (ret < 0)
backtrace_close (d, error_callback, data);
else
@@ -3106,8 +3108,9 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor,
int ret;
ret = elf_add (state, filename, d, base_address, error_callback, data,
- fileline_fn, found_sym, found_dwarf, 0, 1,
- debugaltlink_buildid_data, debugaltlink_buildid_size);
+ fileline_fn, found_sym, found_dwarf, NULL,
+ 0, 1, debugaltlink_buildid_data,
+ debugaltlink_buildid_size);
backtrace_release_view (state, &debugaltlink_view, error_callback,
data);
debugaltlink_view_valid = 0;
@@ -3269,7 +3272,8 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor,
sections[DEBUG_STR].data,
sections[DEBUG_STR].size,
ehdr.e_ident[EI_DATA] == ELFDATA2MSB,
- error_callback, data, fileline_fn))
+ error_callback, data, fileline_fn,
+ fileline_entry))
goto fail;
*found_dwarf = 1;
@@ -3359,7 +3363,7 @@ phdr_callback (struct dl_phdr_info *info, size_t size ATTRIBUTE_UNUSED,
if (elf_add (pd->state, filename, descriptor, info->dlpi_addr,
pd->error_callback, pd->data, &elf_fileline_fn, pd->found_sym,
- &found_dwarf, 0, 0, NULL, 0))
+ &found_dwarf, NULL, 0, 0, NULL, 0))
{
if (found_dwarf)
{
@@ -3387,7 +3391,8 @@ backtrace_initialize (struct backtrace_state *state, const char *filename,
struct phdr_data pd;
ret = elf_add (state, filename, descriptor, 0, error_callback, data,
- &elf_fileline_fn, &found_sym, &found_dwarf, 1, 0, NULL, 0);
+ &elf_fileline_fn, &found_sym, &found_dwarf, NULL, 1, 0, NULL,
+ 0);
if (!ret)
return 0;
diff --git a/libbacktrace/internal.h b/libbacktrace/internal.h
index bf3e7d1989f..0664b2e10c3 100644
--- a/libbacktrace/internal.h
+++ b/libbacktrace/internal.h
@@ -302,7 +302,8 @@ extern int backtrace_dwarf_add (struct backtrace_state *state,
size_t dwarf_str_size,
int is_bigendian,
backtrace_error_callback error_callback,
- void *data, fileline *fileline_fn);
+ void *data, fileline *fileline_fn,
+ void **fileline_entry);
/* A test-only hook for elf_uncompress_zdebug. */
diff --git a/libbacktrace/pecoff.c b/libbacktrace/pecoff.c
index f51fc0f13c5..cd20cbe17a7 100644
--- a/libbacktrace/pecoff.c
+++ b/libbacktrace/pecoff.c
@@ -867,7 +867,8 @@ coff_add (struct backtrace_state *state, int descriptor,
sections[DEBUG_STR].data,
sections[DEBUG_STR].size,
0, /* FIXME */
- error_callback, data, fileline_fn))
+ error_callback, data, fileline_fn,
+ NULL))
goto fail;
*found_dwarf = 1;
diff --git a/libbacktrace/xcoff.c b/libbacktrace/xcoff.c
index 111134d4d21..095800b4f71 100644
--- a/libbacktrace/xcoff.c
+++ b/libbacktrace/xcoff.c
@@ -1315,7 +1315,8 @@ xcoff_add (struct backtrace_state *state, int descriptor, off_t offset,
dwsect[DWSECT_STR].data,
dwsect[DWSECT_STR].size,
1, /* big endian */
- error_callback, data, fileline_fn))
+ error_callback, data, fileline_fn,
+ NULL))
goto fail;
}
