Replaced the function pointer by a direct call

Author: mhahnFr

src/functionInfo/functionInfo.c

@@ -37,7 +37,7 @@ static inline bool functionInfo_getFrom(struct loadedLibInfo* info, const char*
 
     file->relocationOffset = info->relocationOffset;
     file->inMemory = true;
-    return functionInfo->found = file->getFunctionInfo(file, functionName, functionInfo);
+    return functionInfo->found = binaryFile_getFunctionInfo(file, functionName, functionInfo);
 }
 
 struct functionInfo functionInfo_loadHint(const char* functionName, const char* libraryName) {

src/parser/file/binaryFile.c

@@ -52,6 +52,21 @@ struct binaryFile* binaryFile_new(const char* fileName, const void* startAddress
     return toReturn;
 }
 
+bool binaryFile_getFunctionInfo(struct binaryFile* self, const char* functionName, struct functionInfo* info) {
+    bool result = false;
+
+#ifdef LCS_MACHO
+    result = machoFile_getFunctionInfo(self->concrete, functionName, info);
+#elif defined(LCS_ELF)
+    result = elfFile_getFunctionInfo(self->concrete, functionName, info);
+#endif
+
+    if (result) {
+        info->imageBegin = (uintptr_t) self->startAddress;
+    }
+    return result;
+}
+
 void binaryFile_clearCaches(void) {
 #ifdef LCS_MACHO
     machoFile_clearCaches();

src/parser/file/binaryFile.h

@@ -70,7 +70,6 @@ struct binaryFile {
      * Returns whether the address could be translated.
      */
     bool (*addr2String)(struct binaryFile*, void*, struct callstack_frame*);
-    bool (*getFunctionInfo)(struct binaryFile*, const char*, struct functionInfo*);
     /** The appropriate deinitializing method.                           */
     void (*destroy)(struct binaryFile*);
     /** The appropriate deleting method.                                 */
@@ -96,6 +95,8 @@ static inline void binaryFile_create(struct binaryFile* self) {
     self->inMemory = false;
 }
 
+bool binaryFile_getFunctionInfo(struct binaryFile* self, const char* functionName, struct functionInfo* info);
+
 /**
  * Clears the caches created by the binary file implementations.
  */

src/parser/file/elf/elfFile.c

@@ -49,10 +49,9 @@ void elfFile_create(struct elfFile* self) {
     self->_.type     = ELF_FILE;
     self->_.concrete = self;
 
-    self->_.getFunctionInfo = &elfFile_getFunctionInfo;
-    self->_.addr2String     = &elfFile_addr2String;
-    self->_.destroy         = &elfFile_destroy;
-    self->_.deleter         = &elfFile_delete;
+    self->_.addr2String = &elfFile_addr2String;
+    self->_.destroy     = &elfFile_destroy;
+    self->_.deleter     = &elfFile_delete;
 
     lcs_section_create(&self->debugLine);
     lcs_section_create(&self->debugLineStr);
@@ -365,12 +364,9 @@ static inline optional_debugInfo_t elfFile_getDebugInfo(struct elfFile* self, vo
     return toReturn;
 }
 
-bool elfFile_getFunctionInfo(struct binaryFile* me, const char* functionName, struct functionInfo* info) {
-    struct elfFile* self = elfFileOrNull(me);
-    if (self == NULL) return false;
-
-    if (!me->parsed &&
-        !(me->parsed = elfFile_loadFile(self))) {
+bool elfFile_getFunctionInfo(struct elfFile* self, const char* functionName, struct functionInfo* info) {
+    if (!self->_.parsed &&
+        !(self->_.parsed = elfFile_loadFile(self))) {
         return false;
     }
 

src/parser/file/elf/elfFile.h

@@ -92,7 +92,7 @@ static inline struct elfFile* elfFileOrNull(struct binaryFile * self) {
  */
 bool elfFile_addr2String(struct binaryFile* self, void* address, struct callstack_frame* frame);
 
-bool elfFile_getFunctionInfo(struct binaryFile* self, const char* functionName, struct functionInfo* info);
+bool elfFile_getFunctionInfo(struct elfFile* self, const char* functionName, struct functionInfo* info);
 
 /**
  * Deinitializes the given binary file structure, if it is an ELF file structure.

src/parser/file/macho/machoFile.c

@@ -54,10 +54,9 @@ void machoFile_create(struct machoFile* self) {
     self->_.type     = MACHO_FILE;
     self->_.concrete = self;
 
-    self->_.getFunctionInfo = &machoFile_getFunctionInfo;
-    self->_.addr2String     = &machoFile_addr2String;
-    self->_.destroy         = &machoFile_destroy;
-    self->_.deleter         = &machoFile_delete;
+    self->_.addr2String = &machoFile_addr2String;
+    self->_.destroy     = &machoFile_destroy;
+    self->_.deleter     = &machoFile_delete;
 
     self->addressOffset    = 0;
     self->linkedit_fileoff = 0;
@@ -376,11 +375,7 @@ static inline bool machoFile_loadFile(struct machoFile* self) {
     return success;
 }
 
-bool machoFile_getFunctionInfo(struct binaryFile* me, const char* functionName, struct functionInfo* info) {
-    struct machoFile* self = machoFileOrNull(me);
-    if (self == NULL) {
-        return false;
-    }
+bool machoFile_getFunctionInfo(struct machoFile* self, const char* functionName, struct functionInfo* info) {
     if (!self->_.parsed &&
         !(self->_.parsed = machoFile_loadFile(self))) {
         return false;

src/parser/file/macho/machoFile.h

@@ -97,7 +97,7 @@ static inline struct machoFile* machoFileOrNull(struct binaryFile * self) {
  */
 bool machoFile_addr2String(struct binaryFile* self, void* address, struct callstack_frame* frame);
 
-bool machoFile_getFunctionInfo(struct binaryFile* self, const char* functionName, struct functionInfo* info);
+bool machoFile_getFunctionInfo(struct machoFile* self, const char* functionName, struct functionInfo* info);
 
 /**
  * Deinitializes the given binary file structure if it is a Mach-O file structure.