diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2022-12-22 22:34:34 +0900 |
|---|---|---|
| committer | Yusuke Endoh <mame@ruby-lang.org> | 2022-12-23 00:32:35 +0900 |
| commit | 515f816b7f3985e0cfa889a574c3b93274d50b6f (patch) | |
| tree | 047e6dc2e9e1f315d38f696490542ff3fc0ddcbc /addr2line.c | |
| parent | 5234f99b76689e7cf711961a737efd4de863460a (diff) | |
| download | ruby-515f816b7f3985e0cfa889a574c3b93274d50b6f.tar.gz | |
addr2line.c: Support DW_FORM_strx* forms
Diffstat (limited to 'addr2line.c')
| -rw-r--r-- | addr2line.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/addr2line.c b/addr2line.c index 4bad665d2b..db159f1e79 100644 --- a/addr2line.c +++ b/addr2line.c @@ -1124,6 +1124,20 @@ get_cstr_value(DebugInfoValue *v) } } +static const char * +resolve_strx(DebugInfoReader *reader, uint64_t idx) +{ + const char *p = reader->obj->debug_str_offsets.ptr + reader->current_str_offsets_base; + uint64_t off; + if (reader->format == 4) { + off = ((uint32_t *)p)[idx]; + } + else { + off = ((uint64_t *)p)[idx]; + } + return reader->obj->debug_str.ptr + off; +} + static void debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoValue *v) { @@ -1236,7 +1250,7 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa set_uint_value(v, 1); break; case DW_FORM_strx: - set_uint_value(v, uleb128(&reader->p)); + set_cstr_value(v, resolve_strx(reader, uleb128(&reader->p))); break; case DW_FORM_addrx: set_addr_idx_value(v, uleb128(&reader->p)); @@ -1272,16 +1286,16 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa set_uint_value(v, read_uint64(&reader->p)); break; case DW_FORM_strx1: - set_uint_value(v, read_uint8(&reader->p)); + set_cstr_value(v, resolve_strx(reader, read_uint8(&reader->p))); break; case DW_FORM_strx2: - set_uint_value(v, read_uint16(&reader->p)); + set_cstr_value(v, resolve_strx(reader, read_uint16(&reader->p))); break; case DW_FORM_strx3: - set_uint_value(v, read_uint24(&reader->p)); + set_cstr_value(v, resolve_strx(reader, read_uint24(&reader->p))); break; case DW_FORM_strx4: - set_uint_value(v, read_uint32(&reader->p)); + set_cstr_value(v, resolve_strx(reader, read_uint32(&reader->p))); break; case DW_FORM_addrx1: set_addr_idx_value(v, read_uint8(&reader->p)); |