[Vm-dev] [commit][2887] CogVM source as per VMMaker.oscog-eem.663

commits at squeakvm.org commits at squeakvm.org
Thu Apr 3 02:28:28 UTC 2014


Revision: 2887
Author:   eliot
Date:     2014-04-02 19:28:25 -0700 (Wed, 02 Apr 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.663

Fix pc-mapping for NewspeakV4.  Dynamic super sends should
/not/ be annotated with IsNSSendCall, but wth the vanilla IsSendCall.
This fixes a bug converting an interpreter activation of a method
with a loop and a duynamic super send to a machine code frame.

Sista:
Add sistasrc & sistamacbuild.  It's time ;-).
Reload TempReg from ReceiverResultReg on return from
counter trip, so that branch retry tests the right value.
Add a primitive to reset branch counters in a method.

Modified Paths:
--------------
    branches/Cog/nscogsrc/vm/cogit.c
    branches/Cog/nscogsrc/vm/cogit.h
    branches/Cog/nscogsrc/vm/cogmethod.h
    branches/Cog/nsspursrc/vm/cogit.c
    branches/Cog/nsspursrc/vm/cogit.h
    branches/Cog/nsspursrc/vm/cogmethod.h
    branches/Cog/nsspursrc/vm/cointerp.c
    branches/Cog/nsspursrc/vm/cointerp.h
    branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
    branches/Cog/nsspursrc/vm/interp.h
    branches/Cog/nsspursrc/vm/vmCallback.h

Added Paths:
-----------
    branches/Cog/sistamacbuild/
    branches/Cog/sistamacbuild/BochsIA32Plugin/
    branches/Cog/sistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/
    branches/Cog/sistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1
    branches/Cog/sistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.pbxuser
    branches/Cog/sistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/BochsIA32Plugin/Info.plist
    branches/Cog/sistamacbuild/BochsIA32Plugin/makeit
    branches/Cog/sistamacbuild/CoreVM.plist
    branches/Cog/sistamacbuild/CoreVM.xcodeproj/
    branches/Cog/sistamacbuild/CoreVM.xcodeproj/johnmci.mode1
    branches/Cog/sistamacbuild/CoreVM.xcodeproj/johnmci.pbxuser
    branches/Cog/sistamacbuild/CoreVM.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/CoreVM.xcodeproj/sophie.mode1
    branches/Cog/sistamacbuild/CoreVM.xcodeproj/sophie.pbxuser
    branches/Cog/sistamacbuild/CoreVM.xcodeproj/temp
    branches/Cog/sistamacbuild/CoreVM.xcodeproj/werdna.pbxuser
    branches/Cog/sistamacbuild/CroquetPlugin/
    branches/Cog/sistamacbuild/CroquetPlugin/CroquetPlugin.xcodeproj/
    branches/Cog/sistamacbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/sistamacbuild/CroquetPlugin/English.lproj/
    branches/Cog/sistamacbuild/CroquetPlugin/English.lproj/InfoPlist.strings
    branches/Cog/sistamacbuild/CroquetPlugin/Info.plist
    branches/Cog/sistamacbuild/FloatArrayPlugin/
    branches/Cog/sistamacbuild/FloatArrayPlugin/English.lproj/
    branches/Cog/sistamacbuild/FloatArrayPlugin/English.lproj/InfoPlist.strings
    branches/Cog/sistamacbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/
    branches/Cog/sistamacbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/FloatArrayPlugin/FloatArrayPlugin_Prefix.pch
    branches/Cog/sistamacbuild/FloatArrayPlugin/Info.plist
    branches/Cog/sistamacbuild/FloatMathPlugin/
    branches/Cog/sistamacbuild/FloatMathPlugin/English.lproj/
    branches/Cog/sistamacbuild/FloatMathPlugin/English.lproj/InfoPlist.strings
    branches/Cog/sistamacbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/
    branches/Cog/sistamacbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/FloatMathPlugin/FloatMathPlugin_Prefix.pch
    branches/Cog/sistamacbuild/FloatMathPlugin/Info.plist
    branches/Cog/sistamacbuild/HowToBuild
    branches/Cog/sistamacbuild/Mpeg3Plugin/
    branches/Cog/sistamacbuild/Mpeg3Plugin/Mpeg3Plugin-Info.plist
    branches/Cog/sistamacbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/
    branches/Cog/sistamacbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/SqueakFFIPrims/
    branches/Cog/sistamacbuild/SqueakFFIPrims/Info.plist
    branches/Cog/sistamacbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/
    branches/Cog/sistamacbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/SqueakFFIPrims/SqueakFFIPrims_Prefix.pch
    branches/Cog/sistamacbuild/SqueakSSL/
    branches/Cog/sistamacbuild/SqueakSSL/Info.plist
    branches/Cog/sistamacbuild/SqueakSSL/SqueakSSL.xcodeproj/
    branches/Cog/sistamacbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/sistamacbuild/Template/
    branches/Cog/sistamacbuild/Template/HowToMakeANewPlugin.txt
    branches/Cog/sistamacbuild/Template/Info.plist
    branches/Cog/sistamacbuild/Template/Template.xcodeproj/
    branches/Cog/sistamacbuild/Template/Template.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/Template/Template_Prefix.pch
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/English.lproj/
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/English.lproj/InfoPlist.strings
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/Info.plist
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/PkgInfo
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.mode1
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.pbxuser
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/sistamacbuild/UnixOSProcessPlugin/makeit
    branches/Cog/sistamacbuild/makeall
    branches/Cog/sistamacbuild/makeclean
    branches/Cog/sistamacbuild/makevm
    branches/Cog/sistamacbuild/mkNamedPrims.sh
    branches/Cog/sistamacbuild/mvm
    branches/Cog/sistamacbuild/plugins.ext
    branches/Cog/sistamacbuild/plugins.int
    branches/Cog/sistamacbuild/resources/
    branches/Cog/sistamacbuild/resources/FT2Plugin.bundle/
    branches/Cog/sistamacbuild/resources/FT2Plugin.bundle/Contents/
    branches/Cog/sistamacbuild/resources/FT2Plugin.bundle/Contents/Info.plist
    branches/Cog/sistamacbuild/resources/FT2Plugin.bundle/Contents/MacOS/
    branches/Cog/sistamacbuild/resources/FT2Plugin.bundle/Contents/MacOS/FT2Plugin
    branches/Cog/sistamacbuild/resources/FT2Plugin.bundle/Contents/PkgInfo
    branches/Cog/sistamacbuild/resources/FT2Plugin.bundle/Contents/Resources/
    branches/Cog/sistamacbuild/resources/FT2Plugin.bundle/Contents/Resources/SqueakPlugin.icns
    branches/Cog/sistamacbuild/resources/FloatMathPlugin.bundle/
    branches/Cog/sistamacbuild/resources/FloatMathPlugin.bundle/Contents/
    branches/Cog/sistamacbuild/resources/FloatMathPlugin.bundle/Contents/Info.plist
    branches/Cog/sistamacbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/
    branches/Cog/sistamacbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/FloatMathPlugin
    branches/Cog/sistamacbuild/resources/FloatMathPlugin.bundle/Contents/PkgInfo
    branches/Cog/sistamacbuild/resources/FloatMathPlugin.bundle/Contents/Resources/
    branches/Cog/sistamacbuild/resources/FloatMathPlugin.bundle/Contents/Resources/SqueakPlugin.icns
    branches/Cog/sistamacbuild/resources/LocalePlugin.bundle/
    branches/Cog/sistamacbuild/resources/LocalePlugin.bundle/Contents/
    branches/Cog/sistamacbuild/resources/LocalePlugin.bundle/Contents/Info.plist
    branches/Cog/sistamacbuild/resources/LocalePlugin.bundle/Contents/MacOS/
    branches/Cog/sistamacbuild/resources/LocalePlugin.bundle/Contents/MacOS/LocalePlugin
    branches/Cog/sistamacbuild/resources/LocalePlugin.bundle/Contents/PkgInfo
    branches/Cog/sistamacbuild/resources/LocalePlugin.bundle/Contents/Resources/
    branches/Cog/sistamacbuild/resources/LocalePlugin.bundle/Contents/Resources/SqueakPlugin.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/
    branches/Cog/sistamacbuild/resources/ProjectBuilder/Croquet.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/GreenCogSqueak.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/Squeak VM.r
    branches/Cog/sistamacbuild/resources/ProjectBuilder/Squeak.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/SqueakChanges.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/SqueakGeneric.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/SqueakImage.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/SqueakPlugin.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/SqueakProject.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/SqueakScript.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/SqueakSources.icns
    branches/Cog/sistamacbuild/resources/ProjectBuilder/Teleplace.icns
    branches/Cog/sistamacbuild/resources/QuicktimePlugin.bundle/
    branches/Cog/sistamacbuild/resources/QuicktimePlugin.bundle/Contents/
    branches/Cog/sistamacbuild/resources/QuicktimePlugin.bundle/Contents/Info.plist
    branches/Cog/sistamacbuild/resources/QuicktimePlugin.bundle/Contents/MacOS/
    branches/Cog/sistamacbuild/resources/QuicktimePlugin.bundle/Contents/MacOS/QuicktimePlugin
    branches/Cog/sistamacbuild/resources/QuicktimePlugin.bundle/Contents/PkgInfo
    branches/Cog/sistamacbuild/resources/QuicktimePlugin.bundle/Contents/Resources/
    branches/Cog/sistamacbuild/resources/QuicktimePlugin.bundle/Contents/Resources/SqueakPlugin.icns
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Info.plist
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/SpellCheck
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/InfoPlist.strings
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Info.plist
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/MacOS/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/MacOS/SpellingPlugin
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/PkgInfo
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Resources/
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Resources/InfoPlist.strings
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Resources/PkgInfo
    branches/Cog/sistamacbuild/resources/SpellingPlugin.bundle/Contents/Resources/SqueakPlugin.icns
    branches/Cog/sistamacbuild/sqNamedPrims.h
    branches/Cog/sistasrc/
    branches/Cog/sistasrc/examplePlugins.ext
    branches/Cog/sistasrc/examplePlugins.int
    branches/Cog/sistasrc/plugins
    branches/Cog/sistasrc/plugins.ext
    branches/Cog/sistasrc/plugins.int
    branches/Cog/sistasrc/vm/
    branches/Cog/sistasrc/vm/cogit.c
    branches/Cog/sistasrc/vm/cogit.h
    branches/Cog/sistasrc/vm/cogmethod.h
    branches/Cog/sistasrc/vm/cointerp.c
    branches/Cog/sistasrc/vm/cointerp.h
    branches/Cog/sistasrc/vm/exampleSqNamedPrims.h
    branches/Cog/sistasrc/vm/gcc3x-cointerp.c
    branches/Cog/sistasrc/vm/interp.h
    branches/Cog/sistasrc/vm/vmCallback.h

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nscogsrc/vm/cogit.c	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9
+	CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9
+	StackToRegisterMappingCogit VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -3048,19 +3048,17 @@
 			/* It's a linked send; find which kind. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -3106,19 +3104,17 @@
 		}
 		else {
 			/* begin offsetAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				offset = cmEntryOffset;
 
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					offset = cmDynSuperEntryOffset;
 
 				}
 				else {
-					assert(annotation == IsSendCall);
 					offset = cmNoCheckEntryOffset;
 
 				}
@@ -13229,7 +13225,7 @@
 	}
 	/* begin MoveCw:R: */
 	genoperandoperand(MoveCwR, selector, ClassReg);
-	CallNewspeakSend(dynamicSuperSendTrampolines[((numArgs < (NumSendTrampolines - 1)) ? numArgs : (NumSendTrampolines - 1))]);
+	CallSend(dynamicSuperSendTrampolines[((numArgs < (NumSendTrampolines - 1)) ? numArgs : (NumSendTrampolines - 1))]);
 	usesMethodClass = 1;
 	(optStatus.isReceiverResultRegLive = 0);
 	return ssPushRegister(ReceiverResultReg);
@@ -16258,19 +16254,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -17976,19 +17970,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint1 & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint1 - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint1 & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint1 - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint1 - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -19494,21 +19486,19 @@
 			return 0;
 		}
 		/* begin offsetAndSendTableFor:annotation:into: */
