diff --git a/nemu/src/monitor/elf.c b/nemu/src/monitor/elf.c index e8502fb..4a5067a 100644 --- a/nemu/src/monitor/elf.c +++ b/nemu/src/monitor/elf.c @@ -77,13 +77,13 @@ void init_elf(const char* elf_file) { // get symbol table and string table Elf_Sym *psymt = NULL; char* pstrt = NULL; - size_t symt_sz = 0, strt_sz = 0; + size_t symt_len = 0, strt_sz = 0; for (int i = 0; i < ehdr.e_shnum; i++) { if (shdr[i].sh_type == SHT_SYMTAB) { fseek(fp, shdr[i].sh_offset, SEEK_SET); assert(shdr[i].sh_size % sizeof(Elf_Sym) == 0); - symt_sz = shdr[i].sh_entsize; - Elf_Sym sym[symt_sz]; + symt_len = shdr[i].sh_entsize; + Elf_Sym sym[symt_len]; ret = fread(sym, shdr[i].sh_size, 1, fp); assert(ret == 1); psymt = sym; @@ -99,7 +99,8 @@ void init_elf(const char* elf_file) { // filling ftrace assert(pstrt != NULL && pstrt != NULL); - for (int i = 0; i < symt_sz; i ++) { + for (int i = 0; i < symt_len; i ++) { + Log("---LOG: %3d: %08x %5d %x", i, psymt[i].st_value, psymt[i].st_size, psymt[i].st_name); if (ELF_ST_TYPE(psymt[i].st_info) == STT_FUNC) { // Warning due to elf_ftrace is global variable so you don't need to set '\0' in the end // strncpy(elf_ftrace[elf_ftrace_size].fname, pstrt + psymt[i].st_name, @@ -108,7 +109,6 @@ void init_elf(const char* elf_file) { elf_ftrace[elf_ftrace_size].size = psymt[i].st_size; elf_ftrace[elf_ftrace_size].end = psymt[i].st_value + psymt[i].st_size - 1; elf_ftrace_size ++; - Log("---LOG: %d: %08x %d", i, psymt[i].st_value, psymt[i].st_name); } }