Smalltalk › Squeak › Squeak VM

[commit] r2230 - iOS add interp.c/h compiled with VMMaker-John M McIntosh.184. Fix cog stack vm xcode to build uuid in distribution mode

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

commits-3

[commit] r2230 - iOS add interp.c/h compiled with VMMaker-John M McIntosh.184. Fix cog stack vm xcode to build uuid in distribution mode

Author: johnmci
Date: 2010-07-08 12:39:22 -0700 (Thu, 08 Jul 2010)
New Revision: 2230

Modified:
trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3
trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser
trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3
trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser
trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj
trunk/platforms/iOS/vm/src/vm/interp.c
trunk/platforms/iOS/vm/src/vm/interp.h
Log:
iOS add interp.c/h compiled with VMMaker-John M McIntosh.184. Fix cog stack vm xcode to build uuid in distribution mode

Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3
===================================================================
--- trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 2010-07-08 06:40:25 UTC (rev 2229)
+++ trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 2010-07-08 19:39:22 UTC (rev 2230)
@@ -302,6 +302,8 @@
<key>Layout</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -388,7 +390,7 @@
<real>421</real>
</array>
<key>RubberWindowFrame</key>
- <string>99 -10 1646 973 0 0 1680 1028 </string>
+ <string>34 50 1646 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -399,8 +401,6 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -418,7 +418,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>94EE1D9511E57F9400DC6E8C</string>
+ <string>941A33B911E64E4D004796BA</string>
<key>history</key>
<array>
<string>94BCE7390DDDEF8200F38F31</string>
@@ -615,9 +615,7 @@
<string>94D3660B10CEE03900805023</string>
<string>94B954A010E6D0F700DC476A</string>
<string>9493E98F10EE90BC000C4FB3</string>
- <string>9458514810F03C23001401E7</string>
<string>94E438F510F1E34E006A2430</string>
- <string>940191A210F2B5E40019A524</string>
<string>9448940B10F3E8FF00FB3EC8</string>
<string>947923F21102BC12007C87F8</string>
<string>947923FE1102BE53007C87F8</string>
@@ -648,7 +646,7 @@
<string>94EF6E0511E5617E003BA64D</string>
<string>94EF6E0611E5617E003BA64D</string>
<string>94EF6ED111E56BDD003BA64D</string>
- <string>94EF711111E57F6D003BA64D</string>
+ <string>941A33B811E64E4D004796BA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -660,14 +658,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {1181, 659}}</string>
+ <string>{{0, 0}, {1181, 653}}</string>
<key>RubberWindowFrame</key>
- <string>99 -10 1646 973 0 0 1680 1028 </string>
+ <string>34 50 1646 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>659pt</string>
+ <string>653pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -680,14 +678,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 664}, {1181, 268}}</string>
+ <string>{{0, 658}, {1181, 274}}</string>
<key>RubberWindowFrame</key>
- <string>99 -10 1646 973 0 0 1680 1028 </string>
+ <string>34 50 1646 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>268pt</string>
+ <string>274pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -706,9 +704,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>94EE1D9611E57F9400DC6E8C</string>
+ <string>941A33BA11E64E4D004796BA</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>94EE1D9711E57F9400DC6E8C</string>
+ <string>941A33BB11E64E4D004796BA</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -829,7 +827,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>300253076.84179199</real>
+ <real>300305997.74636102</real>
<key>ToolbarDisplayMode</key>
<integer>1</integer>
<key>ToolbarIsVisible</key>
@@ -846,11 +844,10 @@
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>9424FF6E0DDCB226009912BF</string>
- <string>9488792B0E0F2F8000555242</string>
<string>/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>99 -10 1646 973 0 0 1680 1028 </string>
+ <string>34 50 1646 973 0 0 1680 1028 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -927,7 +924,7 @@
<key>TableOfContents</key>
<array>
<string>9424FF6E0DDCB226009912BF</string>
- <string>94EE1D9011E57F8D00DC6E8C</string>
+ <string>941A33BC11E64E4D004796BA</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -1047,13 +1044,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>94EE1D9811E57F9400DC6E8C</string>
+ <string>941A33BD11E64E4D004796BA</string>
<string>1C162984064C10D400B95A72</string>
- <string>94EE1D9911E57F9400DC6E8C</string>
- <string>94EE1D9A11E57F9400DC6E8C</string>
- <string>94EE1D9B11E57F9400DC6E8C</string>
- <string>94EE1D9C11E57F9400DC6E8C</string>
- <string>94EE1D9D11E57F9400DC6E8C</string>
+ <string>941A33BE11E64E4D004796BA</string>
+ <string>941A33BF11E64E4D004796BA</string>
+ <string>941A33C011E64E4D004796BA</string>
+ <string>941A33C111E64E4D004796BA</string>
+ <string>941A33C211E64E4D004796BA</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>

Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser
===================================================================
--- trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser 2010-07-08 06:40:25 UTC (rev 2229)
+++ trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser 2010-07-08 19:39:22 UTC (rev 2230)
@@ -249,11 +249,10 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 300253064;
- PBXWorkspaceStateSaveDate = 300253064;
+ PBXPerProjectTemplateStateSaveDate = 300305644;
+ PBXWorkspaceStateSaveDate = 300305644;
};
perUserProjectItems = {
- 940191A210F2B5E40019A524 /* PBXTextBookmark */ = 940191A210F2B5E40019A524 /* PBXTextBookmark */;
9402DC9C10CDB5F3005C2102 /* PBXTextBookmark */ = 9402DC9C10CDB5F3005C2102 /* PBXTextBookmark */;
9402DDB610CE12A5005C2102 /* PBXTextBookmark */ = 9402DDB610CE12A5005C2102 /* PBXTextBookmark */;
9406E7E210B663F4002F81F2 /* PBXTextBookmark */ = 9406E7E210B663F4002F81F2 /* PBXTextBookmark */;
@@ -262,6 +261,8 @@
941441FD10BC817D0088F8AC /* PBXTextBookmark */ = 941441FD10BC817D0088F8AC /* PBXTextBookmark */;
9414420110BC817D0088F8AC /* PBXTextBookmark */ = 9414420110BC817D0088F8AC /* PBXTextBookmark */;
9414425110BC8A620088F8AC /* PBXBookmark */ = 9414425110BC8A620088F8AC /* PBXBookmark */;
+ 941A33B811E64E4D004796BA /* PBXTextBookmark */ = 941A33B811E64E4D004796BA /* PBXTextBookmark */;
+ 941A33B911E64E4D004796BA /* PBXTextBookmark */ = 941A33B911E64E4D004796BA /* PBXTextBookmark */;
9421AB550FF1807D008F54E9 /* PBXTextBookmark */ = 9421AB550FF1807D008F54E9 /* PBXTextBookmark */;
9428BBAD10BB50E200DAD287 /* PBXTextBookmark */ = 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */;
9428BC5510BB74BF00DAD287 /* PBXTextBookmark */ = 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */;
@@ -291,7 +292,6 @@
9456C32210B32F43000BF3DE /* PBXTextBookmark */ = 9456C32210B32F43000BF3DE /* PBXTextBookmark */;
9456C34E10B33618000BF3DE /* PBXTextBookmark */ = 9456C34E10B33618000BF3DE /* PBXTextBookmark */;
9456C3CB10B341F9000BF3DE /* PBXTextBookmark */ = 9456C3CB10B341F9000BF3DE /* PBXTextBookmark */;
- 9458514810F03C23001401E7 /* PBXTextBookmark */ = 9458514810F03C23001401E7 /* PBXTextBookmark */;
9459E7C510C047DD001D0053 /* PBXTextBookmark */ = 9459E7C510C047DD001D0053 /* PBXTextBookmark */;
945C4D7C10BB0A8500548CC1 /* PBXTextBookmark */ = 945C4D7C10BB0A8500548CC1 /* PBXTextBookmark */;
945C4EAC10BB348300548CC1 /* PBXTextBookmark */ = 945C4EAC10BB348300548CC1 /* PBXTextBookmark */;
@@ -458,14 +458,12 @@
94E746D011E539AF00E90B3A /* PBXTextBookmark */ = 94E746D011E539AF00E90B3A /* PBXTextBookmark */;
94E8EEEA11C94D5D0049D853 /* PBXTextBookmark */ = 94E8EEEA11C94D5D0049D853 /* PBXTextBookmark */;
94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */ = 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */;
- 94EE1D9511E57F9400DC6E8C /* PBXTextBookmark */ = 94EE1D9511E57F9400DC6E8C /* PBXTextBookmark */;
94EF6D6611E55D1F003BA64D /* PBXTextBookmark */ = 94EF6D6611E55D1F003BA64D /* PBXTextBookmark */;
94EF6D6C11E55E31003BA64D /* PBXTextBookmark */ = 94EF6D6C11E55E31003BA64D /* PBXTextBookmark */;
94EF6D6D11E55E31003BA64D /* PBXTextBookmark */ = 94EF6D6D11E55E31003BA64D /* PBXTextBookmark */;
94EF6E0511E5617E003BA64D /* PBXTextBookmark */ = 94EF6E0511E5617E003BA64D /* PBXTextBookmark */;
94EF6E0611E5617E003BA64D /* PBXTextBookmark */ = 94EF6E0611E5617E003BA64D /* PBXTextBookmark */;
94EF6ED111E56BDD003BA64D /* PBXTextBookmark */ = 94EF6ED111E56BDD003BA64D /* PBXTextBookmark */;
- 94EF711111E57F6D003BA64D /* PBXTextBookmark */ = 94EF711111E57F6D003BA64D /* PBXTextBookmark */;
94F155570E83EA1F001657CE /* PBXTextBookmark */ = 94F155570E83EA1F001657CE /* PBXTextBookmark */;
94F155580E83EA1F001657CE /* PBXTextBookmark */ = 94F155580E83EA1F001657CE /* PBXTextBookmark */;
94F1F5C910C30C22008DB9CF /* PBXTextBookmark */ = 94F1F5C910C30C22008DB9CF /* PBXTextBookmark */;
@@ -512,16 +510,6 @@
sepNavWindowFrame = "{{483, -9}, {694, 1008}}";
};
};
- 940191A210F2B5E40019A524 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */;
- name = "ObjectiveCPlugin.c: 365";
- rLen = 0;
- rLoc = 11300;
- rType = 0;
- vrLen = 2030;
- vrLoc = 9317;
- };
9402DC9C10CDB5F3005C2102 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 94E658FA0DDD03FE00358328 /* HostWindowPlugin.c */;
@@ -673,7 +661,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 529;
- modificationTime = 300252914.934988;
+ modificationTime = 300305989.249983;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -689,7 +677,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 53;
- modificationTime = 300252914.935451;
+ modificationTime = 300305989.249927;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -784,6 +772,26 @@
sepNavVisRange = "{2526, 1527}";
};
};
+ 941A33B811E64E4D004796BA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 94E658E00DDD03FE00358328 /* interp.c */;
+ name = "interp.c: 18522";
+ rLen = 437;
+ rLoc = 592914;
+ rType = 0;
+ vrLen = 1360;
+ vrLoc = 592037;
+ };
+ 941A33B911E64E4D004796BA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 94E658E00DDD03FE00358328 /* interp.c */;
+ name = "interp.c: 18522";
+ rLen = 437;
+ rLoc = 592914;
+ rType = 0;
+ vrLen = 1360;
+ vrLoc = 592037;
+ };
941C24EF1198BBE3008BF398 /* sqSqueakScreenAndWindow.m:96 */ = {
isa = PBXFileBreakpoint;
actions = (
@@ -1998,20 +2006,10 @@
ignoreCount = 0;
lineNumber = 101;
location = Squeak;
- modificationTime = 300252758.417717;
+ modificationTime = 300305650.442468;
originalNumberOfMultipleMatches = 1;
state = 1;
};
- 9458514810F03C23001401E7 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 94E659200DDD03FE00358328 /* sqNamedPrims.h */;
- name = "sqNamedPrims.h: 66";
- rLen = 0;
- rLoc = 2091;
- rType = 0;
- vrLen = 1778;
- vrLoc = 558;
- };
945851AC10F03D1F001401E7 /* sqSqueakOSXApplication+clipboard.m:69 */ = {
isa = PBXFileBreakpoint;
actions = (
@@ -2025,7 +2023,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 69;
- modificationTime = 300252914.935517;
+ modificationTime = 300305989.249751;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2042,7 +2040,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 75;
- modificationTime = 300252914.93529;
+ modificationTime = 300305989.249909;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2075,7 +2073,7 @@
ignoreCount = 0;
lineNumber = 37;
location = Squeak;
- modificationTime = 300252758.639356;
+ modificationTime = 300305650.631059;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2092,7 +2090,7 @@
ignoreCount = 0;
lineNumber = 45;
location = Squeak;
- modificationTime = 300252758.7063661;
+ modificationTime = 300305650.683134;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2109,7 +2107,7 @@
ignoreCount = 0;
lineNumber = 50;
location = Squeak;
- modificationTime = 300252758.7621281;
+ modificationTime = 300305650.740088;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2126,7 +2124,7 @@
ignoreCount = 0;
lineNumber = 72;
location = Squeak;
- modificationTime = 300252758.8317651;
+ modificationTime = 300305650.776172;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2143,7 +2141,7 @@
ignoreCount = 0;
lineNumber = 88;
location = Squeak;
- modificationTime = 300252758.935259;
+ modificationTime = 300305650.82773;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2188,7 +2186,7 @@
ignoreCount = 0;
lineNumber = 31;
location = Squeak;
- modificationTime = 300252758.967312;
+ modificationTime = 300305650.871168;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2205,7 +2203,7 @@
ignoreCount = 0;
lineNumber = 24;
location = Squeak;
- modificationTime = 300252759.059801;
+ modificationTime = 300305650.92339;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2222,7 +2220,7 @@
ignoreCount = 0;
lineNumber = 17;
location = Squeak;
- modificationTime = 300252759.179004;
+ modificationTime = 300305650.971901;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2553,7 +2551,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 79;
- modificationTime = 300252914.935225;
+ modificationTime = 300305989.250078;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2629,7 +2627,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 218;
- modificationTime = 300252914.935492;
+ modificationTime = 300305989.249855;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2788,7 +2786,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 257;
- modificationTime = 300252914.9352;
+ modificationTime = 300305989.249041;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2805,7 +2803,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 262;
- modificationTime = 300252914.935311;
+ modificationTime = 300305989.249283;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -3684,7 +3682,7 @@
ignoreCount = 0;
lineNumber = 235;
location = Squeak;
- modificationTime = 300252758.223945;
+ modificationTime = 300305650.306065;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -5901,7 +5899,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 326;
- modificationTime = 300252914.935472;
+ modificationTime = 300305989.24995;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -5951,9 +5949,9 @@
};
94E658E00DDD03FE00358328 /* interp.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {3694, 358683}}";
- sepNavSelRange = "{803334, 0}";
- sepNavVisRange = "{802567, 1530}";
+ sepNavIntBoundsRect = "{{0, 0}, {3694, 358722}}";
+ sepNavSelRange = "{592914, 437}";
+ sepNavVisRange = "{592037, 1360}";
sepNavWindowFrame = "{{38, 34}, {1438, 968}}";
};
};
@@ -6780,7 +6778,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 118;
- modificationTime = 300252914.934909;
+ modificationTime = 300305989.250032;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -6801,16 +6799,6 @@
path = "/Users/johnmci/Work In Progress/smalltalk/CocoaSqueakSource/CocoaSqueak/Document.m";
sourceTree = "<absolute>";
};
- 94EE1D9511E57F9400DC6E8C /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 94E658E00DDD03FE00358328 /* interp.c */;
- name = "interp.c: 25359";
- rLen = 0;
- rLoc = 803334;
- rType = 0;
- vrLen = 1530;
- vrLoc = 802567;
- };
94EECBD811C76107001AFA91 /* interp.c:24055 */ = {
isa = PBXFileBreakpoint;
actions = (
@@ -6824,7 +6812,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 24055;
- modificationTime = 300252914.9350139;
+ modificationTime = 300305989.249568;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -6895,16 +6883,6 @@
vrLen = 1913;
vrLoc = 418;
};
- 94EF711111E57F6D003BA64D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 94E658E00DDD03FE00358328 /* interp.c */;
- name = "interp.c: 25359";
- rLen = 0;
- rLoc = 803334;
- rType = 0;
- vrLen = 1464;
- vrLoc = 802590;
- };
94F155570E83EA1F001657CE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 94B88C640E81500200C98131 /* SqueakObjcBridge.m */;

Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3
===================================================================
--- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 2010-07-08 06:40:25 UTC (rev 2229)
+++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 2010-07-08 19:39:22 UTC (rev 2230)
@@ -302,6 +302,8 @@
<key>Layout</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -340,12 +342,14 @@
<array>
<string>29B97314FDCFA39411CA2CEA</string>
<string>29B97315FDCFA39411CA2CEA</string>
+ <string>9424FF570DDCB17F009912BF</string>
+ <string>9424FF590DDCB198009912BF</string>
+ <string>9424FF5A0DDCB19F009912BF</string>
+ <string>94BCE6640DDDEB5000F38F31</string>
<string>94E658DC0DDD03FE00358328</string>
- <string>94E658DF0DDD03FE00358328</string>
+ <string>94E658DD0DDD03FE00358328</string>
<string>94EF6CB911E55947003BA64D</string>
<string>94EF6CBC11E55947003BA64D</string>
- <string>29B97317FDCFA39411CA2CEA</string>
- <string>94B6E9DC10BC777A00333E9E</string>
<string>29B97323FDCFA39411CA2CEA</string>
<string>19C28FACFE9D520D11CA2CBB</string>
<string>1C37FBAC04509CD000000102</string>
@@ -354,13 +358,11 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>3</integer>
- <integer>2</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 10}, {443, 914}}</string>
+ <string>{{0, 0}, {443, 914}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -381,7 +383,7 @@
<real>421</real>
</array>
<key>RubberWindowFrame</key>
- <string>0 50 1646 973 0 0 1680 1028 </string>
+ <string>17 55 1646 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -392,14 +394,12 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>sqUnixHeartbeat.c</string>
+ <string>sqAtomicOps.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -407,11 +407,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>sqUnixHeartbeat.c</string>
+ <string>sqAtomicOps.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>94E1BDB511E5AA0100D5B92B</string>
+ <string>94A3F95811E65EBC008113C6</string>
<key>history</key>
<array>
<string>94BCE7390DDDEF8200F38F31</string>
@@ -605,7 +605,6 @@
<string>94D3660B10CEE03900805023</string>
<string>94B954A010E6D0F700DC476A</string>
<string>9493E98F10EE90BC000C4FB3</string>
- <string>94E438F510F1E34E006A2430</string>
<string>9448940B10F3E8FF00FB3EC8</string>
<string>947923F21102BC12007C87F8</string>
<string>947923FE1102BE53007C87F8</string>
@@ -624,7 +623,6 @@
<string>9494934211E5274B0019BC29</string>
<string>9494934311E5274B0019BC29</string>
<string>9494934511E5274B0019BC29</string>
- <string>9494944811E52D570019BC29</string>
<string>9494944B11E52D570019BC29</string>
<string>94E7470211E53B8F00E90B3A</string>
<string>949AD35211E54A81006D6BF4</string>
@@ -632,7 +630,6 @@
<string>949AD4BD11E552D7006D6BF4</string>
<string>94F68BCA11E5535F00D8C904</string>
<string>94EF6CCF11E559D9003BA64D</string>
- <string>94EF6CF811E55BAC003BA64D</string>
<string>94EF6CFA11E55BAC003BA64D</string>
<string>94EF6CFB11E55BAC003BA64D</string>
<string>94EF6CFD11E55BAC003BA64D</string>
@@ -647,13 +644,18 @@
<string>94EF701E11E57905003BA64D</string>
<string>94EF702B11E57954003BA64D</string>
<string>94EF709B11E57D20003BA64D</string>
- <string>94EF70AC11E57D9E003BA64D</string>
<string>94EE1DAA11E57FAB00DC6E8C</string>
<string>94E1BDAB11E5A9F400D5B92B</string>
<string>94E1BDAC11E5A9F400D5B92B</string>
- <string>94E1BDAD11E5A9F400D5B92B</string>
- <string>94E1BDAE11E5A9F400D5B92B</string>
- <string>94E1BDAF11E5A9F400D5B92B</string>
+ <string>941A331C11E63E1A004796BA</string>
+ <string>941A331D11E63E1A004796BA</string>
+ <string>941A331F11E63E1A004796BA</string>
+ <string>941A333A11E640EE004796BA</string>
+ <string>941A33B411E64E46004796BA</string>
+ <string>94A3F91B11E6564F008113C6</string>
+ <string>94A3F92411E65CB5008113C6</string>
+ <string>94A3F92511E65CB5008113C6</string>
+ <string>94A3F92611E65CB5008113C6</string>
</array>
</dict>
<key>SplitCount</key>
@@ -665,14 +667,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {1181, 846}}</string>
+ <string>{{0, 0}, {1181, 838}}</string>
<key>RubberWindowFrame</key>
- <string>0 50 1646 973 0 0 1680 1028 </string>
+ <string>17 55 1646 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>846pt</string>
+ <string>838pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -685,14 +687,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 851}, {1181, 81}}</string>
+ <string>{{0, 843}, {1181, 89}}</string>
<key>RubberWindowFrame</key>
- <string>0 50 1646 973 0 0 1680 1028 </string>
+ <string>17 55 1646 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>81pt</string>
+ <string>89pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -711,9 +713,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>94E1BDB111E5A9F400D5B92B</string>
+ <string>94A3F8FD11E65115008113C6</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>94E1BDB211E5A9F400D5B92B</string>
+ <string>94A3F8FE11E65115008113C6</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -834,7 +836,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>300263937.01918799</real>
+ <real>300310204.00695699</real>
<key>ToolbarDisplayMode</key>
<integer>1</integer>
<key>ToolbarIsVisible</key>
@@ -849,16 +851,16 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
+ <string>94A3F8FF11E65115008113C6</string>
+ <string>94A3F90011E65115008113C6</string>
+ <string>1C78EAAD065D492600B07095</string>
+ <string>1CD10A99069EF8BA00B06720</string>
<string>1C530D57069F1CE1000CFCEE</string>
- <string>94E1BDB311E5A9F400D5B92B</string>
- <string>94E1BDB411E5A9F400D5B92B</string>
- <string>1CD10A99069EF8BA00B06720</string>
- <string>1C78EAAD065D492600B07095</string>
<string>9424FF6E0DDCB226009912BF</string>
- <string>/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj</string>
+ <string>/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjcCOGVM.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>0 50 1646 973 0 0 1680 1028 </string>
+ <string>17 55 1646 973 0 0 1680 1028 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -879,7 +881,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string></string>
+ <string><No Editor></string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -888,7 +890,7 @@
<key>Frame</key>
<string>{{0, 0}, {1332, 665}}</string>
<key>RubberWindowFrame</key>
- <string>115 106 1332 919 0 0 1680 1028 </string>
+ <string>115 104 1332 919 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -914,7 +916,7 @@
<key>Frame</key>
<string>{{0, 670}, {1332, 208}}</string>
<key>RubberWindowFrame</key>
- <string>115 106 1332 919 0 0 1680 1028 </string>
+ <string>115 104 1332 919 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -937,14 +939,14 @@
<key>TableOfContents</key>
<array>
<string>9424FF6E0DDCB226009912BF</string>
- <string>94E1BD8311E5A7FB00D5B92B</string>
+ <string>94A3F8E511E650CA008113C6</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.buildV3</string>
<key>WindowString</key>
- <string>115 106 1332 919 0 0 1680 1028 </string>
+ <string>115 104 1332 919 0 0 1680 1028 </string>
<key>WindowToolGUID</key>
<string>9424FF6E0DDCB226009912BF</string>
<key>WindowToolIsVisible</key>
@@ -979,8 +981,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {150, 491}}</string>
- <string>{{150, 0}, {1226, 491}}</string>
+ <string>{{0, 0}, {150, 394}}</string>
+ <string>{{150, 0}, {1226, 394}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@@ -995,8 +997,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {1376, 491}}</string>
- <string>{{0, 491}, {1376, 436}}</string>
+ <string>{{0, 0}, {1376, 394}}</string>
+ <string>{{0, 394}, {1376, 533}}</string>
</array>
</dict>
</dict>
@@ -1029,12 +1031,12 @@
<real>713</real>
</array>
<key>Frame</key>
- <string>{{150, 0}, {1226, 491}}</string>
+ <string>{{150, 0}, {1226, 394}}</string>
<key>RubberWindowFrame</key>
- <string>58 -62 1376 968 0 0 1680 1028 </string>
+ <string>64 60 1376 968 0 0 1680 1028 </string>
</dict>
<key>RubberWindowFrame</key>
- <string>58 -62 1376 968 0 0 1680 1028 </string>
+ <string>64 60 1376 968 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
@@ -1057,18 +1059,18 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>94E1BD8411E5A7FB00D5B92B</string>
+ <string>94A3F8E611E650CA008113C6</string>
<string>1C162984064C10D400B95A72</string>
- <string>94E1BD8511E5A7FB00D5B92B</string>
- <string>94E1BD8611E5A7FB00D5B92B</string>
- <string>94E1BD8711E5A7FB00D5B92B</string>
- <string>94E1BD8811E5A7FB00D5B92B</string>
- <string>94E1BD8911E5A7FB00D5B92B</string>
+ <string>94A3F8E711E650CA008113C6</string>
+ <string>94A3F8E811E650CA008113C6</string>
+ <string>94A3F8E911E650CA008113C6</string>
+ <string>94A3F8EA11E650CA008113C6</string>
+ <string>94A3F8EB11E650CA008113C6</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
<key>WindowString</key>
- <string>58 -62 1376 968 0 0 1680 1028 </string>
+ <string>64 60 1376 968 0 0 1680 1028 </string>
<key>WindowToolGUID</key>
<string>1CD10A99069EF8BA00B06720</string>
<key>WindowToolIsVisible</key>
@@ -1090,21 +1092,23 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CDD528C0622207200134675</string>
<key>PBXProjectModuleLabel</key>
- <string>sqUnixHeartbeat.c</string>
+ <string>sqExternalSemaphores.c</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {1417, 634}}</string>
+ <string>{{0, 0}, {1417, 676}}</string>
<key>RubberWindowFrame</key>
- <string>263 4 1417 1024 0 0 1680 1028 </string>
+ <string>677 0 1417 1024 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -1113,11 +1117,9 @@
</dict>
</array>
<key>Proportion</key>
- <string>634pt</string>
+ <string>676pt</string>
</dict>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -1128,14 +1130,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 639}, {1417, 344}}</string>
+ <string>{{0, 681}, {1417, 302}}</string>
<key>RubberWindowFrame</key>
- <string>263 4 1417 1024 0 0 1680 1028 </string>
+ <string>677 0 1417 1024 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXProjectFindModule</string>
<key>Proportion</key>
- <string>344pt</string>
+ <string>302pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -1153,13 +1155,13 @@
<key>TableOfContents</key>
<array>
<string>1C530D57069F1CE1000CFCEE</string>
- <string>94E1BD8E11E5A7FB00D5B92B</string>
- <string>94E1BD8F11E5A7FB00D5B92B</string>
+ <string>94A3F8F011E650CA008113C6</string>
+ <string>94A3F8F111E650CA008113C6</string>
<string>1CDD528C0622207200134675</string>
<string>1CD0528E0623707200166675</string>
</array>
<key>WindowString</key>
- <string>263 4 1417 1024 0 0 1680 1028 </string>
+ <string>677 0 1417 1024 0 0 1680 1028 </string>
<key>WindowToolGUID</key>
<string>1C530D57069F1CE1000CFCEE</string>
<key>WindowToolIsVisible</key>
@@ -1182,8 +1184,6 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -1219,7 +1219,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>94E1BD9011E5A7FB00D5B92B</string>
+ <string>94A3F8F211E650CA008113C6</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
@@ -1229,7 +1229,7 @@
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
- <true/>
+ <false/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>

Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser
===================================================================
--- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser 2010-07-08 06:40:25 UTC (rev 2229)
+++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser 2010-07-08 19:39:22 UTC (rev 2230)
@@ -23,7 +23,7 @@
);
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
- activeArchitecturePreference = armv6;
+ activeArchitecturePreference = armv7;
activeBuildConfigurationName = Debug;
activeExecutable = 9424FF3E0DDC8654009912BF /* Squeak */;
activeSDKPreference = iphoneos3.2;
@@ -75,6 +75,11 @@
94E8EF1211C950540049D853 /* sqSqueakOSXNSView.m:118 */,
94EF6FB511E57577003BA64D /* sqUnixHeartbeat.c:168 */,
94E1BD9C11E5A94E00D5B92B /* sqMacV2Time.c:64 */,
+ 941A331211E63DE7004796BA /* sqUnixHeartbeat.c:68 */,
+ 941A337811E64A37004796BA /* ObjectiveCPlugin.c:203 */,
+ 94A3F8DA11E6506A008113C6 /* ObjectiveCPlugin.c:1418 */,
+ 94A3F8DC11E65074008113C6 /* ObjectiveCPlugin.c:1426 */,
+ 94A3F8DE11E6507C008113C6 /* ObjectiveCPlugin.c:1412 */,
);
codeSenseManager = 9424FF430DDC8673009912BF /* Code sense */;
executables = (
@@ -250,8 +255,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 300262288;
- PBXWorkspaceStateSaveDate = 300262288;
+ PBXPerProjectTemplateStateSaveDate = 300306498;
+ PBXWorkspaceStateSaveDate = 300306498;
};
perUserProjectItems = {
9402DDB610CE12A5005C2102 /* PBXTextBookmark */ = 9402DDB610CE12A5005C2102 /* PBXTextBookmark */;
@@ -261,6 +266,11 @@
941441FD10BC817D0088F8AC /* PBXTextBookmark */ = 941441FD10BC817D0088F8AC /* PBXTextBookmark */;
9414420110BC817D0088F8AC /* PBXTextBookmark */ = 9414420110BC817D0088F8AC /* PBXTextBookmark */;
9414425110BC8A620088F8AC /* PBXBookmark */ = 9414425110BC8A620088F8AC /* PBXBookmark */;
+ 941A331C11E63E1A004796BA /* PBXTextBookmark */ = 941A331C11E63E1A004796BA /* PBXTextBookmark */;
+ 941A331D11E63E1A004796BA /* PBXTextBookmark */ = 941A331D11E63E1A004796BA /* PBXTextBookmark */;
+ 941A331F11E63E1A004796BA /* PBXTextBookmark */ = 941A331F11E63E1A004796BA /* PBXTextBookmark */;
+ 941A333A11E640EE004796BA /* PBXTextBookmark */ = 941A333A11E640EE004796BA /* PBXTextBookmark */;
+ 941A33B411E64E46004796BA /* PBXTextBookmark */ = 941A33B411E64E46004796BA /* PBXTextBookmark */;
9421AB550FF1807D008F54E9 /* PBXTextBookmark */ = 9421AB550FF1807D008F54E9 /* PBXTextBookmark */;
9428BBAD10BB50E200DAD287 /* PBXTextBookmark */ = 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */;
9428BC5510BB74BF00DAD287 /* PBXTextBookmark */ = 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */;
@@ -359,7 +369,6 @@
9494934211E5274B0019BC29 /* PBXTextBookmark */ = 9494934211E5274B0019BC29 /* PBXTextBookmark */;
9494934311E5274B0019BC29 /* PBXTextBookmark */ = 9494934311E5274B0019BC29 /* PBXTextBookmark */;
9494934511E5274B0019BC29 /* PBXTextBookmark */ = 9494934511E5274B0019BC29 /* PBXTextBookmark */;
- 9494944811E52D570019BC29 /* PBXTextBookmark */ = 9494944811E52D570019BC29 /* PBXTextBookmark */;
9494944B11E52D570019BC29 /* PBXTextBookmark */ = 9494944B11E52D570019BC29 /* PBXTextBookmark */;
949AD35211E54A81006D6BF4 /* PBXTextBookmark */ = 949AD35211E54A81006D6BF4 /* PBXTextBookmark */;
949AD36211E54AAA006D6BF4 /* PBXTextBookmark */ = 949AD36211E54AAA006D6BF4 /* PBXTextBookmark */;
@@ -367,6 +376,11 @@
949DDD6D11D141080017F79B /* PBXTextBookmark */ = 949DDD6D11D141080017F79B /* PBXTextBookmark */;
94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */ = 94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */;
94A1B41E10BA05E600C64473 /* PBXTextBookmark */ = 94A1B41E10BA05E600C64473 /* PBXTextBookmark */;
+ 94A3F91B11E6564F008113C6 /* PBXTextBookmark */ = 94A3F91B11E6564F008113C6 /* PBXTextBookmark */;
+ 94A3F92411E65CB5008113C6 /* PBXTextBookmark */ = 94A3F92411E65CB5008113C6 /* PBXTextBookmark */;
+ 94A3F92511E65CB5008113C6 /* PBXTextBookmark */ = 94A3F92511E65CB5008113C6 /* PBXTextBookmark */;
+ 94A3F92611E65CB5008113C6 /* PBXTextBookmark */ = 94A3F92611E65CB5008113C6 /* PBXTextBookmark */;
+ 94A3F95811E65EBC008113C6 /* PBXTextBookmark */ = 94A3F95811E65EBC008113C6 /* PBXTextBookmark */;
94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */;
94AB2E6C0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */;
94B1514E0DE2CE530059F208 /* PBXTextBookmark */ = 94B1514E0DE2CE530059F208 /* PBXTextBookmark */;
@@ -441,17 +455,12 @@
94D740B210B6242000F8C034 /* PBXTextBookmark */ = 94D740B210B6242000F8C034 /* PBXTextBookmark */;
94E1BDAB11E5A9F400D5B92B /* PBXTextBookmark */ = 94E1BDAB11E5A9F400D5B92B /* PBXTextBookmark */;
94E1BDAC11E5A9F400D5B92B /* PBXTextBookmark */ = 94E1BDAC11E5A9F400D5B92B /* PBXTextBookmark */;
- 94E1BDAD11E5A9F400D5B92B /* PBXTextBookmark */ = 94E1BDAD11E5A9F400D5B92B /* PBXTextBookmark */;
- 94E1BDAE11E5A9F400D5B92B /* PBXTextBookmark */ = 94E1BDAE11E5A9F400D5B92B /* PBXTextBookmark */;
- 94E1BDAF11E5A9F400D5B92B /* PBXTextBookmark */ = 94E1BDAF11E5A9F400D5B92B /* PBXTextBookmark */;
- 94E1BDB511E5AA0100D5B92B /* PBXTextBookmark */ = 94E1BDB511E5AA0100D5B92B /* PBXTextBookmark */;
94E297D10DECA72F009CF73A /* PBXTextBookmark */ = 94E297D10DECA72F009CF73A /* PBXTextBookmark */;
94E297D30DECA72F009CF73A /* PBXTextBookmark */ = 94E297D30DECA72F009CF73A /* PBXTextBookmark */;
94E297D50DECA72F009CF73A /* PBXTextBookmark */ = 94E297D50DECA72F009CF73A /* PBXTextBookmark */;
94E297D70DECA72F009CF73A /* PBXTextBookmark */ = 94E297D70DECA72F009CF73A /* PBXTextBookmark */;
94E2DAD40ED2351B00012E92 /* PBXTextBookmark */ = 94E2DAD40ED2351B00012E92 /* PBXTextBookmark */;
94E2DB270ED2355F00012E92 /* PBXTextBookmark */ = 94E2DB270ED2355F00012E92 /* PBXTextBookmark */;
- 94E438F510F1E34E006A2430 /* PBXTextBookmark */ = 94E438F510F1E34E006A2430 /* PBXTextBookmark */;
94E4930310BD32D00011AC75 /* PBXTextBookmark */ = 94E4930310BD32D00011AC75 /* PBXTextBookmark */;
94E583DB10BF43970073FD63 /* PBXTextBookmark */ = 94E583DB10BF43970073FD63 /* PBXTextBookmark */;
94E584AE10BF6EE30073FD63 /* PBXTextBookmark */ = 94E584AE10BF6EE30073FD63 /* PBXTextBookmark */;
@@ -462,7 +471,6 @@
94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */ = 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */;
94EE1DAA11E57FAB00DC6E8C /* PBXTextBookmark */ = 94EE1DAA11E57FAB00DC6E8C /* PBXTextBookmark */;
94EF6CCF11E559D9003BA64D /* PBXTextBookmark */ = 94EF6CCF11E559D9003BA64D /* PBXTextBookmark */;
- 94EF6CF811E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CF811E55BAC003BA64D /* PBXTextBookmark */;
94EF6CFA11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFA11E55BAC003BA64D /* PBXTextBookmark */;
94EF6CFB11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFB11E55BAC003BA64D /* PBXTextBookmark */;
94EF6CFD11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFD11E55BAC003BA64D /* PBXTextBookmark */;
@@ -477,7 +485,6 @@
94EF701E11E57905003BA64D /* PBXTextBookmark */ = 94EF701E11E57905003BA64D /* PBXTextBookmark */;
94EF702B11E57954003BA64D /* PBXTextBookmark */ = 94EF702B11E57954003BA64D /* PBXTextBookmark */;
94EF709B11E57D20003BA64D /* PBXTextBookmark */ = 94EF709B11E57D20003BA64D /* PBXTextBookmark */;
- 94EF70AC11E57D9E003BA64D /* PBXTextBookmark */ = 94EF70AC11E57D9E003BA64D /* PBXTextBookmark */;
94F155570E83EA1F001657CE /* PBXTextBookmark */ = 94F155570E83EA1F001657CE /* PBXTextBookmark */;
94F155580E83EA1F001657CE /* PBXTextBookmark */ = 94F155580E83EA1F001657CE /* PBXTextBookmark */;
94F1F5C910C30C22008DB9CF /* PBXTextBookmark */ = 94F1F5C910C30C22008DB9CF /* PBXTextBookmark */;
@@ -666,9 +673,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 529;
- modificationTime = 300263919.212603;
+ modificationTime = 300309947.151439;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
940CD113110E3E6500A9344A /* sqSqueakOSXDropAPI.m:53 */ = {
isa = PBXFileBreakpoint;
@@ -682,9 +689,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 53;
- modificationTime = 300263919.2125;
+ modificationTime = 300309947.151451;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
940CE8540DFCE2D200EBA91B /* SqueakUIController.h */ = {
uiCtxt = {
@@ -777,6 +784,105 @@
sepNavVisRange = "{2526, 1527}";
};
};
+ 941A331211E63DE7004796BA /* sqUnixHeartbeat.c:68 */ = {
+ isa = PBXFileBreakpoint;
+ actions = (
+ );
+ breakpointStyle = 0;
+ continueAfterActions = 0;
+ countType = 0;
+ delayBeforeContinue = 0;
+ fileReference = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */;
+ functionName = "ioGetClockLogSizeUsecsIdxMsecsIdx()";
+ hitCount = 0;
+ ignoreCount = 0;
+ lineNumber = 68;
+ location = Squeak;
+ modificationTime = 300309948.188813;
+ originalNumberOfMultipleMatches = 1;
+ state = 1;
+ };
+ 941A331C11E63E1A004796BA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */;
+ name = "sqUnixHeartbeat.c: 265";
+ rLen = 15;
+ rLoc = 7974;
+ rType = 0;
+ vrLen = 1570;
+ vrLoc = 7116;
+ };
+ 941A331D11E63E1A004796BA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 941A331E11E63E1A004796BA /* ia64.c */;
+ name = "ia64.c: 7278";
+ rLen = 1;
+ rLoc = 208277;
+ rType = 0;
+ vrLen = 2659;
+ vrLoc = 207667;
+ };
+ 941A331E11E63E1A004796BA /* ia64.c */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
+ name = ia64.c;
+ path = "/Users/johnmci/Documents/Files from Lamie/Documents/Darwin/gcc3-1151/gcc/config/ia64/ia64.c";
+ sourceTree = "<absolute>";
+ };
+ 941A331F11E63E1A004796BA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 941A332011E63E1A004796BA /* gatomic.c */;
+ name = "gatomic.c: 522";
+ rLen = 18;
+ rLoc = 14250;
+ rType = 0;
+ vrLen = 1827;
+ vrLoc = 13448;
+ };
+ 941A332011E63E1A004796BA /* gatomic.c */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.c;
+ name = gatomic.c;
+ path = "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_glib2-devel/work/glib-2.15.6/glib/gatomic.c";
+ sourceTree = "<absolute>";
+ };
+ 941A333A11E640EE004796BA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 9494935011E527AB0019BC29 /* sqMemoryFence.h */;
+ name = "sqMemoryFence.h: 53";
+ rLen = 16;
+ rLoc = 2247;
+ rType = 0;
+ vrLen = 2383;
+ vrLoc = 0;
+ };
+ 941A337811E64A37004796BA /* ObjectiveCPlugin.c:203 */ = {
+ isa = PBXFileBreakpoint;
+ actions = (
+ );
+ breakpointStyle = 0;
+ continueAfterActions = 0;
+ countType = 0;
+ delayBeforeContinue = 0;
+ fileReference = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */;
+ hitCount = 0;
+ ignoreCount = 0;
+ lineNumber = 203;
+ location = Squeak;
+ modificationTime = 300309948.236926;
+ originalNumberOfMultipleMatches = 1;
+ state = 1;
+ };
+ 941A33B411E64E46004796BA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 94E659000DDD03FE00358328 /* JPEGReadWriter2Plugin.c */;
+ name = "JPEGReadWriter2Plugin.c: 696";
+ rLen = 29;
+ rLoc = 20297;
+ rType = 0;
+ vrLen = 2099;
+ vrLoc = 19525;
+ };
941C24EF1198BBE3008BF398 /* sqSqueakScreenAndWindow.m:96 */ = {
isa = PBXFileBreakpoint;
actions = (
@@ -791,7 +897,7 @@
ignoreCount = 0;
lineNumber = 96;
location = Squeak;
- modificationTime = 300263795.296935;
+ modificationTime = 300309947.151476;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -802,9 +908,9 @@
};
94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1368, 25974}}";
- sepNavSelRange = "{190, 35}";
- sepNavVisRange = "{0, 1130}";
+ sepNavIntBoundsRect = "{{0, 0}, {1132, 25922}}";
+ sepNavSelRange = "{39280, 0}";
+ sepNavVisRange = "{38190, 1786}";
sepNavWindowFrame = "{{50, 470}, {750, 558}}";
};
};
@@ -1001,9 +1107,9 @@
};
9424FF5C0DDCB1C7009912BF /* sqMemoryAccess.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1327, 2093}}";
- sepNavSelRange = "{3143, 0}";
- sepNavVisRange = "{2021, 2848}";
+ sepNavIntBoundsRect = "{{0, 0}, {1327, 2080}}";
+ sepNavSelRange = "{3900, 0}";
+ sepNavVisRange = "{1841, 3901}";
sepNavWindowFrame = "{{15, 4}, {878, 1019}}";
};
};
@@ -1041,8 +1147,8 @@
9424FF640DDCB1EF009912BF /* sqPlatformSpecific.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1202, 2223}}";
- sepNavSelRange = "{5190, 0}";
- sepNavVisRange = "{4491, 2303}";
+ sepNavSelRange = "{6593, 8}";
+ sepNavVisRange = "{4403, 2391}";
sepNavWindowFrame = "{{38, 19}, {905, 983}}";
};
};
@@ -1196,7 +1302,7 @@
ignoreCount = 0;
lineNumber = 59;
location = Squeak;
- modificationTime = 300263795.295957;
+ modificationTime = 300309947.151047;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -1214,7 +1320,7 @@
ignoreCount = 0;
lineNumber = 218;
location = Squeak;
- modificationTime = 300263795.295995;
+ modificationTime = 300309947.151062;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -1232,7 +1338,7 @@
ignoreCount = 0;
lineNumber = 179;
location = Squeak;
- modificationTime = 300263795.296026;
+ modificationTime = 300309947.15108;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -1250,7 +1356,7 @@
ignoreCount = 0;
lineNumber = 204;
location = Squeak;
- modificationTime = 300263795.296045;
+ modificationTime = 300309947.151088;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -1996,7 +2102,7 @@
ignoreCount = 0;
lineNumber = 101;
location = Squeak;
- modificationTime = 300263795.73622;
+ modificationTime = 300309947.562642;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2013,9 +2119,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 69;
- modificationTime = 300263919.212518;
+ modificationTime = 300309947.151274;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
945851AE10F03D20001401E7 /* sqSqueakOSXApplication+clipboard.m:75 */ = {
isa = PBXFileBreakpoint;
@@ -2030,9 +2136,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 75;
- modificationTime = 300263919.212619;
+ modificationTime = 300309947.151286;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
945851EE10F03E60001401E7 /* sqMacExtendedClipboard.h */ = {
uiCtxt = {
@@ -2063,7 +2169,7 @@
ignoreCount = 0;
lineNumber = 37;
location = Squeak;
- modificationTime = 300263795.794756;
+ modificationTime = 300309947.631659;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2080,7 +2186,7 @@
ignoreCount = 0;
lineNumber = 45;
location = Squeak;
- modificationTime = 300263795.851079;
+ modificationTime = 300309947.679507;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2097,7 +2203,7 @@
ignoreCount = 0;
lineNumber = 50;
location = Squeak;
- modificationTime = 300263795.922508;
+ modificationTime = 300309947.731767;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2114,7 +2220,7 @@
ignoreCount = 0;
lineNumber = 72;
location = Squeak;
- modificationTime = 300263795.972301;
+ modificationTime = 300309947.763045;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2131,7 +2237,7 @@
ignoreCount = 0;
lineNumber = 88;
location = Squeak;
- modificationTime = 300263796.039272;
+ modificationTime = 300309947.819219;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2176,7 +2282,7 @@
ignoreCount = 0;
lineNumber = 31;
location = Squeak;
- modificationTime = 300263796.072386;
+ modificationTime = 300309947.863804;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2193,7 +2299,7 @@
ignoreCount = 0;
lineNumber = 24;
location = Squeak;
- modificationTime = 300263796.135318;
+ modificationTime = 300309947.920558;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2210,7 +2316,7 @@
ignoreCount = 0;
lineNumber = 17;
location = Squeak;
- modificationTime = 300263796.185619;
+ modificationTime = 300309947.94795;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -2252,7 +2358,7 @@
ignoreCount = 0;
lineNumber = 117;
location = Squeak;
- modificationTime = 300263795.295888;
+ modificationTime = 300309947.151016;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -2270,7 +2376,7 @@
ignoreCount = 0;
lineNumber = 101;
location = Squeak;
- modificationTime = 300263795.295918;
+ modificationTime = 300309947.15103;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -2327,9 +2433,9 @@
};
94638B260EAFB77B00A3F155 /* iPhone.changes */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {943, 1.71625e+06}}";
- sepNavSelRange = "{5412558, 0}";
- sepNavVisRange = "{0, 2331}";
+ sepNavIntBoundsRect = "{{0, 0}, {1368, 1.71565e+06}}";
+ sepNavSelRange = "{5337079, 32}";
+ sepNavVisRange = "{5336099, 2682}";
};
};
94638BD10EB0F98000A3F155 /* PBXTextBookmark */ = {
@@ -2531,9 +2637,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 79;
- modificationTime = 300263919.21255;
+ modificationTime = 300309947.15115;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
946DA9FF10C0D35500F26F56 /* sqMacUnixExternalPrims.m */ = {
uiCtxt = {
@@ -2607,9 +2713,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 218;
- modificationTime = 300263919.212535;
+ modificationTime = 300309947.151163;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
946DAB5110C0F2B000F26F56 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -2766,9 +2872,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 257;
- modificationTime = 300263919.212586;
+ modificationTime = 300309947.151181;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
9476031010C375C600B621C9 /* sqSqueakOSXApplication.m:262 */ = {
isa = PBXFileBreakpoint;
@@ -2783,9 +2889,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 262;
- modificationTime = 300263919.212634;
+ modificationTime = 300309947.151192;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
947713B610C45C0A00890A9B /* Queue.m:117 */ = {
isa = PBXFileBreakpoint;
@@ -2801,7 +2907,7 @@
ignoreCount = 0;
lineNumber = 117;
location = Squeak;
- modificationTime = 300263795.296349;
+ modificationTime = 300309947.15121;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -3636,32 +3742,32 @@
};
949492C311E51C6B0019BC29 /* sqExternalSemaphores.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1327, 3094}}";
- sepNavSelRange = "{5135, 16}";
- sepNavVisRange = "{4591, 897}";
+ sepNavIntBoundsRect = "{{0, 0}, {1368, 2808}}";
+ sepNavSelRange = "{3156, 0}";
+ sepNavVisRange = "{2334, 1921}";
};
};
949492C411E51C6B0019BC29 /* sqAtomicOps.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1132, 2691}}";
- sepNavSelRange = "{5308, 16}";
- sepNavVisRange = "{5110, 2261}";
+ sepNavIntBoundsRect = "{{0, 0}, {1132, 2626}}";
+ sepNavSelRange = "{5280, 19}";
+ sepNavVisRange = "{4398, 2104}";
sepNavWindowFrame = "{{122, -62}, {1573, 1024}}";
};
};
949492C611E51C6B0019BC29 /* sqTicker.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1368, 2925}}";
- sepNavSelRange = "{7434, 19}";
- sepNavVisRange = "{6448, 1470}";
+ sepNavIntBoundsRect = "{{0, 0}, {1368, 3016}}";
+ sepNavSelRange = "{7842, 16}";
+ sepNavVisRange = "{6427, 1089}";
sepNavWindowFrame = "{{15, 4}, {1385, 1024}}";
};
};
9494932C11E527180019BC29 /* sqUnixHeartbeat.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1368, 8710}}";
- sepNavSelRange = "{9297, 19}";
- sepNavVisRange = "{8686, 1788}";
+ sepNavIntBoundsRect = "{{0, 0}, {1368, 8996}}";
+ sepNavSelRange = "{2078, 16}";
+ sepNavVisRange = "{1433, 1225}";
};
};
9494932D11E527180019BC29 /* sqUnixThreads.c */ = {
@@ -3759,8 +3865,8 @@
9494935011E527AB0019BC29 /* sqMemoryFence.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1526, 873}}";
- sepNavSelRange = "{2283, 36}";
- sepNavVisRange = "{0, 2341}";
+ sepNavSelRange = "{2367, 0}";
+ sepNavVisRange = "{0, 2383}";
sepNavWindowFrame = "{{15, 4}, {1573, 1024}}";
};
};
@@ -3771,16 +3877,6 @@
sepNavVisRange = "{0, 1983}";
};
};
- 9494944811E52D570019BC29 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 9494935011E527AB0019BC29 /* sqMemoryFence.h */;
- name = "sqMemoryFence.h: 10";
- rLen = 0;
- rLoc = 224;
- rType = 0;
- vrLen = 2207;
- vrLoc = 0;
- };
9494944B11E52D570019BC29 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 9452D6020E044CB3000AD792 /* sqSqueakAttributesAPI.m */;
@@ -3805,7 +3901,7 @@
ignoreCount = 0;
lineNumber = 235;
location = Squeak;
- modificationTime = 300263795.699899;
+ modificationTime = 300309947.530433;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -3823,7 +3919,7 @@
ignoreCount = 0;
lineNumber = 352;
location = Squeak;
- modificationTime = 300263795.296768;
+ modificationTime = 300309947.151428;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -4017,7 +4113,7 @@
ignoreCount = 0;
lineNumber = 1429;
location = "Squeak VM Opt";
- modificationTime = 300263795.295866;
+ modificationTime = 300309947.151005;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -4093,6 +4189,107 @@
sepNavVisRange = "{1158, 1564}";
};
};
+ 94A3F8DA11E6506A008113C6 /* ObjectiveCPlugin.c:1418 */ = {
+ isa = PBXFileBreakpoint;
+ actions = (
+ );
+ breakpointStyle = 0;
+ continueAfterActions = 0;
+ countType = 0;
+ delayBeforeContinue = 0;
+ fileReference = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */;
+ functionName = "primitiveNSInvocationSetSelector()";
+ hitCount = 0;
+ ignoreCount = 0;
+ lineNumber = 1418;
+ location = Squeak;
+ modificationTime = 300309948.289467;
+ originalNumberOfMultipleMatches = 1;
+ state = 1;
+ };
+ 94A3F8DC11E65074008113C6 /* ObjectiveCPlugin.c:1426 */ = {
+ isa = PBXFileBreakpoint;
+ actions = (
+ );
+ breakpointStyle = 0;
+ continueAfterActions = 0;
+ countType = 0;
+ delayBeforeContinue = 0;
+ fileReference = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */;
+ functionName = "primitiveNSInvocationSetSelector()";
+ hitCount = 0;
+ ignoreCount = 0;
+ lineNumber = 1426;
+ location = Squeak;
+ modificationTime = 300309948.316902;
+ originalNumberOfMultipleMatches = 1;
+ state = 1;
+ };
+ 94A3F8DE11E6507C008113C6 /* ObjectiveCPlugin.c:1412 */ = {
+ isa = PBXFileBreakpoint;
+ actions = (
+ );
+ breakpointStyle = 0;
+ continueAfterActions = 0;
+ countType = 0;
+ delayBeforeContinue = 0;
+ fileReference = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */;
+ functionName = "primitiveNSInvocationSetSelector()";
+ hitCount = 0;
+ ignoreCount = 0;
+ lineNumber = 1412;
+ location = Squeak;
+ modificationTime = 300309948.369211;
+ originalNumberOfMultipleMatches = 1;
+ state = 1;
+ };
+ 94A3F91B11E6564F008113C6 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 949492C311E51C6B0019BC29 /* sqExternalSemaphores.c */;
+ name = "sqExternalSemaphores.c: 189";
+ rLen = 0;
+ rLoc = 6923;
+ rType = 0;
+ vrLen = 1829;
+ vrLoc = 5722;
+ };
+ 94A3F92411E65CB5008113C6 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 94EF6CBE11E55947003BA64D /* gcc3x-interp.c */;
+ name = "gcc3x-interp.c: 38978";
+ rLen = 0;
+ rLoc = 1130253;
+ rType = 0;
+ vrLen = 1678;
+ vrLoc = 750000;
+ };
+ 94A3F92511E65CB5008113C6 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */;
+ name = "ObjectiveCPlugin.c: 1408";
+ rLen = 0;
+ rLoc = 39280;
+ rType = 0;
+ vrLen = 1786;
+ vrLoc = 38190;
+ };
+ 94A3F92611E65CB5008113C6 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 949492C411E51C6B0019BC29 /* sqAtomicOps.h */;
+ rLen = 8;
+ rLoc = 5332;
+ rType = 0;
+ };
+ 94A3F95811E65EBC008113C6 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 949492C411E51C6B0019BC29 /* sqAtomicOps.h */;
+ name = "sqAtomicOps.h: 143";
+ rLen = 19;
+ rLoc = 5280;
+ rType = 0;
+ vrLen = 2104;
+ vrLoc = 4398;
+ };
94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 94AB2E6B0E003879006A79E4 /* npsqueak.c */;
@@ -4464,8 +4661,8 @@
};
94BCE7870DDDF61200F38F31 /* sqUnixUUID.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1132, 828}}";
- sepNavSelRange = "{38, 0}";
+ sepNavIntBoundsRect = "{{0, 0}, {1283, 633}}";
+ sepNavSelRange = "{0, 0}";
sepNavVisRange = "{0, 275}";
};
};
@@ -4528,7 +4725,7 @@
ignoreCount = 0;
lineNumber = 79;
location = Squeak;
- modificationTime = 300263795.296896;
+ modificationTime = 300309947.151465;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -5361,7 +5558,7 @@
ignoreCount = 0;
lineNumber = 465;
location = Squeak;
- modificationTime = 300263795.295623;
+ modificationTime = 300309947.150881;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -5379,7 +5576,7 @@
ignoreCount = 0;
lineNumber = 461;
location = Squeak;
- modificationTime = 300263795.295695;
+ modificationTime = 300309947.150934;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -5397,7 +5594,7 @@
ignoreCount = 0;
lineNumber = 449;
location = Squeak;
- modificationTime = 300263795.295722;
+ modificationTime = 300309947.150951;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -5415,7 +5612,7 @@
ignoreCount = 0;
lineNumber = 437;
location = Squeak;
- modificationTime = 300263795.295739;
+ modificationTime = 300309947.150962;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -5433,7 +5630,7 @@
ignoreCount = 0;
lineNumber = 445;
location = Squeak;
- modificationTime = 300263795.295783;
+ modificationTime = 300309947.150977;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -5451,7 +5648,7 @@
ignoreCount = 0;
lineNumber = 474;
location = Squeak;
- modificationTime = 300263795.295835;
+ modificationTime = 300309947.150988;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -5834,7 +6031,7 @@
ignoreCount = 0;
lineNumber = 64;
location = Squeak;
- modificationTime = 300263796.373119;
+ modificationTime = 300309948.053212;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -5858,43 +6055,6 @@
vrLen = 2352;
vrLoc = 2316;
};
- 94E1BDAD11E5A9F400D5B92B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 949492C411E51C6B0019BC29 /* sqAtomicOps.h */;
- name = "sqAtomicOps.h: 144";
- rLen = 16;
- rLoc = 5308;
- rType = 0;
- vrLen = 2261;
- vrLoc = 5110;
- };
- 94E1BDAE11E5A9F400D5B92B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 94EF6CBE11E55947003BA64D /* gcc3x-interp.c */;
- name = "gcc3x-interp.c: 9982";
- rLen = 0;
- rLoc = 312928;
- rType = 0;
- vrLen = 1989;
- vrLoc = 312075;
- };
- 94E1BDAF11E5A9F400D5B92B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */;
- rLen = 0;
- rLoc = 236;
- rType = 1;
- };
- 94E1BDB511E5AA0100D5B92B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */;
- name = "sqUnixHeartbeat.c: 317";
- rLen = 0;
- rLoc = 9245;
- rType = 0;
- vrLen = 1515;
- vrLoc = 7872;
- };
94E297D10DECA72F009CF73A /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 94E297D20DECA72F009CF73A /* config.h */;
@@ -5990,16 +6150,6 @@
vrLen = 922;
vrLoc = 3342;
};
- 94E438F510F1E34E006A2430 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 94E659000DDD03FE00358328 /* JPEGReadWriter2Plugin.c */;
- name = "JPEGReadWriter2Plugin.c: 382";
- rLen = 0;
- rLoc = 10506;
- rType = 0;
- vrLen = 1594;
- vrLoc = 9156;
- };
94E4930310BD32D00011AC75 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 9414420010BC817D0088F8AC /* NSPanel.h */;
@@ -6054,9 +6204,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 326;
- modificationTime = 300263919.212443;
+ modificationTime = 300309947.151141;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
94E5846510BF67600073FD63 /* NSResponder.h */ = {
isa = PBXFileReference;
@@ -6183,9 +6333,9 @@
};
94E659000DDD03FE00358328 /* JPEGReadWriter2Plugin.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1283, 9607}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{0, 884}";
+ sepNavIntBoundsRect = "{{0, 0}, {1195, 9672}}";
+ sepNavSelRange = "{20297, 29}";
+ sepNavVisRange = "{19525, 2099}";
};
};
94E659020DDD03FE00358328 /* Klatt.c */ = {
@@ -6302,9 +6452,9 @@
};
94E659200DDD03FE00358328 /* sqNamedPrims.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {870, 1079}}";
- sepNavSelRange = "{2091, 0}";
- sepNavVisRange = "{558, 1778}";
+ sepNavIntBoundsRect = "{{0, 0}, {1368, 1118}}";
+ sepNavSelRange = "{2185, 24}";
+ sepNavVisRange = "{1847, 641}";
sepNavWindowFrame = "{{15, 9}, {1078, 1014}}";
};
};
@@ -6858,9 +7008,9 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 118;
- modificationTime = 300263919.212571;
+ modificationTime = 300309947.151523;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -6902,15 +7052,15 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 24055;
- modificationTime = 300263919.212475;
+ modificationTime = 300309947.151507;
originalNumberOfMultipleMatches = 1;
- state = 1;
+ state = 0;
};
94EF6CBE11E55947003BA64D /* gcc3x-interp.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1783, 506480}}";
- sepNavSelRange = "{312928, 0}";
- sepNavVisRange = "{312075, 1989}";
+ sepNavIntBoundsRect = "{{0, 0}, {1132, 507026}}";
+ sepNavSelRange = "{1130253, 0}";
+ sepNavVisRange = "{750000, 1678}";
};
};
94EF6CBF11E55947003BA64D /* interp.c */ = {
@@ -6938,16 +7088,6 @@
vrLen = 2067;
vrLoc = 3458;
};
- 94EF6CF811E55BAC003BA64D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 949492C311E51C6B0019BC29 /* sqExternalSemaphores.c */;
- name = "sqExternalSemaphores.c: 57";
- rLen = 7;
- rLoc = 2737;
- rType = 0;
- vrLen = 2950;
- vrLoc = 1092;
- };
94EF6CFA11E55BAC003BA64D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 9494927D11E5178D0019BC29 /* cogit.c */;
@@ -7049,7 +7189,7 @@
ignoreCount = 0;
lineNumber = 168;
location = Squeak;
- modificationTime = 300263796.24242;
+ modificationTime = 300309948.013706;
originalNumberOfMultipleMatches = 1;
state = 1;
};
@@ -7120,16 +7260,6 @@
vrLen = 2456;
vrLoc = 0;
};
- 94EF70AC11E57D9E003BA64D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 9424FF640DDCB1EF009912BF /* sqPlatformSpecific.h */;
- name = "sqPlatformSpecific.h: 119";
- rLen = 0;
- rLoc = 5190;
- rType = 0;
- vrLen = 2303;
- vrLoc = 4491;
- };
94F155570E83EA1F001657CE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 94B88C640E81500200C98131 /* SqueakObjcBridge.m */;
@@ -7244,7 +7374,7 @@
ignoreCount = 0;
lineNumber = 432;
location = Squeak;
- modificationTime = 300263795.29607;
+ modificationTime = 300309947.151097;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -7262,7 +7392,7 @@
ignoreCount = 0;
lineNumber = 453;
location = Squeak;
- modificationTime = 300263795.29612;
+ modificationTime = 300309947.151112;
originalNumberOfMultipleMatches = 1;
state = 2;
};
@@ -7280,7 +7410,7 @@
ignoreCount = 0;
lineNumber = 457;
location = Squeak;
- modificationTime = 300263795.296173;
+ modificationTime = 300309947.151127;
originalNumberOfMultipleMatches = 1;
state = 2;
};

Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj
===================================================================
--- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj 2010-07-08 06:40:25 UTC (rev 2229)
+++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj 2010-07-08 19:39:22 UTC (rev 2230)
@@ -1884,7 +1884,7 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
- buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SqueakPureObjcCogVM" */;
+ buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SqueakPureObjcCOGVM" */;
compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
@@ -2419,6 +2419,7 @@
GCC_PREPROCESSOR_DEFINITIONS = SQUEAK_BUILTIN_PLUGIN;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = /usr/include/uuid;
PREBINDING = NO;
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "4D1323CE-3998-4FF8-AB83-49838083E965";
SDKROOT = iphoneos2.0;
@@ -2489,7 +2490,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SqueakPureObjcCogVM" */ = {
+ C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SqueakPureObjcCOGVM" */ = {
isa = XCConfigurationList;
buildConfigurations = (
947E5F3610A9FD0400D3B69E /* Debug */,

Modified: trunk/platforms/iOS/vm/src/vm/interp.c
===================================================================
--- trunk/platforms/iOS/vm/src/vm/interp.c 2010-07-08 06:40:25 UTC (rev 2229)
+++ trunk/platforms/iOS/vm/src/vm/interp.c 2010-07-08 19:39:22 UTC (rev 2230)
@@ -1,8 +1,8 @@
/* This file has been post-processed for GNU C */

-/* Automatically generated from Squeak on 15 June 2010 5:06:02 pm
- by VMMaker 4.2.4
+/* Automatically generated from Squeak on 8 July 2010 12:32:36 pm
+ by VMMaker 4.2.6
*/
#define SQ_USE_GLOBAL_STRUCT 1

@@ -150,7 +150,7 @@
#define InitialIPIndex 4
#define InstanceSpecificationIndex 2
#define InstructionPointerIndex 1
-#define InterpreterSourceVersion "4.2.4"
+#define InterpreterSourceVersion "4.2.6"
#define InvokeCallbackSelector 53
#define LargeContextBit 262144
#define LastLinkIndex 1
@@ -18449,6 +18449,7 @@
int evtBuf[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
sqInt i;
sqInt value;
+ sqInt eventTypeIs;
sqInt oop;

;
@@ -18462,6 +18463,7 @@
if (!(foo->successFlag)) {
return null;
}
+ eventTypeIs = evtBuf[0];
/* begin storeInteger:ofObject:withValue: */
if (
# ifdef SQ_HOST32 // cast to int for 64 bit image on 32 bit host
@@ -18478,32 +18480,34 @@
if (!(foo->successFlag)) {
return null;
}
- /* begin storeInteger:ofObject:withValue: */
- if (
-# ifdef SQ_HOST32 // cast to int for 64 bit image on 32 bit host
- (((((int) ((evtBuf[1]) & MillisecondClockMask))) ^ ((((int) ((evtBuf[1]) & MillisecondClockMask))) << 1)) >= 0)
-# else
- ((((evtBuf[1]) & MillisecondClockMask) >= -1073741824) && (((evtBuf[1]) & MillisecondClockMask) <= 1073741823))
-# endif // SQ_HOST32
- ) {
- longAtput((arg + (BASE_HEADER_SIZE)) + (1 << (SHIFT_FOR_WORD)), ((((evtBuf[1]) & MillisecondClockMask) << 1) | 1));
+ if (eventTypeIs == 6) {
+ for (i = 1; i <= 7; i += 1) {
+ value = evtBuf[i];
+ /* begin storePointer:ofObject:withValue: */
+ if ((((usqInt) arg)) < (((usqInt) foo->youngStart))) {
+ possibleRootStoreIntovalue(arg, value);
+ }
+ longAtput((arg + (BASE_HEADER_SIZE)) + (i << (SHIFT_FOR_WORD)), value);
+ }
} else {
- /* begin primitiveFail */
- foo->successFlag = 0;
- }
- if (!(foo->successFlag)) {
- return null;
- }
- for (i = 2; i <= 7; i += 1) {
- value = evtBuf[i];
+ /* begin storeInteger:ofObject:withValue: */
if (
# ifdef SQ_HOST32 // cast to int for 64 bit image on 32 bit host
- (((((int) value)) ^ ((((int) value)) << 1)) >= 0)
+ (((((int) ((evtBuf[1]) & MillisecondClockMask))) ^ ((((int) ((evtBuf[1]) & MillisecondClockMask))) << 1)) >= 0)
# else
- ((value >= -1073741824) && (value <= 1073741823))
+ ((((evtBuf[1]) & MillisecondClockMask) >= -1073741824) && (((evtBuf[1]) & MillisecondClockMask) <= 1073741823))
# endif // SQ_HOST32
) {
- /* begin storeInteger:ofObject:withValue: */
+ longAtput((arg + (BASE_HEADER_SIZE)) + (1 << (SHIFT_FOR_WORD)), ((((evtBuf[1]) & MillisecondClockMask) << 1) | 1));
+ } else {
+ /* begin primitiveFail */
+ foo->successFlag = 0;
+ }
+ if (!(foo->successFlag)) {
+ return null;
+ }
+ for (i = 2; i <= 7; i += 1) {
+ value = evtBuf[i];
if (
# ifdef SQ_HOST32 // cast to int for 64 bit image on 32 bit host
(((((int) value)) ^ ((((int) value)) << 1)) >= 0)
@@ -18511,24 +18515,33 @@
((value >= -1073741824) && (value <= 1073741823))
# endif // SQ_HOST32
) {
- longAtput((arg + (BASE_HEADER_SIZE)) + (i << (SHIFT_FOR_WORD)), ((value << 1) | 1));
+ /* begin storeInteger:ofObject:withValue: */
+ if (
+# ifdef SQ_HOST32 // cast to int for 64 bit image on 32 bit host
+ (((((int) value)) ^ ((((int) value)) << 1)) >= 0)
+# else
+ ((value >= -1073741824) && (value <= 1073741823))
+# endif // SQ_HOST32
+ ) {
+ longAtput((arg + (BASE_HEADER_SIZE)) + (i << (SHIFT_FOR_WORD)), ((value << 1) | 1));
+ } else {
+ /* begin primitiveFail */
+ foo->successFlag = 0;
+ }
} else {
- /* begin primitiveFail */
- foo->successFlag = 0;
+ /* begin pushRemappableOop: */
+ foo->remapBuffer[foo->remapBufferCount += 1] = arg;
+ value = positive32BitIntegerFor(value);
+ /* begin popRemappableOop */
+ oop = foo->remapBuffer[foo->remapBufferCount];
+ foo->remapBufferCount -= 1;
+ arg = oop;
+ /* begin storePointer:ofObject:withValue: */
+ if ((((usqInt) arg)) < (((usqInt) foo->youngStart))) {
+ possibleRootStoreIntovalue(arg, value);
+ }
+ longAtput((arg + (BASE_HEADER_SIZE)) + (i << (SHIFT_FOR_WORD)), value);
}
- } else {
- /* begin pushRemappableOop: */
- foo->remapBuffer[foo->remapBufferCount += 1] = arg;
- value = positive32BitIntegerFor(value);
- /* begin popRemappableOop */
- oop = foo->remapBuffer[foo->remapBufferCount];
- foo->remapBufferCount -= 1;
- arg = oop;
- /* begin storePointer:ofObject:withValue: */
- if ((((usqInt) arg)) < (((usqInt) foo->youngStart))) {
- possibleRootStoreIntovalue(arg, value);
- }
- longAtput((arg + (BASE_HEADER_SIZE)) + (i << (SHIFT_FOR_WORD)), value);
}
}
if (!(foo->successFlag)) {
@@ -27023,11 +27036,14 @@

entriesAvailable = fwdTableInit((BYTES_PER_WORD) * 2);
survivors = 0;
- freeChunk = null;

+ /* an invalid object pointer, note that 0 may refer to a meaningful slot */
+
+ freeChunk = -1;
+
/* will be updated later */

- firstFree = null;
+ firstFree = -1;
endOfMemoryLocal = foo->endOfMemory;
oop = foo->youngStart + (foo->headerTypeBytes[(longAt(foo->youngStart)) & TypeMask]);
while (oop < endOfMemoryLocal) {
@@ -27052,7 +27068,7 @@
}
if ((oopHeader & (MARK_BIT)) == 0) {
longAtput(oop - hdrBytes, HeaderTypeFree);
- if (freeChunk != null) {
+ if (freeChunk != -1) {

/* enlarge current free chunk to include this oop */

@@ -27067,7 +27083,7 @@
/* adjust size for possible extra header bytes */

freeChunkSize = oopSize + (oop - freeChunk);
- if (firstFree == null) {
+ if (firstFree == -1) {
firstFree = freeChunk;
}
}
@@ -27084,21 +27100,21 @@

firstFree = freeChunk;
}
- if (freeChunk != null) {
+ if (freeChunk != -1) {
longAtput(freeChunk, (freeChunkSize & (LONG_SIZE_MASK)) | HeaderTypeFree);
- freeChunk = null;
+ freeChunk = -1;
}
survivors += 1;
}
oop = (oop + oopSize) + (foo->headerTypeBytes[(longAt(oop + oopSize)) & TypeMask]);
}
- if (freeChunk != null) {
+ if (freeChunk != -1) {
longAtput(freeChunk, (freeChunkSize & (LONG_SIZE_MASK)) | HeaderTypeFree);
}
if (!(oop == foo->endOfMemory)) {
error("sweep failed to find exact end of memory");
}
- if (firstFree == null) {
+ if (firstFree == -1) {
error("expected to find at least one free object");
} else {
foo->compStart = firstFree;
Modified: trunk/platforms/iOS/vm/src/vm/interp.h
===================================================================
--- trunk/platforms/iOS/vm/src/vm/interp.h 2010-07-08 06:40:25 UTC (rev 2229)
+++ trunk/platforms/iOS/vm/src/vm/interp.h 2010-07-08 19:39:22 UTC (rev 2230)
@@ -1,8 +1,8 @@
-/* Automatically generated from Squeak on 15 June 2010 5:05:57 pm
- by VMMaker 4.2.4
+/* Automatically generated from Squeak on 8 July 2010 12:32:31 pm
+ by VMMaker 4.2.6
*/

-#define VMMAKER_VERSION "4.2.4"
+#define VMMAKER_VERSION "4.2.6"

/*
* define SQ_VI_BYTES_PER_WORD 8 for a 64-bit word size VM