Vm-dev April 2014

vm-dev@lists.squeakfoundation.org

39 participants
112 discussions

VM Maker: VMMaker.oscog-eem.664.mcz
by commits＠source.squeak.org 03 Apr '14

03 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.664.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.664 Author: eem Time: 3 April 2014, 10:30:27.071 am UUID: c3e36805-b678-46b9-92b2-dd015fa5c970 Ancestors: VMMaker.oscog-eem.663 Move two stragglers into the VMMaker package, as needed for the new allInstances function in ObjectMemory. =============== Diff against VMMaker.oscog-eem.663 =============== Item was added: + ----- Method: NewObjectMemory>>minLargeHeaderSize (in category 'primitive support') ----- + minLargeHeaderSize + "Answer the smallest byte size requiring a large header." + ^256! Item was added: + ----- Method: NewObjectMemory>>sizeHeader:putBodySize: (in category 'primitive support') ----- + sizeHeader: obj putBodySize: byteSize + "Too lazy to set the odd bits right now. Just insist on a multiple of 4 bytes." + self assert: byteSize \\ 4 = 0. + self longAt: obj - (BytesPerWord*2) + put: ((byteSize + BytesPerWord bitAnd: LongSizeMask) + bitOr: ((self longAt: obj - (BytesPerWord*2)) bitClear: LongSizeMask))!

1 0

Plugins Directory
by Colin Putney 03 Apr '14

03 Apr '14

Hi all, I've been working on a custom build of Cog (rev 2886) on Linux. I notice that the VM always looks for plugins in the same directory as the VM binary, and thus we need a wrapper script to set SQUEAK_PLUGINS and LD_LIBRARY_PATH correctly. I'd like to do away with the wrapper script in my specific case, since I know in advance where everything will be installed. Is there a way to specify the plugin directory at compile time? Cheers, Colin

4 6

[commit][2887] CogVM source as per VMMaker.oscog-eem.663
by commits＠squeakvm.org 03 Apr '14

03 Apr '14

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. @@

1 0

VM Maker: VMMaker.oscog-eem.663.mcz
by commits＠source.squeak.org 03 Apr '14

