Remove unnecessary debugging code #19525

Author: Mike Richter

Source/CDMachOFile.h

@@ -55,7 +55,6 @@ typedef enum : NSUInteger {
 - (CDLCSegment *)segmentWithName:(NSString *)segmentName;
 - (CDLCSegment *)segmentContainingAddress:(NSUInteger)address;
 - (NSString *)stringAtAddress:(NSUInteger)address;
-- (NSString *)stringAtAddress2:(NSUInteger)address;
 
 - (NSUInteger)dataOffsetForAddress:(NSUInteger)address;
 

Source/CDMachOFile.m

@@ -352,65 +352,11 @@ - (NSString *)stringAtAddress:(NSUInteger)address;
     if (offset == 0)
         return nil;
 
+    // Support small methods referencing selector names in __objc_selrefs.
     CDSection *section = [segment sectionContainingAddress:address];
     if ([[section sectionName] isEqualToString:@"__objc_selrefs"]) {
-        NSLog(@"large method reference (0x%016lx) into __objc_selrefs!", address);
-    }
-
-    ptr = (uint8_t *)[self.data bytes] + offset;
-
-    return [[NSString alloc] initWithBytes:ptr length:strlen(ptr) encoding:NSASCIIStringEncoding];
-}
-
-- (NSString *)stringAtAddress2:(NSUInteger)address;
-{
-    const void *ptr;
-
-    if (address == 0)
-        return nil;
-
-    CDLCSegment *segment = [self segmentContainingAddress:address];
-    if (segment == nil) {
-        NSLog(@"Error: Cannot find offset for address 0x%08lx in stringAtAddress:", address);
-        exit(5);
-        return nil;
-    }
-
-    if ([segment isProtected]) {
-        NSData *d2 = [segment decryptedData];
-        NSUInteger d2Offset = [segment segmentOffsetForAddress:address];
-        if (d2Offset == 0)
-            return nil;
-
-        ptr = (uint8_t *)[d2 bytes] + d2Offset;
-        return [[NSString alloc] initWithBytes:ptr length:strlen(ptr) encoding:NSASCIIStringEncoding];
-    }
-
-    NSUInteger offset = [self dataOffsetForAddress:address];
-    if (offset == 0)
-        return nil;
-
-    CDSection *section = [segment sectionContainingAddress:address];
-    if ([[section sectionName] isEqualToString:@"__objc_selrefs"]) {
-//        int pointerSize = (int)[self ptrSize];
-//        int numberOfBytes = pointerSize;//([section alignment] == 8) ? 8 : 4;
-//        if ((1 << [section alignment]) != pointerSize) {
-//            NSLog(@"__objc_selrefs with alignment of %lu and pointerSize of %d!", (unsigned long)[section alignment], pointerSize);
-//        }
-//        const void * reference = [self.data bytes] + offset;
-//        uint64_t referencedAddress = 0ULL;
-//        for (int index = 0; index < numberOfBytes; index++) {
-//            referencedAddress |= ((uint64_t)bytes[index]) << (index * 8);
-//        }
-        
         const void * reference = [self.data bytes] + offset;
         offset = ([self ptrSize] == 8) ? *((uint64_t *)reference) : *((uint32_t *)reference);
-
-        // This is probably not the right translation: how do we know that this address is correct, does it need to go through dataOffsetForAddress?
-//        ptr = (uint8_t *)([self.data bytes] + selectorOffset);
-//    } else {
-//        NSLog(@"small method pointer into %@ section!", [section sectionName]);
-//        ptr = (uint8_t *)[self.data bytes] + offset;
     }
 
     ptr = (uint8_t *)[self.data bytes] + offset;

Source/CDMachOFileDataCursor.h

@@ -28,6 +28,6 @@
 
 // Read using the current byteOrder and ptrSize (from the machOFile)
 - (uint64_t)readPtr;
-- (uint64_t)readSmallPtr:(uint64_t)base;
+- (uint64_t)readPtr:(bool)small;
 
 @end

Source/CDMachOFileDataCursor.m

@@ -110,13 +110,15 @@ - (uint64_t)readPtr;
     return 0;
 }
 
