Vm-dev May 2015

vm-dev@lists.squeakfoundation.org

28 participants
153 discussions

VM Maker: VMMaker.oscog-eem.1316.mcz
by commits＠source.squeak.org 19 May '15

19 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1316.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1316 Author: eem Time: 19 May 2015, 2:09:58.385 pm UUID: ac16258c-3444-49a0-957a-7b02871f8682 Ancestors: VMMaker.oscog-eem.1315 Fix signature of InterpreterProxy's callbackLeave: =============== Diff against VMMaker.oscog-eem.1315 =============== Item was changed: ----- Method: InterpreterProxy>>callbackLeave: (in category 'callback support') ----- callbackLeave: cbID "Leave from a previous callback" - <var: #callbackID type: #'sqInt *'> ^self notYetImplementedError!

1 0

New CogVMs available
by Eliot Miranda 19 May '15

19 May '15

at http://www.mirandabanda.org/files/Cog/VM/VM.r3350/. CogVM binaries as per VMMaker.oscog-eem.1315/r3350 General: Make the bounds check in primitiveObject:perform:... more restrictive and fix bugs in the commentary. Make stack pages a reasonable size. My math was wrong and the size was half as big as intended. Extend the fastPrimTrace scheme to trace stack overflow, prim failure and prim retry to help debug the phantom stack frame bug in Cog Spur. Cogit: Fix old bug in ceMNUFromPICMNUMethod:receiver: that has been masked by cacheing of MNU method in MNU PIC entries. ceMNUFromPICMNUMethod:receiver: must set up lkupClass before calling handleMNU:... Revamp icache flushing in the Cogit for ARM. Move icache flush for generated methods/pics to the fillIn*Header: routines. Make sure the cache is flushed in generateCaptureCStackPointers:. Flush the entire PIC when extending it. Fix ARM-only regression in StackToRegisterMappingCogit's PIC aborts when the SimpleStackBasedCogit was fixed. Make ARM rotated 8bit constants actually be correct(er) ie 16r4000001 (SmallInteger 16r2000000) work. Spur: Fix ceActivateFailingPrimitiveMethod: to return properly after retrying a primitive after checkForAndFollowForwardedPrimitiveState. e.g. fixes | s | 1 to: 5 do: [:i| s := 'bar'. s becomeForward: 'bzzt' copy. 'foo' <= s] Fix bug in followForwardedFrameContents:stackPointer: so that arguments are actually followed. N.B. drives the above bug underground ;-). so that named constants (defines) are not elided. Make accessor depth calculation more accurate by not considering fetchInteger:ofObject: and arraySize: et al as object accessors. Newspeak: Remove landmine left from restructing implicit receiver and outer sends as clean sends. Slang: Do a more thorough job of transforming complex to:[by:]do: loops so that the limit expression is only evaluated once, not on each iteration of the loop. Make the read-before-written initializer safer, only initialzing simple types. Plugins: Regenerated because of changes in accessorDepth calculation, constant elimination, and read-before-use initialization. -- best, Eliot

1 0

[commit][3350] CogVM source as per VMMaker.oscog-eem.1315
by commits＠squeakvm.org 19 May '15

19 May '15