03 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.663.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.663 Author: eem Time: 2 April 2014, 7:15:10.429 pm UUID: b4c4ad18-808c-4afb-9ddc-80def5e01086 Ancestors: VMMaker.oscog-eem.662 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. One more fix (addition to ByteArray) to fix in-image decompilation. =============== Diff against VMMaker.oscog-eem.662 =============== Item was added: + ----- Method: ByteArray>>longAt: (in category '*VMMaker-accessing') ----- + longAt: byteIndex + ^self signedLongAt: byteIndex! Item was changed: ----- Method: Cogit>>offsetAndSendTableFor:annotation:into: (in category 'in-line cacheing') ----- offsetAndSendTableFor: entryPoint annotation: annotation into: binaryBlock "Find the relevant sendTable for a linked-send to entryPoint. Do this based on the alignment of entryPoint. N.B. For Newspeak sends we don't need to distinguish between ceImplicitReceiver and the other sends since ceImplicitReceiver will never appear to be linked, so only three cases here." <inline: true> self cppIf: NewspeakVM ifTrue: + [self assert: annotation = IsSendCall. + (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment + ifTrue: [binaryBlock value: cmEntryOffset value: sendTrampolines] - [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment - ifTrue: - [self assert: annotation = IsSendCall. - binaryBlock - value: cmEntryOffset - value: sendTrampolines] ifFalse: [(entryPoint bitAnd: entryPointMask) = dynSuperEntryAlignment + ifTrue: [binaryBlock value: cmDynSuperEntryOffset value: dynamicSuperSendTrampolines] + ifFalse: [binaryBlock value: cmNoCheckEntryOffset value: superSendTrampolines]]] - ifTrue: - [self assert: annotation = IsNSSendCall. - binaryBlock - value: cmDynSuperEntryOffset - value: dynamicSuperSendTrampolines] - ifFalse: - [self assert: annotation = IsSendCall. - binaryBlock - value: cmNoCheckEntryOffset - value: superSendTrampolines]]] ifFalse: [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment ifTrue: [binaryBlock value: cmEntryOffset value: sendTrampolines] ifFalse: [binaryBlock value: cmNoCheckEntryOffset value: superSendTrampolines]]! Item was changed: ----- Method: Cogit>>targetMethodAndSendTableFor:annotation:into: (in category 'in-line cacheing') ----- targetMethodAndSendTableFor: entryPoint annotation: annotation into: binaryBlock "Evaluate binaryBlock with the targetMethod and relevant send table for a linked-send to entryPoint. Do so based on the alignment of entryPoint. N.B. For Newspeak sends we don't need to distinguish between ceImplicitReceiver and the other sends since ceImplicitReceiver will never appear to be linked, so only three cases here." <inline: true> | targetMethod sendTable | <var: #targetMethod type: #'CogMethod *'> <var: #sendTable type: #'sqInt *'> self cppIf: NewspeakVM ifTrue: + [self assert: annotation = IsSendCall. + (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment - [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment ifTrue: + [targetMethod := self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *'. - [self assert: annotation = IsSendCall. - targetMethod := self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *'. sendTable := sendTrampolines] ifFalse: [(entryPoint bitAnd: entryPointMask) = dynSuperEntryAlignment ifTrue: + [targetMethod := self cCoerceSimple: entryPoint - cmDynSuperEntryOffset to: #'CogMethod *'. - [self assert: annotation = IsNSSendCall. - targetMethod := self cCoerceSimple: entryPoint - cmDynSuperEntryOffset to: #'CogMethod *'. sendTable := dynamicSuperSendTrampolines] ifFalse: + [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. - [self assert: annotation = IsSendCall. - targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. sendTable := superSendTrampolines]]] ifFalse: [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment ifTrue: [targetMethod := self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *'. sendTable := sendTrampolines] ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. sendTable := superSendTrampolines]]. binaryBlock value: targetMethod value: sendTable! Item was changed: ----- Method: Cogit>>testMcToBcPcMappingForMethod: (in category 'tests-method map') ----- testMcToBcPcMappingForMethod: cogMethod <doNotGenerate> | bcMethod subMethods prevMcpc isAltInstSet | "self disassembleMethod: cogMethod" "coInterpreter symbolicMethod: cogMethod methodObject" "coInterpreter printOop: cogMethod methodObject" "self printPCMapPairsFor: cogMethod on: Transcript" cogMethod stackCheckOffset = 0 ifTrue: "frameless" [^self]. bcMethod := coInterpreter isCurrentImageFacade ifTrue: [coInterpreter objectForOop: cogMethod methodObject] ifFalse: [VMCompiledMethodProxy new for: cogMethod methodObject coInterpreter: coInterpreter objectMemory: objectMemory]. subMethods := self subMethodsAsRangesFor: cogMethod. isAltInstSet := coInterpreter headerIndicatesAlternateBytecodeSet: cogMethod methodHeader. self mapFor: cogMethod do: [:annotation :mcpc| | subMethod bcpc mappedpc | (self isPCMappedAnnotation: annotation alternateInstructionSet: isAltInstSet) ifTrue: [subMethod := subMethods detect: [:range| range includes: mcpc] ifNone: ["a trailing call ceNonLocalReturnTrampoline's following pc is the start of a following block or the end of the map" subMethods detect: [:range| range includes: mcpc - 1]]. mcpc > subMethod first ifTrue: [bcpc := self bytecodePCFor: mcpc startBcpc: subMethod startpc in: subMethod cogMethod. self assert: bcpc ~= 0. mappedpc := self mcPCFor: bcpc startBcpc: subMethod startpc in: subMethod cogMethod. self assert: mappedpc ~= 0. mappedpc := mappedpc + subMethod cogMethod address. "mcpc = mappedpc is obviously what we want and expect. PrevMcpc = mappedpc hacks around frame building accessors where the frst bytecode is mapped twice, once for the stack check and once for the context inst var access. The bytecode pc can only map back to a single mcpc, the first, so the second map entry will fail without this hack." self assert: (mcpc = mappedpc or: [prevMcpc = mappedpc]). + "IsNSSendCall is used only for pushImplicitReceiver:. This isn't a send bytecode. + So filter-out these annotations." + ((self isSendAnnotation: annotation) and: [annotation ~= IsNSSendCall]) ifTrue: - (self isSendAnnotation: annotation) ifTrue: [| mcSelector bcSelector | mcSelector := self selectorForSendAt: mcpc annotation: annotation. "sends map to the following pc. need to find the selector for the previous pc" bcSelector := self selectorForSendBefore: bcpc in: bcMethod. self assert: mcSelector = bcSelector]]. prevMcpc := mcpc]. false "keep scanning"]! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendDynamicSuper:numArgs: (in category 'bytecode generators') ----- genSendDynamicSuper: selector numArgs: numArgs (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. self assert: needsFrame. self MoveMw: numArgs * BytesPerWord r: SPReg R: ReceiverResultReg. numArgs > 2 ifTrue: [self MoveCq: numArgs R: SendNumArgsReg]. self MoveCw: selector R: ClassReg. + self CallSend: (dynamicSuperSendTrampolines at: (numArgs min: NumSendTrampolines - 1)). - self CallNewspeakSend: (dynamicSuperSendTrampolines at: (numArgs min: NumSendTrampolines - 1)). usesMethodClass := true. self flag: 'currently caller pushes result'. self PushR: ReceiverResultReg. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genMarshalledSendDynamicSuper:numArgs: (in category 'bytecode generators') ----- genMarshalledSendDynamicSuper: selector numArgs: numArgs <inline: false> (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. self assert: needsFrame. numArgs > 2 ifTrue: [self MoveCq: numArgs R: SendNumArgsReg]. self MoveCw: selector R: ClassReg. + self CallSend: (dynamicSuperSendTrampolines at: (numArgs min: NumSendTrampolines - 1)). - self CallNewspeakSend: (dynamicSuperSendTrampolines at: (numArgs min: NumSendTrampolines - 1)). usesMethodClass := true. optStatus isReceiverResultRegLive: false. ^self ssPushRegister: ReceiverResultReg!

