From 9d440c488b27a112232ebf4d4ea2f3b4462a910c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 17 Jun 2011 16:40:20 +0300 Subject: [PATCH] Add DWARF-4 support to debugedit (RhBug:707677) Signed-off-by: Panu Matilainen --- tools/debugedit.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tools/debugedit.c b/tools/debugedit.c index e8466d4..89d0428 100644 --- a/tools/debugedit.c +++ b/tools/debugedit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003, 2005, 2007, 2009, 2010 Red Hat, Inc. +/* Copyright (C) 2001, 2002, 2003, 2005, 2007, 2009, 2010, 2011 Red Hat, Inc. Written by Alexander Larsson , 2002 Based on code by Jakub Jelinek , 2001. @@ -44,6 +44,10 @@ #include "tools/hashtab.h" #define DW_TAG_partial_unit 0x3c +#define DW_FORM_sec_offset 0x17 +#define DW_FORM_exprloc 0x18 +#define DW_FORM_flag_present 0x19 +#define DW_FORM_ref_sig8 0x20 char *base_dir = NULL; char *dest_dir = NULL; @@ -220,6 +224,7 @@ static struct #define DEBUG_STR 8 #define DEBUG_FRAME 9 #define DEBUG_RANGES 10 +#define DEBUG_TYPES 11 { ".debug_info", NULL, NULL, 0, 0, 0 }, { ".debug_abbrev", NULL, NULL, 0, 0, 0 }, { ".debug_line", NULL, NULL, 0, 0, 0 }, @@ -231,6 +236,7 @@ static struct { ".debug_str", NULL, NULL, 0, 0, 0 }, { ".debug_frame", NULL, NULL, 0, 0, 0 }, { ".debug_ranges", NULL, NULL, 0, 0, 0 }, + { ".debug_types", NULL, NULL, 0, 0, 0 }, { NULL, NULL, NULL, 0, 0, 0 } }; @@ -323,7 +329,8 @@ no_memory: goto no_memory; } form = read_uleb128 (ptr); - if (form == 2 || form > DW_FORM_indirect) + if (form == 2 + || (form > DW_FORM_flag_present && form != DW_FORM_ref_sig8)) { error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form); htab_delete (h); @@ -493,7 +500,7 @@ edit_dwarf2_line (DSO *dso, uint32_t off, char *comp_dir, int phase) } value = read_16 (ptr); - if (value != 2 && value != 3) + if (value != 2 && value != 3 && value != 4) { error (0, 0, "%s: DWARF version %d unhandled", dso->filename, value); @@ -509,8 +516,8 @@ edit_dwarf2_line (DSO *dso, uint32_t off, char *comp_dir, int phase) return 1; } - opcode_base = ptr[4]; - ptr = dir = ptr + 4 + opcode_base; + opcode_base = ptr[4 + (value >= 4)]; + ptr = dir = ptr + 4 + (value >= 4) + opcode_base; /* dir table: */ value = 1; @@ -737,7 +744,8 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase) { if (t->attr[i].attr == DW_AT_stmt_list) { - if (form == DW_FORM_data4) + if (form == DW_FORM_data4 + || form == DW_FORM_sec_offset) { list_offs = do_read_32_relocated (ptr); found_list_offs = 1; @@ -839,6 +847,8 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase) else ptr += 4; break; + case DW_FORM_flag_present: + break; case DW_FORM_addr: ptr += ptr_size; break; @@ -853,10 +863,12 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase) break; case DW_FORM_ref4: case DW_FORM_data4: + case DW_FORM_sec_offset: ptr += 4; break; case DW_FORM_ref8: case DW_FORM_data8: + case DW_FORM_ref_sig8: ptr += 8; break; case DW_FORM_sdata: @@ -885,6 +897,7 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase) form = DW_FORM_block1; break; case DW_FORM_block: + case DW_FORM_exprloc: len = read_uleb128 (ptr); form = DW_FORM_block1; assert (len < UINT_MAX); @@ -1188,7 +1201,7 @@ edit_dwarf2 (DSO *dso) } cu_version = read_16 (ptr); - if (cu_version != 2 && cu_version != 3) + if (cu_version != 2 && cu_version != 3 && cu_version != 4) { error (0, 0, "%s: DWARF version %d unhandled", dso->filename, cu_version); -- 2.7.4