Dr.Deamon64 Git-Repository
(2014/03/01- Main-Repository: migrate from cvs)
| Revision | c97a7c88d72d9186628ddc3bc5af81b4704d66d8 (tree) |
|---|---|
| Zeit | 2019-06-12 05:25:25 |
| Autor |  Koine Yuusuke(koinec) <koinec@user...> |
| Commiter | Koine Yuusuke(koinec) |
libgoblin/drd64_libgoblin_binaryfile.c (diff) libgoblin/drd64_libgoblin_debug_dwarf.c (diff)
libgoblin/drd64_libgoblin_debug_dwarf.h (diff) libgoblin/drd64_libgoblin_dwarf_abbrev.c (diff) libgoblin/drd64_libgoblin_dwarf_info.c (diff) libgoblin/drd64_libgoblin_type.h (diff)| @@ -97,12 +97,6 @@ void | ||
| 97 | 97 | p_binfile->dwarf.i_abbrevs_max = 0; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - if( NULL != p_binfile->dwarf.p_infoval ) { | |
| 101 | - free( p_binfile->dwarf.p_infoval ); | |
| 102 | - p_binfile->dwarf.p_infoval = NULL; | |
| 103 | - p_binfile->dwarf.i_maxvals = 0; | |
| 104 | - } | |
| 105 | - | |
| 106 | 100 | memset( p_binfile, 0x00, sizeof( LibGoblin_BinaryFile ) ); |
| 107 | 101 | |
| 108 | 102 | p_binfile->i_id = -0x01; |
| @@ -170,7 +164,6 @@ goto_BinaryFile_AllocBinaryFile_dataset: | ||
| 170 | 164 | |
| 171 | 165 | p_binfile->srcfile.p_srcfile = NULL; |
| 172 | 166 | p_binfile->dwarf.p_abbrev = NULL; |
| 173 | - p_binfile->dwarf.p_infoval = NULL; | |
| 174 | 167 | BinaryFile_ClearBinaryFile( p_binfile ); |
| 175 | 168 | |
| 176 | 169 | p_binfile->i_id = i_id_now; |
| @@ -336,7 +329,6 @@ int | ||
| 336 | 329 | p_binfile = BINFILE( i_cnt ); |
| 337 | 330 | p_binfile->srcfile.p_srcfile = NULL; |
| 338 | 331 | p_binfile->dwarf.p_abbrev = NULL; |
| 339 | - p_binfile->dwarf.p_infoval = NULL; | |
| 340 | 332 | BinaryFile_ClearBinaryFile( p_binfile ); |
| 341 | 333 | } |
| 342 | 334 |
| @@ -43,7 +43,7 @@ Comment: | ||
| 43 | 43 | LIBGOBLIN_DEBUG_DWARF_EXTERN |
| 44 | 44 | void |
| 45 | 45 | Debug_DWARF_PrintDIE( |
| 46 | - LibGoblin_BinaryFile *p_bfile, | |
| 46 | + LibGoblin_BinaryInfo *p_binfo, | |
| 47 | 47 | DWARF_AbbrevEntry *p_abbrev, |
| 48 | 48 | DWord dw_abbrevid, |
| 49 | 49 | int i_childlv ) |
| @@ -60,7 +60,7 @@ void | ||
| 60 | 60 | str_space[i_end] = '\0'; |
| 61 | 61 | |
| 62 | 62 | p_arvnow = p_abbrev + (dw_abbrevid - 1); |
| 63 | - p_val = p_bfile->dwarf.p_infoval; | |
| 63 | + p_val = p_binfo->dwarf.p_infoval; | |
| 64 | 64 | |
| 65 | 65 | printf( "%s<%2d>: Abbrev Number: %2d (%s [%02xh])\n", |
| 66 | 66 | str_space, i_childlv, dw_abbrevid, |
| @@ -47,7 +47,7 @@ Comment: | ||
| 47 | 47 | |
| 48 | 48 | LIBGOBLIN_DEBUG_DWARF_EXTERN |
| 49 | 49 | void Debug_DWARF_PrintDIE( |
| 50 | - LibGoblin_BinaryFile *p_bfile, DWARF_AbbrevEntry *p_abbrev, | |
| 50 | + LibGoblin_BinaryInfo *p_binfo, DWARF_AbbrevEntry *p_abbrev, | |
| 51 | 51 | DWord dw_abbrevid, int i_childlv ); |
| 52 | 52 | |
| 53 | 53 | #endif /* DRD64_HEADER_LIBGOBLIN_BINFO */ |
| @@ -382,7 +382,9 @@ int | ||
| 382 | 382 | return 0x03; |
| 383 | 383 | } |
| 384 | 384 | p_bfile->dwarf.i_maxvals = i_maxitems; |
| 385 | - p_bfile->dwarf.p_infoval = p_dievalue; | |
| 385 | + | |
| 386 | + p_binfo->dwarf.i_maxvals = i_maxitems; | |
| 387 | + p_binfo->dwarf.p_infoval = p_dievalue; | |
| 386 | 388 | |
| 387 | 389 | return 0x00; |
| 388 | 390 | } |
| @@ -555,7 +555,7 @@ LibGoblin_SrcFile * | ||
| 555 | 555 | assert( NULL != p_binfo ); |
| 556 | 556 | assert( NULL != p_bfile ); |
| 557 | 557 | |
| 558 | - p_infoval = p_bfile->dwarf.p_infoval; | |
| 558 | + p_infoval = p_binfo->dwarf.p_infoval; | |
| 559 | 559 | i_childlv = 0; |
| 560 | 560 | do { |
| 561 | 561 | // Read Reference Abbrev-ID --- |
| @@ -592,7 +592,7 @@ LibGoblin_SrcFile * | ||
| 592 | 592 | return NULL; |
| 593 | 593 | } |
| 594 | 594 | |
| 595 | - p_val = p_bfile->dwarf.p_infoval; | |
| 595 | + p_val = p_binfo->dwarf.p_infoval; | |
| 596 | 596 | for( i_cnt = 0; i_cnt < p_arvnow->i_items; i_cnt++, p_val++ ) { |
| 597 | 597 | if( DW_AT_name == p_arvnow->dw_attribute[ i_cnt ] ) { |
| 598 | 598 | pstr_srcpath = p_val->value.pstr_value; |
| @@ -652,7 +652,7 @@ int | ||
| 652 | 652 | |
| 653 | 653 | i_srcfiles = p_bfile->dwarf.i_srcfiles; |
| 654 | 654 | |
| 655 | - p_infoval = p_bfile->dwarf.p_infoval; | |
| 655 | + p_infoval = p_binfo->dwarf.p_infoval; | |
| 656 | 656 | |
| 657 | 657 | // Get section Info --- |
| 658 | 658 | psec_info = Section_GetSectionInfo( p_binfo, LIBGOBLIN_SECTION_ID_DEBUG_INFO ); |
| @@ -728,7 +728,7 @@ int | ||
| 728 | 728 | // Dispatch for generate Rapid-Access Table by DIE-tag |
| 729 | 729 | i_result = DWARF_Tag_Dispatch( p_binfo, p_bfile, p_srcfile, p_arvnow ); |
| 730 | 730 | |
| 731 | - Debug_DWARF_PrintDIE( p_bfile, p_abbrev, dw_arvid, i_childlv ); | |
| 731 | + Debug_DWARF_PrintDIE( p_binfo, p_abbrev, dw_arvid, i_childlv ); | |
| 732 | 732 | |
| 733 | 733 | }while( 0 != qw_size_cu ); |
| 734 | 734 | qw_size_info -= t_cuheader.qw_unitsize; |
| @@ -312,7 +312,6 @@ typedef struct { | ||
| 312 | 312 | int i_srcfiles; |
| 313 | 313 | |
| 314 | 314 | int i_maxvals; |
| 315 | - LibGoblin_DWARF_DIEValue *p_infoval; | |
| 316 | 315 | } dwarf; |
| 317 | 316 | |
| 318 | 317 | /* Binary-Format Depending Info. (ELF)*/ |
Fork