Skip to content

Very early support for swift. #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sandym wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Very early support for swift. #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion Source/CDObjectiveC2Processor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,30 @@ - (CDOCCategory *)loadCategoryAtAddress:(uint64_t)address;
return category;
}

- (NSString *)demangleSwiftName:(NSString *)s
{
// xcode-select -s /Applications/Xcode6-Beta3.app for this to work!

NSTask *task = [[NSTask alloc] init];
task.launchPath = @"/usr/bin/xcrun";
task.arguments = @[@"swift-demangle",@"-compact",s];

NSPipe *outputPipe = [NSPipe pipe];
task.standardOutput = outputPipe;
[task launch];
[task waitUntilExit];

NSData *data = [[outputPipe fileHandleForReading] readDataToEndOfFile];
if ( [data length] > 0 )
{
NSString *demangled = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
if ( demangled )
return [demangled stringByReplacingOccurrencesOfString:@"\n" withString:@""];
}

return s;
}

- (CDOCClass *)loadClassAtAddress:(uint64_t)address;
{
if (address == 0)
Expand Down Expand Up @@ -226,7 +250,8 @@ - (CDOCClass *)loadClassAtAddress:(uint64_t)address;
//NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.data, objc2Class.reserved1, objc2Class.reserved2, objc2Class.reserved3);

NSParameterAssert(objc2Class.data != 0);
[cursor setAddress:objc2Class.data];
// objc2Class.data first bit is set for swift classes
[cursor setAddress:(objc2Class.data&0xFFFFFFFFFFFFFFF8)];

struct cd_objc2_class_ro_t objc2ClassData;
objc2ClassData.flags = [cursor readInt32];
Expand All @@ -252,6 +277,12 @@ - (CDOCClass *)loadClassAtAddress:(uint64_t)address;
NSString *str = [self.machOFile stringAtAddress:objc2ClassData.name];
//NSLog(@"name = %@", str);

if ( objc2Class.data & 1 )
{
// swift class
str = [self demangleSwiftName:str];
}

CDOCClass *aClass = [[CDOCClass alloc] init];
[aClass setName:str];

Expand Down