nygard · Quuxplusone · May 24, 2012 · May 29, 2012 · May 29, 2012 · May 29, 2012
diff --git a/Source/CDLCSymbolTable.m b/Source/CDLCSymbolTable.m
@@ -127,6 +127,11 @@ - (void)loadSymbols;
 
             CDSymbol *symbol = [[CDSymbol alloc] initWithName:str machOFile:self.machOFile nlist32:nlist];
             [_symbols addObject:symbol];
+
+            if ([str hasPrefix:ObjCClassSymbolPrefix] && symbol.value != 0) {
+                NSString *className = [str substringFromIndex:[ObjCClassSymbolPrefix length]];
+                [_classSymbols setObject:symbol forKey:className];
+            }
         }
 
         //NSLog(@"Loaded %lu 32-bit symbols", [symbols count]);
@@ -151,7 +156,7 @@ - (void)loadSymbols;
             CDSymbol *symbol = [[CDSymbol alloc] initWithName:str machOFile:self.machOFile nlist64:nlist];
             [_symbols addObject:symbol];
 
-            if ([str hasPrefix:ObjCClassSymbolPrefix] && [symbol value] != 0) {
+            if ([str hasPrefix:ObjCClassSymbolPrefix] && symbol.value != 0) {
                 NSString *className = [str substringFromIndex:[ObjCClassSymbolPrefix length]];
                 [_classSymbols setObject:symbol forKey:className];
             }

diff --git a/Source/CDMultiFileVisitor.m b/Source/CDMultiFileVisitor.m
@@ -235,9 +235,9 @@ - (NSString *)importStringForProtocolName:(NSString *)name;
     if (name != nil) {
         NSString *framework = [self frameworkForProtocolName:name];
         if (framework == nil)
-            return [NSString stringWithFormat:@"#import \"%@.h\"\n", name];
+            return [NSString stringWithFormat:@"#import \"%@-Protocol.h\"\n", name];
         else
-            return [NSString stringWithFormat:@"#import <%@/%@.h>\n", framework, name];
+            return [NSString stringWithFormat:@"#import <%@/%@-Protocol.h>\n", framework, name];
     }
 
     return nil;

diff --git a/Source/CDOCIvar.h b/Source/CDOCIvar.h
@@ -9,11 +9,13 @@
 
 @interface CDOCIvar : NSObject
 
-- (id)initWithName:(NSString *)name type:(NSString *)aType offset:(NSUInteger)offset;
+- (id)initWithName:(NSString *)name type:(NSString *)aType offset:(NSUInteger)offset alignment:(NSUInteger)alignment size:(NSUInteger)size;
 
 @property (readonly) NSString *name;
 @property (readonly) NSString *type;
 @property (readonly) NSUInteger offset;
+@property (readonly) NSUInteger alignment;
+@property (readonly) NSUInteger size;
 
 @property (nonatomic, readonly) CDType *parsedType;
 

diff --git a/Source/CDOCIvar.m b/Source/CDOCIvar.m
@@ -22,17 +22,21 @@ @implementation CDOCIvar
     NSString *name;
     NSString *type;
     NSUInteger offset;
+    NSUInteger alignment;
+    NSUInteger size;
 
     BOOL hasParsedType;
     CDType *parsedType;
 }
 