1 0

Re: [Pharo-dev] Lock-free Atomic Counter ?
by Eliot Miranda 03 Apr '14

03 Apr '14

Hi Sven, On Wed, Apr 2, 2014 at 3:11 PM, Sven Van Caekenberghe <sven(a)stfx.eu> wrote: > Hi, > > Is it possible to have a simple lock-free atomic counter in Pharo 3.0 ? > > nextId > ^ idCounter := idCounter + 1 > > Or is it still possible that two process entering this code can mess > things up ? > OK, but it's a real hack ;-). In the current Interpreter, Stack and Cog VMs this will work fine up to 63-bits because non-failing primitives are not suspension points in the VM /except/ for the Semaphore primitives. If the counter is initialized to 0, at first, there won't even be a send since either the interpreter will evaluate special selector #+ on SmallInteger without performing a send, or machine code will evaluate the inlined code for SmallInteger #+ without doing a send. Once the counter overflows into LargePositveInteger but is within 63-bits, there will be sends but these will always be of primitive 21 (LargePositiveInteger>>#+ uses primitive 21, which does 64-bit /signed/ arithmetic but nothing larger, hence works up to 63-bit LargePositiveIntegers). Once beyond 63 bits the primitive will fail and there will be a suspension point in LargePositiveInteger>>#+ before it calls Integer>>#+, which will call digitAdd:. You should be able to test this. Try evaluating this one: | counter proc | counter := 0. proc := [[counter := counter + 1. true] whileTrue] newProcess. proc priority: Processor activePriority - 1. proc resume. [(Delay forSeconds: 1) wait. proc suspendedContext method ~~ thisContext method ifTrue: [proc suspend. self halt]] repeat Now try and evaluate this one: | counter proc | counter := 1 bitShift: 64. proc := [[counter := counter + 1. true] whileTrue] newProcess. proc priority: Processor activePriority - 1. proc resume. [(Delay forSeconds: 1) wait. proc suspendedContext method ~~ thisContext method ifTrue: [proc suspend. self halt]] repeat The second one halts almost immediately. You can fix this by changing LargePositiveInteger>>#+ to use the primitive frm the large integer arithmetic plugin, which will not fail until it runs out of memory. So if you really /must/ go this route you /can/ get away with it. But on your own head be it ;-) > I vaguely remember a discussion about that long ago... > > TIA, > > Sven > -- best, Eliot

