OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libbacktrace] Factor out read_initial_length 

Factor out new function read_initial_length in dwarf.c.

Bootstrapped and reg-tested on x86_64.

2018-11-22  Tom de Vries  <tdevries@suse.de>

	* dwarf.c (read_initial_length): Factor out of ...
	(build_address_map, read_line_info): ... here.

From-SVN: r266361
This commit is contained in:
Tom de Vries 2018-11-22 00:06:27 +00:00 committed by Tom de Vries
parent 208a532904
commit 292592c5da
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libbacktrace/ChangeLog
View File

@ -1,3 +1,8 @@
2018-11-22 Tom de Vries <tdevries@suse.de>
* dwarf.c (read_initial_length): Factor out of ...
(build_address_map, read_line_info): ... here.
2018-11-21 Tom de Vries <tdevries@suse.de>
* dwarf.c (read_string): Factor out of ...

36
libbacktrace/dwarf.c
View File

@ -651,6 +651,25 @@ leb128_len (const unsigned char *p)
return ret;
}
/* Read initial_length from BUF and advance the appropriate number of bytes. */
static uint64_t
read_initial_length (struct dwarf_buf *buf, int *is_dwarf64)
{
uint64_t len;
len = read_uint32 (buf);
if (len == 0xffffffff)
{
len = read_uint64 (buf);
*is_dwarf64 = 1;
}
else
*is_dwarf64 = 0;
return len;
}
/* Free an abbreviations structure. */
static void
@ -1463,14 +1482,7 @@ build_address_map (struct backtrace_state *state, uintptr_t base_address,
unit_data_start = info.buf;
is_dwarf64 = 0;
len = read_uint32 (&info);
if (len == 0xffffffff)
{
len = read_uint64 (&info);
is_dwarf64 = 1;
}
len = read_initial_length (&info, &is_dwarf64);
unit_buf = info;
unit_buf.left = len;
@ -2002,13 +2014,7 @@ read_line_info (struct backtrace_state *state, struct dwarf_data *ddata,
line_buf.data = data;
line_buf.reported_underflow = 0;
is_dwarf64 = 0;
len = read_uint32 (&line_buf);
if (len == 0xffffffff)
{
len = read_uint64 (&line_buf);
is_dwarf64 = 1;
}
len = read_initial_length (&line_buf, &is_dwarf64);
line_buf.left = len;
if (!read_line_header (state, u, is_dwarf64, &line_buf, hdr))