+		assert(annotation == IsSendCall);
 		if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-			assert(annotation == IsSendCall);
 			offset = cmEntryOffset;
 			sendTable = sendTrampolines;
 
 		}
 		else {
 			if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-				assert(annotation == IsNSSendCall);
 				offset = cmDynSuperEntryOffset;
 				sendTable = dynamicSuperSendTrampolines;
 
 			}
 			else {
-				assert(annotation == IsSendCall);
 				offset = cmNoCheckEntryOffset;
 				sendTable = superSendTrampolines;
 
@@ -20836,19 +20826,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -20892,19 +20880,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -20939,19 +20925,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -20990,19 +20974,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}

Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nscogsrc/vm/cogit.h	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9
+	CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
 
 

Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nscogsrc/vm/cogmethod.h	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9
+	CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
 
 typedef struct {

Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nsspursrc/vm/cogit.c	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9
+	CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9
+	StackToRegisterMappingCogit VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -3047,19 +3047,17 @@
 			/* It's a linked send; find which kind. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -3105,19 +3103,17 @@
 		}
 		else {
 			/* begin offsetAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				offset = cmEntryOffset;
 
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					offset = cmDynSuperEntryOffset;
 
 				}
 				else {
-					assert(annotation == IsSendCall);
 					offset = cmNoCheckEntryOffset;
 
 				}
@@ -14107,7 +14103,7 @@
 	}
 	/* begin MoveCw:R: */
 	genoperandoperand(MoveCwR, selector, ClassReg);
-	CallNewspeakSend(dynamicSuperSendTrampolines[((numArgs < (NumSendTrampolines - 1)) ? numArgs : (NumSendTrampolines - 1))]);
+	CallSend(dynamicSuperSendTrampolines[((numArgs < (NumSendTrampolines - 1)) ? numArgs : (NumSendTrampolines - 1))]);
 	usesMethodClass = 1;
 	(optStatus.isReceiverResultRegLive = 0);
 	return ssPushRegister(ReceiverResultReg);
@@ -17193,19 +17189,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -20152,21 +20146,19 @@
 			return 0;
 		}
 		/* begin offsetAndSendTableFor:annotation:into: */
