darlinghq/MachO-Kit
1
0
Fork 0
mirror of https://github.com/darlinghq/MachO-Kit.git synced 2024-11-23 04:19:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests for arm64e binaries

Browse Source 
dyldinfo returns no output when run with `-arch arm64e`.  Add a workaround.
This commit is contained in:
Devin Vaukz 2021-07-04 18:25:35 -07:00
parent 421cb303d4
commit 245a5d5d3c
3 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Tests/Support/Binary.m
View File

@ -30,6 +30,7 @@
//----------------------------------------------------------------------------//
@implementation Architecture {
NSArray* (^makeArgs)(NSString*, NSArray*);
NSString* (^dyldinfo)(NSArray*);
}
//|++++++++++++++++++++++++++++++++++++|//
@ -52,6 +53,15 @@
return args;
};
dyldinfo = ^(NSArray *options) {
NSMutableArray *args = [NSMutableArray array];
[args addObject:@"dyldinfo"];
[args addObjectsFromArray:options];
[args addObject:url.path];
NSString *output = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:args];
return [DyldInfoUtil extractOutputForArchitecture:name fromInput:output];
};
// Mach Header
@autoreleasepool {
NSString *machHeader = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"otool", @[@"-h"])];
@ -66,13 +76,13 @@
// Libraries
@autoreleasepool {
NSString *loadCommands = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"dyldinfo", @[@"-dylibs"])];
_dependentLibraries = [DyldInfoUtil parseDylibs:loadCommands];
NSString *libraries = dyldinfo(@[@"-dylibs"]);
_dependentLibraries = [DyldInfoUtil parseDylibs:libraries];
}
// Rebase & bind Commands
@autoreleasepool {
NSString *opcodes = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"dyldinfo", @[@"-opcodes"])];
NSString *opcodes = dyldinfo(@[@"-opcodes"]);
_rebaseCommands = [DyldInfoUtil parseRebaseCommands:opcodes];
_bindCommands = [DyldInfoUtil parseBindCommands:opcodes];
_weakBindCommands = [DyldInfoUtil parseWeakBindCommands:opcodes];
@ -87,7 +97,7 @@
{
NSArray *fixupAddresses;
@autoreleasepool {
NSString *fixups = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"dyldinfo", @[@"-rebase"])];
NSString *fixups = dyldinfo(@[@"-rebase"]);
fixupAddresses = [DyldInfoUtil parseFixups:fixups];
}
return fixupAddresses;
@ -98,7 +108,7 @@
{
NSArray *bindingAddresses;
@autoreleasepool {
NSString *bindings = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"dyldinfo", @[@"-bind"])];
NSString *bindings = dyldinfo(@[@"-bind"]);
bindingAddresses = [DyldInfoUtil parseBindings:bindings];
}
return bindingAddresses;
@ -109,7 +119,7 @@
{
NSArray *bindingAddresses;
@autoreleasepool {
NSString *bindings = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"dyldinfo", @[@"-weak_bind"])];
NSString *bindings = dyldinfo(@[@"-weak_bind"]);
bindingAddresses = [DyldInfoUtil parseWeakBindings:bindings];
}
return bindingAddresses;
@ -120,7 +130,7 @@
{
NSArray *bindingAddresses;
@autoreleasepool {
NSString *bindings = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"dyldinfo", @[@"-lazy_bind"])];
NSString *bindings = dyldinfo(@[@"-lazy_bind"]);
bindingAddresses = [DyldInfoUtil parseLazyBindings:bindings];
}
return bindingAddresses;
@ -131,7 +141,7 @@
{
NSArray *exportsList;
@autoreleasepool {
NSString *exports = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"dyldinfo", @[@"-export"])];
NSString *exports = dyldinfo(@[@"-export"]);
exportsList = [DyldInfoUtil parseExports:exports];
}
return exportsList;
@ -142,7 +152,7 @@
{
NSArray *functionStartsList;
@autoreleasepool {
NSString *functionStarts = [NSTask outputForLaunchedTaskWithLaunchPath:@XCRUN_PATH arguments:makeArgs(@"dyldinfo", @[@"-function_starts"])];
NSString *functionStarts = dyldinfo(@[@"-function_starts"]);
functionStartsList = [DyldInfoUtil parseFunctionStarts:functionStarts];
}
return functionStartsList;

4
Tests/Support/DyldInfoUtil.h
View File

@ -30,6 +30,10 @@
//----------------------------------------------------------------------------//
@interface DyldInfoUtil : NSObject
//! Splits the output of dyldinfo by architecture and returns only the output
//! for the requested \a arch.
+ (NSString*)extractOutputForArchitecture:(NSString*)arch fromInput:(NSString*)input;
//! Parses \a input into an array of dictionaries, each representing a single
//! dependent library. Each dictionary contains the following keys:
//!

26
Tests/Support/DyldInfoUtil.m
View File

@ -30,6 +30,32 @@
//----------------------------------------------------------------------------//
@implementation DyldInfoUtil
//|++++++++++++++++++++++++++++++++++++|//
+ (NSString*)extractOutputForArchitecture:(NSString*)arch fromInput:(NSString*)input
{
NSMutableArray *result = [NSMutableArray array];
NSArray *lines = [input componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]];
if ([lines.firstObject rangeOfString:@"for arch "].location != 0)
// Only a single arch.
return input;
for (NSUInteger i = 0; i < lines.count; i++) {
NSString *line = lines[i];
if ([line rangeOfString:[NSString stringWithFormat:@"for arch %@:", arch]].location == 0) {
for (i = i+1; i < lines.count; i++) {
line = lines[i];
if ([line rangeOfString:@"for arch "].location == 0)
break;
[result addObject:line];
}
}
}
return [result componentsJoinedByString:@"\n"];
}
//|++++++++++++++++++++++++++++++++++++|//
+ (NSArray*)parseDylibs:(NSString*)input
{