1 0

VM Maker: VMMaker.oscog-eem.662.mcz
by commits＠source.squeak.org 03 Apr '14

03 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.662.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.662 Author: eem Time: 2 April 2014, 3:17:05.32 pm UUID: 2b89547d-56bd-42fa-a1e9-06ef4f9bd5f6 Ancestors: VMMaker.oscog-eem.661 Fix in-image compilation (at least for ObjectMemory). =============== Diff against VMMaker.oscog-eem.661 =============== Item was added: + ----- Method: ByteArray>>longAt:put: (in category '*VMMaker-accessing') ----- + longAt: byteIndex put: aValue + ^self signedLongAt: byteIndex put: aValue! Item was changed: ----- Method: Cogit class>>cog:selector:options: (in category 'in-image compilation') ----- cog: aCompiledMethod selector: aSelector options: optionsDictionaryOrArray "StackToRegisterMappingCogit cog: (Integer >> #benchFib) selector: #benchFib options: #(COGMTVM false)" | coInterpreter cogit | self initializeWithOptions: (self asOptionsDictionary: optionsDictionaryOrArray). coInterpreter := CurrentImageCoInterpreterFacade forCogit: (cogit := self new). [cogit setInterpreter: coInterpreter; singleStep: true; + initializeCodeZoneFrom: 1024 upTo: coInterpreter memory size / 2. "leave space for rump C stack" - initializeCodeZoneFrom: 1024 upTo: coInterpreter memory size. cogit methodZone freeStart: (cogit methodZone freeStart roundUpTo: 1024)] on: Notification do: [:ex| (ex messageText beginsWith: 'cannot find receiver for') ifTrue: [ex resume: coInterpreter]. ex pass]. ^{ coInterpreter. cogit. cogit cog: (coInterpreter oopForObject: aCompiledMethod) selector: (coInterpreter oopForObject: aSelector) }! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>baseHeaderSize (in category 'accessing') ----- + baseHeaderSize + ^self subclassResponsibility! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>isYoungObject: (in category 'accessing') ----- + isYoungObject: anOop + ^false! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>rumpCStackAddress (in category 'accessing') ----- rumpCStackAddress + ^memory size / 4 * 3 + 1024! - ^memory size / 2 + 1024! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>temporaryCountOfMethodHeader: (in category 'accessing') ----- + temporaryCountOfMethodHeader: header + ^(CompiledMethod + newMethod: 8 + header: (header <= SmallInteger maxVal + ifTrue: [header] + ifFalse: [(header bitAnd: SmallInteger maxVal) + SmallInteger minVal])) + numTemps! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>baseHeaderSize (in category 'accessing') ----- + baseHeaderSize + ^SpurMemoryManager baseHeaderSize! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation>>baseHeaderSize (in category 'accessing') ----- + baseHeaderSize + ^ObjectMemory baseHeaderSize!

1 0

Re: Pharo VM bug 11130
by Stephan Eggermont 02 Apr '14

02 Apr '14

