Skip to content

Commit 33587de

Browse files
committed
Added image begin pointer to the function info
1 parent 3ac0f07 commit 33587de

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

include/functionInfo/functionInfo.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ extern "C" {
3030
#include <stddef.h>
3131
#include <stdint.h>
3232

33+
// The actual function address is beginOffset + imageBegin.
3334
struct functionInfo {
34-
uintptr_t begin;
35+
uintptr_t beginOffset,
36+
imageBegin;
3537
size_t length;
3638
bool found;
3739
};

src/functionInfo/functionInfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static inline bool functionInfo_getFrom(struct loadedLibInfo* info, const char*
4141
}
4242

4343
struct functionInfo functionInfo_loadHint(const char* functionName, const char* libraryName) {
44-
struct functionInfo toReturn = (struct functionInfo) { 0, 0, false };
44+
struct functionInfo toReturn = (struct functionInfo) { 0, 0, 0, false };
4545

4646
dlMapper_init();
4747
if (libraryName != NULL && functionInfo_getFrom(dlMapper_libInfoForFileName(libraryName), functionName, &toReturn)) {

src/parser/file/macho/machoFile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ bool machoFile_getFunctionInfo(struct binaryFile* me, const char* functionName,
388388

389389
vector_iterate(pair_funcFile_t, &self->functions, {
390390
if (strcmp(element->first.linkedName, functionName) == 0) {
391-
info->begin = (uintptr_t) element->first.startAddress;
391+
info->beginOffset = (uintptr_t) element->first.startAddress;
392392
info->length = element->first.length;
393393
return true;
394394
}

0 commit comments

Comments
 (0)