Readded Mach-O function starts handling

Author: mhahnFr

src/parser/file/macho/machoFile.c

@@ -36,6 +36,7 @@
 
 #include "../bounds.h"
 #include "../loader.h"
+#include "../dwarf/leb128.h"
 
 #include "../../callstack_parser.h"
 
@@ -245,6 +246,26 @@ static inline void machoFile_addFunction(struct pair_funcFile function, va_list
     vector_pairFuncFile_push_back(&self->functions, function);
 }
 
+static inline int machoFile_uint64Compare(uint64_t* lhs, uint64_t* rhs) {
+    if (*lhs == *rhs) return 0;
+
+    return *lhs < *rhs ? -1 : +1;
+}
+
+static inline bool machoFile_handleFunctionStarts(struct machoFile* self, struct linkedit_data_command* command, const void* baseAddress, bool bitsReversed) {
+    uint32_t offset = macho_maybeSwap(32, bitsReversed, command->dataoff);
+    uint32_t size   = macho_maybeSwap(32, bitsReversed, command->datasize);
+
+    const void* bytes = baseAddress + offset;
+    uint64_t funcAddr = self->addressOffset;
+    for (size_t i = 0; i < size;) {
+        funcAddr += getULEB128(bytes, &i);
+        vector_uint64_push_back(&self->functionStarts, funcAddr);
+    }
+    vector_uint64_sort(&self->functionStarts, &machoFile_uint64Compare);
+    return true;
+}
+
 /**
  * Parses a Mach-O file into the given Mach-O file abstraction object.
  *
@@ -277,6 +298,10 @@ static inline bool machoFile_parseFileImpl(struct machoFile * self,
                 memcpy(&self->uuid, &((struct uuid_command*) ((void*) lc))->uuid, 16);
                 result = true;
                 break;
+
+            case LC_FUNCTION_STARTS:
+                result = machoFile_handleFunctionStarts(self, (void*) lc, baseAddress, bitsReversed);
+                break;
         }
         if (!result) {
             return false;
@@ -318,6 +343,10 @@ static inline bool machoFile_parseFileImpl64(struct machoFile * self,
                 memcpy(&self->uuid, &((struct uuid_command*) ((void*) lc))->uuid, 16);
                 result = true;
                 break;
+
+            case LC_FUNCTION_STARTS:
+                result = machoFile_handleFunctionStarts(self, (void*) lc, baseAddress, bitsReversed);
+                break;
         }
         if (!result) {
             return false;

src/parser/file/macho/machoFile.h

@@ -27,6 +27,7 @@
 
 #include "objectFile.h"
 #include "vector_pair_funcFile.h"
+#include "vector_uint64.h"
 
 #include "../binaryFile.h"
 #include "../debugInfo.h"
@@ -59,6 +60,7 @@ struct machoFile {
 
     /** The functions mapped to their object file.                              */
     vector_pairFuncFile_t functions;
+    vector_uint64_t functionStarts;
 };
 
 /**