Loading in a Moose image VMMaker.oscog-eem.240.mcz VMMaker.oscog-eem.236.mcz VMMaker-oscog-LaurentLaffont.303.mcz There are 12 methods that changed from 236 to 240 that are not the same in 303 (ignoring removed methods): StackInterpreter>findClassOfMethod:forReceiver: StackInterpreter>floatValueOf: ObjectMemory>changeClassOf:to: Cogit>declareCVarsIn: StackInterpreter>isLiveContext: InterpreterPrimitives>isInstanceOfClassByteString: StackInterpreter>longPrintoop: NewObjectMemory>okayOop: NewObjectMemory>incrementalGC: Stephan

2 1

Re: [Pharo-users] 64 bit version
by phil＠highoctane.be 02 Apr '14

02 Apr '14

How would that work? Would this be a 32 bit Object memory and engine compiled in 64bit mode? How is the code amended to make that possible? Is there a source tree somewhere? There are "int"s all over the place, so, how do we handle this? For the Slang part it appears doable. For the support code, especially Windows, it looks harder. TIA Phil Le 2 avr. 2014 01:07, "Clément Bera" <bera.clement(a)gmail.com> a écrit : > Hey, > > For 64 bits Spur is a big step forward. For Christmas you should have at > least the stack VM in 64bits. The JIT may take a bit longer to port. > Esteban and Eliot will work on that starting from May. > > There's also the solution to compile the VM in 64bits with a 32bits > runtime (I think FFI does not work, but the VM works in 64bits environment, > as gettimothy posted on vm-dev). > > > 2014-03-29 13:18 GMT-07:00 Pharo4Stef <pharo4Stef(a)free.fr>: > >> >> On 29 Mar 2014, at 21:16, Roelof Wobben <r.wobben(a)home.nl> wrote: >> >> > Pharo4Stef schreef op 29-3-2014 21:07: >> >> >> >> >> >>> Pity. >> >> >> >> You know there is no magic powder. We are already really grateful that >> eliot is pushing the vm work. >> >> Esteban will help on the 64 bits and clement probably too or spur and >> new bytecodes plus language side optimisations. If we could pay 3 full time >> engineers in the future... but this is not the case. >> >> >> > >> > I know that and it's not that i think the developer do a bad job. >> > It's more a expresiion of my feeling. >> >> Ok then I share the same feeling :) >> >> > >> > Roelof >> > >> >> >> >

3 2

VM Maker: VMMaker.oscog-eem.661.mcz
by commits＠source.squeak.org 02 Apr '14