+		assert(annotation == IsSendCall);
 		if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-			assert(annotation == IsSendCall);
 			offset = cmEntryOffset;
 			sendTable = sendTrampolines;
 
 		}
 		else {
 			if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-				assert(annotation == IsNSSendCall);
 				offset = cmDynSuperEntryOffset;
 				sendTable = dynamicSuperSendTrampolines;
 
 			}
 			else {
-				assert(annotation == IsSendCall);
 				offset = cmNoCheckEntryOffset;
 				sendTable = superSendTrampolines;
 
@@ -21492,19 +21484,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -21548,19 +21538,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -21595,19 +21583,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}
@@ -21646,19 +21632,17 @@
 			/* It's a linked send. */
 
 			/* begin targetMethodAndSendTableFor:annotation:into: */
+			assert(annotation == IsSendCall);
 			if ((entryPoint & entryPointMask) == checkedEntryAlignment) {
-				assert(annotation == IsSendCall);
 				targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset));
 				sendTable1 = sendTrampolines;
 			}
 			else {
 				if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) {
-					assert(annotation == IsNSSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmDynSuperEntryOffset));
 					sendTable1 = dynamicSuperSendTrampolines;
 				}
 				else {
-					assert(annotation == IsSendCall);
 					targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset));
 					sendTable1 = superSendTrampolines;
 				}

Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nsspursrc/vm/cogit.h	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9
+	CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
 
 

Modified: branches/Cog/nsspursrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogmethod.h	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nsspursrc/vm/cogmethod.h	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.659 uuid: cc4b5641-6415-4f25-a5ee-bffa61fbd6d9
+	CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
 
 typedef struct {

Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nsspursrc/vm/cointerp.c	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
    from
-	CoInterpreter VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f
+	CoInterpreter VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1381,7 +1381,6 @@
 sqInt tempCountOf(sqInt methodPointer);
 sqInt temporaryCountOfMethodHeader(sqInt header);
 void tenuringIncrementalGC(void);
-static sqInt tenuringThreshold(void);
 static sqInt topOfObjStack(sqInt objStack);
 sqInt topRemappableOop(void);
 static sqInt totalBytesInSegments(void);
@@ -1455,8 +1454,8 @@
 _iss sqInt numSegments;
 _iss usqInt scavengeThreshold;
 _iss sqInt firstFreeChunk;
-_iss sqInt rememberedSetSize;
 _iss SpurNewSpaceSpace pastSpace;
+_iss sqInt rememberedSetSize;
 _iss SpurContiguousObjStack unscannedEphemerons;
 _iss SpurNewSpaceSpace futureSpace;
 _iss usqInt newSpaceStart;
@@ -2204,7 +2203,7 @@
 	/* 574 */ (void (*)(void))0,
 	/* 575 */ (void (*)(void))0,
  0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.658";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.663";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
 volatile int sendTrace;
 
@@ -5496,7 +5495,6 @@
 							GIV(framePointer) = localFP;
 							
 							ceEnterCogCodePopReceiverReg();
-							null;
 							goto l290;
 						}
 						localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5514,7 +5512,7 @@
 					/* begin fetchNextBytecode */
 					currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
 
