From 322a4d5e02a2f73ca746fba100b46ea4307328d6 Mon Sep 17 00:00:00 2001 From: "Koine Yuusuke(koinec)" Date: Tue, 20 Aug 2019 15:41:33 +0900 Subject: [PATCH] (LibGoblin) * WorkBackup --- libgoblin/drd64_libgoblin_dwarf_tag_compileunit.c | 2 +- libgoblin/drd64_libgoblin_elf_proghdr.c | 3 --- libgoblin/drd64_libgoblin_elf_rela.c | 1 - libgoblin/drd64_libgoblin_elf_symtab.c | 26 ----------------------- libgoblin/drd64_libgoblin_section.c | 2 -- 5 files changed, 1 insertion(+), 33 deletions(-) diff --git a/libgoblin/drd64_libgoblin_dwarf_tag_compileunit.c b/libgoblin/drd64_libgoblin_dwarf_tag_compileunit.c index 4bc6411..87cd77c 100644 --- a/libgoblin/drd64_libgoblin_dwarf_tag_compileunit.c +++ b/libgoblin/drd64_libgoblin_dwarf_tag_compileunit.c @@ -160,7 +160,7 @@ int (QWord)(t_ranges.ptr_high[i_cnt].value - t_ranges.ptr_low[i_cnt].value), NULL, OBJINFO_INSETMODE_INSET | OBJINFO_INSETMODE_ADOPT, OBJINFO_TYPE_OBJFILE ); - //p_obj->b_type = OBJINFO_TYPE_OBJFILE; + p_obj->pstr_name = pval_name->value.pstr_value; p_obj->dw_hash = Common_CalcDJBhash( pval_name->value.pstr_value ); diff --git a/libgoblin/drd64_libgoblin_elf_proghdr.c b/libgoblin/drd64_libgoblin_elf_proghdr.c index a530640..5cdd1a2 100644 --- a/libgoblin/drd64_libgoblin_elf_proghdr.c +++ b/libgoblin/drd64_libgoblin_elf_proghdr.c @@ -92,7 +92,6 @@ int return -0x01; } - //p_objinfo->b_type = OBJINFO_TYPE_PROGRAM; p_objinfo->pstr_name = p_binfo->str_filename; p_objinfo->info.program.i_binfo_id = p_binfo->i_id; @@ -119,8 +118,6 @@ int } // Set ProgramHdr Value to ObjectInfo --- - //p_objinfo->b_type = OBJINFO_TYPE_PROGHDR; - p_objinfo->file.i_binfile = p_binfo->i_binfile; // p_offset - File offset of contents. p_objinfo->file.pv_offset = (void *)(pb_data + p_proghdr->p_offset); diff --git a/libgoblin/drd64_libgoblin_elf_rela.c b/libgoblin/drd64_libgoblin_elf_rela.c index 610aa41..12bd5fb 100644 --- a/libgoblin/drd64_libgoblin_elf_rela.c +++ b/libgoblin/drd64_libgoblin_elf_rela.c @@ -213,7 +213,6 @@ int p_pginfo, ((PtrValue)pelf_rela->r_offset + p_binfo->ptr_loadbase), sizeof( void * ), NULL, OBJINFO_INSETMODE_INSET | OBJINFO_INSETMODE_ADOPT, OBJINFO_TYPE_REL ); - //pobj_rel->b_type = OBJINFO_TYPE_REL; } assert( NULL != pobj_rel ); diff --git a/libgoblin/drd64_libgoblin_elf_symtab.c b/libgoblin/drd64_libgoblin_elf_symtab.c index 00b79da..af07b9a 100644 --- a/libgoblin/drd64_libgoblin_elf_symtab.c +++ b/libgoblin/drd64_libgoblin_elf_symtab.c @@ -111,32 +111,6 @@ LibGoblin_ObjectInfo * p_obj->pstr_name = (char *)(pb_strtab + p_sym->st_name); p_obj->dw_hash = Common_CalcDJBhash( (char *)(pb_strtab + p_sym->st_name) ); -/* - // st_info - Type and binding information. - p_obj->info.symbol.b_type = ELF64_ST_TYPE( p_sym->st_info ); - switch( ELF64_ST_TYPE( p_sym->st_info ) ) { - // Unspecified type. - case STT_NOTYPE: - p_obj->b_type = OBJINFO_TYPE_NONE; break; - // Data object. - case STT_OBJECT: - p_obj->b_type = OBJINFO_TYPE_OBJECT; break; - // Function. - case STT_FUNC: - p_obj->b_type = OBJINFO_TYPE_FUNCTION; break; - // Section. - case STT_SECTION: - p_obj->b_type = OBJINFO_TYPE_SECTION; break; - // Uninitialized common block. - case STT_COMMON: - p_obj->b_type = OBJINFO_TYPE_COMMON; break; - // TLS object. - case STT_TLS: - p_obj->b_type = OBJINFO_TYPE_TLS; break; - default: - p_obj->b_type = OBJINFO_TYPE_NONE; break; - } -*/ // st_info - Type and binding information. p_obj->info.symbol.b_binding = ELF64_ST_BIND( p_sym->st_info ); diff --git a/libgoblin/drd64_libgoblin_section.c b/libgoblin/drd64_libgoblin_section.c index 0abe24f..4ed9d7f 100644 --- a/libgoblin/drd64_libgoblin_section.c +++ b/libgoblin/drd64_libgoblin_section.c @@ -186,8 +186,6 @@ int OBJINFO_INSETMODE_INSET | OBJINFO_INSETMODE_ADOPT, OBJINFO_TYPE_SECTION ); - //p_objinfo->b_type = OBJINFO_TYPE_SECTION; - p_objinfo->file.i_binfile = p_section->i_binfile; // sh_offset - Offset in file. p_objinfo->file.pv_offset = (void *)p_section->pb_data; -- 2.11.0