+2 -2

src/dyld/MachOObject.cpp

reviewed

··· 365 365 jmp_instr* instr = reinterpret_cast<jmp_instr*>(ptr); 366 366 367 367 instr->relJmp = 0xE9; // x86 jmp rel32 368 368 - instr->addr = newAddr - uint32_t(ptr) - sizeof(jmp_instr); 368 368 + instr->addr = uint32_t(newAddr) - uint32_t(ptr) - sizeof(jmp_instr); 369 369 } 370 370 else if (type == BIND_TYPE_PCREL) 371 371 { 372 372 - *ptr = newAddr - uintptr_t(ptr) - 4; 372 372 + *ptr = (void*) (uint32_t(newAddr) - uintptr_t(ptr) - 4); 373 373 } 374 374 #endif 375 375 }

+1 -1

src/dyld/dyld_public.cpp

reviewed

··· 66 66 if (!segname) 67 67 segname = ""; 68 68 69 69 - return (char*) obj->getSection(segname, sectname, size); 69 69 + return (char*) obj->getSection(segname, sectname, (uintptr_t*) size); 70 70 } 71 71 72 72 void _dyld_register_func_for_add_image(MachOMgr::LoaderHookFunc* func)

+2

src/libmach-o/MachO.h

reviewed

··· 27 27 #include <vector> 28 28 #include <list> 29 29 #include <stdexcept> 30 30 + #include <unistd.h> 30 31 31 32 #include <mach/vm_types.h> 32 33 #include <mach-o/loader.h> ··· 195 196 196 197 // we express stub binds as another type of ordinary bind 197 198 #define BIND_TYPE_STUB 100 199 199 + #define BIND_TYPE_PCREL 101 198 200 199 201 #endif // MACH_O_H_

+1 -1

src/libobjcdarwin/old/category.h

reviewed

··· 4 4 #include "./AppleLayout.h" 5 5 #include <objc/runtime.h> 6 6 #include <stdint.h> 7 7 - #include "../../dyld/public.h" 7 7 + #include <dyld/dyld_public.h> 8 8 9 9 void ProcessCategoriesOld(const struct mach_header* mh, intptr_t slide, module_info* modinfo); 10 10

+1 -1

src/libobjcdarwin/old/class.h

reviewed

··· 5 5 #include <stdint.h> 6 6 #include <string> 7 7 #include <vector> 8 8 - #include "../../dyld/public.h" 8 8 + #include <dyld/dyld_public.h> 9 9 10 10 Class RegisterClass(old_class* cls, bool hasExt); 11 11 std::vector<const char*> ProcessClassesOld(const struct mach_header* mh, intptr_t slide, module_info* info);

+1 -1

src/libobjcdarwin/old/protocol.h

reviewed

··· 3 3 #include "./AppleLayout.h" 4 4 #include <objc/runtime.h> 5 5 #include <stdint.h> 6 6 - #include "../../dyld/public.h" 6 6 + #include <dyld/dyld_public.h> 7 7 8 8 void RegisterProtocolMethods(Protocol* p, const old_method_decl_list* list, bool required, bool instance); 9 9 Protocol* RegisterProtocol(old_protocol* prot, uintptr_t extStart, unsigned long extLen);