-					null;
+					/* return self */
 				l290:	/* end baseFrameReturn */;
 					goto l287;
 				}
@@ -54950,7 +54948,6 @@
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     float aProportion;
     sqInt arg;
-    sqInt averageObjectSize;
     sqInt i;
     sqInt index;
     sqInt paramsArraySize;
@@ -55015,7 +55012,7 @@
 		assert(!(isForwarded(result)));
 		longAtput((result + (BaseHeaderSize)) + (4 << 2), GIV(nilObj));
 		/* begin storePointerUnchecked:ofObject:withValue: */
-		valuePointer3 = (((tenuringThreshold()) << 1) | 1);
+		valuePointer3 = (((((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / (8 * 4)))) << 1) | 1);
 		assert(!(isForwarded(result)));
 		longAtput((result + (BaseHeaderSize)) + (5 << 2), valuePointer3);
 		/* begin storePointerUnchecked:ofObject:withValue: */
@@ -55252,7 +55249,7 @@
 			result = GIV(nilObj);
 		}
 		if (arg == 6) {
-			result = (((tenuringThreshold()) << 1) | 1);
+			result = (((((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / (8 * 4)))) << 1) | 1);
 		}
 		if (arg == 7) {
 			result = ((GIV(statFullGCs) << 1) | 1);
@@ -55450,12 +55447,10 @@
 		GIV(primFailCode) = 0;
 	}
 	if (index == 6) {
-		/* begin tenuringThreshold */
-		averageObjectSize = 8 * (wordSize());
-		result = ((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / averageObjectSize));
+		result = ((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / (8 * 4)));
 		/* begin tenuringThreshold: */
 		/* begin scavengerTenuringThreshold: */
-		aProportion = (((double) ((arg * 8) * (wordSize())) )) / (((double) (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start))) ));
+		aProportion = (((double) (arg * (8 * 4)) )) / (((double) (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start))) ));
 		GIV(tenuringProportion) = aProportion;
 		GIV(tenureThreshold) = (aProportion == 0.0
 			? 0
@@ -65554,24 +65549,6 @@
 }
 
 
-/*	In the scavenger the tenuring threshold is effectively a number of bytes
-	of objects,
-	accessed as a proportion of pastSpace from 0 to 1. In the Squeak image the
-	tenuring threshold is an object count. Marry the two notions by
-	multiplying the proportion by
-	the size of pastSpace and dividing by the average object size, as derived
-	from observation. */
-
-static sqInt
-tenuringThreshold(void)
-{   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt averageObjectSize;
-
-	averageObjectSize = 8 * (wordSize());
-	return ((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / averageObjectSize));
-}
-
-
 /*	This assert is tricky. push:onObjStack: may call topOfObjStack: just after
 	pushing an
 	empty page on the stack, and will ask if the second page is valid. */

Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nsspursrc/vm/cointerp.h	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
 
 

Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2014-04-03 02:28:25 UTC (rev 2887)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
    from
-	CoInterpreter VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f
+	CoInterpreter VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1384,7 +1384,6 @@
 sqInt tempCountOf(sqInt methodPointer);
 sqInt temporaryCountOfMethodHeader(sqInt header);
 void tenuringIncrementalGC(void);
-static sqInt tenuringThreshold(void);
 static sqInt topOfObjStack(sqInt objStack);
 sqInt topRemappableOop(void);
 static sqInt totalBytesInSegments(void);
@@ -1458,8 +1457,8 @@
 _iss sqInt numSegments;
 _iss usqInt scavengeThreshold;
 _iss sqInt firstFreeChunk;
-_iss sqInt rememberedSetSize;
 _iss SpurNewSpaceSpace pastSpace;
+_iss sqInt rememberedSetSize;
 _iss SpurContiguousObjStack unscannedEphemerons;
 _iss SpurNewSpaceSpace futureSpace;
 _iss usqInt newSpaceStart;
@@ -2207,7 +2206,7 @@
 	/* 574 */ (void (*)(void))0,
 	/* 575 */ (void (*)(void))0,
  0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.658";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.663";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
 volatile int sendTrace;
 
@@ -5505,7 +5504,6 @@
 							GIV(framePointer) = localFP;
 							
 							ceEnterCogCodePopReceiverReg();
-							null;
 							goto l290;
 						}
 						localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5523,7 +5521,7 @@
 					/* begin fetchNextBytecode */
 					currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
 
-					null;
+					/* return self */
 				l290:	/* end baseFrameReturn */;
 					goto l287;
 				}
@@ -54959,7 +54957,6 @@
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     float aProportion;
     sqInt arg;
-    sqInt averageObjectSize;
     sqInt i;
     sqInt index;
     sqInt paramsArraySize;
@@ -55024,7 +55021,7 @@
 		assert(!(isForwarded(result)));
 		longAtput((result + (BaseHeaderSize)) + (4 << 2), GIV(nilObj));
 		/* begin storePointerUnchecked:ofObject:withValue: */
-		valuePointer3 = (((tenuringThreshold()) << 1) | 1);
+		valuePointer3 = (((((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / (8 * 4)))) << 1) | 1);
 		assert(!(isForwarded(result)));
 		longAtput((result + (BaseHeaderSize)) + (5 << 2), valuePointer3);
 		/* begin storePointerUnchecked:ofObject:withValue: */