02 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.661.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.661 Author: eem Time: 1 April 2014, 3:51:53.558 pm UUID: e09e68b7-6224-4c07-acd0-ea1f7cf57370 Ancestors: VMMaker.oscog-eem.660 Sista: 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. Spur: abstract out the average object size calculation into its own method (it'll be needed for pig compact). Simulator: Fix sqFile:Read:Into:At: for stdout when stdoiut is the Transcript (Pharo startup indirectly tries to set line-end convention of stdout). Implement remapping in remapOop:in: (simulating a Sista image resulted in a GC in one of the LargeInteger routines). =============== Diff against VMMaker.oscog-eem.660 =============== Item was added: + ----- Method: CoInterpreterPrimitives>>primitiveResetCountersInMethod (in category 'method introspection primitives') ----- + primitiveResetCountersInMethod + <export: true> + <option: #SistaStackToRegisterMappingCogit> + | methodReceiver | + argumentCount ~= 0 ifTrue: + [self primitiveFailFor: PrimErrBadNumArgs]. + methodReceiver := self stackTop. + (self methodHasCogMethod: methodReceiver) ifTrue: + [cogit resetCountersIn: (self cogMethodOf: methodReceiver)]! Item was added: + ----- Method: CogVMSimulator>>ceCounterTripped: (in category 'cog jit support') ----- + ceCounterTripped: condition + self transcript cr; nextPutAll: 'counter trpped in '. + self shortPrintFrame: framePointer. + ^super ceCounterTripped: condition! Item was changed: ----- Method: FilePluginSimulator>>sqFile:Read:Into:At: (in category 'simulation') ----- sqFile: file Read: count Into: byteArrayIndex At: startIndex | interpreter | interpreter := interpreterProxy interpreter. + [[startIndex to: startIndex + count - 1 do: - startIndex to: startIndex + count - 1 do: [ :i | file atEnd ifTrue: [^i - startIndex]. + interpreter + byteAt: byteArrayIndex + i + put: file next asInteger]] + on: Error + do: [:ex| + (file isKindOf: TranscriptStream) ifFalse: [ex pass]. + ^0]] + ensure: [self recordStateOf: file]. - interpreter byteAt: byteArrayIndex + i put: file next asInteger]. - self recordStateOf: file. ^count! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generators') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half." <inline: false> | desc fixup ok counter countTripped retry | <var: #desc type: #'CogSimStackEntry *'> <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> <var: #counter type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: ["Must arrange there's a fixup at the target whether it is jumped to or not so that the simStackPtr can be kept correct." fixup := self ensureFixupAt: targetBytecodePC - initialPC. "Must enter any annotatedConstants into the map" self annotateBytecodeIfAnnotated: desc. "Must annotate the bytecode for correct pc mapping." self annotateBytecode: (desc constant = boolean ifTrue: [self Jump: fixup] ifFalse: [self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label]]). ^0]. desc popToReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counter := self addressOf: (counters at: counterIndex). counterIndex := counterIndex + 1. self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: BytesPerWord = CounterBytes. retry := counter addDependent: (self annotateAbsolutePCRef: (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" "Don't write back if we trip; avoids wrapping count back to initial value, and if we trip we don't execute." countTripped := self JumpCarry: 0. counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self SubCq: 1 R: SendNumArgsReg. "Count untaken" counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if SendNumArgsReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). + "Return to machine code (e.g. via ceEnterCogCodePopReceiverReg in returnToMachineCodeFrame + loads return value into ReceiverResultReg but branch code tests TempReg. So reload Tempreg." + self MoveR: ReceiverResultReg R: TempReg. + self CmpCq: 0 R: ReceiverResultReg. - self CmpCq: 0 R: TempReg. self JumpNonZero: retry. ok jmpTarget: (self annotateBytecode: self Label). ^0! Item was changed: ----- Method: SmartSyntaxInterpreterPlugin>>remapOop:in: (in category 'simulation') ----- remapOop: oopOrList in: aBlock <doNotGenerate> + | ctxt tempNames tempIndices | + ctxt := thisContext sender. + tempNames := ctxt tempNames. + oopOrList isArray + ifTrue: + [tempIndices := oopOrList collect: [:tempName| tempNames indexOf: tempName]. + tempIndices do: + [:index| interpreterProxy pushRemappableOop: (ctxt namedTempAt: index)]] + ifFalse: [interpreterProxy pushRemappableOop: oopOrList]. + ^aBlock ensure: + [oopOrList isArray + ifTrue: + [tempIndices reverseDo: + [:index| ctxt namedTempAt: index put: interpreterProxy popRemappableOop]] + ifFalse: + [1 to: ctxt numTemps do: + [:index| + (ctxt tempAt: index) = oopOrList ifTrue: + [ctxt tempAt: index put: interpreterProxy topRemappableOop]]. + interpreterProxy popRemappableOop]]! - | numGCs result | - numGCs := interpreterProxy statNumGCs. - result := aBlock value. - "If you really did want to implement remapping you would try and locate the - arguments in the caller context and update them via tempAt:put:. But beware - ambiguities. You'd have to parse the bytecode to be sure to get the right temps." - numGCs ~= interpreterProxy statNumGCs ifTrue: - [self error: 'GC occurred in middle of remapOop:in: and remapping in this context is not implemented']. - ^result! Item was added: + ----- Method: SpurMemoryManager>>averageObjectSize (in category 'accessing') ----- + averageObjectSize + "Answer an approximation of the average object size. This is a bit of an underestimate. + In the 32-bit system average object size is about 11 words per object, including header." + ^8 * self bytesPerSlot! Item was changed: ----- Method: SpurMemoryManager>>tenuringThreshold (in category 'accessing') ----- tenuringThreshold "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." + ^(scavenger scavengerTenuringThreshold * scavenger pastSpaceBytes // self averageObjectSize) asInteger! - | averageObjectSize | - averageObjectSize := 8 * self wordSize. - ^(scavenger scavengerTenuringThreshold * scavenger pastSpaceBytes // averageObjectSize) asInteger! Item was changed: ----- Method: SpurMemoryManager>>tenuringThreshold: (in category 'accessing') ----- tenuringThreshold: threshold "c.f. tenuringThreshold" scavenger scavengerTenuringThreshold: + (threshold * self averageObjectSize) asFloat - (threshold * 8 * self wordSize) asFloat / scavenger pastSpaceBytes asFloat!

