From 67b6f8d078ee59b2a6ac60c2a44ccbc560df04d2 Mon Sep 17 00:00:00 2001
From: tracer-ics2023 <tracer@njuics.org>
Date: Wed, 11 Sep 2024 00:15:30 +0800
Subject: [PATCH] =?UTF-8?q?>=20=20compile=20NEMU=20221220000=20=E5=BC=A0?=
 =?UTF-8?q?=E4=B8=89=20Linux=20zzy=205.15.146.1-microsoft-standard-WSL2=20?=
 =?UTF-8?q?#1=20SMP=20Thu=20Jan=2011=2004:09:03=20UTC=202024=20x86=5F64=20?=
 =?UTF-8?q?x86=5F64=20x86=5F64=20GNU/Linux=20=2000:15:29=20up=205=20days,?=
 =?UTF-8?q?=2012:23,=20=203=20users,=20=20load=20average:=200.97,=200.62,?=
 =?UTF-8?q?=200.50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nemu/src/monitor/elf.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/nemu/src/monitor/elf.c b/nemu/src/monitor/elf.c
index 72ccac7..9043e46 100644
--- a/nemu/src/monitor/elf.c
+++ b/nemu/src/monitor/elf.c
@@ -82,31 +82,30 @@ void init_elf(const char* elf_file) {
     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_len = shdr[i].sh_entsize;
+      symt_len = shdr[i].sh_size / shdr[i].sh_entsize;
       Elf_Sym sym[symt_len];
       ret = fread(sym, shdr[i].sh_size, 1, fp);
       assert(ret == 1);
       psymt = sym;
-      Log("SYMTAB %08x %06x %06x", shdr[i].sh_addr, shdr[i].sh_offset, shdr[i].sh_size);
-    } else if (shdr[i].sh_type == SHT_STRTAB && shdr[i].sh_flags != 0) {
+      // Log("SYMTAB %08x %06x %06x", shdr[i].sh_addr, shdr[i].sh_offset, shdr[i].sh_size);
+    } else if (shdr[i].sh_type == SHT_STRTAB && shdr[i].sh_name != ehdr.e_shstrndx) {
       strt_sz = shdr[i].sh_size;
       fseek(fp, shdr[i].sh_offset, SEEK_SET);
       char buffer[strt_sz];
       ret = fread(buffer, strt_sz, 1, fp);
       assert(ret == 1);
       pstrt = buffer;
-      Log("SHT_STRTAB %08x %06x %06x", shdr[i].sh_addr, shdr[i].sh_offset, shdr[i].sh_size);
+      // Log("SHT_STRTAB %08x %06x %06x", shdr[i].sh_addr, shdr[i].sh_offset, shdr[i].sh_size);
     }
   }
 
   // filling ftrace
   assert(pstrt != NULL && pstrt != NULL);
   for (int i = 0; i < symt_len; i ++) {
-    Log("---LOG: %3d: %08x %5u %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,
-      //   sizeof(elf_ftrace[0].fname) - 1);
+      strncpy(elf_ftrace[elf_ftrace_size].fname, pstrt + psymt[i].st_name,
+        sizeof(elf_ftrace[0].fname) - 1);
       elf_ftrace[elf_ftrace_size].start = psymt[i].st_value;
       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;