@@ -55261,7 +55258,7 @@
 			result = GIV(nilObj);
 		}
 		if (arg == 6) {
-			result = (((tenuringThreshold()) << 1) | 1);
+			result = (((((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / (8 * 4)))) << 1) | 1);
 		}
 		if (arg == 7) {
 			result = ((GIV(statFullGCs) << 1) | 1);
@@ -55459,12 +55456,10 @@
 		GIV(primFailCode) = 0;
 	}
 	if (index == 6) {
-		/* begin tenuringThreshold */
-		averageObjectSize = 8 * (wordSize());
-		result = ((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / averageObjectSize));
+		result = ((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / (8 * 4)));
 		/* begin tenuringThreshold: */
 		/* begin scavengerTenuringThreshold: */
-		aProportion = (((double) ((arg * 8) * (wordSize())) )) / (((double) (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start))) ));
+		aProportion = (((double) (arg * (8 * 4)) )) / (((double) (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start))) ));
 		GIV(tenuringProportion) = aProportion;
 		GIV(tenureThreshold) = (aProportion == 0.0
 			? 0
@@ -65563,24 +65558,6 @@
 }
 
 
-/*	In the scavenger the tenuring threshold is effectively a number of bytes
-	of objects,
-	accessed as a proportion of pastSpace from 0 to 1. In the Squeak image the
-	tenuring threshold is an object count. Marry the two notions by
-	multiplying the proportion by
-	the size of pastSpace and dividing by the average object size, as derived
-	from observation. */
-
-static sqInt
-tenuringThreshold(void)
-{   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt averageObjectSize;
-
-	averageObjectSize = 8 * (wordSize());
-	return ((sqInt)(((scavengerTenuringThreshold()) * (((GIV(pastSpace).limit)) - ((GIV(pastSpace).start)))) / averageObjectSize));
-}
-
-
 /*	This assert is tricky. push:onObjStack: may call topOfObjStack: just after
 	pushing an
 	empty page on the stack, and will ask if the second page is valid. */

Modified: branches/Cog/nsspursrc/vm/interp.h
===================================================================
--- branches/Cog/nsspursrc/vm/interp.h	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nsspursrc/vm/interp.h	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
 
 #define VM_PROXY_MAJOR 1

Modified: branches/Cog/nsspursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspursrc/vm/vmCallback.h	2014-03-28 23:11:48 UTC (rev 2886)
+++ branches/Cog/nsspursrc/vm/vmCallback.h	2014-04-03 02:28:25 UTC (rev 2887)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086
  */
 
 #define VM_CALLBACK_INC 1


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Fri Mar 28 16:10:05 PDT 2014
   + Wed Apr  2 19:25:27 PDT 2014