-- (uint64_t)readSmallPtr:(uint64_t)base;
+- (uint64_t)readPtr:(bool)small;
 {
-    uint64_t offsetIntoFile = [self offset];
-    int32_t offset = [self readInt32];
-    return (uint64_t)((int64_t)(offsetIntoFile) + offset);
-    //    return (uint64_t)((int64_t)(base) + offset);
-    //return (uint64_t)(uint32_t)[self readInt32];
+    // "small" pointers are signed 32-bit values
+    if (small) {
+        // The pointers are relative to the location in the image, so get the offset before reading the offset:
+        return [self offset] + [self readInt32];
+    } else {
+        return [self readPtr];
+    }
 }
 
 @end

Source/CDObjectiveC2Processor.m

@@ -400,17 +400,11 @@ - (NSArray *)loadMethodsAtAddress:(uint64_t)address;
 }
 
 - (NSArray *)loadMethodsAtAddress:(uint64_t)address extendedMethodTypesCursor:(CDMachOFileDataCursor *)extendedMethodTypesCursor;
-{
-    return [self loadMethodsAtAddress:address extendedMethodTypesCursor:extendedMethodTypesCursor base:0ULL];
-}
-
-- (NSArray *)loadMethodsAtAddress:(uint64_t)address extendedMethodTypesCursor:(CDMachOFileDataCursor *)extendedMethodTypesCursor base:(uint64_t)base;
 {
     NSMutableArray *methods = [NSMutableArray array];
 
     if (address != 0) {
         CDMachOFileDataCursor *cursor = [[CDMachOFileDataCursor alloc] initWithFile:self.machOFile address:address];
-        NSLog(@"initial offset 0x%016lx address 0x%016llx", [cursor offset], address);
         NSParameterAssert([cursor offset] != 0);
         //NSLog(@"method list data offset: %lu", [cursor offset]);
 
@@ -419,60 +413,31 @@ - (NSArray *)loadMethodsAtAddress:(uint64_t)address extendedMethodTypesCursor:(C
         // See https://opensource.apple.com/source/objc4/objc4-787.1/runtime/objc-runtime-new.h
         uint32_t value = [cursor readInt32];
         listHeader.entsize = value & ~METHOD_LIST_T_ENTSIZE_MASK;
-        int smallMethodPointers = (value & METHOD_LIST_T_SMALL_METHOD_FLAG) != 0;
+        bool small = (value & METHOD_LIST_T_SMALL_METHOD_FLAG) != 0;
         listHeader.count = [cursor readInt32];
-        NSParameterAssert(listHeader.entsize == 3 * (smallMethodPointers ? sizeof(int32_t) : [self.machOFile ptrSize]));
-
-        uint64_t min1 = 0xFFFFFFFFFFFFFFFFULL;
-        uint64_t max1 = 0ULL;
-        uint64_t min2 = 0xFFFFFFFFFFFFFFFFULL;
-        uint64_t max2 = 0ULL;
-        uint64_t min3 = 0xFFFFFFFFFFFFFFFFULL;
-        uint64_t max3 = 0ULL;
-        uint64_t val2;
+        NSParameterAssert(listHeader.entsize == 3 * (small ? sizeof(int32_t) : [self.machOFile ptrSize]));
 
         for (uint32_t index = 0; index < listHeader.count; index++) {
             struct cd_objc2_method objc2Method;
-            uint64_t offset = [cursor offset];
-            if (smallMethodPointers) {
-                val2 = [cursor readSmallPtr:address]; if (val2 < min1) min1 = val2; if (val2 > max1) max1 = val2;
-                objc2Method.name = val2;
-                val2 = [cursor readSmallPtr:address]; if (val2 < min2) min2 = val2; if (val2 > max2) max2 = val2;
-                objc2Method.types = val2;
-                val2 = [cursor readSmallPtr:address]; if (val2 < min3) min3 = val2; if (val2 > max3) max3 = val2;
-                objc2Method.imp = val2;
-                //                NSLog(@"values12f: 0x%016llx 0x%016llx 0x%016llx", objc2Method.name, objc2Method.types, objc2Method.imp);
-//                NSLog(@"values12: 0x%08x 0x%08x 0x%08x", value1, value2, value3);
-            } else {
-                objc2Method.name  = [cursor readPtr];
-                objc2Method.types = [cursor readPtr];
-                objc2Method.imp   = [cursor readPtr];
-            }
-            NSString *name;
-            if (smallMethodPointers) {
-                name = [self.machOFile stringAtAddress2:objc2Method.name];
-                NSLog(@"small name: %@", name);
-            } else {
-                name = [self.machOFile stringAtAddress:objc2Method.name];
-            }
+
+            objc2Method.name  = [cursor readPtr:small];
+            objc2Method.types = [cursor readPtr:small];
+            objc2Method.imp   = [cursor readPtr:small];
+            NSString *name    = [self.machOFile stringAtAddress:objc2Method.name];
             NSString *types   = [self.machOFile stringAtAddress:objc2Method.types];
 
             if (extendedMethodTypesCursor) {
                 uint64_t extendedMethodTypes = [extendedMethodTypesCursor readPtr];
                 types = [self.machOFile stringAtAddress:extendedMethodTypes];
             }
 
-//            NSLog(@"%s%3u: 0x%016llx 0x%016llx 0x%016llx 0x%016llx 0x%016llx", (smallMethodPointers ? "small " : ""), index, objc2Method.name, objc2Method.types, objc2Method.imp, offset, address);
-//            NSLog(@"name: %@", name);
-//            NSLog(@"types: %@", types);
+            //NSLog(@"%3u: %016llx %016llx %016llx", index, objc2Method.name, objc2Method.types, objc2Method.imp);
+            //NSLog(@"name: %@", name);
+            //NSLog(@"types: %@", types);
 
             CDOCMethod *method = [[CDOCMethod alloc] initWithName:name typeString:types address:objc2Method.imp];
             [methods addObject:method];
         }
-
-//        if (smallMethodPointers) {
-//            NSLog(@"Small method range: 0x%016llx 0x%016llx 0x%016llx 0x%016llx 0x%016llx 0x%016llx", min1, max1, min2, max2, min3, max3);
-//        }
     }
 
     return [methods reversedArray];
@@ -485,7 +450,7 @@ - (NSArray *)loadIvarsAtAddress:(uint64_t)address;
     if (address != 0) {
         CDMachOFileDataCursor *cursor = [[CDMachOFileDataCursor alloc] initWithFile:self.machOFile address:address];
         NSParameterAssert([cursor offset] != 0);
-        // NSLog(@"ivar list data offset: %lu", [cursor offset]);
+        //NSLog(@"ivar list data offset: %lu", [cursor offset]);
 
         struct cd_objc2_list_header listHeader;
 

Source/CDObjectiveCProcessor.m

@@ -139,7 +139,6 @@ - (void)addCategory:(CDOCCategory *)category;
 - (int)process;
 {
     if (self.machOFile.isEncrypted == NO && self.machOFile.canDecryptAllSegments) {
-        NSLog(@"Loading file %@", [[self machOFile] filename]);
         [self.machOFile.symbolTable loadSymbols];
         [self.machOFile.dynamicSymbolTable loadSymbols];
 

Source/CDSection.h

@@ -19,7 +19,6 @@
 
 @property (nonatomic, readonly) NSUInteger addr;
 @property (nonatomic, readonly) NSUInteger size;
-@property (nonatomic, readonly) NSUInteger alignment;
 
 - (BOOL)containsAddress:(NSUInteger)address;
 - (NSUInteger)fileOffsetForAddress:(NSUInteger)address;

Source/CDSection.m

@@ -68,11 +68,6 @@ - (NSUInteger)size;
     return _section.size;
 }
 
-- (NSUInteger)alignment;
-{
-    return _section.align;
-}
-
 - (BOOL)containsAddress:(NSUInteger)address;
 {
     return (address >= _section.addr) && (address < _section.addr + _section.size);