-- (id)initWithName:(NSString *)aName type:(NSString *)aType offset:(NSUInteger)anOffset;
+- (id)initWithName:(NSString *)aName type:(NSString *)aType offset:(NSUInteger)anOffset alignment:(NSUInteger)anAlignment size:(NSUInteger)aSize;
 {
     if ((self = [super init])) {
         name = aName;
         type = aType;
         offset = anOffset;
+        alignment = anAlignment;
+        size = aSize;
 
         hasParsedType = NO;
         parsedType = nil;
@@ -54,6 +58,8 @@ - (NSString *)description;
 @synthesize name;
 @synthesize type;
 @synthesize offset;
+@synthesize alignment;
+@synthesize size;
 @synthesize hasParsedType;
 
 - (CDType *)parsedType;
@@ -66,6 +72,10 @@ - (CDType *)parsedType;
         if (parsedType == nil)
             NSLog(@"Warning: Parsing ivar type failed, %@", name);
 
+        if (parsedType.isBitfieldType) {
+            [parsedType setUnderlyingType:size];
+        }
+
         self.hasParsedType = YES;
     }
 
@@ -74,7 +84,7 @@ - (CDType *)parsedType;
 
 - (void)appendToString:(NSMutableString *)resultString typeController:(CDTypeController *)typeController;
 {
-    NSString *formattedString = [[typeController ivarTypeFormatter] formatVariable:name type:type];
+    NSString *formattedString = [[typeController ivarTypeFormatter] formatVariable:name parsedType:[self parsedType]];
     if (formattedString != nil) {
         [resultString appendString:formattedString];
         [resultString appendString:@";"];

diff --git a/Source/CDOCMethod.m b/Source/CDOCMethod.m
@@ -53,7 +53,7 @@ - (id)initWithName:(NSString *)aName type:(NSString *)aType;
 
 - (id)copyWithZone:(NSZone *)zone;
 {
-    return [[CDOCMethod alloc] initWithName:name type:type imp:imp];
+    return [[CDOCMethod allocWithZone:zone] initWithName:name type:type imp:imp];
 }
 
 #pragma mark - Debugging

diff --git a/Source/CDObjectiveC1Processor.m b/Source/CDObjectiveC1Processor.m
@@ -288,7 +288,7 @@ - (CDOCClass *)processClassDefinitionAtAddress:(uint32_t)address;
             // bitfields don't need names.
             // NSIconRefBitmapImageRep in AppKit on 10.5 has a single-bit bitfield, plus an unnamed 31-bit field.
             if (type != nil) {
-                CDOCIvar *anIvar = [[CDOCIvar alloc] initWithName:name type:type offset:objcIvar.offset];
+                CDOCIvar *anIvar = [[CDOCIvar alloc] initWithName:name type:type offset:objcIvar.offset alignment:0 size:0];
                 [ivars addObject:anIvar];
             }
         }

diff --git a/Source/CDObjectiveC2Processor.m b/Source/CDObjectiveC2Processor.m
@@ -411,7 +411,7 @@ - (NSArray *)loadIvarsAtAddress:(uint64_t)address;
                 NSString *name = [self.machOFile stringAtAddress:objc2Ivar.name];
                 NSString *type = [self.machOFile stringAtAddress:objc2Ivar.type];
 
-                CDOCIvar *ivar = [[CDOCIvar alloc] initWithName:name type:type offset:objc2Ivar.offset];
+                CDOCIvar *ivar = [[CDOCIvar alloc] initWithName:name type:type offset:objc2Ivar.offset alignment:objc2Ivar.alignment size:objc2Ivar.size];
                 [ivars addObject:ivar];
             } else {
                 //NSLog(@"%016lx %016lx %016lx  %08x %08x", objc2Ivar.offset, objc2Ivar.name, objc2Ivar.type, objc2Ivar.alignment, objc2Ivar.size);

diff --git a/Source/CDStructureInfo.m b/Source/CDStructureInfo.m
@@ -34,7 +34,7 @@ - (id)initWithType:(CDType *)type;
 
 - (id)copyWithZone:(NSZone *)zone;
 {
-    CDStructureInfo *copy = [[CDStructureInfo alloc] initWithType:self.type]; // type gets copied
+    CDStructureInfo *copy = [[CDStructureInfo allocWithZone:zone] initWithType:self.type]; // type gets copied
     copy.referenceCount = self.referenceCount;
     copy.isUsedInMethod = self.isUsedInMethod;
     copy.typedefName = self.typedefName;

diff --git a/Source/CDStructureTable.m b/Source/CDStructureTable.m
@@ -825,6 +825,7 @@ - (void)appendTypedefsToString:(NSMutableString *)resultString
                 [resultString appendFormat:@"// depth: %u, ref: %u, used in method? %u\n", info.type.structureDepth, info.referenceCount, info.isUsedInMethod];
             }
 
+            typeFormatter.shouldExpand = NO;
             NSString *formattedString = [typeFormatter formatVariable:nil parsedType:info.type];
             if (formattedString != nil) {
                 //[resultString appendFormat:@"%@;\n\n", formattedString];

diff --git a/Source/CDTextClassDumpVisitor.m b/Source/CDTextClassDumpVisitor.m
@@ -10,6 +10,7 @@
 #import "CDOCCategory.h"
 #import "CDOCMethod.h"
 #import "CDOCProperty.h"
+#import "CDType.h"
 #import "CDTypeController.h"
 #import "CDTypeFormatter.h"
 #import "CDVisitorPropertyState.h"
@@ -45,7 +46,7 @@ - (id)init;
 - (void)willVisitClass:(CDOCClass *)aClass;
 {
     if (aClass.isExported == NO)
-        [self.resultString appendString:@"// Not exported\n"];
+        [self.resultString appendString:@"__attribute__((visibility(\"hidden\")))\n"];
 
     [self.resultString appendFormat:@"@interface %@", aClass.name];
     if (aClass.superClassName != nil)
@@ -284,6 +285,10 @@ - (void)_visitProperty:(CDOCProperty *)property parsedType:(CDType *)parsedType
     if (isWeak)
         [self.resultString appendString:@"__weak "];
 
+    if ([alist containsObject:@"retain"] || [alist containsObject:@"copy"])
+        if (!parsedType.isGarbageCollectedType)
+            [self.resultString appendString:@"__attribute__((NSObject)) "];
+
     NSString *formattedString = [self.classDump.typeController.propertyTypeFormatter formatVariable:property.name parsedType:parsedType];
     [self.resultString appendFormat:@"%@;", formattedString];
 

diff --git a/Source/CDType.h b/Source/CDType.h
@@ -15,17 +15,23 @@
 - (id)initIDTypeWithProtocols:(NSArray *)protocols;
 - (id)initStructType:(CDTypeName *)name members:(NSArray *)members;
 - (id)initUnionType:(CDTypeName *)name members:(NSArray *)members;
-- (id)initBitfieldType:(NSString *)bitfieldSize;
-- (id)initArrayType:(CDType *)type count:(NSString *)count;
+- (id)initBitfieldType:(int)bitfieldSize;
+- (id)initArrayType:(CDType *)type count:(int)count;
 - (id)initPointerType:(CDType *)type;
+- (id)initFunctionPointerType;
+- (id)initBlockType;
 - (id)initModifier:(int)modifier type:(CDType *)type;
 
+- (void)setUnderlyingType:(NSUInteger)underlyingWidth;
+
 @property (strong) NSString *variableName;
 
 @property (nonatomic, readonly) int type;
 @property (readonly) BOOL isIDType;
 @property (readonly) BOOL isNamedObject;
 @property (readonly) BOOL isTemplateType;
+@property (readonly) BOOL isGarbageCollectedType;
+@property (readonly) BOOL isBitfieldType;
 
 @property (nonatomic, readonly) CDType *subtype;
 @property (nonatomic, readonly) CDTypeName *typeName;
@@ -64,3 +70,5 @@
 - (void)phase3MergeWithTypeController:(CDTypeController *)typeController;
 
 @end
+
+extern BOOL global_shouldMangleTemplateTypes;