Added: branches/Cog/sistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1
===================================================================
--- branches/Cog/sistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1	                        (rev 0)
+++ branches/Cog/sistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1	2014-04-03 02:28:25 UTC (rev 2887)
@@ -0,0 +1,1333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>ActivePerspectiveName</key>
+	<string>Project</string>
+	<key>AllowedModules</key>
+	<array>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>PBXSmartGroupTreeModule</string>
+			<key>Name</key>
+			<string>Groups and Files Outline View</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>PBXNavigatorGroup</string>
+			<key>Name</key>
+			<string>Editor</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>XCTaskListModule</string>
+			<key>Name</key>
+			<string>Task List</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>XCDetailModule</string>
+			<key>Name</key>
+			<string>File and Smart Group Detail Viewer</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>1</string>
+			<key>Module</key>
+			<string>PBXBuildResultsModule</string>
+			<key>Name</key>
+			<string>Detailed Build Results Viewer</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>1</string>
+			<key>Module</key>
+			<string>PBXProjectFindModule</string>
+			<key>Name</key>
+			<string>Project Batch Find Tool</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>PBXRunSessionModule</string>
+			<key>Name</key>
+			<string>Run Log</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>PBXBookmarksModule</string>
+			<key>Name</key>
+			<string>Bookmarks Tool</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>PBXClassBrowserModule</string>
+			<key>Name</key>
+			<string>Class Browser</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>PBXCVSModule</string>
+			<key>Name</key>
+			<string>Source Code Control Tool</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>PBXDebugBreakpointsModule</string>
+			<key>Name</key>
+			<string>Debug Breakpoints Tool</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>XCDockableInspector</string>
+			<key>Name</key>
+			<string>Inspector</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>n</string>
+			<key>Module</key>
+			<string>PBXOpenQuicklyModule</string>
+			<key>Name</key>
+			<string>Open Quickly Tool</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>1</string>
+			<key>Module</key>
+			<string>PBXDebugSessionModule</string>
+			<key>Name</key>
+			<string>Debugger</string>
+		</dict>
+		<dict>
+			<key>BundleLoadPath</key>
+			<string></string>
+			<key>MaxInstances</key>
+			<string>1</string>
+			<key>Module</key>
+			<string>PBXDebugCLIModule</string>
+			<key>Name</key>
+			<string>Debug Console</string>
+		</dict>
+	</array>
+	<key>Description</key>
+	<string>DefaultDescriptionKey</string>
+	<key>DockingSystemVisible</key>
+	<false/>
+	<key>Extension</key>
+	<string>mode1</string>
+	<key>FavBarConfig</key>
+	<dict>
+		<key>PBXProjectModuleGUID</key>
+		<string>732BAA9E0EE7128F00655F61</string>
+		<key>XCBarModuleItemNames</key>
+		<dict/>
+		<key>XCBarModuleItems</key>
+		<array/>
+	</dict>
+	<key>FirstTimeWindowDisplayed</key>
+	<false/>
+	<key>Identifier</key>
+	<string>com.apple.perspectives.project.mode1</string>
+	<key>MajorVersion</key>
+	<integer>31</integer>
+	<key>MinorVersion</key>
+	<integer>1</integer>
+	<key>Name</key>
+	<string>Default</string>
+	<key>Notifications</key>
+	<array/>
+	<key>OpenEditors</key>
+	<array/>
+	<key>PerspectiveWidths</key>
+	<array>
+		<integer>-1</integer>
+		<integer>-1</integer>
+	</array>
+	<key>Perspectives</key>
+	<array>
+		<dict>
+			<key>ChosenToolbarItems</key>
+			<array>
+				<string>active-target-popup</string>
+				<string>active-buildstyle-popup</string>
+				<string>action</string>
+				<string>NSToolbarFlexibleSpaceItem</string>
+				<string>buildOrClean</string>
+				<string>build-and-runOrDebug</string>
+				<string>com.apple.ide.PBXToolbarStopButton</string>
+				<string>get-info</string>
+				<string>toggle-editor</string>
+				<string>NSToolbarFlexibleSpaceItem</string>
+				<string>com.apple.pbx.toolbar.searchfield</string>
+			</array>
+			<key>ControllerClassBaseName</key>
+			<string></string>
+			<key>IconName</key>
+			<string>WindowOfProjectWithEditor</string>
+			<key>Identifier</key>
+			<string>perspective.project</string>
+			<key>IsVertical</key>
+			<false/>
+			<key>Layout</key>
+			<array>
+				<dict>
+					<key>ContentConfiguration</key>
+					<dict>
+						<key>PBXBottomSmartGroupGIDs</key>
+						<array>
+							<string>1C37FBAC04509CD000000102</string>
+							<string>1C37FAAC04509CD000000102</string>
+							<string>1C08E77C0454961000C914BD</string>
+							<string>1C37FABC05509CD000000102</string>
+							<string>1C37FABC05539CD112110102</string>
+							<string>E2644B35053B69B200211256</string>
+							<string>1C37FABC04509CD000100104</string>
+							<string>1CC0EA4004350EF90044410B</string>
+							<string>1CC0EA4004350EF90041110B</string>
+						</array>
+						<key>PBXProjectModuleGUID</key>
+						<string>1CE0B1FE06471DED0097A5F4</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>Files</string>
+						<key>PBXProjectStructureProvided</key>
+						<string>yes</string>
+						<key>PBXSmartGroupTreeModuleColumnData</key>
+						<dict>
+							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
+							<array>
+								<real>186</real>
+							</array>
+							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
+							<array>
+								<string>MainColumn</string>
+							</array>
+						</dict>
+						<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
+						<dict>
+							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
+							<array>
+								<string>089C166AFE841209C02AAC07</string>
+								<string>08FB77ADFE841716C02AAC07</string>
+								<string>089C167CFE841241C02AAC07</string>
+								<string>089C1671FE841209C02AAC07</string>
+								<string>19C28FB4FE9D528D11CA2CBB</string>
+								<string>1C37FBAC04509CD000000102</string>
+								<string>1C37FABC05509CD000000102</string>
+							</array>
+							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
+							<array>
+								<array>
+									<integer>0</integer>
+								</array>
+							</array>
+							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
+							<string>{{0, 0}, {186, 777}}</string>
+						</dict>
+						<key>PBXTopSmartGroupGIDs</key>
+						<array/>
+						<key>XCIncludePerspectivesSwitch</key>
+						<true/>
+						<key>XCSharingToken</key>
+						<string>com.apple.Xcode.GFSharingToken</string>
+					</dict>
+					<key>GeometryConfiguration</key>
+					<dict>
+						<key>Frame</key>
+						<string>{{0, 0}, {203, 795}}</string>
+						<key>GroupTreeTableConfiguration</key>
+						<array>
+							<string>MainColumn</string>
+							<real>186</real>
+						</array>
+						<key>RubberWindowFrame</key>
+						<string>172 180 1063 836 0 0 1680 1028 </string>
+					</dict>
+					<key>Module</key>
+					<string>PBXSmartGroupTreeModule</string>
+					<key>Proportion</key>
+					<string>203pt</string>
+				</dict>
+				<dict>
+					<key>Dock</key>
+					<array>
+						<dict>
+							<key>ContentConfiguration</key>
+							<dict>
+								<key>PBXProjectModuleGUID</key>
+								<string>1CE0B20306471E060097A5F4</string>
+								<key>PBXProjectModuleLabel</key>
+								<string>MyNewFile14.java</string>
+								<key>PBXSplitModuleInNavigatorKey</key>
+								<dict>
+									<key>Split0</key>
+									<dict>
+										<key>PBXProjectModuleGUID</key>
+										<string>1CE0B20406471E060097A5F4</string>
+										<key>PBXProjectModuleLabel</key>
+										<string>MyNewFile14.java</string>
+									</dict>
+									<key>SplitCount</key>
+									<string>1</string>
+								</dict>
+								<key>StatusBarVisibility</key>
+								<true/>
+							</dict>
+							<key>GeometryConfiguration</key>
+							<dict>
+								<key>Frame</key>
+								<string>{{0, 0}, {855, 0}}</string>
+								<key>RubberWindowFrame</key>
+								<string>172 180 1063 836 0 0 1680 1028 </string>
+							</dict>
+							<key>Module</key>
+							<string>PBXNavigatorGroup</string>
+							<key>Proportion</key>
+							<string>0pt</string>
+						</dict>
+						<dict>
+							<key>BecomeActive</key>
+							<true/>
+							<key>ContentConfiguration</key>
+							<dict>
+								<key>PBXProjectModuleGUID</key>
+								<string>1CE0B20506471E060097A5F4</string>
+								<key>PBXProjectModuleLabel</key>
+								<string>Detail</string>
+							</dict>
+							<key>GeometryConfiguration</key>
+							<dict>
+								<key>Frame</key>
+								<string>{{0, 5}, {855, 790}}</string>
+								<key>RubberWindowFrame</key>
+								<string>172 180 1063 836 0 0 1680 1028 </string>
+							</dict>
+							<key>Module</key>
+							<string>XCDetailModule</string>
+							<key>Proportion</key>
+							<string>790pt</string>
+						</dict>
+					</array>
+					<key>Proportion</key>
+					<string>855pt</string>
+				</dict>
+			</array>
+			<key>Name</key>
+			<string>Project</string>
+			<key>ServiceClasses</key>
+			<array>
+				<string>XCModuleDock</string>
+				<string>PBXSmartGroupTreeModule</string>
+				<string>XCModuleDock</string>
+				<string>PBXNavigatorGroup</string>
+				<string>XCDetailModule</string>
+			</array>
+			<key>TableOfContents</key>
+			<array>
+				<string>73A0CCA30F8A856300EB4B80</string>
+				<string>1CE0B1FE06471DED0097A5F4</string>
+				<string>73A0CCA40F8A856300EB4B80</string>
+				<string>1CE0B20306471E060097A5F4</string>
+				<string>1CE0B20506471E060097A5F4</string>
+			</array>
+			<key>ToolbarConfiguration</key>
+			<string>xcode.toolbar.config.default</string>
+		</dict>
+		<dict>
+			<key>ControllerClassBaseName</key>
+			<string></string>
+			<key>IconName</key>
+			<string>WindowOfProject</string>
+			<key>Identifier</key>
+			<string>perspective.morph</string>
+			<key>IsVertical</key>
+			<integer>0</integer>
+			<key>Layout</key>
+			<array>
+				<dict>
+					<key>BecomeActive</key>
+					<integer>1</integer>
+					<key>ContentConfiguration</key>
+					<dict>
+						<key>PBXBottomSmartGroupGIDs</key>
+						<array>
+							<string>1C37FBAC04509CD000000102</string>
+							<string>1C37FAAC04509CD000000102</string>
+							<string>1C08E77C0454961000C914BD</string>
+							<string>1C37FABC05509CD000000102</string>
+							<string>1C37FABC05539CD112110102</string>
+							<string>E2644B35053B69B200211256</string>
+							<string>1C37FABC04509CD000100104</string>
+							<string>1CC0EA4004350EF90044410B</string>
+							<string>1CC0EA4004350EF90041110B</string>
+						</array>
+						<key>PBXProjectModuleGUID</key>
+						<string>11E0B1FE06471DED0097A5F4</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>Files</string>
+						<key>PBXProjectStructureProvided</key>
+						<string>yes</string>
+						<key>PBXSmartGroupTreeModuleColumnData</key>
+						<dict>
+							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
+							<array>
+								<real>186</real>
+							</array>
+							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
+							<array>
+								<string>MainColumn</string>
+							</array>
+						</dict>
+						<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
+						<dict>
+							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
+							<array>
+								<string>29B97314FDCFA39411CA2CEA</string>
+								<string>1C37FABC05509CD000000102</string>
+							</array>
+							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
+							<array>
+								<array>
+									<integer>0</integer>
+								</array>
+							</array>
+							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
+							<string>{{0, 0}, {186, 337}}</string>
+						</dict>
+						<key>PBXTopSmartGroupGIDs</key>
+						<array/>
+						<key>XCIncludePerspectivesSwitch</key>
+						<integer>1</integer>
+						<key>XCSharingToken</key>
+						<string>com.apple.Xcode.GFSharingToken</string>
+					</dict>
+					<key>GeometryConfiguration</key>
+					<dict>
+						<key>Frame</key>
+						<string>{{0, 0}, {203, 355}}</string>
+						<key>GroupTreeTableConfiguration</key>
+						<array>
+							<string>MainColumn</string>
+							<real>186</real>
+						</array>
+						<key>RubberWindowFrame</key>
+						<string>373 269 690 397 0 0 1440 878 </string>
+					</dict>
+					<key>Module</key>
+					<string>PBXSmartGroupTreeModule</string>
+					<key>Proportion</key>
+					<string>100%</string>
+				</dict>
+			</array>
+			<key>Name</key>
+			<string>Morph</string>
+			<key>PreferredWidth</key>
+			<integer>300</integer>
+			<key>ServiceClasses</key>
+			<array>
+				<string>XCModuleDock</string>
+				<string>PBXSmartGroupTreeModule</string>
+			</array>
+			<key>TableOfContents</key>
+			<array>
+				<string>11E0B1FE06471DED0097A5F4</string>
+			</array>
+			<key>ToolbarConfiguration</key>
+			<string>xcode.toolbar.config.default.short</string>
+		</dict>
+	</array>
+	<key>PerspectivesBarVisible</key>
+	<false/>
+	<key>ShelfIsVisible</key>
+	<false/>
+	<key>SourceDescription</key>
+	<string>file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Versions/A/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string>
+	<key>StatusbarIsVisible</key>
+	<true/>
+	<key>TimeStamp</key>
+	<real>0.0</real>
+	<key>ToolbarDisplayMode</key>
+	<integer>1</integer>
+	<key>ToolbarIsVisible</key>
+	<true/>
+	<key>ToolbarSizeMode</key>
+	<integer>1</integer>
+	<key>Type</key>
+	<string>Perspectives</string>
+	<key>UpdateMessage</key>
+	<string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature).  You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature.  Do you wish to update to the latest Workspace defaults for project '%@'?</string>
+	<key>WindowJustification</key>
+	<integer>5</integer>
+	<key>WindowOrderList</key>
+	<array>
+		<string>/Users/eliot/Cog/cogvm/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj</string>
+	</array>
+	<key>WindowString</key>
+	<string>172 180 1063 836 0 0 1680 1028 </string>
+	<key>WindowTools</key>
+	<array>
+		<dict>
+			<key>FirstTimeWindowDisplayed</key>
+			<false/>
+			<key>Identifier</key>
+			<string>windowTool.build</string>
+			<key>IsVertical</key>
+			<true/>
+			<key>Layout</key>
+			<array>
+				<dict>
+					<key>Dock</key>
+					<array>
+						<dict>
+							<key>ContentConfiguration</key>
+							<dict>
+								<key>PBXProjectModuleGUID</key>
+								<string>1CD0528F0623707200166675</string>
+								<key>PBXProjectModuleLabel</key>
+								<string></string>
+								<key>StatusBarVisibility</key>
+								<true/>
+							</dict>
+							<key>GeometryConfiguration</key>
+							<dict>
+								<key>Frame</key>
+								<string>{{0, 0}, {1111, 288}}</string>
+								<key>RubberWindowFrame</key>
+								<string>48 84 1111 797 0 0 1680 1028 </string>
+							</dict>
+							<key>Module</key>
+							<string>PBXNavigatorGroup</string>
+							<key>Proportion</key>
+							<string>288pt</string>
+						</dict>
+						<dict>
+							<key>BecomeActive</key>
+							<true/>
+							<key>ContentConfiguration</key>
+							<dict>
+								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
+								<string>{{0, 5}, {1111, 458}}</string>
+								<key>PBXProjectModuleGUID</key>
+								<string>XCMainBuildResultsModuleGUID</string>
+								<key>PBXProjectModuleLabel</key>
+								<string>Build</string>
+								<key>XCBuildResultsTrigger_Collapse</key>
+								<integer>1021</integer>
+								<key>XCBuildResultsTrigger_Open</key>
+								<integer>1011</integer>
+							</dict>
+							<key>GeometryConfiguration</key>
+							<dict>
+								<key>Frame</key>
+								<string>{{0, 293}, {1111, 463}}</string>
+								<key>RubberWindowFrame</key>
+								<string>48 84 1111 797 0 0 1680 1028 </string>
+							</dict>
+							<key>Module</key>
+							<string>PBXBuildResultsModule</string>
+							<key>Proportion</key>
+							<string>463pt</string>
+						</dict>
+					</array>
+					<key>Proportion</key>
+					<string>756pt</string>
+				</dict>
+			</array>
+			<key>Name</key>
+			<string>Build Results</string>
+			<key>ServiceClasses</key>
+			<array>
+				<string>PBXBuildResultsModule</string>
+			</array>
+			<key>StatusbarIsVisible</key>
+			<true/>
+			<key>TableOfContents</key>
+			<array>
+				<string>73020E920EE71AAE0021D217</string>
+				<string>73DED5EA0EF1EC7100C60103</string>
+				<string>1CD0528F0623707200166675</string>
+				<string>XCMainBuildResultsModuleGUID</string>
+			</array>
+			<key>ToolbarConfiguration</key>
+			<string>xcode.toolbar.config.build</string>
+			<key>WindowString</key>
+			<string>48 84 1111 797 0 0 1680 1028 </string>
+			<key>WindowToolGUID</key>
+			<string>73020E920EE71AAE0021D217</string>
+			<key>WindowToolIsVisible</key>
+			<true/>
+		</dict>
+		<dict>
+			<key>Identifier</key>
+			<string>windowTool.debugger</string>
+			<key>Layout</key>
+			<array>
+				<dict>
+					<key>Dock</key>
+					<array>
+						<dict>
+							<key>ContentConfiguration</key>
+							<dict>
+								<key>Debugger</key>
+								<dict>
+									<key>HorizontalSplitView</key>
+									<dict>
+										<key>_collapsingFrameDimension</key>
+										<real>0.0</real>
+										<key>_indexOfCollapsedView</key>
+										<integer>0</integer>
+										<key>_percentageOfCollapsedView</key>
+										<real>0.0</real>
+										<key>isCollapsed</key>
+										<string>yes</string>
+										<key>sizes</key>
+										<array>
+											<string>{{0, 0}, {317, 164}}</string>
+											<string>{{317, 0}, {377, 164}}</string>
+										</array>
+									</dict>
+									<key>VerticalSplitView</key>
+									<dict>
+										<key>_collapsingFrameDimension</key>
+										<real>0.0</real>
+										<key>_indexOfCollapsedView</key>
+										<integer>0</integer>
+										<key>_percentageOfCollapsedView</key>
+										<real>0.0</real>
+										<key>isCollapsed</key>
+										<string>yes</string>
+										<key>sizes</key>
+										<array>
+											<string>{{0, 0}, {694, 164}}</string>
+											<string>{{0, 164}, {694, 216}}</string>
+										</array>
+									</dict>
+								</dict>
+								<key>LauncherConfigVersion</key>
+								<string>8</string>
+								<key>PBXProjectModuleGUID</key>
+								<string>1C162984064C10D400B95A72</string>
+								<key>PBXProjectModuleLabel</key>
+								<string>Debug - GLUTExamples (Underwater)</string>
+							</dict>
+							<key>GeometryConfiguration</key>
+							<dict>
+								<key>DebugConsoleDrawerSize</key>
+								<string>{100, 120}</string>
+								<key>DebugConsoleVisible</key>
+								<string>None</string>
+								<key>DebugConsoleWindowFrame</key>
+								<string>{{200, 200}, {500, 300}}</string>
+								<key>DebugSTDIOWindowFrame</key>
+								<string>{{200, 200}, {500, 300}}</string>
+								<key>Frame</key>
+								<string>{{0, 0}, {694, 380}}</string>
+								<key>RubberWindowFrame</key>
+								<string>321 238 694 422 0 0 1440 878 </string>
+							</dict>
+							<key>Module</key>
+							<string>PBXDebugSessionModule</string>
+							<key>Proportion</key>
+							<string>100%</string>
+						</dict>
+					</array>
+					<key>Proportion</key>
+					<string>100%</string>
+				</dict>
+			</array>
+			<key>Name</key>
+			<string>Debugger</string>
+			<key>ServiceClasses</key>
+			<array>
+				<string>PBXDebugSessionModule</string>
+			</array>
+			<key>StatusbarIsVisible</key>
+			<integer>1</integer>
+			<key>TableOfContents</key>
+			<array>
+				<string>1CD10A99069EF8BA00B06720</string>
+				<string>1C0AD2AB069F1E9B00FABCE6</string>
+				<string>1C162984064C10D400B95A72</string>
+				<string>1C0AD2AC069F1E9B00FABCE6</string>
+			</array>
+			<key>ToolbarConfiguration</key>

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list