1 0

Re: [Pharo-dev] PharoVM on Windows & Code::Blocks for debugging
by phil＠highoctane.be 01 Apr '14

01 Apr '14

> > On Tue, Apr 1, 2014 at 1:22 PM, Esteban Lorenzano <estebanlm(a)gmail.com> > wrote: > >> Hi, >> >> I use CDT regularly (bah, its been like 6 months that I don't, but I use >> it when I need it :) ) >> It is not a problem with the current configuration (and debug flags), but >> is a bit of work for adding the source paths. >> >> I do not know if it can be done easier... would be cool, but I don't know >> how feasible :) >> >> Esteban >> > > Now, I managed to get GDB to work with my build. > > I had to change the compile options a bit (-g -O0) in the code generation > and add a couple of source folders in the .gdbinit file to get the sources > to show: > > directory > C:/MinGW/msys/1.0/home/User/PharoVmHeadlessWin/pharo-vm/src/plugins > directory C:/MinGW/msys/1.0/home/User/PharoVmHeadlessWin/pharo-vm/src/vm > directory > C:/MinGW/msys/1.0/home/User/PharoVmHeadlessWin/pharo-vm/platforms/win32 > directory > C:/MinGW/msys/1.0/home/User/PharoVmHeadlessWin/pharo-vm/platforms/Cross > directory > C:/MinGW/msys/1.0/home/User/PharoVmHeadlessWin/pharo-vm/platforms/Cross/vm > directory > C:/MinGW/msys/1.0/home/User/PharoVmHeadlessWin/pharo-vm/platforms/Cross/plugins > directory > C:/MinGW/msys/1.0/home/User/PharoVmHeadlessWin/pharo-vm/platforms/win32/vm > directory > C:/MinGW/msys/1.0/home/User/PharoVmHeadlessWin/pharo-vm/platforms/win32/plugins > break sqMain > > Now it works. > > But that's not really funny to work like that, so, back to the UI > integration. > > Esteban, do you debug with CDT with the current flags? > > compilerFlagsRelease > "Define NDEBUG for production to exclude asserts " > ^ '-g0 -O2 -march=pentium4 -momit-leaf-frame-pointer > -maccumulate-outgoing-args -funroll-loops ', > '-DNDEBUG -DDEBUGVM=0' > > > for debugging I've set things to: > > compilerFlagsDebug > "Define NDEBUG for production to exclude asserts " > ^ '-g -O0 -march=pentium4 ', > '-DNDEBUG -DDEBUGVM=0' > > and > > compilerFlags > "depends on config ..." > ^ self commonCompilerFlags, ' ' , self compilerFlagsDebug "was Release" > > I've checked that the flags were right with building with > > make VERBOSE=1 > > in the build.sh > > I am interested in looking at the startup process for the VM and getting a > real windows headless system. > The current one isn't working at the moment. Also, the pharo as a service > should work again (is now with -DNO_SERVICE in the compilation) > > I've noticed that the OSX Version supports debug options, but not Windows. > Am I right? > > Phil > >

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2014