Revision: 3350 Author: eliot Date: 2015-05-18 18:13:54 -0700 (Mon, 18 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1315 Slang: Do a more thorough job of transforming complex to:[by:]do: loops so that the limit expression is only evaluated once, not on each iteration of the loop. Fix regression in read-before-written code when rewriting to only initialize simple types. Cogit: Fix ARM-only regression in StackToRegisterMappingCogit's PIC aborts when the SimpleStackBasedCogit was fixed. Modified Paths: -------------- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + VMPluginCodeGenerator VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - BalloonEnginePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + BalloonEnginePlugin VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; @@ -836,9 +836,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.1313 (i)" + "B2DPlugin VMMaker.oscog-eem.1315 (i)" #else - "B2DPlugin VMMaker.oscog-eem.1313 (e)" + "B2DPlugin VMMaker.oscog-eem.1315 (e)" #endif ; static int* objBuffer; @@ -11962,6 +11962,7 @@ { sqInt aaLevel; + aaLevel = 0; if (level >= 4) { aaLevel = 4; } Modified: branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - BitBltSimulation VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + BitBltSimulation VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; @@ -344,9 +344,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.1313 (i)" + "BitBltPlugin VMMaker.oscog-eem.1315 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.1313 (e)" + "BitBltPlugin VMMaker.oscog-eem.1315 (e)" #endif ; static sqInt noHalftone; @@ -5027,6 +5027,7 @@ sqInt val; sqInt _return_value; + val = 0; colorA = (BytesPerOop == 4 ? positive32BitValueOf(stackValue(2)) : positive64BitValueOf(stackValue(2))); Modified: branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + VMPluginCodeGenerator VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - FilePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + FilePlugin VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; @@ -177,9 +177,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.1313 (i)" + "FilePlugin VMMaker.oscog-eem.1315 (i)" #else - "FilePlugin VMMaker.oscog-eem.1313 (e)" + "FilePlugin VMMaker.oscog-eem.1315 (e)" #endif ; static void * sCCPfn; @@ -471,6 +471,10 @@ sqInt requestedName; sqInt status; + createDate = 0; + dirFlag = 0; + entryNameSize = 0; + modifiedDate = 0; requestedName = stackValue(0); pathName = stackValue(1); if (!(isBytes(pathName))) { @@ -576,6 +580,10 @@ sqInt pathNameSize; sqInt status; + createDate = 0; + dirFlag = 0; + entryNameSize = 0; + modifiedDate = 0; index = stackIntegerValue(0); pathName = stackValue(1); if (!(isBytes(pathName))) { Modified: branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + VMPluginCodeGenerator VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 */ @@ -1856,6 +1856,7 @@ sqInt index; struct {int index; HANDLE handle;} *threadArgs; + index = 0; threadArgs = args; index = threadArgs->index; handle = threadArgs->handle; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGenerator VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGenerator VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + StackToRegisterMappingCogit VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10696,9 +10696,9 @@ genoperandoperand(CmpCqR, 0, ClassReg); /* begin JumpZero: */ jumpMNUCase = genoperand(JumpZero, ((sqInt)0)); - compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceInterpretMethodFromPICreceiver, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null); + compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceInterpretMethodFromPICreceiver, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 0, null); jmpTarget(jumpMNUCase, gLabel()); - return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceMNUFromPICMNUMethodreceiver, name, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceMNUFromPICMNUMethodreceiver, name, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 0, null, 1); } static sqInt @@ -11559,6 +11559,7 @@ sqInt result; sqInt val; + val = 0; hasYoungObj = 0; hasYoungObjPtr = ((sqInt)((&hasYoungObj))); codeModified = (freedPIC = 0); @@ -11755,6 +11756,7 @@ sqInt result; sqInt val; + val = 0; hasYoungObj = 0; hasYoungObjPtr = ((sqInt)((&hasYoungObj))); codeModified = 0; @@ -11876,6 +11878,8 @@ sqInt val; sqInt val1; + val = 0; + val1 = 0; if (leakCheckFullGC()) { assert(allMachineCodeObjectReferencesValid()); } @@ -20372,6 +20376,7 @@ sqInt savedNumArgs; sqInt savedNumTemps; + initialIndexOfIRC = 0; assert(blockCount > 0); savedNeedsFrame = needsFrame; savedNumArgs = methodOrBlockNumArgs; Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGenerator VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + StackToRegisterMappingCogit VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9453,9 +9453,9 @@ genoperandoperand(CmpCqR, 0, ClassReg); /* begin JumpZero: */ jumpMNUCase = genoperand(JumpZero, ((sqInt)0)); - compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceInterpretMethodFromPICreceiver, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null); + compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceInterpretMethodFromPICreceiver, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 0, null); jmpTarget(jumpMNUCase, gLabel()); - return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceMNUFromPICMNUMethodreceiver, name, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceMNUFromPICMNUMethodreceiver, name, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 0, null, 1); } static sqInt @@ -10326,6 +10326,7 @@ sqInt result; sqInt val; + val = 0; hasYoungObj = 0; hasYoungObjPtr = ((sqInt)((&hasYoungObj))); codeModified = (freedPIC = 0); @@ -10522,6 +10523,7 @@ sqInt result; sqInt val; + val = 0; hasYoungObj = 0; hasYoungObjPtr = ((sqInt)((&hasYoungObj))); codeModified = 0; @@ -10643,6 +10645,8 @@ sqInt val; sqInt val1; + val = 0; + val1 = 0; if (leakCheckFullGC()) { assert(allMachineCodeObjectReferencesValid()); } @@ -19132,6 +19136,7 @@ sqInt savedNumArgs; sqInt savedNumTemps; + initialIndexOfIRC = 0; assert(blockCount > 0); savedNeedsFrame = needsFrame; savedNumArgs = methodOrBlockNumArgs; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - CoInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CoInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2380,7 +2380,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1313"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1315"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6046,6 +6046,7 @@ sqInt table; VM_LABEL(commonSend); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin sendBreakpoint:receiver: */ @@ -8956,6 +8957,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -11577,6 +11579,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt1); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -13435,6 +13438,7 @@ sqInt tagBits; VM_LABEL(commonSendAbsentImplicit); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; localAbsentReceiver = implicitReceiverFormixinimplementing(longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method)), GIV(messageSelector)); @@ -13854,6 +13858,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentDynamicSuperBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -14433,6 +14438,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentSelfBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -14997,6 +15003,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentOuterBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -15775,7 +15782,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; - sqInt theIP; + usqInt theIP; assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); assertl(addressIsInPage(GIV(stackPage), lifp), ln); @@ -20024,6 +20031,7 @@ char *savedFramePointer; char *savedStackPointer; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; assertCStackWellAligned(); @@ -26335,6 +26343,7 @@ char *savedFramePointer; char *savedStackPointer; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; if (recordPrimTrace()) { @@ -30227,6 +30236,7 @@ sqInt copyHashFlag; sqInt ec; + copyHashFlag = 0; if ((longAt(GIV(stackPointer))) == GIV(trueObj)) { copyHashFlag = 1; } @@ -30259,6 +30269,7 @@ sqInt reasonCode; char *sp; + objOop = 0; characterCode = longAt(GIV(stackPointer)); if (!(((characterCode & 1)) && (((characterCode = (characterCode >> 1)), @@ -30327,6 +30338,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -30739,6 +30751,7 @@ depth = 0; extentX = 0; extentY = 0; + i = 0; maskBitsIndex = 0; maskObj = 0; offsetObj = 0; @@ -31926,7 +31939,9 @@ sqInt v1; sqInt v2; + midx = 0; msecs = 0; + uidx = 0; usecs = 0; if (GIV(argumentCount) != 1) { /* begin primitiveFail */ @@ -33171,7 +33186,7 @@ sqInt arg; sqInt fmt; sqInt i; - usqInt length; + sqInt length; usqInt numBytes; usqInt numSlots; usqInt numSlots1; @@ -33212,18 +33227,18 @@ /* bytes (the common case), including CompiledMethod */ - length = ((sqInt) (numBytes - (fmt & 7))); + length = numBytes - (fmt & 7); goto l1; } if (fmt <= 9) { - length = ((sqInt) numBytes); + length = numBytes; goto l1; } if (fmt >= 12) { - length = ((sqInt) (numBytes - ((fmt & 3) << 1))); + length = numBytes - ((fmt & 3) << 1); goto l1; } - length = ((sqInt) (numBytes - ((fmt & 1) << 2))); + length = numBytes - ((fmt & 1) << 2); l1: /* end numBytesOf: */; if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F)) && (length == (numBytesOf(arg))))) { @@ -33241,9 +33256,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - length = (numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1); + length = ((usqInt) ((numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1))); if (!((isAppropriateForCopyObject(arg)) && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) { (GIV(primFailCode) = PrimErrBadArgument); @@ -37267,6 +37282,7 @@ char *sp1; sqInt spaceOkay; + spaceOkay = 0; /* Allocate a new fixed-size instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. This *will not* cause a GC :-) */ @@ -37534,6 +37550,7 @@ sqInt spaceOkay; sqInt value; + spaceOkay = 0; /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((oop1 & 1)) { @@ -40386,6 +40403,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -45311,7 +45329,7 @@ sqInt ptr2; sqInt slotBytes; usqInt smallObj; - usqInt start; + sqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -48910,6 +48928,7 @@ sqInt referent2; sqInt startOfFreeRun; + endOfFreeRun = 0; startOfFreeRun = 0; assert(!(isForwarded(GIV(nilObj)))); assert(!(isForwarded(GIV(falseObj)))); @@ -63576,6 +63595,7 @@ sqInt segAddress1; sqInt segIndex; + allocatedSize = 0; newSegIndex = 0; null; segAddress = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(ammount, firstGapOfSizeAtLeast(ammount), (&allocatedSize)); @@ -64268,7 +64288,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -64618,6 +64638,7 @@ { sqInt objOop; + objOop = 0; return (CharacterTable == null ? (ascii << 2) + 2 : (/* begin fetchPointer:ofObject: */ @@ -67454,17 +67475,19 @@ { sqInt oop; char *ptr; + char * toDoLimit1; + char * toDoLimit2; - for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) { + for (ptr = theSP, toDoLimit1 = (frameReceiverLocation(theFP)); ptr <= toDoLimit1; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 3) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { longAtput(ptr, followForwarded(oop)); } } - for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord); ptr <= (theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord), toDoLimit2 = (theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1))))); ptr += BytesPerWord) { + : byteAt((theFP + FoxIFrameFlags) + 1))))); ptr <= toDoLimit2; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 3) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { @@ -77525,6 +77548,8 @@ char *sp2; sqInt successBoolean; + nArgs = 0; + nArgs1 = 0; savedFramePointer = 0; savedFramePointer1 = 0; savedStackPointer = 0; @@ -77896,6 +77921,8 @@ Fetch the first literal of the method; check its an Array of length 4. Look at the function index in case it has been loaded before */ + accessorDepth = 0; + val = 0; if (!((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (((literalCountOfMethodHeader(methodHeaderOf(GIV(newMethod)))) > 0) Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - CoInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CoInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2383,7 +2383,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1313"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1315"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6055,6 +6055,7 @@ sqInt table; VM_LABEL(commonSend); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin sendBreakpoint:receiver: */ @@ -8965,6 +8966,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -11586,6 +11588,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt1); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -13444,6 +13447,7 @@ sqInt tagBits; VM_LABEL(commonSendAbsentImplicit); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; localAbsentReceiver = implicitReceiverFormixinimplementing(longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method)), GIV(messageSelector)); @@ -13863,6 +13867,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentDynamicSuperBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -14442,6 +14447,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentSelfBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -15006,6 +15012,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentOuterBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -15784,7 +15791,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; - sqInt theIP; + usqInt theIP; assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); assertl(addressIsInPage(GIV(stackPage), lifp), ln); @@ -20033,6 +20040,7 @@ char *savedFramePointer; char *savedStackPointer; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; assertCStackWellAligned(); @@ -26344,6 +26352,7 @@ char *savedFramePointer; char *savedStackPointer; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; if (recordPrimTrace()) { @@ -30236,6 +30245,7 @@ sqInt copyHashFlag; sqInt ec; + copyHashFlag = 0; if ((longAt(GIV(stackPointer))) == GIV(trueObj)) { copyHashFlag = 1; } @@ -30268,6 +30278,7 @@ sqInt reasonCode; char *sp; + objOop = 0; characterCode = longAt(GIV(stackPointer)); if (!(((characterCode & 1)) && (((characterCode = (characterCode >> 1)), @@ -30336,6 +30347,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -30748,6 +30760,7 @@ depth = 0; extentX = 0; extentY = 0; + i = 0; maskBitsIndex = 0; maskObj = 0; offsetObj = 0; @@ -31935,7 +31948,9 @@ sqInt v1; sqInt v2; + midx = 0; msecs = 0; + uidx = 0; usecs = 0; if (GIV(argumentCount) != 1) { /* begin primitiveFail */ @@ -33180,7 +33195,7 @@ sqInt arg; sqInt fmt; sqInt i; - usqInt length; + sqInt length; usqInt numBytes; usqInt numSlots; usqInt numSlots1; @@ -33221,18 +33236,18 @@ /* bytes (the common case), including CompiledMethod */ - length = ((sqInt) (numBytes - (fmt & 7))); + length = numBytes - (fmt & 7); goto l1; } if (fmt <= 9) { - length = ((sqInt) numBytes); + length = numBytes; goto l1; } if (fmt >= 12) { - length = ((sqInt) (numBytes - ((fmt & 3) << 1))); + length = numBytes - ((fmt & 3) << 1); goto l1; } - length = ((sqInt) (numBytes - ((fmt & 1) << 2))); + length = numBytes - ((fmt & 1) << 2); l1: /* end numBytesOf: */; if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F)) && (length == (numBytesOf(arg))))) { @@ -33250,9 +33265,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - length = (numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1); + length = ((usqInt) ((numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1))); if (!((isAppropriateForCopyObject(arg)) && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) { (GIV(primFailCode) = PrimErrBadArgument); @@ -37276,6 +37291,7 @@ char *sp1; sqInt spaceOkay; + spaceOkay = 0; /* Allocate a new fixed-size instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. This *will not* cause a GC :-) */ @@ -37543,6 +37559,7 @@ sqInt spaceOkay; sqInt value; + spaceOkay = 0; /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((oop1 & 1)) { @@ -40395,6 +40412,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -45320,7 +45338,7 @@ sqInt ptr2; sqInt slotBytes; usqInt smallObj; - usqInt start; + sqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -48919,6 +48937,7 @@ sqInt referent2; sqInt startOfFreeRun; + endOfFreeRun = 0; startOfFreeRun = 0; assert(!(isForwarded(GIV(nilObj)))); assert(!(isForwarded(GIV(falseObj)))); @@ -63585,6 +63604,7 @@ sqInt segAddress1; sqInt segIndex; + allocatedSize = 0; newSegIndex = 0; null; segAddress = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(ammount, firstGapOfSizeAtLeast(ammount), (&allocatedSize)); @@ -64277,7 +64297,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -64627,6 +64647,7 @@ { sqInt objOop; + objOop = 0; return (CharacterTable == null ? (ascii << 2) + 2 : (/* begin fetchPointer:ofObject: */ @@ -67463,17 +67484,19 @@ { sqInt oop; char *ptr; + char * toDoLimit1; + char * toDoLimit2; - for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) { + for (ptr = theSP, toDoLimit1 = (frameReceiverLocation(theFP)); ptr <= toDoLimit1; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 3) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { longAtput(ptr, followForwarded(oop)); } } - for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord); ptr <= (theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord), toDoLimit2 = (theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1))))); ptr += BytesPerWord) { + : byteAt((theFP + FoxIFrameFlags) + 1))))); ptr <= toDoLimit2; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 3) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { @@ -77534,6 +77557,8 @@ char *sp2; sqInt successBoolean; + nArgs = 0; + nArgs1 = 0; savedFramePointer = 0; savedFramePointer1 = 0; savedStackPointer = 0; @@ -77905,6 +77930,8 @@ Fetch the first literal of the method; check its an Array of length 4. Look at the function index in case it has been loaded before */ + accessorDepth = 0; + val = 0; if (!((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (((literalCountOfMethodHeader(methodHeaderOf(GIV(newMethod)))) > 0) Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - StackInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + StackInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2149,7 +2149,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1313"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1315"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5716,6 +5716,7 @@ sqInt table; VM_LABEL(commonSend); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin sendBreakpoint:receiver: */ @@ -8764,6 +8765,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -11682,6 +11684,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt1); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -13458,6 +13461,7 @@ sqInt wrapAround; VM_LABEL(commonSendAbsentImplicit); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin implicitReceiverFor:mixin:implementing: */ @@ -13911,6 +13915,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentDynamicSuperBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -14330,6 +14335,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentSelfBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -14753,6 +14759,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentOuterBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -15824,6 +15831,7 @@ sqInt copyHashFlag; sqInt ec; + copyHashFlag = 0; if ((longAt(GIV(stackPointer))) == GIV(trueObj)) { copyHashFlag = 1; } @@ -15856,6 +15864,7 @@ sqInt reasonCode; char *sp; + objOop = 0; characterCode = longAt(GIV(stackPointer)); if (!(((((characterCode) & 7) == 1)) && (((characterCode = (characterCode >> 3)), @@ -15920,6 +15929,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -16285,6 +16295,7 @@ depth = 0; extentX = 0; extentY = 0; + i = 0; maskBitsIndex = 0; maskObj = 0; offsetObj = 0; @@ -17237,7 +17248,9 @@ sqInt v1; sqInt v2; + midx = 0; msecs = 0; + uidx = 0; usecs = 0; if (GIV(argumentCount) != 1) { /* begin primitiveFail */ @@ -21389,6 +21402,7 @@ sqInt top1; sqInt valuePointer; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin eeInstantiateClassIndex:format:numSlots: */ @@ -22501,6 +22515,7 @@ char *sp1; sqInt spaceOkay; + spaceOkay = 0; /* Allocate a new fixed-size instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. This *will not* cause a GC :-) */ @@ -22770,6 +22785,7 @@ sqInt spaceOkay; sqInt value; + spaceOkay = 0; /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((((oop1) & 7) == 1)) { @@ -23628,6 +23644,7 @@ sqInt tagBits2; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; lookupClass = longAt(GIV(stackPointer)); @@ -23905,6 +23922,7 @@ sqInt tagBits1; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin primitiveObject:perform:withArguments:lookedUpIn: */ @@ -27068,6 +27086,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -36764,6 +36783,7 @@ sqInt slotBytes2; sqInt startOfFreeRun; + endOfFreeRun = 0; startOfFreeRun = 0; assert(!(isForwarded(GIV(nilObj)))); assert(!(isForwarded(GIV(falseObj)))); @@ -53189,6 +53209,7 @@ sqInt segAddress1; sqInt segIndex; + allocatedSize = 0; newSegIndex = 0; null; segAddress = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(ammount, firstGapOfSizeAtLeast(ammount), (&allocatedSize)); @@ -54395,6 +54416,7 @@ { sqInt objOop; + objOop = 0; return (CharacterTable == null ? (((long)ascii) << 3) + 2 : (/* begin fetchPointer:ofObject: */ @@ -57606,15 +57628,17 @@ { sqInt oop; char *ptr; + char * toDoLimit1; + char * toDoLimit2; - for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) { + for (ptr = theSP, toDoLimit1 = (frameReceiverLocation(theFP)); ptr <= toDoLimit1; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 7) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { longAtput(ptr, followForwarded(oop)); } } - for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord); ptr <= (theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())))); ptr += BytesPerWord) { + for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord), toDoLimit2 = (theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())))); ptr <= toDoLimit2; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 7) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { @@ -71034,6 +71058,8 @@ char *sp2; sqInt successBoolean; + nArgs = 0; + nArgs1 = 0; savedFramePointer = 0; savedFramePointer1 = 0; savedStackPointer = 0; @@ -71207,6 +71233,7 @@ sqInt table; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; methodArgument = longAt(GIV(stackPointer)); @@ -71400,6 +71427,7 @@ char *sp7; sqInt table; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; methodArgument = longAt(GIV(stackPointer)); @@ -71631,6 +71659,8 @@ Fetch the first literal of the method; check its an Array of length 4. Look at the function index in case it has been loaded before */ + accessorDepth = 0; + val = 0; if (!((((GIV(newMethod) & 7) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (((literalCountOfMethodHeader(methodHeaderOf(GIV(newMethod)))) > 0) @@ -72665,6 +72695,7 @@ sqInt table; sqInt tagBits; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; performMethod = GIV(newMethod); Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspurstack64src/vm/interp.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - StackInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + StackInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2146,7 +2146,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1313"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1315"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5707,6 +5707,7 @@ sqInt table; VM_LABEL(commonSend); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin sendBreakpoint:receiver: */ @@ -8755,6 +8756,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -11673,6 +11675,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt1); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -13449,6 +13452,7 @@ sqInt wrapAround; VM_LABEL(commonSendAbsentImplicit); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin implicitReceiverFor:mixin:implementing: */ @@ -13902,6 +13906,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentDynamicSuperBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -14321,6 +14326,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentSelfBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -14744,6 +14750,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentOuterBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -15815,6 +15822,7 @@ sqInt copyHashFlag; sqInt ec; + copyHashFlag = 0; if ((longAt(GIV(stackPointer))) == GIV(trueObj)) { copyHashFlag = 1; } @@ -15847,6 +15855,7 @@ sqInt reasonCode; char *sp; + objOop = 0; characterCode = longAt(GIV(stackPointer)); if (!(((((characterCode) & 7) == 1)) && (((characterCode = (characterCode >> 3)), @@ -15911,6 +15920,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -16276,6 +16286,7 @@ depth = 0; extentX = 0; extentY = 0; + i = 0; maskBitsIndex = 0; maskObj = 0; offsetObj = 0; @@ -17228,7 +17239,9 @@ sqInt v1; sqInt v2; + midx = 0; msecs = 0; + uidx = 0; usecs = 0; if (GIV(argumentCount) != 1) { /* begin primitiveFail */ @@ -21380,6 +21393,7 @@ sqInt top1; sqInt valuePointer; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin eeInstantiateClassIndex:format:numSlots: */ @@ -22492,6 +22506,7 @@ char *sp1; sqInt spaceOkay; + spaceOkay = 0; /* Allocate a new fixed-size instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. This *will not* cause a GC :-) */ @@ -22761,6 +22776,7 @@ sqInt spaceOkay; sqInt value; + spaceOkay = 0; /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((((oop1) & 7) == 1)) { @@ -23619,6 +23635,7 @@ sqInt tagBits2; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; lookupClass = longAt(GIV(stackPointer)); @@ -23896,6 +23913,7 @@ sqInt tagBits1; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin primitiveObject:perform:withArguments:lookedUpIn: */ @@ -27059,6 +27077,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -36755,6 +36774,7 @@ sqInt slotBytes2; sqInt startOfFreeRun; + endOfFreeRun = 0; startOfFreeRun = 0; assert(!(isForwarded(GIV(nilObj)))); assert(!(isForwarded(GIV(falseObj)))); @@ -53180,6 +53200,7 @@ sqInt segAddress1; sqInt segIndex; + allocatedSize = 0; newSegIndex = 0; null; segAddress = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(ammount, firstGapOfSizeAtLeast(ammount), (&allocatedSize)); @@ -54386,6 +54407,7 @@ { sqInt objOop; + objOop = 0; return (CharacterTable == null ? (((long)ascii) << 3) + 2 : (/* begin fetchPointer:ofObject: */ @@ -57597,15 +57619,17 @@ { sqInt oop; char *ptr; + char * toDoLimit1; + char * toDoLimit2; - for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) { + for (ptr = theSP, toDoLimit1 = (frameReceiverLocation(theFP)); ptr <= toDoLimit1; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 7) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { longAtput(ptr, followForwarded(oop)); } } - for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord); ptr <= (theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())))); ptr += BytesPerWord) { + for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord), toDoLimit2 = (theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())))); ptr <= toDoLimit2; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 7) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { @@ -71025,6 +71049,8 @@ char *sp2; sqInt successBoolean; + nArgs = 0; + nArgs1 = 0; savedFramePointer = 0; savedFramePointer1 = 0; savedStackPointer = 0; @@ -71198,6 +71224,7 @@ sqInt table; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; methodArgument = longAt(GIV(stackPointer)); @@ -71391,6 +71418,7 @@ char *sp7; sqInt table; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; methodArgument = longAt(GIV(stackPointer)); @@ -71622,6 +71650,8 @@ Fetch the first literal of the method; check its an Array of length 4. Look at the function index in case it has been loaded before */ + accessorDepth = 0; + val = 0; if (!((((GIV(newMethod) & 7) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && (((literalCountOfMethodHeader(methodHeaderOf(GIV(newMethod)))) > 0) @@ -72656,6 +72686,7 @@ sqInt table; sqInt tagBits; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; performMethod = GIV(newMethod); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-05-18 01:20:04 UTC (rev 3349) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-05-19 01:13:54 UTC (rev 3350) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 from - StackInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae + StackInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1315 uuid: a8172799-131a-401c-861e-55a1d2c21710 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2120,7 +2120,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1313"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1315"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5689,6 +5689,7 @@ sqInt table; VM_LABEL(commonSend); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin sendBreakpoint:receiver: */ @@ -8365,6 +8366,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -10964,6 +10966,7 @@ sqInt totalLength1; VM_LABEL(bytecodePrimAt1); + objOop = 0; result = 0; index = longAtPointer(localSP); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); @@ -12789,6 +12792,7 @@ sqInt wrapAround; VM_LABEL(commonSendAbsentImplicit); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin implicitReceiverFor:mixin:implementing: */ @@ -13246,6 +13250,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentDynamicSuperBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -13665,6 +13670,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentSelfBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -14090,6 +14096,7 @@ sqInt tagBits; VM_LABEL(extSendAbsentOuterBytecode); + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; byte = byteAtPointer(++localIP); @@ -15199,6 +15206,7 @@ sqInt copyHashFlag; sqInt ec; + copyHashFlag = 0; if ((longAt(GIV(stackPointer))) == GIV(trueObj)) { copyHashFlag = 1; } @@ -15231,6 +15239,7 @@ sqInt reasonCode; char *sp; + objOop = 0; characterCode = longAt(GIV(stackPointer)); if (!(((characterCode & 1)) && (((characterCode = (characterCode >> 1)), @@ -15299,6 +15308,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -15711,6 +15721,7 @@ depth = 0; extentX = 0; extentY = 0; + i = 0; maskBitsIndex = 0; maskObj = 0; offsetObj = 0; @@ -16898,7 +16909,9 @@ sqInt v1; sqInt v2; + midx = 0; msecs = 0; + uidx = 0; usecs = 0; if (GIV(argumentCount) != 1) { /* begin primitiveFail */ @@ -20905,6 +20918,7 @@ sqInt top1; sqInt valuePointer; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin eeInstantiateClassIndex:format:numSlots: */ @@ -22037,6 +22051,7 @@ char *sp1; sqInt spaceOkay; + spaceOkay = 0; /* Allocate a new fixed-size instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. This *will not* cause a GC :-) */ @@ -22304,6 +22319,7 @@ sqInt spaceOkay; sqInt value; + spaceOkay = 0; /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((oop1 & 1)) { @@ -23071,6 +23087,7 @@ sqInt tagBits2; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; lookupClass = longAt(GIV(stackPointer)); @@ -23350,6 +23367,7 @@ sqInt tagBits1; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; /* begin primitiveObject:perform:withArguments:lookedUpIn: */ @@ -25575,6 +25593,7 @@ sqInt stSize; sqInt totalLength; + objOop = 0; /* begin commonAt: */ /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -34380,6 +34399,7 @@ sqInt referent2; sqInt startOfFreeRun; + endOfFreeRun = 0; startOfFreeRun = 0; assert(!(isForwarded(GIV(nilObj)))); assert(!(isForwarded(GIV(falseObj)))); @@ -48829,6 +48849,7 @@ sqInt segAddress1; sqInt segIndex; + allocatedSize = 0; newSegIndex = 0; null; segAddress = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(ammount, firstGapOfSizeAtLeast(ammount), (&allocatedSize)); @@ -50005,6 +50026,7 @@ { sqInt objOop; + objOop = 0; return (CharacterTable == null ? (ascii << 2) + 2 : (/* begin fetchPointer:ofObject: */ @@ -52989,15 +53011,17 @@ { sqInt oop; char *ptr; + char * toDoLimit1; + char * toDoLimit2; - for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) { + for (ptr = theSP, toDoLimit1 = (frameReceiverLocation(theFP)); ptr <= toDoLimit1; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 3) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { longAtput(ptr, followForwarded(oop)); } } - for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord); ptr <= (theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord())))); ptr += BytesPerWord) { + for (ptr = ((theFP + FoxCallerSavedIP) + BytesPerWord), toDoLimit2 = (theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord())))); ptr <= toDoLimit2; ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 3) == 0) && (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) { @@ -66898,6 +66922,8 @@ char *sp2; sqInt successBoolean; + nArgs = 0; + nArgs1 = 0; savedFramePointer = 0; savedFramePointer1 = 0; savedStackPointer = 0; @@ -67071,6 +67097,7 @@ sqInt table; sqInt top; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; methodArgument = longAt(GIV(stackPointer)); @@ -67264,6 +67291,7 @@ char *sp7; sqInt table; + nArgs = 0; savedFramePointer = 0; savedStackPointer = 0; methodArgument = longAt(GIV(stackPointer)); @@ -67495,6 +67523,8 @@ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1315.mcz
by commits＠source.squeak.org 19 May '15

19 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1315.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1315 Author: eem Time: 18 May 2015, 5:44:23.955 pm UUID: a8172799-131a-401c-861e-55a1d2c21710 Ancestors: VMMaker.oscog-eem.1314 Slang: Do a more thorough job of transforming complex to:[by:]do: loops so that the limit expression is only evaluated once, not on each iteration of the loop. =============== Diff against VMMaker.oscog-eem.1314 =============== Item was added: + ----- Method: TMethod>>ensureToByDoLoopLimitIsSafeAndEfficient:in: (in category 'transformations') ----- + ensureToByDoLoopLimitIsSafeAndEfficient: node in: aCodeGen + "For both safety and efficiency, make sure that to:[by:]do: loops + with complex limits have a variable to hold the limit expression. + In C the limit expression is evaluated each time round the loop + so if the loop has side-effects (which it usually will), the C compiler + may not be able to optimize the limit expression itself." + | limitExpr hasSideEffects | + limitExpr := node args first. + hasSideEffects := limitExpr anySatisfy: + [:subNode| + subNode isSend + and: [(aCodeGen isBuiltinSelector: subNode selector) not + and: [(subNode isStructSendIn: aCodeGen) not]]]. + node args size = 4 + ifTrue: + [hasSideEffects + ifTrue: [locals add: node args last name] + ifFalse: [node arguments: node args allButLast]] + ifFalse: "If the expression is complex but as yet there is no limit variable, add it" + [hasSideEffects ifTrue: + [| var | + var := self unusedNamePrefixedBy: 'toDoLimit' avoiding: locals. "N.B. adds it to locals!!!!" + node arguments: node args, {TVariableNode new setName: var; yourself}. + declarations + at: node args third args first + ifPresent: [:decl| self declarationAt: var put: (self typeFor: node args third args first in: aCodeGen), ' ', var]]]! Item was changed: ----- Method: TMethod>>prepareMethodIn: (in category 'transformations') ----- prepareMethodIn: aCodeGen "Record sends of builtin operators, map sends of the special selector dispatchOn:in: with case statement nodes, and map sends of caseOf:[otherwise:] to switch statements. + Declare limit variables for to:[by:]do: loops with limits that potentially have side-effects. As a hack also update the types of variables introduced to implement cascades correctly. This has to be done at the same time as this is done, so why not piggy back here?" extraVariableNumber ifNotNil: [declarations keysAndValuesDo: [:varName :decl| decl isBlock ifTrue: [self assert: ((varName beginsWith: 'cascade') and: [varName last isDigit]). locals add: varName. self declarationAt: varName put: (decl value: self value: aCodeGen), ' ', varName]]]. aCodeGen pushScope: declarations while:"N.B. nodesWithParentsDo: is bottom-up, hence replacement is destructive and conserved." [parseTree nodesWithParentsDo: [:node :parent| node isSend ifTrue: [(aCodeGen isBuiltinSelector: node selector) ifTrue: [node isBuiltinOperator: true. "If a to:by:do:'s limit has side-effects, declare the limit variable, otherwise delete it from the args" + node selector = #to:by:do: ifTrue: + [self ensureToByDoLoopLimitIsSafeAndEfficient: node in: aCodeGen]] - (node selector = #to:by:do: - and: [node args size = 4]) ifTrue: - [| limitExpr | - limitExpr := node args first. - (limitExpr anySatisfy: - [:subNode| - subNode isSend - and: [(aCodeGen isBuiltinSelector: subNode selector) not - and: [(subNode isStructSendIn: aCodeGen) not]]]) - ifTrue: [locals add: node args last name] - ifFalse: - [node arguments: node args allButLast]]] ifFalse: [(CaseStatements includes: node selector) ifTrue: [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildCaseStmt: node in: aCodeGen})]. (#(caseOf: #caseOf:otherwise:) includes: node selector) ifTrue: [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildSwitchStmt: node parent: parent })]]]]]!

1 0

VM Maker: VMMaker.oscog-eem.1314.mcz
by commits＠source.squeak.org 18 May '15

18 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1314.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1314 Author: eem Time: 18 May 2015, 1:18:51.827 pm UUID: a1091890-158e-4f00-bb49-c1b2bd6f8a5b Ancestors: VMMaker.oscog-eem.1313 Fix regression in read-before-written code when rewriting to only initialize simple types. Fix ARM-only regression in StackToRegisterMappingCogit's PIC aborts when the SimpleStackBasedCogit was fixed. =============== Diff against VMMaker.oscog-eem.1313 =============== Item was changed: ----- Method: Cogit>>genInnerPICAbortTrampoline: (in category 'initialization') ----- genInnerPICAbortTrampoline: name "Generate the abort for a PIC. This abort performs either a call of ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged target or a call of ceMNUFromPICMNUMethod:receiver: to handle an MNU dispatch in a closed PIC. It distinguishes the two by testing ClassReg. If the register is zero then this is an MNU. This poses a problem in 32-bit Spur, where zero is the cache tag for immediate characters (tag pattern 2r10) because SmallIntegers have tag patterns 2r11 and 2r01, so anding with 1 reduces these to 0 & 1. We solve the ambiguity by patching send sites with a 0 cache tag to open PICs instead of closed PICs." <var: #name type: #'char *'> | jumpMNUCase | <var: #jumpMNUCase type: #'AbstractInstruction *'> self CmpCq: self picAbortDiscriminatorValue R: ClassReg. jumpMNUCase := self JumpZero: 0. self compileTrampolineFor: #ceInterpretMethodFromPIC:receiver: numArgs: 2 arg: SendNumArgsReg arg: ReceiverResultReg arg: nil arg: nil saveRegs: false + pushLinkReg: false - pushLinkReg: true resultReg: nil. jumpMNUCase jmpTarget: self Label. ^self genTrampolineFor: #ceMNUFromPICMNUMethod:receiver: called: name numArgs: 2 arg: SendNumArgsReg arg: ReceiverResultReg arg: nil arg: nil saveRegs: false + pushLinkReg: false - pushLinkReg: true resultReg: nil appendOpcodes: true! Item was changed: ----- Method: Cogit>>genPICAbortTrampoline (in category 'initialization') ----- genPICAbortTrampoline "Generate the abort for a PIC. This abort performs either a call of ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged target or a call of ceMNUFromPICMNUMethod:receiver: to handle an MNU dispatch in a closed PIC. It distinguishes the two by testing ClassReg. If the register is zero then this is an MNU." opcodeIndex := 0. + backEnd hasLinkRegister ifTrue: + [self PushR: LinkReg]. ^self genInnerPICAbortTrampoline: 'cePICAbort'! Item was changed: ----- Method: TMethod>>removeUnusedTempsAndNilIfRequiredIn: (in category 'utilities') ----- removeUnusedTempsAndNilIfRequiredIn: aCodeGen "Remove all of the unused temps in this method. Answer a set of the references. As a side-effect introduce explicit temp := nil statements for temps that are tested for nil before necessarily being assigned." | refs readBeforeAssigned simplyTypedLocals | refs := self removeUnusedTempsIn: aCodeGen. "reset the locals to be only those still referred to" locals := locals select: [:e| refs includes: e]. (locals notEmpty and: [aCodeGen pushScope: declarations while: [simplyTypedLocals := locals select: + [:var| + declarations + at: var + ifPresent: [:decl| aCodeGen isSimpleType: (aCodeGen extractTypeFor: var fromDeclaration: decl)] + ifAbsent: [true]]. - [:ea| - (self typeFor: ea in: aCodeGen) - ifNil: [false] - ifNotNil: [:type| aCodeGen isSimpleType: type]]. (readBeforeAssigned := (self findReadBeforeAssignedIn: simplyTypedLocals in: aCodeGen)) notEmpty]]) ifTrue: [readBeforeAssigned := readBeforeAssigned reject: [:v| | d | "don't initialize externs, arrays or the explicitly initialized." d := self declarationAt: v. (d beginsWith: 'extern') or: [(d includes: $[) or: [d includes: $=]]]. parseTree statements addAllFirst: (readBeforeAssigned asSortedCollection collect: [:var| TAssignmentNode new setVariable: (TVariableNode new setName: var; yourself) expression: (TConstantNode new setValue: 0; yourself)])]. ^refs!

1 0

New Cog VMs available
by Eliot Miranda 18 May '15

18 May '15

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3349. I hope that the Squeak VMs here-in are final Spur 5.0 and Squeak 4.6 VMs. The last known serious bug in Spur has been found and fixed with these VMs. Of course uch hubris is asking for it. I await the wrath of the gods. CogVM binaries as per VMMaker.oscog-eem.1313/r3349 General: Make the bounds check in primitiveObject:perform:... more restrictive and fix bugs in the commentary. Make stack pages a reasonable size. My math was wrong and the size was half as big as intended. Extend the fastPrimTrace scheme to trace stack overflow, prim failure and prim retry to help debug the phantom stack frame bug in Cog Spur. Fix old bug in ceMNUFromPICMNUMethod:receiver: that has been masked by cacheing of MNU method in MNU PIC entries. ceMNUFromPICMNUMethod:receiver: must set up lkupClass before calling handleMNU:... Spur: Fix ceActivateFailingPrimitiveMethod: to return properly after retrying a primitive after checkForAndFollowForwardedPrimitiveState. e.g. fixes | s | 1 to: 5 do: [:i| s := 'bar'. s becomeForward: 'bzzt' copy. 'foo' <= s] Fix bug in followForwardedFrameContents:stackPointer: so that arguments are actually followed. N.B. drives the above bug underground ;-). so that named constants (defines) are not elided. Make accessor depth calculation more accurate by not considering fetchInteger:ofObject: and arraySize: et al as object accessors. Make the read-before-written initializer safer, only initialzing simple types. Newspeak: Remove landmine left from restructing implicit receiver and outer sends as clean sends. Plugins: Regenerated because of changes in accessorDepth calculation, constant elimination, and read-before-use initialization. -- best, Eliot

1 1

[commit][3348] CogVM source as per VMMaker.oscog-eem.1311
by commits＠squeakvm.org 18 May '15

18 May '15

Revision: 3348 Author: eliot Date: 2015-05-17 16:03:01 -0700 (Sun, 17 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1311 General: Make the bounds check in primitiveObject:perform:... more restrictive and fix bugs in the commentary. Make stack pages a reasonable size. My math was wrong and the size was half as big as intended. Extend the fastPrimTrace scheme to trace stack overflow, prim failure and prim retry to help debug the phantom stack frame bug in Cog Spur. Cogit: Revamp icache flushing in the Cogit for ARM. Move icache flush for generated methods/pics to the fillIn*Header: routines. Make sure the cache is flushed in generateCaptureCStackPointers:. Flush the entire PIC when extending it. Spur: Fix ceActivateFailingPrimitiveMethod: to return properly after retrying a primitive after checkForAndFollowForwardedPrimitiveState. e.g. fixes | s | 1 to: 5 do: [:i| s := 'bar'. s becomeForward: 'bzzt' copy. 'foo' <= s] Fix bug in followForwardedFrameContents:stackPointer: so that arguments are actually followed. N.B. drives the above bug underground ;-). so that named constants (defines) are not elided. Newspeak: Remove landmine left from restructing implicit receiver and outer sends as clean sends. Slang: Fix constant elimination on arithmetic generation. Plugins: Regenerated because of changes in accessorDepth calculation, constant elimination, and read-before-use initialization. Modified Paths: -------------- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c branches/Cog/nsspursrc/plugins/SoundPlugin/SoundPlugin.c branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/win32/vm/sqWin32Directory.c branches/Cog/scripts/revertUnchangedPlugins branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - BalloonEnginePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + BalloonEnginePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -836,9 +836,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.1145 (i)" + "B2DPlugin VMMaker.oscog-eem.1311 (i)" #else - "B2DPlugin VMMaker.oscog-eem.1145 (e)" + "B2DPlugin VMMaker.oscog-eem.1311 (e)" #endif ; static int* objBuffer; @@ -1689,13 +1689,13 @@ static sqInt bzStartX(sqInt index) { - return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)]; + return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))]; } static sqInt bzStartXput(sqInt index, sqInt value) { - return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)] = value; + return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))] = value; } static sqInt @@ -2153,7 +2153,7 @@ if (engineStopped) { return 0; } - leftViaX = (startX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)]); + leftViaX = (startX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))]); leftViaY = (startY = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 1)]); rightViaX = (viaX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)]); rightViaY = (viaY = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 3)]); @@ -2178,7 +2178,7 @@ workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 3)] = leftViaY; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 4)] = sharedX; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 5)] = sharedY; - workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex) + 0)] = sharedX; + workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex))] = sharedX; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex) + 1)] = sharedY; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex) + 2)] = rightViaX; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex) + 3)] = rightViaY; @@ -2210,7 +2210,7 @@ sqInt viaX; sqInt viaY; - leftViaX = (startX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)]); + leftViaX = (startX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))]); leftViaY = (startY = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 1)]); rightViaX = (viaX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)]); rightViaY = (viaY = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 3)]); @@ -2294,7 +2294,7 @@ workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 3)] = leftViaY; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 4)] = sharedX; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 5)] = sharedY; - workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex) + 0)] = sharedX; + workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex))] = sharedX; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex) + 1)] = sharedY; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex) + 2)] = rightViaX; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - newIndex) + 3)] = rightViaY; @@ -5234,7 +5234,7 @@ workBuffer[GWBufferTop] = ((workBuffer[GWBufferTop]) + 3); return 1; } - workBuffer[(workBuffer[GWBufferTop]) + index] = (workBuffer[(workBuffer[GWBufferTop]) + 0]); + workBuffer[(workBuffer[GWBufferTop]) + index] = (workBuffer[(workBuffer[GWBufferTop])]); workBuffer[(workBuffer[GWBufferTop]) + (index + 1)] = (workBuffer[(workBuffer[GWBufferTop]) + (0 + 1)]); workBuffer[(workBuffer[GWBufferTop]) + (index + 2)] = (workBuffer[(workBuffer[GWBufferTop]) + (0 + 2)]); /* begin freeStackFillEntry */ @@ -5708,7 +5708,7 @@ if (engineStopped) { return 0; } - workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - bz1) + 0)] = (point1[0]); + workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - bz1))] = (point1[0]); workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - bz1) + 1)] = (point1[1]); workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - bz1) + 2)] = (point2[0]); workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - bz1) + 3)] = (point2[1]); @@ -6117,7 +6117,7 @@ /* Top to bottom */ - objBuffer[bezier + GEXValue] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)]); + objBuffer[bezier + GEXValue] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))]); objBuffer[bezier + GEYValue] = ((workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 1)]) - yOffset); objBuffer[bezier + GBViaX] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)]); objBuffer[bezier + GBViaY] = ((workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 3)]) - yOffset); @@ -6129,7 +6129,7 @@ objBuffer[bezier + GEYValue] = ((workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 5)]) - yOffset); objBuffer[bezier + GBViaX] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)]); objBuffer[bezier + GBViaY] = ((workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 3)]) - yOffset); - objBuffer[bezier + GBEndX] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)]); + objBuffer[bezier + GBEndX] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))]); objBuffer[bezier + GBEndY] = ((workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 1)]) - yOffset); } objBuffer[bezier + GEZValue] = (workBuffer[GWCurrentZ]); @@ -6385,7 +6385,7 @@ /* Load short points */ /* begin loadPointShortAt:from: */ - x0 = (((short *) points))[index + 0]; + x0 = (((short *) points))[index]; /* begin loadPointShortAt:from: */ y0 = (((short *) points))[index + 1]; /* begin loadPointShortAt:from: */ @@ -6398,7 +6398,7 @@ y2 = (((short *) points))[index + 5]; } else { - x0 = (((int *) points))[index + 0]; + x0 = (((int *) points))[index]; y0 = (((int *) points))[index + 1]; x1 = (((int *) points))[index + 2]; y1 = (((int *) points))[index + 3]; @@ -6795,7 +6795,7 @@ /* Load short points */ /* begin loadPointShortAt:from: */ - x0 = (((short *) points))[index + 0]; + x0 = (((short *) points))[index]; /* begin loadPointShortAt:from: */ y0 = (((short *) points))[index + 1]; /* begin loadPointShortAt:from: */ @@ -6808,7 +6808,7 @@ y2 = (((short *) points))[index + 5]; } else { - x0 = (((int *) points))[index + 0]; + x0 = (((int *) points))[index]; y0 = (((int *) points))[index + 1]; x1 = (((int *) points))[index + 2]; y1 = (((int *) points))[index + 3]; @@ -7417,8 +7417,8 @@ /* Load start point of segment */ - x0 = ((sqInt)((((circleCosTable())[(seg * 2) + 0]) * (((double) w ))) + cx)); - y0 = ((sqInt)((((circleSinTable())[(seg * 2) + 0]) * (((double) h ))) + cy)); + x0 = ((sqInt)((((circleCosTable())[(seg * 2)]) * (((double) w ))) + cx)); + y0 = ((sqInt)((((circleSinTable())[(seg * 2)]) * (((double) h ))) + cy)); (point1Get())[0] = x0; (point1Get())[1] = y0; x2 = ((sqInt)((((circleCosTable())[(seg * 2) + 2]) * (((double) w ))) + cx)); @@ -7967,7 +7967,7 @@ /* Load short points */ /* begin loadPointShortAt:from: */ - x0 = (((short *) points))[index + 0]; + x0 = (((short *) points))[index]; /* begin loadPointShortAt:from: */ y0 = (((short *) points))[index + 1]; /* begin loadPointShortAt:from: */ @@ -7980,7 +7980,7 @@ y2 = (((short *) points))[index + 5]; } else { - x0 = (((int *) points))[index + 0]; + x0 = (((int *) points))[index]; y0 = (((int *) points))[index + 1]; x1 = (((int *) points))[index + 2]; y1 = (((int *) points))[index + 3]; @@ -11962,6 +11962,7 @@ { sqInt aaLevel; + aaLevel = 0; if (level >= 4) { aaLevel = 4; } @@ -12081,7 +12082,7 @@ if (!(wbStackPush(3))) { return null; } - workBuffer[(workBuffer[GWBufferTop]) + 0] = fillIndex; + workBuffer[(workBuffer[GWBufferTop])] = fillIndex; workBuffer[(workBuffer[GWBufferTop]) + (0 + 1)] = depth; workBuffer[(workBuffer[GWBufferTop]) + (0 + 2)] = rightX; if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 3) { @@ -12091,7 +12092,7 @@ /* New top fill */ - workBuffer[(workBuffer[GWBufferTop]) + 0] = (workBuffer[(workBuffer[GWBufferTop]) + (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3)]); + workBuffer[(workBuffer[GWBufferTop])] = (workBuffer[(workBuffer[GWBufferTop]) + (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3)]); workBuffer[(workBuffer[GWBufferTop]) + (0 + 1)] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3) + 1)]); workBuffer[(workBuffer[GWBufferTop]) + (0 + 2)] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3) + 2)]); workBuffer[(workBuffer[GWBufferTop]) + (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3)] = fillIndex; @@ -13244,7 +13245,7 @@ workBuffer[GWBezierHeightSubdivisions] = ((workBuffer[GWBezierHeightSubdivisions]) + 1); return computeBezierSplitAtHalf(index); } - startX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)]; + startX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))]; endX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 4)]; deltaX = endX - startX; if (deltaX < 0) { @@ -13271,7 +13272,7 @@ sqInt startX; sqInt viaX; - startX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)]; + startX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index))]; viaX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)]; endX = workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 4)]; dx1 = viaX - startX; @@ -14235,7 +14236,7 @@ {"B2DPlugin", "initialiseModule", (void*)initialiseModule}, {"B2DPlugin", "moduleUnloaded", (void*)moduleUnloaded}, {"B2DPlugin", "primitiveAbortProcessing\000\002", (void*)primitiveAbortProcessing}, - {"B2DPlugin", "primitiveAddActiveEdgeEntry\000\002", (void*)primitiveAddActiveEdgeEntry}, + {"B2DPlugin", "primitiveAddActiveEdgeEntry\000\003", (void*)primitiveAddActiveEdgeEntry}, {"B2DPlugin", "primitiveAddBezier\000\002", (void*)primitiveAddBezier}, {"B2DPlugin", "primitiveAddBezierShape\000\003", (void*)primitiveAddBezierShape}, {"B2DPlugin", "primitiveAddBitmapFill\000\002", (void*)primitiveAddBitmapFill}, @@ -14284,7 +14285,7 @@ #else /* ifdef SQ_BUILTIN_PLUGIN */ signed char primitiveAbortProcessingAccessorDepth = 2; -signed char primitiveAddActiveEdgeEntryAccessorDepth = 2; +signed char primitiveAddActiveEdgeEntryAccessorDepth = 3; signed char primitiveAddBezierAccessorDepth = 2; signed char primitiveAddBezierShapeAccessorDepth = 3; signed char primitiveAddBitmapFillAccessorDepth = 2; Modified: branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - BitBltSimulation VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + BitBltSimulation VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -344,9 +344,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.1145 (i)" + "BitBltPlugin VMMaker.oscog-eem.1311 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.1145 (e)" + "BitBltPlugin VMMaker.oscog-eem.1311 (e)" #endif ; static sqInt noHalftone; @@ -5027,6 +5027,7 @@ sqInt val; sqInt _return_value; + val = 0; colorA = (BytesPerOop == 4 ? positive32BitValueOf(stackValue(2)) : positive64BitValueOf(stackValue(2))); Modified: branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c =================================================================== --- branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - DSAPlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + DSAPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -91,9 +91,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims VMMaker.oscog-eem.1072 (i)" + "DSAPrims VMMaker.oscog-eem.1311 (i)" #else - "DSAPrims VMMaker.oscog-eem.1072 (e)" + "DSAPrims VMMaker.oscog-eem.1311 (e)" #endif ; static sqInt remainderDigitCount; @@ -721,7 +721,7 @@ void* DSAPrims_exports[][3] = { {"DSAPrims", "getModuleName", (void*)getModuleName}, - {"DSAPrims", "primitiveBigDivide\000\001", (void*)primitiveBigDivide}, + {"DSAPrims", "primitiveBigDivide\000\002", (void*)primitiveBigDivide}, {"DSAPrims", "primitiveBigMultiply\000\001", (void*)primitiveBigMultiply}, {"DSAPrims", "primitiveExpandBlock\000\001", (void*)primitiveExpandBlock}, {"DSAPrims", "primitiveHashBlock\000\001", (void*)primitiveHashBlock}, @@ -733,7 +733,7 @@ #else /* ifdef SQ_BUILTIN_PLUGIN */ -signed char primitiveBigDivideAccessorDepth = 1; +signed char primitiveBigDivideAccessorDepth = 2; signed char primitiveBigMultiplyAccessorDepth = 1; signed char primitiveExpandBlockAccessorDepth = 1; signed char primitiveHashBlockAccessorDepth = 1; Modified: branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - FilePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + FilePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -177,9 +177,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.1145 (i)" + "FilePlugin VMMaker.oscog-eem.1311 (i)" #else - "FilePlugin VMMaker.oscog-eem.1145 (e)" + "FilePlugin VMMaker.oscog-eem.1311 (e)" #endif ; static void * sCCPfn; @@ -471,6 +471,11 @@ sqInt requestedName; sqInt status; + createDate = 0; + dirFlag = 0; + entryNameSize = 0; + fileSize = 0; + modifiedDate = 0; requestedName = stackValue(0); pathName = stackValue(1); if (!(isBytes(pathName))) { @@ -576,6 +581,11 @@ sqInt pathNameSize; sqInt status; + createDate = 0; + dirFlag = 0; + entryNameSize = 0; + fileSize = 0; + modifiedDate = 0; index = stackIntegerValue(0); pathName = stackValue(1); if (!(isBytes(pathName))) { @@ -678,6 +688,7 @@ SQFile *file; sqInt objectPointer; + atEnd = 0; /* begin fileValueOf: */ objectPointer = stackValue(0); if (!((isBytes(objectPointer)) @@ -782,6 +793,7 @@ sqInt objectPointer; squeakFileOffsetType position; + position = 0; /* begin fileValueOf: */ objectPointer = stackValue(0); if (!((isBytes(objectPointer)) @@ -944,6 +956,7 @@ sqInt objectPointer; squeakFileOffsetType size; + size = 0; /* begin fileValueOf: */ objectPointer = stackValue(0); if (!((isBytes(objectPointer)) Modified: branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - JPEGReaderPlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + JPEGReaderPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -175,9 +175,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker.oscog-eem.1145 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.1311 (i)" #else - "JPEGReaderPlugin VMMaker.oscog-eem.1145 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.1311 (e)" #endif ; static int *residuals; @@ -741,7 +741,7 @@ t3 = (t3 + z1) + z4; ws[i] = ((t10 + t3) / Pass1Div); ws[(DCTSize * 7) + i] = ((t10 - t3) / Pass1Div); - ws[(DCTSize * 1) + i] = ((t11 + t2) / Pass1Div); + ws[(DCTSize) + i] = ((t11 + t2) / Pass1Div); ws[(DCTSize * 6) + i] = ((t11 - t2) / Pass1Div); ws[(DCTSize * 2) + i] = ((t12 + t1) / Pass1Div); ws[(DCTSize * 5) + i] = ((t12 - t1) / Pass1Div); @@ -1695,7 +1695,7 @@ t3 = (t3 + z1) + z4; ws[i] = ((t10 + t3) / Pass1Div); ws[(DCTSize * 7) + i] = ((t10 - t3) / Pass1Div); - ws[(DCTSize * 1) + i] = ((t11 + t2) / Pass1Div); + ws[(DCTSize) + i] = ((t11 + t2) / Pass1Div); ws[(DCTSize * 6) + i] = ((t11 - t2) / Pass1Div); ws[(DCTSize * 2) + i] = ((t12 + t1) / Pass1Div); ws[(DCTSize * 5) + i] = ((t12 - t1) / Pass1Div); Modified: branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - LargeIntegersPlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + LargeIntegersPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -174,9 +174,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.1145 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.1311 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.1145 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.1311 (e)" #endif ; static const int orOpIndex = 1; @@ -373,7 +373,7 @@ /* C indexed! */ /* begin cBytesReplace:from:to:with:startingAt: */ - cBytesCopyFromtolen(pFrom + 0, pTo + byteShift, ((newLen - 1) - byteShift) + 1); + cBytesCopyFromtolen(pFrom, pTo + byteShift, ((newLen - 1) - byteShift) + 1); goto l1; } carry = 0; @@ -489,7 +489,7 @@ /* C indexed! */ /* begin cBytesReplace:from:to:with:startingAt: */ - cBytesCopyFromtolen(pFrom + b, pTo + 0, ((newLen - 1) - 0) + 1); + cBytesCopyFromtolen(pFrom + b, pTo, ((newLen - 1)) + 1); goto l5; } x1 = (pFrom[b]) << f; @@ -614,7 +614,7 @@ /* C indexed! */ /* begin cBytesReplace:from:to:with:startingAt: */ - return cBytesCopyFromtolen(pFrom + 0, pTo + byteShift, ((lenTo - 1) - byteShift) + 1); + return cBytesCopyFromtolen(pFrom, pTo + byteShift, ((lenTo - 1) - byteShift) + 1); } carry = 0; limit = byteShift - 1; @@ -685,7 +685,7 @@ /* C indexed! */ /* begin cBytesReplace:from:to:with:startingAt: */ - return cBytesCopyFromtolen(pFrom + b, pTo + 0, ((toLen - 1) - 0) + 1); + return cBytesCopyFromtolen(pFrom + b, pTo, ((toLen - 1)) + 1); } x = (pFrom[b]) << f; /* begin sqAssert: */ Modified: branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,16 +1,16 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e + VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - MiscPrimitivePlugin VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e - Bitmap * Graphics-mt.312 uuid: ad5f17db-6eed-a44f-a07c-cbfb9d4e09ee - ByteArray * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028 - ByteString * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028 + MiscPrimitivePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + Bitmap * Graphics-mt.313 uuid: 99af1adc-65b3-5549-8d10-ab452e0c59e5 + ByteArray * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631, Collections.spur-mt.635 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028 + ByteString * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631, Collections.spur-mt.635 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028 SampledSound Sound-topa.43 uuid: c1c2b948-6c86-4cf8-877d-1620433f558e */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e\n\ -Bitmap * Graphics-mt.312 uuid: ad5f17db-6eed-a44f-a07c-cbfb9d4e09ee\n\ -ByteArray * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028\n\ -ByteString * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028\n\ +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3\n\ +Bitmap * Graphics-mt.313 uuid: 99af1adc-65b3-5549-8d10-ab452e0c59e5\n\ +ByteArray * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631, Collections.spur-mt.635 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028\n\ +ByteString * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631, Collections.spur-mt.635 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028\n\ SampledSound Sound-topa.43 uuid: c1c2b948-6c86-4cf8-877d-1620433f558e " __DATE__ ; @@ -90,9 +90,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.1288 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.1311 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.1288 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.1311 (e)" #endif ; @@ -932,7 +932,7 @@ {"MiscPrimitivePlugin", "primitiveCompareString\000\000", (void*)primitiveCompareString}, {"MiscPrimitivePlugin", "primitiveCompressToByteArray\000\000", (void*)primitiveCompressToByteArray}, {"MiscPrimitivePlugin", "primitiveConvert8BitSigned\000\000", (void*)primitiveConvert8BitSigned}, - {"MiscPrimitivePlugin", "primitiveDecompressFromByteArray\000\000", (void*)primitiveDecompressFromByteArray}, + {"MiscPrimitivePlugin", "primitiveDecompressFromByteArray\000\001", (void*)primitiveDecompressFromByteArray}, {"MiscPrimitivePlugin", "primitiveFindFirstInString\000\000", (void*)primitiveFindFirstInString}, {"MiscPrimitivePlugin", "primitiveFindSubstring\000\000", (void*)primitiveFindSubstring}, {"MiscPrimitivePlugin", "primitiveIndexOfAsciiInString\000\000", (void*)primitiveIndexOfAsciiInString}, @@ -947,7 +947,7 @@ signed char primitiveCompareStringAccessorDepth = 0; signed char primitiveCompressToByteArrayAccessorDepth = 0; signed char primitiveConvert8BitSignedAccessorDepth = 0; -signed char primitiveDecompressFromByteArrayAccessorDepth = 0; +signed char primitiveDecompressFromByteArrayAccessorDepth = 1; signed char primitiveFindFirstInStringAccessorDepth = 0; signed char primitiveFindSubstringAccessorDepth = 0; signed char primitiveIndexOfAsciiInStringAccessorDepth = 0; Modified: branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - RePlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + RePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -123,9 +123,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.1072 (i)" + "RePlugin VMMaker.oscog-eem.1311 (i)" #else - "RePlugin VMMaker.oscog-eem.1072 (e)" + "RePlugin VMMaker.oscog-eem.1311 (e)" #endif ; static int netMemory = 0; @@ -143,6 +143,7 @@ void *extraByteArrayPtr; sqInt extraObject; + extraByteArrayPtr = 0; if (anExtraPtr) { /* Allocate a Smalltalk ByteArray -- lastAlloc contains the length */ Modified: branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - SocketPlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + SocketPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; +static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -176,9 +176,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SocketPlugin VMMaker.oscog-eem.1145 (i)" + "SocketPlugin VMMaker.oscog-eem.1311 (i)" #else - "SocketPlugin VMMaker.oscog-eem.1145 (e)" + "SocketPlugin VMMaker.oscog-eem.1311 (e)" #endif ; static void * sCCLOPfn; @@ -326,6 +326,7 @@ sqInt s; sqInt sz; + s = 0; sz = sqResolverAddrLookupResultSize(); if (!(failed())) { s = instantiateClassindexableSize(classString(), sz); @@ -800,6 +801,7 @@ sqInt socketOop; sqInt sockHandle; + socketOop = 0; sockHandle = stackValue(3); recvBufSize = stackIntegerValue(2); sendBufSize = stackIntegerValue(1); @@ -843,6 +845,7 @@ sqInt socketOop; sqInt sockHandle; + socketOop = 0; sockHandle = stackValue(5); recvBufSize = stackIntegerValue(4); sendBufSize = stackIntegerValue(3); @@ -1039,6 +1042,7 @@ sqInt status; sqInt _return_value; + status = 0; socket = stackValue(0); if (failed()) { return null; @@ -1309,6 +1313,7 @@ sqInt socket; sqInt _return_value; + err = 0; socket = stackValue(0); if (failed()) { return null; @@ -1710,6 +1715,7 @@ sqInt startIndex; sqInt _return_value; + bytesReceived = 0; socket = stackValue(3); array = stackValue(2); startIndex = stackIntegerValue(1); @@ -1766,6 +1772,7 @@ sqInt socket; sqInt startIndex; + results = 0; socket = stackValue(3); array = stackValue(2); startIndex = stackIntegerValue(1); @@ -1952,6 +1959,7 @@ sqInt startIndex; sqInt _return_value; + bytesSent = 0; socket = stackValue(3); array = stackValue(2); startIndex = stackIntegerValue(1); @@ -2036,6 +2044,7 @@ sqInt sz; sqInt _return_value; + bytesSent = 0; socket = stackValue(5); array = stackValue(4); success(isBytes(stackValue(3))); Modified: branches/Cog/nsspursrc/plugins/SoundPlugin/SoundPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/SoundPlugin/SoundPlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/SoundPlugin/SoundPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - SoundPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + SoundPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundPlugin VMMaker.oscog-eem.983 (i)" + "SoundPlugin VMMaker.oscog-eem.1311 (i)" #else - "SoundPlugin VMMaker.oscog-eem.983 (e)" + "SoundPlugin VMMaker.oscog-eem.1311 (e)" #endif ; @@ -225,6 +225,7 @@ sqInt leadTime; sqInt _return_value; + framesPlayed = 0; frameCount = stackIntegerValue(2); success(isWords(stackValue(1))); buf = ((unsigned *) (firstIndexableField(stackValue(1)))); @@ -257,6 +258,7 @@ sqInt startIndex; sqInt _return_value; + framesPlayed = 0; frameCount = stackIntegerValue(2); success(isWords(stackValue(1))); buf = ((unsigned *) (firstIndexableField(stackValue(1)))); @@ -317,6 +319,8 @@ sqInt startWordIndex; sqInt _return_value; + bufSizeInBytes = 0; + samplesRecorded = 0; success(isWords(stackValue(1))); buf = ((unsigned *) (firstIndexableField(stackValue(1)))); startWordIndex = stackIntegerValue(0); Modified: branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 + VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 */ @@ -1221,6 +1221,7 @@ sqInt SigStackSize; stack_t sigstack; + sigstack = 0; if (useSignalStack >= 0) { return useSignalStack != 0; } @@ -1456,6 +1457,8 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; + readerIOStream = 0; + writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1517,6 +1520,8 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; + readerIOStream = 0; + writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1945,6 +1950,7 @@ sqInt semaphoreIndex; sqInt sigNum; + semaphoreIndex = 0; index = stackValue(0); if (index == (nilObject())) { semaphoreIndex = 0; @@ -2440,6 +2446,8 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; + readerIOStream = 0; + writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -2502,6 +2510,8 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; + readerIOStream = 0; + writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -4147,6 +4157,7 @@ { struct sigaction sigchldHandlerAction; + sigchldHandlerAction = 0; # if defined(SA_NOCLDSTOP) sigchldHandlerAction.sa_sigaction = reapChildProcess; @@ -4192,6 +4203,8 @@ struct sigaction oldHandlerAction; struct sigaction sigHandlerAction; + oldHandlerAction = 0; + sigHandlerAction = 0; if (!(needSigaltstack())) { return signal(signalNumber, signalHandlerAddress); } @@ -4623,7 +4636,7 @@ {"UnixOSProcessPlugin", "primitiveForkExec\000\001", (void*)primitiveForkExec}, {"UnixOSProcessPlugin", "primitiveForkSqueak\000\377", (void*)primitiveForkSqueak}, {"UnixOSProcessPlugin", "primitiveForkSqueakWithoutSigHandler\000\377", (void*)primitiveForkSqueakWithoutSigHandler}, - {"UnixOSProcessPlugin", "primitiveForwardSignalToSemaphore\000\001", (void*)primitiveForwardSignalToSemaphore}, + {"UnixOSProcessPlugin", "primitiveForwardSignalToSemaphore\000\002", (void*)primitiveForwardSignalToSemaphore}, {"UnixOSProcessPlugin", "primitiveGetCurrentWorkingDirectory\000\377", (void*)primitiveGetCurrentWorkingDirectory}, {"UnixOSProcessPlugin", "primitiveGetEGid\000\377", (void*)primitiveGetEGid}, {"UnixOSProcessPlugin", "primitiveGetEUid\000\377", (void*)primitiveGetEUid}, @@ -4651,7 +4664,7 @@ {"UnixOSProcessPlugin", "primitivePutEnv\000\002", (void*)primitivePutEnv}, {"UnixOSProcessPlugin", "primitiveRealpath\000\000", (void*)primitiveRealpath}, {"UnixOSProcessPlugin", "primitiveReapChildProcess\000\000", (void*)primitiveReapChildProcess}, - {"UnixOSProcessPlugin", "primitiveSemaIndexFor\000\000", (void*)primitiveSemaIndexFor}, + {"UnixOSProcessPlugin", "primitiveSemaIndexFor\000\001", (void*)primitiveSemaIndexFor}, {"UnixOSProcessPlugin", "primitiveSendSigabrtTo\000\000", (void*)primitiveSendSigabrtTo}, {"UnixOSProcessPlugin", "primitiveSendSigalrmTo\000\000", (void*)primitiveSendSigalrmTo}, {"UnixOSProcessPlugin", "primitiveSendSigchldTo\000\000", (void*)primitiveSendSigchldTo}, @@ -4714,7 +4727,7 @@ signed char primitiveFixPointersInArrayOfStringsAccessorDepth = 1; signed char primitiveForkAndExecInDirectoryAccessorDepth = 1; signed char primitiveForkExecAccessorDepth = 1; -signed char primitiveForwardSignalToSemaphoreAccessorDepth = 1; +signed char primitiveForwardSignalToSemaphoreAccessorDepth = 2; signed char primitiveGetPGidAccessorDepth = 0; signed char primitiveGetStdErrHandleWithSessionIdentifierAccessorDepth = 1; signed char primitiveGetStdInHandleWithSessionIdentifierAccessorDepth = 1; @@ -4727,7 +4740,7 @@ signed char primitivePutEnvAccessorDepth = 2; signed char primitiveRealpathAccessorDepth = 0; signed char primitiveReapChildProcessAccessorDepth = 0; -signed char primitiveSemaIndexForAccessorDepth = 0; +signed char primitiveSemaIndexForAccessorDepth = 1; signed char primitiveSendSigabrtToAccessorDepth = 0; signed char primitiveSendSigalrmToAccessorDepth = 0; signed char primitiveSendSigchldToAccessorDepth = 0; Modified: branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 + VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 */ @@ -434,6 +434,7 @@ volatile int index; struct {int count; HANDLE *handles; int semaIndex;} *threadArgs; + index = 0; threadArgs = args; count= threadArgs->count; handles= threadArgs->handles; @@ -895,6 +896,8 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; + readerIOStream = 0; + writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -956,6 +959,8 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; + readerIOStream = 0; + writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1128,6 +1133,7 @@ DWORD exitStatus; HANDLE handle; + exitStatus = 0; if (((handle = handleFrom(stackObjectValue(0)))) == null) { return null; } @@ -1453,6 +1459,8 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; + readerIOStream = 0; + writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1515,6 +1523,8 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; + readerIOStream = 0; + writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1573,6 +1583,7 @@ static struct {int index; HANDLE handle;} threadArgs; DWORD threadID; + threadID = 0; index = stackIntegerValue(0); if (index >= readCharArraySize) { return primitiveFail(); @@ -1856,6 +1867,8 @@ sqInt index; struct {int index; HANDLE handle;} *threadArgs; + handle = 0; + index = 0; threadArgs = args; index = threadArgs->index; handle = threadArgs->handle; @@ -2137,6 +2150,7 @@ /* Complete setup of one handler before doing the next. Mutex will be released in the newly started thread. */ + threadID = 0; waitForThreadMutex(exitThreadMutexHandle()); threadArgs.count= arraySize; threadArgs.handles= handleArrayPointer; @@ -2328,7 +2342,7 @@ {"Win32OSProcessPlugin", "initialiseModule", (void*)initialiseModule}, {"Win32OSProcessPlugin", "moduleUnloaded", (void*)moduleUnloaded}, {"Win32OSProcessPlugin", "primitiveAllocConsole\000\377", (void*)primitiveAllocConsole}, - {"Win32OSProcessPlugin", "primitiveBufferValuesAt\000\000", (void*)primitiveBufferValuesAt}, + {"Win32OSProcessPlugin", "primitiveBufferValuesAt\000\001", (void*)primitiveBufferValuesAt}, {"Win32OSProcessPlugin", "primitiveCanAccessChildProcess\000\001", (void*)primitiveCanAccessChildProcess}, {"Win32OSProcessPlugin", "primitiveCloseHandle\000\001", (void*)primitiveCloseHandle}, {"Win32OSProcessPlugin", "primitiveCommand\000\002", (void*)primitiveCommand}, @@ -2370,7 +2384,7 @@ #else /* ifdef SQ_BUILTIN_PLUGIN */ -signed char primitiveBufferValuesAtAccessorDepth = 0; +signed char primitiveBufferValuesAtAccessorDepth = 1; signed char primitiveCanAccessChildProcessAccessorDepth = 1; signed char primitiveCloseHandleAccessorDepth = 1; signed char primitiveCommandAccessorDepth = 2; Modified: branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - DeflatePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec + DeflatePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; +static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; @@ -139,9 +139,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ZipPlugin VMMaker.oscog-eem.1145 (i)" + "ZipPlugin VMMaker.oscog-eem.1311 (i)" #else - "ZipPlugin VMMaker.oscog-eem.1145 (e)" + "ZipPlugin VMMaker.oscog-eem.1311 (e)" #endif ; static sqInt readStreamInstSize; @@ -347,6 +347,8 @@ unsigned int prevEntry1; unsigned int prevEntry2; + hereLength = 0; + hereMatch = 0; if (zipBlockPos > lastIndex) { return 0; } @@ -708,7 +710,7 @@ /* zipWriteLimit := interpreterProxy fetchInteger: 3 ofObject: rcvr. */ zipReadLimit = fetchIntegerofObject(2, rcvr); - oop = fetchPointerofObject(writeStreamInstSize + 0, rcvr); + oop = fetchPointerofObject(writeStreamInstSize, rcvr); if (!((isWords(oop)) && ((slotSizeOf(oop)) == DeflateHashTableSize))) { return 0; @@ -939,7 +941,7 @@ return primitiveFail(); } zipReadLimit = fetchIntegerofObject(2, rcvr); - zipState = fetchIntegerofObject(readStreamInstSize + 0, rcvr); + zipState = fetchIntegerofObject(readStreamInstSize, rcvr); zipBitBuf = fetchIntegerofObject(readStreamInstSize + 1, rcvr); zipBitPos = fetchIntegerofObject(readStreamInstSize + 2, rcvr); zipSourcePos = fetchIntegerofObject(readStreamInstSize + 4, rcvr); @@ -976,7 +978,7 @@ /* store modified values back */ storeIntegerofObjectwithValue(2, rcvr, zipReadLimit + 1); - storeIntegerofObjectwithValue(readStreamInstSize + 0, rcvr, zipState); + storeIntegerofObjectwithValue(readStreamInstSize, rcvr, zipState); storeIntegerofObjectwithValue(readStreamInstSize + 1, rcvr, zipBitBuf); storeIntegerofObjectwithValue(readStreamInstSize + 2, rcvr, zipBitPos); storeIntegerofObjectwithValue(readStreamInstSize + 4, rcvr, zipSourcePos + 1); @@ -1854,7 +1856,7 @@ {"ZipPlugin", "primitiveInflateDecompressBlock\000\002", (void*)primitiveInflateDecompressBlock}, {"ZipPlugin", "primitiveUpdateAdler32\000\001", (void*)primitiveUpdateAdler32}, {"ZipPlugin", "primitiveUpdateGZipCrc32\000\001", (void*)primitiveUpdateGZipCrc32}, - {"ZipPlugin", "primitiveZipSendBlock\000\002", (void*)primitiveZipSendBlock}, + {"ZipPlugin", "primitiveZipSendBlock\000\004", (void*)primitiveZipSendBlock}, {"ZipPlugin", "setInterpreter", (void*)setInterpreter}, {NULL, NULL, NULL} }; @@ -1866,6 +1868,6 @@ signed char primitiveInflateDecompressBlockAccessorDepth = 2; signed char primitiveUpdateAdler32AccessorDepth = 1; signed char primitiveUpdateGZipCrc32AccessorDepth = 1; -signed char primitiveZipSendBlockAccessorDepth = 2; +signed char primitiveZipSendBlockAccessorDepth = 4; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 + CCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-17 20:13:47 UTC (rev 3347) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-17 23:03:01 UTC (rev 3348) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 + CCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 + StackToRegisterMappingCogit VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -7842,7 +7842,7 @@ assert(((((usqInt) mapByte) >> AnnotationShift) == IsDisplacementX2N) || ((((usqInt) mapByte) >> AnnotationShift) == IsAnnotationExtension)); if (mapByte < (IsAnnotationExtension << AnnotationShift)) { - mcpc1 += ((mapByte) << AnnotationShift) * 4; + mcpc1 += ((mapByte - DisplacementX2N) << AnnotationShift) * 4; } } map -= 1; @@ -8769,7 +8769,7 @@ address = addressOfEndOfCaseinCPIC(((cPIC->cPICNumCases)) - 1, cPIC); size = generateInstructionsAt(address); end = outputInstructionsAt(address); - flushICacheFromto(processor, address, (((sqInt)cPIC)) + closedPICSize); + flushICacheFromto(processor, ((sqInt)cPIC), (((sqInt)cPIC)) + closedPICSize); (cPIC->cPICNumCases = ((cPIC->cPICNumCases)) + 1); return 0; } @@ -9618,7 +9618,7 @@ { sqInt classIndex; sqInt i; - usqInt pc; + sqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -9828,6 +9828,7 @@ assert(((pic->cPICNumCases)) == numCases); assert((callTargetFromReturnAddress(backEnd, (((sqInt)pic)) + missOffset)) == (picAbortTrampolineFor(numArgs))); assert(size == (roundUpLength(size))); + flushICacheFromto(processor, ((usqInt)pic), (((usqInt)pic)) + size); return pic; } @@ -9880,6 +9881,7 @@ : 0)); assert((callTargetFromReturnAddress(backEnd, (((sqInt)method)) + missOffset)) == (methodAbortTrampolineFor((method->cmNumArgs)))); assert(size == (roundUpLength(size))); + flushICacheFromto(processor, ((usqInt)method), (((usqInt)method)) + size); return method; } @@ -9905,6 +9907,7 @@ assert(((pic->cmNumArgs)) == numArgs); assert((callTargetFromReturnAddress(backEnd, (((sqInt)pic)) + missOffset)) == (picAbortTrampolineFor(numArgs))); assert(size == (roundUpLength(size))); + flushICacheFromto(processor, ((usqInt)pic), (((usqInt)pic)) + size); return pic; } @@ -9937,7 +9940,7 @@ annotation = ((usqInt) mapByte) >> AnnotationShift; if (annotation != IsAnnotationExtension) { mcpc += 4 * ((annotation == IsDisplacementX2N - ? (mapByte) << AnnotationShift + ? (mapByte - DisplacementX2N) << AnnotationShift : mapByte & DisplacementMask)); } if (mcpc >= targetMcpc) { @@ -10028,7 +10031,7 @@ } else { if (mapByte < (IsAnnotationExtension << AnnotationShift)) { - mcpc += ((mapByte) << AnnotationShift) * 4; + mcpc += ((mapByte - DisplacementX2N) << AnnotationShift) * 4; } } map -= 1; @@ -10306,6 +10309,7 @@ /* begin RetN: */ genoperand(RetN, 0); @@ Diff output truncated at 50000 characters. @@

4 3

[commit][3349] CogVM source as per VMMaker.oscog-eem.1313
by commits＠squeakvm.org 18 May '15

18 May '15

Revision: 3349 Author: eliot Date: 2015-05-17 18:20:04 -0700 (Sun, 17 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1313 Make accessor depth calculation more accurate by not considering fetchInteger:ofObject: and arraySize: et al as object accessors. Make the read-before-written initializer safer, only initialzing simple types. Modified Paths: -------------- branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nsspursrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/CameraPlugin/CameraPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c branches/Cog/src/plugins/UnicodePlugin/UnicodePlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/src/plugins/WeDoPlugin/WeDoPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - AsynchFilePlugin VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + AsynchFilePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -102,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.1035 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.1313 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.1035 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.1313 (e)" #endif ; static void * sCOAFfn; @@ -490,10 +490,10 @@ {"AsynchFilePlugin", "moduleUnloaded", (void*)moduleUnloaded}, {"AsynchFilePlugin", "primitiveAsyncFileClose\000\000", (void*)primitiveAsyncFileClose}, {"AsynchFilePlugin", "primitiveAsyncFileOpen\000\000", (void*)primitiveAsyncFileOpen}, - {"AsynchFilePlugin", "primitiveAsyncFileReadResult\000\001", (void*)primitiveAsyncFileReadResult}, + {"AsynchFilePlugin", "primitiveAsyncFileReadResult\000\000", (void*)primitiveAsyncFileReadResult}, {"AsynchFilePlugin", "primitiveAsyncFileReadStart\000\000", (void*)primitiveAsyncFileReadStart}, {"AsynchFilePlugin", "primitiveAsyncFileWriteResult\000\000", (void*)primitiveAsyncFileWriteResult}, - {"AsynchFilePlugin", "primitiveAsyncFileWriteStart\000\001", (void*)primitiveAsyncFileWriteStart}, + {"AsynchFilePlugin", "primitiveAsyncFileWriteStart\000\000", (void*)primitiveAsyncFileWriteStart}, {"AsynchFilePlugin", "setInterpreter", (void*)setInterpreter}, {"AsynchFilePlugin", "shutdownModule\000\377", (void*)shutdownModule}, {NULL, NULL, NULL} @@ -503,9 +503,9 @@ signed char primitiveAsyncFileCloseAccessorDepth = 0; signed char primitiveAsyncFileOpenAccessorDepth = 0; -signed char primitiveAsyncFileReadResultAccessorDepth = 1; +signed char primitiveAsyncFileReadResultAccessorDepth = 0; signed char primitiveAsyncFileReadStartAccessorDepth = 0; signed char primitiveAsyncFileWriteResultAccessorDepth = 0; -signed char primitiveAsyncFileWriteStartAccessorDepth = 1; +signed char primitiveAsyncFileWriteStartAccessorDepth = 0; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - BalloonEnginePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + BalloonEnginePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -836,9 +836,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.1311 (i)" + "B2DPlugin VMMaker.oscog-eem.1313 (i)" #else - "B2DPlugin VMMaker.oscog-eem.1311 (e)" + "B2DPlugin VMMaker.oscog-eem.1313 (e)" #endif ; static int* objBuffer; @@ -11962,7 +11962,6 @@ { sqInt aaLevel; - aaLevel = 0; if (level >= 4) { aaLevel = 4; } @@ -14265,12 +14264,12 @@ {"B2DPlugin", "primitiveNeedsFlush\000\002", (void*)primitiveNeedsFlush}, {"B2DPlugin", "primitiveNeedsFlushPut\000\002", (void*)primitiveNeedsFlushPut}, {"B2DPlugin", "primitiveNextActiveEdgeEntry\000\002", (void*)primitiveNextActiveEdgeEntry}, - {"B2DPlugin", "primitiveNextFillEntry\000\004", (void*)primitiveNextFillEntry}, + {"B2DPlugin", "primitiveNextFillEntry\000\003", (void*)primitiveNextFillEntry}, {"B2DPlugin", "primitiveNextGlobalEdgeEntry\000\002", (void*)primitiveNextGlobalEdgeEntry}, {"B2DPlugin", "primitiveRegisterExternalEdge\000\002", (void*)primitiveRegisterExternalEdge}, {"B2DPlugin", "primitiveRegisterExternalFill\000\002", (void*)primitiveRegisterExternalFill}, - {"B2DPlugin", "primitiveRenderImage\000\004", (void*)primitiveRenderImage}, - {"B2DPlugin", "primitiveRenderScanline\000\004", (void*)primitiveRenderScanline}, + {"B2DPlugin", "primitiveRenderImage\000\003", (void*)primitiveRenderImage}, + {"B2DPlugin", "primitiveRenderScanline\000\003", (void*)primitiveRenderScanline}, {"B2DPlugin", "primitiveSetAALevel\000\002", (void*)primitiveSetAALevel}, {"B2DPlugin", "primitiveSetBitBltPlugin\000\001", (void*)primitiveSetBitBltPlugin}, {"B2DPlugin", "primitiveSetClipRect\000\002", (void*)primitiveSetClipRect}, @@ -14314,12 +14313,12 @@ signed char primitiveNeedsFlushAccessorDepth = 2; signed char primitiveNeedsFlushPutAccessorDepth = 2; signed char primitiveNextActiveEdgeEntryAccessorDepth = 2; -signed char primitiveNextFillEntryAccessorDepth = 4; +signed char primitiveNextFillEntryAccessorDepth = 3; signed char primitiveNextGlobalEdgeEntryAccessorDepth = 2; signed char primitiveRegisterExternalEdgeAccessorDepth = 2; signed char primitiveRegisterExternalFillAccessorDepth = 2; -signed char primitiveRenderImageAccessorDepth = 4; -signed char primitiveRenderScanlineAccessorDepth = 4; +signed char primitiveRenderImageAccessorDepth = 3; +signed char primitiveRenderScanlineAccessorDepth = 3; signed char primitiveSetAALevelAccessorDepth = 2; signed char primitiveSetBitBltPluginAccessorDepth = 1; signed char primitiveSetClipRectAccessorDepth = 2; Modified: branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - BitBltSimulation VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + BitBltSimulation VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -344,9 +344,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.1311 (i)" + "BitBltPlugin VMMaker.oscog-eem.1313 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.1311 (e)" + "BitBltPlugin VMMaker.oscog-eem.1313 (e)" #endif ; static sqInt noHalftone; @@ -5027,7 +5027,6 @@ sqInt val; sqInt _return_value; - val = 0; colorA = (BytesPerOop == 4 ? positive32BitValueOf(stackValue(2)) : positive64BitValueOf(stackValue(2))); @@ -8182,7 +8181,7 @@ {"BitBltPlugin", "primitiveCopyBits\000\003", (void*)primitiveCopyBits}, {"BitBltPlugin", "primitiveDisplayString\000\003", (void*)primitiveDisplayString}, {"BitBltPlugin", "primitiveDrawLoop\000\003", (void*)primitiveDrawLoop}, - {"BitBltPlugin", "primitivePixelValueAt\000\002", (void*)primitivePixelValueAt}, + {"BitBltPlugin", "primitivePixelValueAt\000\001", (void*)primitivePixelValueAt}, {"BitBltPlugin", "primitiveWarpBits\000\003", (void*)primitiveWarpBits}, {"BitBltPlugin", "setInterpreter", (void*)setInterpreter}, {NULL, NULL, NULL} @@ -8195,7 +8194,7 @@ signed char primitiveCopyBitsAccessorDepth = 3; signed char primitiveDisplayStringAccessorDepth = 3; signed char primitiveDrawLoopAccessorDepth = 3; -signed char primitivePixelValueAtAccessorDepth = 2; +signed char primitivePixelValueAtAccessorDepth = 1; signed char primitiveWarpBitsAccessorDepth = 3; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c =================================================================== --- branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - DSAPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + DSAPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -91,9 +91,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims VMMaker.oscog-eem.1311 (i)" + "DSAPrims VMMaker.oscog-eem.1313 (i)" #else - "DSAPrims VMMaker.oscog-eem.1311 (e)" + "DSAPrims VMMaker.oscog-eem.1313 (e)" #endif ; static sqInt remainderDigitCount; @@ -721,7 +721,7 @@ void* DSAPrims_exports[][3] = { {"DSAPrims", "getModuleName", (void*)getModuleName}, - {"DSAPrims", "primitiveBigDivide\000\002", (void*)primitiveBigDivide}, + {"DSAPrims", "primitiveBigDivide\000\001", (void*)primitiveBigDivide}, {"DSAPrims", "primitiveBigMultiply\000\001", (void*)primitiveBigMultiply}, {"DSAPrims", "primitiveExpandBlock\000\001", (void*)primitiveExpandBlock}, {"DSAPrims", "primitiveHashBlock\000\001", (void*)primitiveHashBlock}, @@ -733,7 +733,7 @@ #else /* ifdef SQ_BUILTIN_PLUGIN */ -signed char primitiveBigDivideAccessorDepth = 2; +signed char primitiveBigDivideAccessorDepth = 1; signed char primitiveBigMultiplyAccessorDepth = 1; signed char primitiveExpandBlockAccessorDepth = 1; signed char primitiveHashBlockAccessorDepth = 1; Modified: branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - FilePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + FilePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -177,9 +177,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.1311 (i)" + "FilePlugin VMMaker.oscog-eem.1313 (i)" #else - "FilePlugin VMMaker.oscog-eem.1311 (e)" + "FilePlugin VMMaker.oscog-eem.1313 (e)" #endif ; static void * sCCPfn; @@ -471,11 +471,6 @@ sqInt requestedName; sqInt status; - createDate = 0; - dirFlag = 0; - entryNameSize = 0; - fileSize = 0; - modifiedDate = 0; requestedName = stackValue(0); pathName = stackValue(1); if (!(isBytes(pathName))) { @@ -581,11 +576,6 @@ sqInt pathNameSize; sqInt status; - createDate = 0; - dirFlag = 0; - entryNameSize = 0; - fileSize = 0; - modifiedDate = 0; index = stackIntegerValue(0); pathName = stackValue(1); if (!(isBytes(pathName))) { @@ -793,7 +783,6 @@ sqInt objectPointer; squeakFileOffsetType position; - position = 0; /* begin fileValueOf: */ objectPointer = stackValue(0); if (!((isBytes(objectPointer)) @@ -956,7 +945,6 @@ sqInt objectPointer; squeakFileOffsetType size; - size = 0; /* begin fileValueOf: */ objectPointer = stackValue(0); if (!((isBytes(objectPointer)) Modified: branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - FloatArrayPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + FloatArrayPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -109,9 +109,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin VMMaker.oscog-eem.983 (i)" + "FloatArrayPlugin VMMaker.oscog-eem.1313 (i)" #else - "FloatArrayPlugin VMMaker.oscog-eem.983 (e)" + "FloatArrayPlugin VMMaker.oscog-eem.1313 (e)" #endif ; @@ -717,43 +717,43 @@ void* FloatArrayPlugin_exports[][3] = { {"FloatArrayPlugin", "getModuleName", (void*)getModuleName}, - {"FloatArrayPlugin", "primitiveAddFloatArray\000\001", (void*)primitiveAddFloatArray}, - {"FloatArrayPlugin", "primitiveAddScalar\000\001", (void*)primitiveAddScalar}, + {"FloatArrayPlugin", "primitiveAddFloatArray\000\000", (void*)primitiveAddFloatArray}, + {"FloatArrayPlugin", "primitiveAddScalar\000\000", (void*)primitiveAddScalar}, {"FloatArrayPlugin", "primitiveAt\000\001", (void*)primitiveAt}, {"FloatArrayPlugin", "primitiveAtPut\000\001", (void*)primitiveAtPut}, - {"FloatArrayPlugin", "primitiveDivFloatArray\000\001", (void*)primitiveDivFloatArray}, - {"FloatArrayPlugin", "primitiveDivScalar\000\001", (void*)primitiveDivScalar}, - {"FloatArrayPlugin", "primitiveDotProduct\000\001", (void*)primitiveDotProduct}, - {"FloatArrayPlugin", "primitiveEqual\000\001", (void*)primitiveEqual}, - {"FloatArrayPlugin", "primitiveHashArray\000\001", (void*)primitiveHashArray}, - {"FloatArrayPlugin", "primitiveLength\000\001", (void*)primitiveLength}, - {"FloatArrayPlugin", "primitiveMulFloatArray\000\001", (void*)primitiveMulFloatArray}, - {"FloatArrayPlugin", "primitiveMulScalar\000\001", (void*)primitiveMulScalar}, - {"FloatArrayPlugin", "primitiveNormalize\000\001", (void*)primitiveNormalize}, - {"FloatArrayPlugin", "primitiveSubFloatArray\000\001", (void*)primitiveSubFloatArray}, - {"FloatArrayPlugin", "primitiveSubScalar\000\001", (void*)primitiveSubScalar}, - {"FloatArrayPlugin", "primitiveSum\000\001", (void*)primitiveSum}, + {"FloatArrayPlugin", "primitiveDivFloatArray\000\000", (void*)primitiveDivFloatArray}, + {"FloatArrayPlugin", "primitiveDivScalar\000\000", (void*)primitiveDivScalar}, + {"FloatArrayPlugin", "primitiveDotProduct\000\000", (void*)primitiveDotProduct}, + {"FloatArrayPlugin", "primitiveEqual\000\000", (void*)primitiveEqual}, + {"FloatArrayPlugin", "primitiveHashArray\000\000", (void*)primitiveHashArray}, + {"FloatArrayPlugin", "primitiveLength\000\000", (void*)primitiveLength}, + {"FloatArrayPlugin", "primitiveMulFloatArray\000\000", (void*)primitiveMulFloatArray}, + {"FloatArrayPlugin", "primitiveMulScalar\000\000", (void*)primitiveMulScalar}, + {"FloatArrayPlugin", "primitiveNormalize\000\000", (void*)primitiveNormalize}, + {"FloatArrayPlugin", "primitiveSubFloatArray\000\000", (void*)primitiveSubFloatArray}, + {"FloatArrayPlugin", "primitiveSubScalar\000\000", (void*)primitiveSubScalar}, + {"FloatArrayPlugin", "primitiveSum\000\000", (void*)primitiveSum}, {"FloatArrayPlugin", "setInterpreter", (void*)setInterpreter}, {NULL, NULL, NULL} }; #else /* ifdef SQ_BUILTIN_PLUGIN */ -signed char primitiveAddFloatArrayAccessorDepth = 1; -signed char primitiveAddScalarAccessorDepth = 1; +signed char primitiveAddFloatArrayAccessorDepth = 0; +signed char primitiveAddScalarAccessorDepth = 0; signed char primitiveAtAccessorDepth = 1; signed char primitiveAtPutAccessorDepth = 1; -signed char primitiveDivFloatArrayAccessorDepth = 1; -signed char primitiveDivScalarAccessorDepth = 1; -signed char primitiveDotProductAccessorDepth = 1; -signed char primitiveEqualAccessorDepth = 1; -signed char primitiveHashArrayAccessorDepth = 1; -signed char primitiveLengthAccessorDepth = 1; -signed char primitiveMulFloatArrayAccessorDepth = 1; -signed char primitiveMulScalarAccessorDepth = 1; -signed char primitiveNormalizeAccessorDepth = 1; -signed char primitiveSubFloatArrayAccessorDepth = 1; -signed char primitiveSubScalarAccessorDepth = 1; -signed char primitiveSumAccessorDepth = 1; +signed char primitiveDivFloatArrayAccessorDepth = 0; +signed char primitiveDivScalarAccessorDepth = 0; +signed char primitiveDotProductAccessorDepth = 0; +signed char primitiveEqualAccessorDepth = 0; +signed char primitiveHashArrayAccessorDepth = 0; +signed char primitiveLengthAccessorDepth = 0; +signed char primitiveMulFloatArrayAccessorDepth = 0; +signed char primitiveMulScalarAccessorDepth = 0; +signed char primitiveNormalizeAccessorDepth = 0; +signed char primitiveSubFloatArrayAccessorDepth = 0; +signed char primitiveSubScalarAccessorDepth = 0; +signed char primitiveSumAccessorDepth = 0; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -223,9 +223,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.1072 (i)" + "IA32ABI VMMaker.oscog-eem.1313 (i)" #else - "IA32ABI VMMaker.oscog-eem.1072 (e)" + "IA32ABI VMMaker.oscog-eem.1313 (e)" #endif ; @@ -2116,7 +2116,7 @@ {"IA32ABI", "isAlien", (void*)isAlien}, {"IA32ABI", "primAddressField\000\000", (void*)primAddressField}, {"IA32ABI", "primAddressFieldPut\000\000", (void*)primAddressFieldPut}, - {"IA32ABI", "primAlienReplace\000\001", (void*)primAlienReplace}, + {"IA32ABI", "primAlienReplace\000\000", (void*)primAlienReplace}, {"IA32ABI", "primAllocateExecutablePage\000\377", (void*)primAllocateExecutablePage}, {"IA32ABI", "primBoxedFree\000\001", (void*)primBoxedFree}, {"IA32ABI", "primCallOutDoubleReturn\000\000", (void*)primCallOutDoubleReturn}, @@ -2167,7 +2167,7 @@ signed char primAddressFieldAccessorDepth = 0; signed char primAddressFieldPutAccessorDepth = 0; -signed char primAlienReplaceAccessorDepth = 1; +signed char primAlienReplaceAccessorDepth = 0; signed char primBoxedFreeAccessorDepth = 1; signed char primCallOutDoubleReturnAccessorDepth = 0; signed char primCallOutFloatReturnAccessorDepth = 0; Modified: branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - LargeIntegersPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + LargeIntegersPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -174,9 +174,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.1311 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.1313 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.1311 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.1313 (e)" #endif ; static const int orOpIndex = 1; @@ -3692,12 +3692,12 @@ {"LargeIntegers", "primCheckIfCModuleExists\000\377", (void*)primCheckIfCModuleExists}, {"LargeIntegers", "primDigitAdd\000\002", (void*)primDigitAdd}, {"LargeIntegers", "primDigitAddWith\000\002", (void*)primDigitAddWith}, - {"LargeIntegers", "primDigitBitAnd\000\002", (void*)primDigitBitAnd}, - {"LargeIntegers", "primDigitBitLogicWithOp\000\002", (void*)primDigitBitLogicWithOp}, - {"LargeIntegers", "primDigitBitOr\000\002", (void*)primDigitBitOr}, - {"LargeIntegers", "primDigitBitShift\000\004", (void*)primDigitBitShift}, - {"LargeIntegers", "primDigitBitShiftMagnitude\000\004", (void*)primDigitBitShiftMagnitude}, - {"LargeIntegers", "primDigitBitXor\000\002", (void*)primDigitBitXor}, + {"LargeIntegers", "primDigitBitAnd\000\001", (void*)primDigitBitAnd}, + {"LargeIntegers", "primDigitBitLogicWithOp\000\001", (void*)primDigitBitLogicWithOp}, + {"LargeIntegers", "primDigitBitOr\000\001", (void*)primDigitBitOr}, + {"LargeIntegers", "primDigitBitShift\000\003", (void*)primDigitBitShift}, + {"LargeIntegers", "primDigitBitShiftMagnitude\000\003", (void*)primDigitBitShiftMagnitude}, + {"LargeIntegers", "primDigitBitXor\000\001", (void*)primDigitBitXor}, {"LargeIntegers", "primDigitCompare\000\001", (void*)primDigitCompare}, {"LargeIntegers", "primDigitCompareWith\000\001", (void*)primDigitCompareWith}, {"LargeIntegers", "primDigitDivNegative\000\004", (void*)primDigitDivNegative}, @@ -3707,12 +3707,12 @@ {"LargeIntegers", "primDigitSubtract\000\002", (void*)primDigitSubtract}, {"LargeIntegers", "primDigitSubtractWith\000\002", (void*)primDigitSubtractWith}, {"LargeIntegers", "primGetModuleName\000\377", (void*)primGetModuleName}, - {"LargeIntegers", "primMontgomeryTimesModulo\000\002", (void*)primMontgomeryTimesModulo}, + {"LargeIntegers", "primMontgomeryTimesModulo\000\001", (void*)primMontgomeryTimesModulo}, {"LargeIntegers", "primNormalize\000\001", (void*)primNormalize}, {"LargeIntegers", "primNormalizeNegative\000\001", (void*)primNormalizeNegative}, {"LargeIntegers", "primNormalizePositive\000\001", (void*)primNormalizePositive}, {"LargeIntegers", "setInterpreter", (void*)setInterpreter}, - {"LargeIntegers", "_primDigitBitShift\000\004", (void*)_primDigitBitShift}, + {"LargeIntegers", "_primDigitBitShift\000\003", (void*)_primDigitBitShift}, {NULL, NULL, NULL} }; @@ -3722,12 +3722,12 @@ signed char primAsLargeIntegerAccessorDepth = 1; signed char primDigitAddAccessorDepth = 2; signed char primDigitAddWithAccessorDepth = 2; -signed char primDigitBitAndAccessorDepth = 2; -signed char primDigitBitLogicWithOpAccessorDepth = 2; -signed char primDigitBitOrAccessorDepth = 2; -signed char primDigitBitShiftAccessorDepth = 4; -signed char primDigitBitShiftMagnitudeAccessorDepth = 4; -signed char primDigitBitXorAccessorDepth = 2; +signed char primDigitBitAndAccessorDepth = 1; +signed char primDigitBitLogicWithOpAccessorDepth = 1; +signed char primDigitBitOrAccessorDepth = 1; +signed char primDigitBitShiftAccessorDepth = 3; +signed char primDigitBitShiftMagnitudeAccessorDepth = 3; +signed char primDigitBitXorAccessorDepth = 1; signed char primDigitCompareAccessorDepth = 1; signed char primDigitCompareWithAccessorDepth = 1; signed char primDigitDivNegativeAccessorDepth = 4; @@ -3736,10 +3736,10 @@ signed char primDigitMultiplyWithNegativeAccessorDepth = 2; signed char primDigitSubtractAccessorDepth = 2; signed char primDigitSubtractWithAccessorDepth = 2; -signed char primMontgomeryTimesModuloAccessorDepth = 2; +signed char primMontgomeryTimesModuloAccessorDepth = 1; signed char primNormalizeAccessorDepth = 1; signed char primNormalizeNegativeAccessorDepth = 1; signed char primNormalizePositiveAccessorDepth = 1; -signed char _primDigitBitShiftAccessorDepth = 4; +signed char _primDigitBitShiftAccessorDepth = 3; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - RePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + RePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -123,9 +123,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.1311 (i)" + "RePlugin VMMaker.oscog-eem.1313 (i)" #else - "RePlugin VMMaker.oscog-eem.1311 (e)" + "RePlugin VMMaker.oscog-eem.1313 (e)" #endif ; static int netMemory = 0; @@ -615,7 +615,7 @@ {"RePlugin", "primNetMemory\000\377", (void*)primNetMemory}, {"RePlugin", "primNumAllocs\000\377", (void*)primNumAllocs}, {"RePlugin", "primNumFrees\000\377", (void*)primNumFrees}, - {"RePlugin", "primPCRECompile\000\001", (void*)primPCRECompile}, + {"RePlugin", "primPCRECompile\000\000", (void*)primPCRECompile}, {"RePlugin", "primPCREExec\000\001", (void*)primPCREExec}, {"RePlugin", "primPCREExecfromto\000\001", (void*)primPCREExecfromto}, {"RePlugin", "primPCRENumSubPatterns\000\000", (void*)primPCRENumSubPatterns}, @@ -625,7 +625,7 @@ #else /* ifdef SQ_BUILTIN_PLUGIN */ -signed char primPCRECompileAccessorDepth = 1; +signed char primPCRECompileAccessorDepth = 0; signed char primPCREExecAccessorDepth = 1; signed char primPCREExecfromtoAccessorDepth = 1; signed char primPCRENumSubPatternsAccessorDepth = 0; Modified: branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - SocketPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + SocketPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -176,9 +176,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SocketPlugin VMMaker.oscog-eem.1311 (i)" + "SocketPlugin VMMaker.oscog-eem.1313 (i)" #else - "SocketPlugin VMMaker.oscog-eem.1311 (e)" + "SocketPlugin VMMaker.oscog-eem.1313 (e)" #endif ; static void * sCCLOPfn; @@ -2252,7 +2252,7 @@ {"SocketPlugin", "primitiveResolverGetAddressInfoResult\000\377", (void*)primitiveResolverGetAddressInfoResult}, {"SocketPlugin", "primitiveResolverGetAddressInfoSize\000\377", (void*)primitiveResolverGetAddressInfoSize}, {"SocketPlugin", "primitiveResolverGetAddressInfoType\000\377", (void*)primitiveResolverGetAddressInfoType}, - {"SocketPlugin", "primitiveResolverGetNameInfo\000\001", (void*)primitiveResolverGetNameInfo}, + {"SocketPlugin", "primitiveResolverGetNameInfo\000\000", (void*)primitiveResolverGetNameInfo}, {"SocketPlugin", "primitiveResolverGetNameInfoHostResult\000\377", (void*)primitiveResolverGetNameInfoHostResult}, {"SocketPlugin", "primitiveResolverGetNameInfoHostSize\000\377", (void*)primitiveResolverGetNameInfoHostSize}, {"SocketPlugin", "primitiveResolverGetNameInfoServiceResult\000\377", (void*)primitiveResolverGetNameInfoServiceResult}, @@ -2267,40 +2267,40 @@ {"SocketPlugin", "primitiveSocketAbortConnection\000\000", (void*)primitiveSocketAbortConnection}, {"SocketPlugin", "primitiveSocketAccept\000\000", (void*)primitiveSocketAccept}, {"SocketPlugin", "primitiveSocketAccept3Semaphores\000\000", (void*)primitiveSocketAccept3Semaphores}, - {"SocketPlugin", "primitiveSocketAddressGetPort\000\001", (void*)primitiveSocketAddressGetPort}, - {"SocketPlugin", "primitiveSocketAddressSetPort\000\001", (void*)primitiveSocketAddressSetPort}, - {"SocketPlugin", "primitiveSocketBindTo\000\001", (void*)primitiveSocketBindTo}, + {"SocketPlugin", "primitiveSocketAddressGetPort\000\000", (void*)primitiveSocketAddressGetPort}, + {"SocketPlugin", "primitiveSocketAddressSetPort\000\000", (void*)primitiveSocketAddressSetPort}, + {"SocketPlugin", "primitiveSocketBindTo\000\000", (void*)primitiveSocketBindTo}, {"SocketPlugin", "primitiveSocketBindToPort\000\000", (void*)primitiveSocketBindToPort}, {"SocketPlugin", "primitiveSocketCloseConnection\000\000", (void*)primitiveSocketCloseConnection}, {"SocketPlugin", "primitiveSocketConnectionStatus\000\000", (void*)primitiveSocketConnectionStatus}, - {"SocketPlugin", "primitiveSocketConnectTo\000\001", (void*)primitiveSocketConnectTo}, + {"SocketPlugin", "primitiveSocketConnectTo\000\000", (void*)primitiveSocketConnectTo}, {"SocketPlugin", "primitiveSocketConnectToPort\000\000", (void*)primitiveSocketConnectToPort}, {"SocketPlugin", "primitiveSocketCreate\000\000", (void*)primitiveSocketCreate}, {"SocketPlugin", "primitiveSocketCreate3Semaphores\000\000", (void*)primitiveSocketCreate3Semaphores}, {"SocketPlugin", "primitiveSocketCreateRAW\000\000", (void*)primitiveSocketCreateRAW}, {"SocketPlugin", "primitiveSocketDestroy\000\000", (void*)primitiveSocketDestroy}, {"SocketPlugin", "primitiveSocketError\000\000", (void*)primitiveSocketError}, - {"SocketPlugin", "primitiveSocketGetOptions\000\001", (void*)primitiveSocketGetOptions}, + {"SocketPlugin", "primitiveSocketGetOptions\000\000", (void*)primitiveSocketGetOptions}, {"SocketPlugin", "primitiveSocketListenOnPort\000\000", (void*)primitiveSocketListenOnPort}, {"SocketPlugin", "primitiveSocketListenOnPortBacklog\000\000", (void*)primitiveSocketListenOnPortBacklog}, {"SocketPlugin", "primitiveSocketListenOnPortBacklogInterface\000\000", (void*)primitiveSocketListenOnPortBacklogInterface}, {"SocketPlugin", "primitiveSocketListenWithBacklog\000\000", (void*)primitiveSocketListenWithBacklog}, {"SocketPlugin", "primitiveSocketListenWithOrWithoutBacklog\000\000", (void*)primitiveSocketListenWithOrWithoutBacklog}, {"SocketPlugin", "primitiveSocketLocalAddress\000\000", (void*)primitiveSocketLocalAddress}, - {"SocketPlugin", "primitiveSocketLocalAddressResult\000\001", (void*)primitiveSocketLocalAddressResult}, + {"SocketPlugin", "primitiveSocketLocalAddressResult\000\000", (void*)primitiveSocketLocalAddressResult}, {"SocketPlugin", "primitiveSocketLocalAddressSize\000\000", (void*)primitiveSocketLocalAddressSize}, {"SocketPlugin", "primitiveSocketLocalPort\000\000", (void*)primitiveSocketLocalPort}, {"SocketPlugin", "primitiveSocketReceiveDataAvailable\000\000", (void*)primitiveSocketReceiveDataAvailable}, {"SocketPlugin", "primitiveSocketReceiveDataBufCount\000\000", (void*)primitiveSocketReceiveDataBufCount}, {"SocketPlugin", "primitiveSocketReceiveUDPDataBufCount\000\000", (void*)primitiveSocketReceiveUDPDataBufCount}, {"SocketPlugin", "primitiveSocketRemoteAddress\000\000", (void*)primitiveSocketRemoteAddress}, - {"SocketPlugin", "primitiveSocketRemoteAddressResult\000\001", (void*)primitiveSocketRemoteAddressResult}, + {"SocketPlugin", "primitiveSocketRemoteAddressResult\000\000", (void*)primitiveSocketRemoteAddressResult}, {"SocketPlugin", "primitiveSocketRemoteAddressSize\000\000", (void*)primitiveSocketRemoteAddressSize}, {"SocketPlugin", "primitiveSocketRemotePort\000\000", (void*)primitiveSocketRemotePort}, {"SocketPlugin", "primitiveSocketSendDataBufCount\000\000", (void*)primitiveSocketSendDataBufCount}, {"SocketPlugin", "primitiveSocketSendDone\000\000", (void*)primitiveSocketSendDone}, {"SocketPlugin", "primitiveSocketSendUDPDataBufCount\000\000", (void*)primitiveSocketSendUDPDataBufCount}, - {"SocketPlugin", "primitiveSocketSetOptions\000\001", (void*)primitiveSocketSetOptions}, + {"SocketPlugin", "primitiveSocketSetOptions\000\000", (void*)primitiveSocketSetOptions}, {"SocketPlugin", "setInterpreter", (void*)setInterpreter}, {"SocketPlugin", "shutdownModule\000\377", (void*)shutdownModule}, {NULL, NULL, NULL} @@ -2310,43 +2310,43 @@ signed char primitiveInitializeNetworkAccessorDepth = 0; signed char primitiveResolverGetAddressInfoAccessorDepth = 0; -signed char primitiveResolverGetNameInfoAccessorDepth = 1; +signed char primitiveResolverGetNameInfoAccessorDepth = 0; signed char primitiveSocketAbortConnectionAccessorDepth = 0; signed char primitiveSocketAcceptAccessorDepth = 0; signed char primitiveSocketAccept3SemaphoresAccessorDepth = 0; -signed char primitiveSocketAddressGetPortAccessorDepth = 1; -signed char primitiveSocketAddressSetPortAccessorDepth = 1; -signed char primitiveSocketBindToAccessorDepth = 1; +signed char primitiveSocketAddressGetPortAccessorDepth = 0; +signed char primitiveSocketAddressSetPortAccessorDepth = 0; +signed char primitiveSocketBindToAccessorDepth = 0; signed char primitiveSocketBindToPortAccessorDepth = 0; signed char primitiveSocketCloseConnectionAccessorDepth = 0; signed char primitiveSocketConnectionStatusAccessorDepth = 0; -signed char primitiveSocketConnectToAccessorDepth = 1; +signed char primitiveSocketConnectToAccessorDepth = 0; signed char primitiveSocketConnectToPortAccessorDepth = 0; signed char primitiveSocketCreateAccessorDepth = 0; signed char primitiveSocketCreate3SemaphoresAccessorDepth = 0; signed char primitiveSocketCreateRAWAccessorDepth = 0; signed char primitiveSocketDestroyAccessorDepth = 0; signed char primitiveSocketErrorAccessorDepth = 0; -signed char primitiveSocketGetOptionsAccessorDepth = 1; +signed char primitiveSocketGetOptionsAccessorDepth = 0; signed char primitiveSocketListenOnPortAccessorDepth = 0; signed char primitiveSocketListenOnPortBacklogAccessorDepth = 0; signed char primitiveSocketListenOnPortBacklogInterfaceAccessorDepth = 0; signed char primitiveSocketListenWithBacklogAccessorDepth = 0; signed char primitiveSocketListenWithOrWithoutBacklogAccessorDepth = 0; signed char primitiveSocketLocalAddressAccessorDepth = 0; -signed char primitiveSocketLocalAddressResultAccessorDepth = 1; +signed char primitiveSocketLocalAddressResultAccessorDepth = 0; signed char primitiveSocketLocalAddressSizeAccessorDepth = 0; signed char primitiveSocketLocalPortAccessorDepth = 0; signed char primitiveSocketReceiveDataAvailableAccessorDepth = 0; signed char primitiveSocketReceiveDataBufCountAccessorDepth = 0; signed char primitiveSocketReceiveUDPDataBufCountAccessorDepth = 0; signed char primitiveSocketRemoteAddressAccessorDepth = 0; -signed char primitiveSocketRemoteAddressResultAccessorDepth = 1; +signed char primitiveSocketRemoteAddressResultAccessorDepth = 0; signed char primitiveSocketRemoteAddressSizeAccessorDepth = 0; signed char primitiveSocketRemotePortAccessorDepth = 0; signed char primitiveSocketSendDataBufCountAccessorDepth = 0; signed char primitiveSocketSendDoneAccessorDepth = 0; signed char primitiveSocketSendUDPDataBufCountAccessorDepth = 0; -signed char primitiveSocketSetOptionsAccessorDepth = 1; +signed char primitiveSocketSetOptionsAccessorDepth = 0; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 */ @@ -1221,7 +1221,6 @@ sqInt SigStackSize; stack_t sigstack; - sigstack = 0; if (useSignalStack >= 0) { return useSignalStack != 0; } @@ -1457,8 +1456,6 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; - readerIOStream = 0; - writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1520,8 +1517,6 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; - readerIOStream = 0; - writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -2446,8 +2441,6 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; - readerIOStream = 0; - writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -2510,8 +2503,6 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; - readerIOStream = 0; - writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -4157,7 +4148,6 @@ { struct sigaction sigchldHandlerAction; - sigchldHandlerAction = 0; # if defined(SA_NOCLDSTOP) sigchldHandlerAction.sa_sigaction = reapChildProcess; @@ -4203,8 +4193,6 @@ struct sigaction oldHandlerAction; struct sigaction sigHandlerAction; - oldHandlerAction = 0; - sigHandlerAction = 0; if (!(needSigaltstack())) { return signal(signalNumber, signalHandlerAddress); } Modified: branches/Cog/nsspursrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - VMProfileLinuxSupportPlugin VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + VMProfileLinuxSupportPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 " __DATE__ ; +static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -103,9 +103,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.1064 (i)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.1313 (i)" #else - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.1064 (e)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.1313 (e)" #endif ; static sqInt numModules; @@ -343,7 +343,7 @@ void* VMProfileLinuxSupportPlugin_exports[][3] = { {"VMProfileLinuxSupportPlugin", "getModuleName", (void*)getModuleName}, - {"VMProfileLinuxSupportPlugin", "primitiveDLSymInLibrary\000\001", (void*)primitiveDLSymInLibrary}, + {"VMProfileLinuxSupportPlugin", "primitiveDLSymInLibrary\000\000", (void*)primitiveDLSymInLibrary}, {"VMProfileLinuxSupportPlugin", "primitiveExecutableModules\000\377", (void*)primitiveExecutableModules}, {"VMProfileLinuxSupportPlugin", "primitiveInterpretAddress\000\377", (void*)primitiveInterpretAddress}, {"VMProfileLinuxSupportPlugin", "setInterpreter", (void*)setInterpreter}, @@ -352,6 +352,6 @@ #else /* ifdef SQ_BUILTIN_PLUGIN */ -signed char primitiveDLSymInLibraryAccessorDepth = 1; +signed char primitiveDLSymInLibraryAccessorDepth = 0; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 */ @@ -434,7 +434,6 @@ volatile int index; struct {int count; HANDLE *handles; int semaIndex;} *threadArgs; - index = 0; threadArgs = args; count= threadArgs->count; handles= threadArgs->handles; @@ -896,8 +895,6 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; - readerIOStream = 0; - writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -959,8 +956,6 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; - readerIOStream = 0; - writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1133,7 +1128,6 @@ DWORD exitStatus; HANDLE handle; - exitStatus = 0; if (((handle = handleFrom(stackObjectValue(0)))) == null) { return null; } @@ -1459,8 +1453,6 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; - readerIOStream = 0; - writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1523,8 +1515,6 @@ FILEHANDLETYPE *writerIOStreamPtr; SQFile *writerPtr; - readerIOStream = 0; - writerIOStream = 0; /* Create the anonymous OS pipe */ @@ -1583,7 +1573,6 @@ static struct {int index; HANDLE handle;} threadArgs; DWORD threadID; - threadID = 0; index = stackIntegerValue(0); if (index >= readCharArraySize) { return primitiveFail(); @@ -1867,8 +1856,6 @@ sqInt index; struct {int index; HANDLE handle;} *threadArgs; - handle = 0; - index = 0; threadArgs = args; index = threadArgs->index; handle = threadArgs->handle; @@ -2150,7 +2137,6 @@ /* Complete setup of one handler before doing the next. Mutex will be released in the newly started thread. */ - threadID = 0; waitForThreadMutex(exitThreadMutexHandle()); threadArgs.count= arraySize; threadArgs.handles= handleArrayPointer; @@ -2372,7 +2358,7 @@ {"Win32OSProcessPlugin", "primitiveSetStdErr\000\001", (void*)primitiveSetStdErr}, {"Win32OSProcessPlugin", "primitiveSetStdIn\000\001", (void*)primitiveSetStdIn}, {"Win32OSProcessPlugin", "primitiveSetStdOut\000\001", (void*)primitiveSetStdOut}, - {"Win32OSProcessPlugin", "primitiveSetWaitForAnyProcessExitThenSignalSemaphoreWithIndex\000\002", (void*)primitiveSetWaitForAnyProcessExitThenSignalSemaphoreWithIndex}, + {"Win32OSProcessPlugin", "primitiveSetWaitForAnyProcessExitThenSignalSemaphoreWithIndex\000\001", (void*)primitiveSetWaitForAnyProcessExitThenSignalSemaphoreWithIndex}, {"Win32OSProcessPlugin", "primitiveSizeOfInt\000\377", (void*)primitiveSizeOfInt}, {"Win32OSProcessPlugin", "primitiveSizeOfPointer\000\377", (void*)primitiveSizeOfPointer}, {"Win32OSProcessPlugin", "primitiveTerminateThread\000\001", (void*)primitiveTerminateThread}, @@ -2402,7 +2388,7 @@ signed char primitiveSetStdErrAccessorDepth = 1; signed char primitiveSetStdInAccessorDepth = 1; signed char primitiveSetStdOutAccessorDepth = 1; -signed char primitiveSetWaitForAnyProcessExitThenSignalSemaphoreWithIndexAccessorDepth = 2; +signed char primitiveSetWaitForAnyProcessExitThenSignalSemaphoreWithIndexAccessorDepth = 1; signed char primitiveTerminateThreadAccessorDepth = 1; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + VMPluginCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - DeflatePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + DeflatePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; @@ -139,9 +139,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ZipPlugin VMMaker.oscog-eem.1311 (i)" + "ZipPlugin VMMaker.oscog-eem.1313 (i)" #else - "ZipPlugin VMMaker.oscog-eem.1311 (e)" + "ZipPlugin VMMaker.oscog-eem.1313 (e)" #endif ; static sqInt readStreamInstSize; @@ -1856,7 +1856,7 @@ {"ZipPlugin", "primitiveInflateDecompressBlock\000\002", (void*)primitiveInflateDecompressBlock}, {"ZipPlugin", "primitiveUpdateAdler32\000\001", (void*)primitiveUpdateAdler32}, {"ZipPlugin", "primitiveUpdateGZipCrc32\000\001", (void*)primitiveUpdateGZipCrc32}, - {"ZipPlugin", "primitiveZipSendBlock\000\004", (void*)primitiveZipSendBlock}, + {"ZipPlugin", "primitiveZipSendBlock\000\002", (void*)primitiveZipSendBlock}, {"ZipPlugin", "setInterpreter", (void*)setInterpreter}, {NULL, NULL, NULL} }; @@ -1868,6 +1868,6 @@ signed char primitiveInflateDecompressBlockAccessorDepth = 2; signed char primitiveUpdateAdler32AccessorDepth = 1; signed char primitiveUpdateGZipCrc32AccessorDepth = 1; -signed char primitiveZipSendBlockAccessorDepth = 4; +signed char primitiveZipSendBlockAccessorDepth = 2; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + CCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-17 23:03:01 UTC (rev 3348) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-18 01:20:04 UTC (rev 3349) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + CCodeGenerator VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae from - StackToRegisterMappingCogit VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 + StackToRegisterMappingCogit VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1311 uuid: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1313 uuid: f7251538-4676-49b4-bc2c-f2cfecd2a3ae " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9618,7 +9618,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -11559,7 +11559,6 @@ sqInt result; sqInt val; - val = 0; hasYoungObj = 0; hasYoungObjPtr = ((sqInt)((&hasYoungObj))); codeModified = (freedPIC = 0); @@ -11756,7 +11755,6 @@ sqInt result; sqInt val; - val = 0; hasYoungObj = 0; hasYoungObjPtr = ((sqInt)((&hasYoungObj))); codeModified = 0; @@ -11878,8 +11876,6 @@ sqInt val; sqInt val1; - val = 0; - val1 = 0; if (leakCheckFullGC()) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1313.mcz
by commits＠source.squeak.org 18 May '15

18 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1313.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1313 Author: eem Time: 17 May 2015, 5:47:58.622 pm UUID: f7251538-4676-49b4-bc2c-f2cfecd2a3ae Ancestors: VMMaker.oscog-eem.1312 Fix edge case in read-before-written initializer. =============== Diff against VMMaker.oscog-eem.1312 =============== Item was changed: ----- Method: TMethod>>removeUnusedTempsAndNilIfRequiredIn: (in category 'utilities') ----- removeUnusedTempsAndNilIfRequiredIn: aCodeGen "Remove all of the unused temps in this method. Answer a set of the references. As a side-effect introduce explicit temp := nil statements for temps that are tested for nil before necessarily being assigned." + | refs readBeforeAssigned simplyTypedLocals | - | refs readBeforeAssigned | refs := self removeUnusedTempsIn: aCodeGen. "reset the locals to be only those still referred to" locals := locals select: [:e| refs includes: e]. (locals notEmpty and: [aCodeGen pushScope: declarations + while: [simplyTypedLocals := locals select: + [:ea| + (self typeFor: ea in: aCodeGen) + ifNil: [false] + ifNotNil: [:type| aCodeGen isSimpleType: type]]. + (readBeforeAssigned := (self findReadBeforeAssignedIn: simplyTypedLocals in: aCodeGen)) notEmpty]]) ifTrue: - while: [(readBeforeAssigned := (self findReadBeforeAssignedIn: (locals select: [:ea| aCodeGen isSimpleType: (self typeFor: ea in: aCodeGen)]) - in: aCodeGen)) notEmpty]]) ifTrue: [readBeforeAssigned := readBeforeAssigned reject: [:v| | d | "don't initialize externs, arrays or the explicitly initialized." d := self declarationAt: v. (d beginsWith: 'extern') or: [(d includes: $[) or: [d includes: $=]]]. parseTree statements addAllFirst: (readBeforeAssigned asSortedCollection collect: [:var| TAssignmentNode new setVariable: (TVariableNode new setName: var; yourself) expression: (TConstantNode new setValue: 0; yourself)])]. ^refs!

1 0

VM Maker: VMMaker.oscog-eem.1312.mcz
by commits＠source.squeak.org 18 May '15

18 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1312.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1312 Author: eem Time: 17 May 2015, 5:41:05.845 pm UUID: f2ba142e-f4e1-43de-9f3e-b33fa10e5e45 Ancestors: VMMaker.oscog-eem.1311 Make accessor depth calculation more accurate by not considering fetchInteger:ofObject: and arraySize: et al as object accessors. Make the read-before-written initializer safer, only initialzing simple types (integers and pointers). Be prepared to answer the size of usqInt. =============== Diff against VMMaker.oscog-eem.1311 =============== Item was changed: ----- Method: CCodeGenerator>>accessorDepthForChain: (in category 'spur primitive compilation') ----- accessorDepthForChain: chain "OrderedCollection" "Answer the actual number of accessors in the access chain, filtering out assignments of variables to variables." | accessorDepth | accessorDepth := 0. chain do: [:node| + ((node isAssignment and: [node expression isVariable]) + or: [node isSend and: [SpurMemoryManager isSameLevelObjectAccessor: node selector]]) ifFalse: - (node isAssignment and: [node expression isVariable]) ifFalse: [accessorDepth := accessorDepth + 1]]. ^accessorDepth! Item was changed: ----- Method: CCodeGenerator>>accessorsAndAssignmentsForMethod:actuals:depth:interpreterClass:into: (in category 'spur primitive compilation') ----- accessorsAndAssignmentsForMethod: method actuals: actualParameters depth: depth interpreterClass: interpreterClass into: aTrinaryBlock "Evaluate aTrinaryBlock with the root accessor sends, accessor sends and assignments in the method." | accessors assignments roots | accessors := Set new. assignments := Set new. roots := Set new. actualParameters with: method args do: [:actual :argName| (actual isVariable or: [actual isSend]) ifTrue: [(actual isSend and: [self isStackAccessor: actual selector given: interpreterClass]) ifTrue: [roots add: actual]. assignments add: (TAssignmentNode new setVariable: (TVariableNode new setName: argName) expression: actual)]]. method parseTree nodesDo: [:node| node isSend ifTrue: [(self isStackAccessor: node selector given: interpreterClass) ifTrue: [roots add: node]. (self isObjectAccessor: node selector given: interpreterClass) ifTrue: [accessors add: node]. (self accessorDepthDeterminationFollowsSelfSends and: [node receiver isVariable and: [node receiver name = 'self' and: [roots isEmpty or: [node args anySatisfy: [:arg| (roots includes: arg) or: [(accessors includes: arg) or: [assignments anySatisfy: [:assignment| assignment variable isSameAs: arg]]]]]]]]) ifTrue: [self accessorsAndAssignmentsForSubMethodNamed: node selector actuals: node args depth: depth + 1 interpreterClass: interpreterClass into: [:subRoots :subAccessors :subAssignments| (subRoots isEmpty and: [subAccessors isEmpty and: [subAssignments isEmpty]]) ifFalse: [roots addAll: subRoots. accessors add: node. accessors addAll: subAccessors. assignments addAll: subAssignments]]]]. (node isAssignment + and: [(node expression isSend and: [SpurMemoryManager isTerminalObjectAccessor: node expression selector]) not and: [(roots includes: node expression) or: [(accessors includes: node expression) + or: [node expression isVariable and: [node expression name ~= 'nil']]]]]) ifTrue: - or: [node expression isVariable and: [node expression name ~= 'nil']]]]) ifTrue: [assignments add: node]]. ^aTrinaryBlock value: roots value: accessors value: assignments! Item was added: + ----- Method: CCodeGenerator>>isSimpleType: (in category 'type inference') ----- + isSimpleType: aType + "For the purposes of the read-before-written initializer, answer if + aType is simple, e.g. not a structure, and array or an opaque type." + ^aType last = $* + or: [#( sqInt usqInt sqLong usqLong + int #'unsigned int' double float + short #'unsigned short' + char #'unsigned char' #'signed char') includes: aType]! Item was added: + ----- Method: SpurMemoryManager class>>isSameLevelObjectAccessor: (in category 'translation') ----- + isSameLevelObjectAccessor: selector + "For accessor depth calculation, answer if selector doesn't traverse into an object, merely deriving a pointer from it." + ^#(arrayValueOf: firstFixedField: firstIndexableField:) includes: selector! Item was added: + ----- Method: SpurMemoryManager class>>isTerminalObjectAccessor: (in category 'translation') ----- + isTerminalObjectAccessor: selector + "For accessor depth calculation, answer if selector doesn't answer another object object; merely a value." + ^#(byteSizeOf: fetchFloat:ofObject: fetchInteger:ofObject: fetchLong32:ofObject: instanceSizeOf: slotSizeOf: stSizeOf:) includes: selector! Item was changed: ----- Method: TMethod>>removeUnusedTempsAndNilIfRequiredIn: (in category 'utilities') ----- removeUnusedTempsAndNilIfRequiredIn: aCodeGen "Remove all of the unused temps in this method. Answer a set of the references. As a side-effect introduce explicit temp := nil statements for temps that are tested for nil before necessarily being assigned." | refs readBeforeAssigned | refs := self removeUnusedTempsIn: aCodeGen. "reset the locals to be only those still referred to" locals := locals select: [:e| refs includes: e]. (locals notEmpty and: [aCodeGen pushScope: declarations + while: [(readBeforeAssigned := (self findReadBeforeAssignedIn: (locals select: [:ea| aCodeGen isSimpleType: (self typeFor: ea in: aCodeGen)]) + in: aCodeGen)) notEmpty]]) ifTrue: - while: [(readBeforeAssigned := (self findReadBeforeAssignedIn: locals in: aCodeGen)) notEmpty]]) ifTrue: [readBeforeAssigned := readBeforeAssigned reject: [:v| | d | "don't initialize externs, arrays or the explicitly initialized." d := self declarationAt: v. (d beginsWith: 'extern') or: [(d includes: $[) or: [d includes: $=]]]. parseTree statements addAllFirst: (readBeforeAssigned asSortedCollection collect: [:var| TAssignmentNode new setVariable: (TVariableNode new setName: var; yourself) expression: (TConstantNode new setValue: 0; yourself)])]. ^refs! Item was changed: ----- Method: VMClass>>sizeof: (in category 'translation support') ----- sizeof: objectSymbolOrClass <doNotGenerate> | index | objectSymbolOrClass isInteger ifTrue: [^self class objectMemoryClass wordSize]. objectSymbolOrClass isSymbol ifTrue: [(objectSymbolOrClass last == $* or: [#long == objectSymbolOrClass or: [#'unsigned long' == objectSymbolOrClass]]) ifTrue: [^self class objectMemoryClass wordSize]. index := #( #sqLong #usqLong #double #int #'unsigned int' #float #short #'unsigned short' #char #'unsigned char' #'signed char') indexOf: objectSymbolOrClass ifAbsent: + [(#(usqInt sqInt) includes: objectSymbolOrClass) ifTrue: [^self class objectMemoryClass bytesPerOop]. - [objectSymbolOrClass = #sqInt ifTrue: [^self class objectMemoryClass bytesPerOop]. self error: 'unrecognized C type name']. ^#(8 8 8 4 4 4 2 2 1 1 1) at: index]. ^(objectSymbolOrClass isBehavior ifTrue: [objectSymbolOrClass] ifFalse: [objectSymbolOrClass class]) alignedByteSizeOf: objectSymbolOrClass forClient: self!

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2015