Sync with sourceforge repo r219

gdbinit · Sep 6, 2013 · f9c3f0b · f9c3f0b
1 parent eb742ca
commit f9c3f0b
Show file tree

Hide file tree

Showing 27 changed files with 1,842 additions and 2,817 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 .svn/*
-
+build/*
 English.lproj/.svn/all-wcprops
 English.lproj/.svn/entries
 English.lproj/.svn/text-base/InfoPlist.strings.svn-base

diff --git a/ArchiveLayout.h b/ArchiveLayout.h
@@ -12,12 +12,12 @@
 {
   NSString *    name;
   uint32_t      length;
-  MVLayout *    __unsafe_unretained layout;
+  MVLayout *    __weak layout;
 }
 
 @property (nonatomic)                   NSString *  name;
 @property (nonatomic)                   uint32_t    length;
-@property (nonatomic,unsafe_unretained) MVLayout *  layout;
+@property (nonatomic,weak)  MVLayout *  layout;
 
 @end
 

diff --git a/CRTFootPrints.mm b/CRTFootPrints.mm
@@ -1259,6 +1259,9 @@ - (bool) matchAsmAtOffset:(uint32_t)offset
              asmFootPrint:(const AsmFootPrint)footprint 
                 lineCount:(NSUInteger)lineCount
 {
+  if (!dataController) // dataController is weak
+    return false;
+
   uint8_t const * data = ((uint8_t *)[dataController.fileData bytes]) + offset;
 
   for (NSUInteger i = 0; i < lineCount; ++i)
@@ -1284,6 +1287,9 @@ - (bool) matchAsmAtOffset:(uint32_t)offset
 //------------------------------------------------------------------------------
 - (void) determineRuntimeVersion
 {
+  if (!dataController) // dataController is weak
+    return;
+
   if (entryPoint == 0)
   {
     return; // not an executable, no entry point, or cannot detect

diff --git a/DataController.h b/DataController.h
@@ -87,7 +87,7 @@ struct MVNodeSaver;
 {
   NSMutableArray *      rows;         // array of MVRow * (host of all the rows)
   NSMutableArray *      displayRows;  // array of MVRow * (rows filtered by search criteria)
-  MVArchiver *          __unsafe_unretained archiver;
+  MVArchiver *          __weak archiver;
   FILE *                swapFile;
   NSLock *              tableLock;
 }
@@ -113,7 +113,7 @@ struct MVNodeSaver;
 @interface MVNode : NSObject <MVSerializing>
 {
   NSString *            caption;
-  MVNode *              __unsafe_unretained parent;
+  MVNode *              __weak parent;
   NSMutableArray *      children;
   NSRange               dataRange;
   MVTable *             details;
@@ -122,7 +122,7 @@ struct MVNodeSaver;
 }
 
 @property (nonatomic)                   NSString *            caption;
-@property (nonatomic,unsafe_unretained) MVNode *              parent;
+@property (nonatomic,weak)      MVNode *              parent;
 @property (nonatomic)                   NSRange               dataRange;
 @property (nonatomic)                   MVTable *             details;
 @property (nonatomic)                   NSMutableDictionary * userInfo;
@@ -150,7 +150,7 @@ struct MVNodeSaver;
   NSMutableData *       realData;         // patched content by relocs and bindings
   NSMutableArray *      layouts;
   MVNode *              rootNode;
-  MVNode *              __unsafe_unretained selectedNode;
+  MVNode *              __weak selectedNode;
   NSLock *              treeLock;         // semaphore for the node tree
 }
 
@@ -159,7 +159,7 @@ struct MVNodeSaver;
 @property (nonatomic)                   NSMutableData * realData;
 @property (nonatomic,readonly)          NSArray *       layouts;
 @property (nonatomic,readonly)          MVNode *        rootNode;
-@property (nonatomic,unsafe_unretained) MVNode *        selectedNode;
+@property (nonatomic,weak)              MVNode *        selectedNode;
 @property (nonatomic,readonly)          NSLock *        treeLock;
 
 -(NSString *)           getMachine:(cpu_type_t)cputype;

diff --git a/DataController.mm b/DataController.mm
@@ -156,7 +156,7 @@ - (NSString *)readStringFromFile:(FILE *)pFile
   for(;;) 
   {
     char c = fgetc(pFile);
-    if (c) 
+    if (!feof(pFile) && c)
       s += c;
     else
       break;

diff --git a/DataSources.h b/DataSources.h
@@ -8,14 +8,10 @@
 
 extern NSString * const MVScannerErrorMessage;
 
-@interface DataSourceTree : NSObject
-{
-}
+@interface MVDataSourceTree : NSObject;
 @end
 
 
-@interface DataSourceDetails : NSObject
-{
-}
+@interface MVDataSourceDetails : NSObject;
 @end
 
diff --git a/DataSources.mm b/DataSources.mm
@@ -14,7 +14,7 @@
 NSString * const MVScannerErrorMessage  = @"NSScanner error";
 
 //============================================================================
-@implementation DataSourceTree
+@implementation MVDataSourceTree
 
 #pragma mark NSOutlineView must-have delegates
 
@@ -77,7 +77,7 @@ - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTabl
 
 
 //============================================================================
-@implementation DataSourceDetails
+@implementation MVDataSourceDetails
 
 #pragma mark NSTableView must-have delegates
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,7 +156,7 @@ - (NSString *)readStringFromFile:(FILE *)pFile @@
       for(;;)
       {
         char c = fgetc(pFile);
-        if (c)
+        if (!feof(pFile) && c)
           s += c;
         else
           break;
@@ Expand Down @@