about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2023-11-07 20:35:31 +0100
committerptitSeb <sebastien.chev@gmail.com>2023-11-07 20:35:31 +0100
commitab146f5d23e01d2a4e10ac9fdc47584c00aac83d (patch)
treefd5be540bf37861b9a2d2d94dbba03c5454e21c1
parent13fdd31c67d6ef2b115d8817339503dbd077302a (diff)
downloadbox64-ab146f5d23e01d2a4e10ac9fdc47584c00aac83d.tar.gz
box64-ab146f5d23e01d2a4e10ac9fdc47584c00aac83d.zip
[TRACE] Better trace for unknown offset in native elf
-rw-r--r--src/elfs/elfloader.c2
-rw-r--r--src/emu/x64run_private.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c
index d4319186..6834540f 100644
--- a/src/elfs/elfloader.c
+++ b/src/elfs/elfloader.c
@@ -1387,7 +1387,7 @@ uintptr_t GetElfFini(elfheader_t* h)
 
 void* GetBaseAddress(elfheader_t* h)
 {
-    return h->memory;
+    return h->image;
 }
 
 void* GetElfDelta(elfheader_t* h)
diff --git a/src/emu/x64run_private.c b/src/emu/x64run_private.c
index fd4aa9d6..b6e258ac 100644
--- a/src/emu/x64run_private.c
+++ b/src/emu/x64run_private.c
@@ -126,7 +126,7 @@ const char* GetNativeName(void* p)
                 strcat(buff, " ("); strcat(buff, info.dli_fname); strcat(buff, ")");
             }
         } else {
-            sprintf(buff, "%s(%s+%p)", "???", info.dli_fname, p);
+            sprintf(buff, "%s(%s+%p)", "???", info.dli_fname, (void*)(p-info.dli_fbase));
             return buff;
         }
     }