(LibGoblin)

[drdeamon64/drdeamon64.git] / libgoblin / drd64_libgoblin_debug_elf.c

diff --git a/libgoblin/drd64_libgoblin_debug_elf.c b/libgoblin/drd64_libgoblin_debug_elf.c
index e6ac4d8..8142cfb 100644 (file)
--- a/libgoblin/drd64_libgoblin_debug_elf.c
+++ b/libgoblin/drd64_libgoblin_debug_elf.c
@@ -42,43 +42,13 @@ Comment:
 ----------------------------------------------------------------------*/
 LIBGOBLIN_DEBUG_ELF_EXTERN
 int
-       LibGoblin_Debug_Elf_PrintLibFileList(
-                       LibGoblin_LibraryFileList       *p_libflist,
-                       Byte    b_level )
-{
-       int             i_cnt;
-
-       if( 0x00 < b_level )
-               { puts("[DEBUG] Load Library List -------------------------------------------"); }
-
-       for( i_cnt = p_libflist->i_start; i_cnt < p_libflist->i_end; i_cnt++ )  {
-               if( 0x00 < b_level )    {
-                       printf("  [%2d]: %s\t(%s)\n", i_cnt,
-                                       p_libflist->str_libfilepath[ i_cnt - p_libflist->i_start ],
-                                       p_libflist->str_librealpath[ i_cnt - p_libflist->i_start ] ); 
-               }
-       }
-
-       if( 0x00 < b_level )    {
-               puts("-----------------------------------------------------------------------");
-               puts("");
-       }
-
-       return 0x00;
-}
-
-
-/*----------------------------------------------------------------------
-----------------------------------------------------------------------*/
-LIBGOBLIN_DEBUG_ELF_EXTERN
-int
        LibGoblin_Debug_Elf_PrintSectionTable(
                        LibGoblin_BinaryInfo    *p_binfo,
                        Byte            b_level )
 {
        Byte                                    b_cnt;
        void                                    *p_shdr;
-       Ptr                                             ptr_start;
+       PtrValue                                ptr_start;
        LibGoblin_SectionInfo   *p_secinfo;
        Elf64_Shdr                              *p_shdr64;
        Elf32_Shdr                              *p_shdr32;
@@ -87,7 +57,7 @@ int
                { puts("[DEBUG] Section Table -----------------------------------------------"); }
 
        for( b_cnt = 0; b_cnt < LIBGOBLIN_SECTION_ID_MAX; b_cnt++ )             {
-               p_secinfo       = LibGoblin_Section_GetSectionInfo( p_binfo, b_cnt );
+               p_secinfo       = Section_GetSectionInfo( p_binfo, b_cnt );
                assert( NULL != p_secinfo );
                p_shdr          = (void *)p_secinfo->pb_sechdr;
 
@@ -99,22 +69,22 @@ int
                if( isElf64( p_binfo ) )        {
                        p_shdr64        = (Elf64_Shdr *)p_secinfo->pb_sechdr;
                        assert( NULL != p_shdr64 );
-                       ptr_start       = (Ptr)p_shdr64->sh_addr;
+                       ptr_start       = (PtrValue)p_shdr64->sh_addr;
                }
                else    {
                        p_shdr32= (Elf32_Shdr *)p_secinfo->pb_sechdr;
                        assert( NULL != p_shdr32);
-                       ptr_start       = (Ptr)p_shdr32->sh_addr;
+                       ptr_start       = (PtrValue)p_shdr32->sh_addr;
                }
 
                if( 0x00 < b_level )    {
                        if( 0 < ptr_start )             {
-                               printf("  %02d: %08lx - %08lx (%8ld): %20s (FID:%d)\n", b_cnt,
+                               printf("  %02d: %08lx - %08lx (%8ld): %20s (BinFile ID:%d)\n", b_cnt,
                                                        ptr_start, ptr_start + p_secinfo->qw_size, p_secinfo->qw_size,
-                                                       p_secinfo->pstr_secname, p_secinfo->i_fid );
+                                                       p_secinfo->pstr_secname, p_secinfo->i_binfile );
                        } else  {
-                               printf("  %02d:          -          (%8ld): %20s (FID:%d)\n", b_cnt,
-                                                       p_secinfo->qw_size, p_secinfo->pstr_secname, p_secinfo->i_fid );
+                               printf("  %02d:          -          (%8ld): %20s (BinFile ID:%d)\n", b_cnt,
+                                                       p_secinfo->qw_size, p_secinfo->pstr_secname, p_secinfo->i_binfile );
                        }
                }