ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nixprof: make it work with ELF64

This commit is contained in:
Gabriel Corona 2015-08-25 01:49:09 +02:00
parent c87307162d
commit ceca8c72bf
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/deps/libelf/elf.h
View File

@ -116,6 +116,15 @@ struct elf_symbol {
uint16_t st_shndx; // Section index uint16_t st_shndx; // Section index
}; };
struct elf64_symbol {
uint32_t st_name;
unsigned char st_info;
unsigned char st_other;
uint16_t st_shndx;
uint64_t st_value;
uint64_t st_size;
};
/* /*
* constants for Elf32_Phdr.p_flags * constants for Elf32_Phdr.p_flags
*/ */

21
core/linux/nixprof/nixprof.cpp
View File

@ -3,6 +3,7 @@
#if FEAT_HAS_NIXPROF #if FEAT_HAS_NIXPROF
#include "cfg/cfg.h" #include "cfg/cfg.h"
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -178,16 +179,24 @@ static void elf_syms(FILE* out,const char* libfile)
prof_head(out,"libsym",libfile); prof_head(out,"libsym",libfile);
// printf("Found dymsym %d, and dynstr %d!\n",dynsym,dynstr); // printf("Found dymsym %d, and dynstr %d!\n",dynsym,dynstr);
elf_symbol* sym=(elf_symbol*)elf_getSection(data,dynsym); elf_symbol* sym=(elf_symbol*)elf_getSection(data,dynsym);
int symcnt=elf_getSectionSize(data,dynsym)/sizeof(elf_symbol); elf64_symbol* sym64 = (elf64_symbol*) sym;
for (int i=0;i<symcnt;i++) bool elf32 = ((struct Elf32_Header*)data)->e_ident[EI_CLASS] == ELFCLASS32;
size_t symbol_size = elf32 ? sizeof(elf_symbol) : sizeof(elf64_symbol);
int symcnt = elf_getSectionSize(data,dynsym) / symbol_size;
for (int i=0; i < symcnt; i++)
{ {
if (sym[i].st_value && sym[i].st_name && sym[i].st_shndx) uint64_t st_value = elf32 ? sym[i].st_value : sym64[i].st_value;
uint32_t st_name = elf32 ? sym[i].st_name : sym64[i].st_name;
uint16_t st_shndx = elf32 ? sym[i].st_shndx : sym64[i].st_shndx;
uint64_t st_size = elf32 ? sym[i].st_size : sym64[i].st_size;
if (st_value && st_name && st_shndx)
{ {
char* name=(char*)elf_getSection(data,dynstr);// sym[i].st_shndx char* name=(char*)elf_getSection(data,dynstr);// sym[i].st_shndx
// printf("Symbol %d: %s, %08" PRIx64 ", % " PRIi64 " bytes\n",
// printf("Symbol %d: %s, %08X, %d bytes\n",i,name+sym[i].st_name,sym[i].st_value,sym[i].st_size); // i, name + st_name, st_value, st_size);
fprintf(out,"%08X %d %s\n",sym[i].st_value,sym[i].st_size,name+sym[i].st_name); fprintf(out,"%08" PRIX64 "%" PRIi64 " %s\n", st_value, st_size, name + st_name);
} }
} }
} }