Fixed the function info function address (removed the image begin address)

Author: mhahnFr

include/functionInfo/functionInfo.h

@@ -30,10 +30,8 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 
-// The actual function address is beginOffset + imageBegin.
 struct functionInfo {
-    uintptr_t beginOffset,
-              imageBegin;
+    uintptr_t begin;
     size_t length;
     bool found;
 };

src/parser/file/binaryFile.c

@@ -61,9 +61,6 @@ bool binaryFile_getFunctionInfo(struct binaryFile* self, const char* functionNam
     result = elfFile_getFunctionInfo(self->concrete, functionName, info);
 #endif
 
-    if (result) {
-        info->imageBegin = (uintptr_t) self->startAddress;
-    }
     return result;
 }
 

src/parser/file/elf/elfFile.c

@@ -372,7 +372,7 @@ bool elfFile_getFunctionInfo(struct elfFile* self, const char* functionName, str
 
     vector_iterate(struct function, &self->functions, {
         if (strcmp(element->linkedName, functionName) == 0) {
-            info->begin = (uintptr_t) element->startAddress;
+            info->begin = (uintptr_t) element->startAddress + self->_.relocationOffset;
             info->length = element->length;
             return true;
         }

src/parser/file/macho/machoFile.c

@@ -383,7 +383,8 @@ bool machoFile_getFunctionInfo(struct machoFile* self, const char* functionName,
 
     vector_iterate(pair_funcFile_t, &self->functions, {
         if (strcmp(element->first.linkedName, functionName) == 0) {
-            info->beginOffset = (uintptr_t) element->first.startAddress;
+            info->begin = (uintptr_t) element->first.startAddress + (uintptr_t) self->_.startAddress
+                        - (self->_.inMemory ? self->text_vmaddr : self->addressOffset);
             info->length = element->first.length;
             return true;
         }