Vm-dev July 2015

vm-dev@lists.squeakfoundation.org

19 participants
87 discussions

[commit][3409] Include the Alien support in the Squeak ARM VMs now that it works to a fair
by commits＠squeakvm.org 19 Jul '15

19 Jul '15

Revision: 3409 Author: eliot Date: 2015-07-18 18:39:04 -0700 (Sat, 18 Jul 2015) Log Message: ----------- Include the Alien support in the Squeak ARM VMs now that it works to a fair extent in Newspeak. Modified Paths: -------------- branches/Cog/build.linux32ARM/squeak.cog.spur/plugins.int branches/Cog/build.linux32ARM/squeak.stack.spur/plugins.int branches/Cog/build.linux32ARM/squeak.stack.v3/plugins.int Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32ARM/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.linux32ARM/squeak.cog.spur/plugins.int 2015-07-18 21:59:56 UTC (rev 3408) +++ branches/Cog/build.linux32ARM/squeak.cog.spur/plugins.int 2015-07-19 01:39:04 UTC (rev 3409) @@ -16,7 +16,7 @@ FilePlugin \ FloatArrayPlugin \ #FloatMathPlugin \ -#IA32ABI \ +IA32ABI \ #JoystickTabletPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Modified: branches/Cog/build.linux32ARM/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.spur/plugins.int 2015-07-18 21:59:56 UTC (rev 3408) +++ branches/Cog/build.linux32ARM/squeak.stack.spur/plugins.int 2015-07-19 01:39:04 UTC (rev 3409) @@ -15,6 +15,7 @@ FilePlugin \ FloatArrayPlugin \ FloatMathPlugin \ +IA32ABI \ JoystickTabletPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/plugins.int =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/plugins.int 2015-07-18 21:59:56 UTC (rev 3408) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/plugins.int 2015-07-19 01:39:04 UTC (rev 3409) @@ -15,6 +15,7 @@ FilePlugin \ FloatArrayPlugin \ FloatMathPlugin \ +IA32ABI \ JoystickTabletPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Jul 18 14:57:40 PDT 2015 + Sat Jul 18 18:38:25 PDT 2015

1 0

VM Maker: Cog-eem.273.mcz
by commits＠source.squeak.org 19 Jul '15

19 Jul '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.273.mcz ==================== Summary ==================== Name: Cog-eem.273 Author: eem Time: 18 July 2015, 6:19:05.087 pm UUID: 1ce60a6e-219c-43e0-b53e-5f35df10736e Ancestors: Cog-eem.272 Remember to set the window size in the bootstrapped 64-bit image =============== Diff against Cog-eem.272 =============== Item was changed: ----- Method: Spur32to64BitBootstrap>>writeSnapshot:headerFlags:screenSize: (in category 'snapshot') ----- writeSnapshot: imageFileName headerFlags: headerFlags screenSize: screenSizeInteger heap64 checkFreeSpace; runLeakCheckerForFullGC. interpreter64 setImageHeaderFlagsFrom: headerFlags; setDisplayForm: nil; + setSavedWindowSize: savedWindowSize; imageName: imageFileName; writeImageFileIO. Transcript cr; show: 'Done!!'!

1 0

[commit][3408] CogVM source as per VMMaker.oscog-eem.1427
by commits＠squeakvm.org 18 Jul '15

18 Jul '15

Revision: 3408 Author: eliot Date: 2015-07-18 14:59:56 -0700 (Sat, 18 Jul 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1427 Fix at least one set of 64-bit issues caused by Slang. In particular the integerObjectOf: code resulted in (objectMemory integerObjectOf: MillisecondClockMask) evaluating to the -1 object, instead of the 16r1FFFFFFF object, which was the cause of the initially nresponsive 64-bit image on the real VM. Don't use cppIf: NewspeakVM(et al) where possible, to avoid leaving #if NewspeakVM everywhere. Instead rely on generation-time dead code removal. Both Newspeak and Squeak VMs benefit from improved readability. Fix some primitiveFail[For:] calls in potential mirror primitives that did not return after falure, and could hence continue to do damage after detecting a failure condition. Modified Paths: -------------- 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/MiscPrimitivePlugin/MiscPrimitivePlugin.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/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-07-18 21:59:56 UTC (rev 3408) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1423 uuid: cf39cfd3-52f5-4f6b-bba6-892ee83000fe + CCodeGenerator VMMaker.oscog-eem.1427 uuid: c5cb18c5-f69e-4e41-8f87-943a495659b4 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-07-18 21:59:56 UTC (rev 3408) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1423 uuid: cf39cfd3-52f5-4f6b-bba6-892ee83000fe + CCodeGenerator VMMaker.oscog-eem.1427 uuid: c5cb18c5-f69e-4e41-8f87-943a495659b4 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1423 uuid: cf39cfd3-52f5-4f6b-bba6-892ee83000fe + StackToRegisterMappingCogit VMMaker.oscog-eem.1427 uuid: c5cb18c5-f69e-4e41-8f87-943a495659b4 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1423 uuid: cf39cfd3-52f5-4f6b-bba6-892ee83000fe " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1427 uuid: c5cb18c5-f69e-4e41-8f87-943a495659b4 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9895,7 +9895,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -10871,12 +10871,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -24829,16 +24829,7 @@ generateNewspeakSendTrampolines(); -# if BytecodeSetHasDirectedSuperSend for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { - directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) - ? numArgs - : SendNumArgsReg))); - } - -# endif /* BytecodeSetHasDirectedSuperSend */ - - for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) ? numArgs : SendNumArgsReg))); Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-07-18 21:59:56 UTC (rev 3408) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1423 uuid: cf39cfd3-52f5-4f6b-bba6-892ee83000fe + CCodeGenerator VMMaker.oscog-eem.1427 uuid: c5cb18c5-f69e-4e41-8f87-943a495659b4 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1423 uuid: cf39cfd3-52f5-4f6b-bba6-892ee83000fe + StackToRegisterMappingCogit VMMaker.oscog-eem.1427 uuid: c5cb18c5-f69e-4e41-8f87-943a495659b4 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1423 uuid: cf39cfd3-52f5-4f6b-bba6-892ee83000fe " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1427 uuid: c5cb18c5-f69e-4e41-8f87-943a495659b4 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9993,12 +9993,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -24464,16 +24464,7 @@ generateNewspeakSendTrampolines(); -# if BytecodeSetHasDirectedSuperSend for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { - directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) - ? numArgs - : SendNumArgsReg))); - } - -# endif /* BytecodeSetHasDirectedSuperSend */ - - for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) ? numArgs : SendNumArgsReg))); Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-07-18 21:59:56 UTC (rev 3408) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f from - CoInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + CoInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1207,7 +1207,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -extern sqInt stringForCString(const char *aCString); +extern usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; extern void tenuringIncrementalGC(void); @@ -2410,7 +2410,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.1422"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1426"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6211,15 +6211,8 @@ } GIV(lkupClass) = longAt((classTablePage1 + BaseHeaderSize) + ((GIV(lkupClassTag) & ((1 << 10) - 1)) << (shiftForWord()))); l238: /* end classAtIndex: */; - -# if NewspeakVM lookupOrdinarySend(); -# else /* NewspeakVM */ - lookupMethodInClass(GIV(lkupClass)); - -# endif /* NewspeakVM */ - /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -27463,6 +27456,7 @@ validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp) { CogMethod *cogMethod; + sqInt header; sqInt methodField; usqInt theInstrPointer; @@ -27485,7 +27479,7 @@ goto l1; } cogMethod = ((CogMethod *) (methodField & MFMethodMask)); - l1: /* end mframeHomeMethod: */; + l1: /* end mframeHomeMethod: */; return (theInstrPointer >= ((((usqInt)cogMethod)) + (sizeof(CogMethod)))) && (theInstrPointer < ((((usqInt)cogMethod)) + ((cogMethod->blockSize)))); } @@ -30616,7 +30610,8 @@ if (!((GIV(argumentCount) < 1) || ((((longAt(GIV(stackPointer))) & 3) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer))))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } result = allInstancesOf(longAt(GIV(stackPointer))); @@ -31591,6 +31586,9 @@ sqInt hashOrError; char *sp; + + /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(argumentCount) > 0) { if (!((((longAt(GIV(stackPointer))) & 3) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { @@ -32437,7 +32435,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); + s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -38065,7 +38063,7 @@ sqInt err; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38083,7 +38081,8 @@ if (!((GIV(argumentCount) < 1) || (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } @@ -38190,7 +38189,7 @@ sqInt i; usqInt instSpec; sqInt literalCount; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38356,6 +38355,15 @@ sqInt value; spaceOkay = 0; + + /* For the mirror prims check that the class obj is actually a valid class. */ + + if (!((GIV(argumentCount) < 2) + || (addressCouldBeClassObj(longAt(GIV(stackPointer) + (1 * BytesPerWord)))))) { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((oop1 & 1)) { @@ -38428,41 +38436,32 @@ goto l2; } l2: /* end positiveMachineIntegerValueOf: */; - - /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(primFailCode)) { - if (!((GIV(argumentCount) < 2) - || (addressCouldBeClassObj(longAt(GIV(stackPointer) + (1 * BytesPerWord)))))) { - GIV(primFailCode) = PrimErrBadArgument; - } - - if (!GIV(primFailCode)) { - /* positiveMachineIntegerValueOf: succeeds only for non-negative integers. */ - obj = instantiateClassindexableSize(longAt(GIV(stackPointer) + (1 * BytesPerWord)), size); - if (obj == null) { - /* begin instSpecOfClassFormat: */ - instSpec = (((usqInt) (((longAt(((longAt(GIV(stackPointer) + (1 * BytesPerWord))) + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1))) >> 16) & 0x1F; - /* begin primitiveFailFor: */ - reasonCode = (((instSpec >= 2) - && ((instSpec <= 4) - || (instSpec >= 9))) - && (!(instSpec >= 24)) - ? PrimErrNoMemory - : PrimErrBadReceiver); - GIV(primFailCode) = reasonCode; - } - else { - /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), obj); - GIV(stackPointer) = sp; - } - + (GIV(primFailCode) = PrimErrBadArgument); + return; } + obj = instantiateClassindexableSize(longAt(GIV(stackPointer) + (1 * BytesPerWord)), size); + if (obj == null) { + /* begin instSpecOfClassFormat: */ + instSpec = (((usqInt) (((longAt(((longAt(GIV(stackPointer) + (1 * BytesPerWord))) + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1))) >> 16) & 0x1F; + /* begin primitiveFailFor: */ + reasonCode = (((instSpec >= 2) + && ((instSpec <= 4) + || (instSpec >= 9))) + && (!(instSpec >= 24)) + ? PrimErrNoMemory + : PrimErrBadReceiver); + GIV(primFailCode) = reasonCode; + } else { - GIV(primFailCode) = PrimErrBadArgument; + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), obj); + GIV(stackPointer) = sp; } + } /* InterpreterPrimitives>>#primitiveNextInstance */ @@ -41062,7 +41061,8 @@ if (!((GIV(argumentCount) < 1) || (((class & 3) == 0) && (objCouldBeClassObj(class))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } instance = initialInstanceOf(class); @@ -44106,7 +44106,7 @@ sqInt fillValue; sqInt hash; usqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -46238,7 +46238,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - sqInt freeChunk; + usqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -46277,8 +46277,8 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - sqInt smallObj; - sqInt start; + usqInt smallObj; + usqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -49219,7 +49219,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -63906,8 +63906,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - sqInt savedInHashes; - sqInt savedOutHashes; + usqInt savedInHashes; + usqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -64377,13 +64377,13 @@ or nil if out of memory. */ /* SpurMemoryManager>>#stringForCString: */ -sqInt +usqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; sqInt len; usqInt newObj; - sqInt newString; + usqInt newString; usqInt numBytes; sqInt numSlots; @@ -65438,7 +65438,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -65654,7 +65654,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -72744,26 +72744,27 @@ sqInt literal; sqInt objOop; sqInt objOop1; + sqInt objOop2; sqInt offset; - return (/* begin followLiteral:ofMethod: */ - (offset = (literalCountOfMethodHeader(methodHeaderOf(methodPointer))) - 1), - /* begin followField:ofObject: */ - (objOop1 = longAt((methodPointer + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord())))), - (((objOop1 & 3) == 0) - && (((longAt(objOop1)) & 0x3FFFFF) == 8) - ? (objOop1 = fixFollowedFieldofObjectwithInitialValue(offset + LiteralStart, methodPointer, objOop1)) + /* begin followLiteral:ofMethod: */ + offset = (literalCountOfMethodHeader(methodHeaderOf(methodPointer))) - 1; + /* begin followField:ofObject: */ + objOop2 = longAt((methodPointer + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); + if (((objOop2 & 3) == 0) + && (((longAt(objOop2)) & 0x3FFFFF) == 8)) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(offset + LiteralStart, methodPointer, objOop2); + } + literal = objOop2; + return (literal == GIV(nilObj) + ? literal + : (/* begin followField:ofObject: */ + (objOop = longAt((literal + BaseHeaderSize) + (ValueIndex << (shiftForWord())))), + (((objOop & 3) == 0) + && (((longAt(objOop)) & 0x3FFFFF) == 8) + ? (objOop = fixFollowedFieldofObjectwithInitialValue(ValueIndex, literal, objOop)) : 0), - (literal = objOop1), - (literal == GIV(nilObj) - ? literal - : (/* begin followField:ofObject: */ - (objOop = longAt((literal + BaseHeaderSize) + (ValueIndex << (shiftForWord())))), - (((objOop & 3) == 0) - && (((longAt(objOop)) & 0x3FFFFF) == 8) - ? (objOop = fixFollowedFieldofObjectwithInitialValue(ValueIndex, literal, objOop)) - : 0), - objOop))); + objOop)); } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-07-18 21:59:56 UTC (rev 3408) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f */ @@ -258,7 +258,7 @@ extern sqInt splObj(sqInt index); extern usqInt storeCheckBoundary(void); extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -extern sqInt stringForCString(const char *aCString); +extern usqInt stringForCString(const char *aCString); extern void tenuringIncrementalGC(void); extern sqInt topRemappableOop(void); extern sqInt validFreeTree(void); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-07-18 21:59:56 UTC (rev 3408) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f from - CoInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + CoInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1210,7 +1210,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -extern sqInt stringForCString(const char *aCString); +extern usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; extern void tenuringIncrementalGC(void); @@ -2413,7 +2413,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.1422"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1426"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6220,15 +6220,8 @@ } GIV(lkupClass) = longAt((classTablePage1 + BaseHeaderSize) + ((GIV(lkupClassTag) & ((1 << 10) - 1)) << (shiftForWord()))); l238: /* end classAtIndex: */; - -# if NewspeakVM lookupOrdinarySend(); -# else /* NewspeakVM */ - lookupMethodInClass(GIV(lkupClass)); - -# endif /* NewspeakVM */ - /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -27472,6 +27465,7 @@ validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp) { CogMethod *cogMethod; + sqInt header; sqInt methodField; usqInt theInstrPointer; @@ -27494,7 +27488,7 @@ goto l1; } cogMethod = ((CogMethod *) (methodField & MFMethodMask)); - l1: /* end mframeHomeMethod: */; + l1: /* end mframeHomeMethod: */; return (theInstrPointer >= ((((usqInt)cogMethod)) + (sizeof(CogMethod)))) && (theInstrPointer < ((((usqInt)cogMethod)) + ((cogMethod->blockSize)))); } @@ -30625,7 +30619,8 @@ if (!((GIV(argumentCount) < 1) || ((((longAt(GIV(stackPointer))) & 3) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer))))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } result = allInstancesOf(longAt(GIV(stackPointer))); @@ -31600,6 +31595,9 @@ sqInt hashOrError; char *sp; + + /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(argumentCount) > 0) { if (!((((longAt(GIV(stackPointer))) & 3) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { @@ -32446,7 +32444,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); + s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -38074,7 +38072,7 @@ sqInt err; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38092,7 +38090,8 @@ if (!((GIV(argumentCount) < 1) || (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } @@ -38199,7 +38198,7 @@ sqInt i; usqInt instSpec; sqInt literalCount; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38365,6 +38364,15 @@ sqInt value; spaceOkay = 0; + + /* For the mirror prims check that the class obj is actually a valid class. */ + + if (!((GIV(argumentCount) < 2) + || (addressCouldBeClassObj(longAt(GIV(stackPointer) + (1 * BytesPerWord)))))) { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((oop1 & 1)) { @@ -38437,41 +38445,32 @@ goto l2; } l2: /* end positiveMachineIntegerValueOf: */; - - /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(primFailCode)) { - if (!((GIV(argumentCount) < 2) - || (addressCouldBeClassObj(longAt(GIV(stackPointer) + (1 * BytesPerWord)))))) { - GIV(primFailCode) = PrimErrBadArgument; - } - - if (!GIV(primFailCode)) { - /* positiveMachineIntegerValueOf: succeeds only for non-negative integers. */ - obj = instantiateClassindexableSize(longAt(GIV(stackPointer) + (1 * BytesPerWord)), size); - if (obj == null) { - /* begin instSpecOfClassFormat: */ - instSpec = (((usqInt) (((longAt(((longAt(GIV(stackPointer) + (1 * BytesPerWord))) + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1))) >> 16) & 0x1F; - /* begin primitiveFailFor: */ - reasonCode = (((instSpec >= 2) - && ((instSpec <= 4) - || (instSpec >= 9))) - && (!(instSpec >= 24)) - ? PrimErrNoMemory - : PrimErrBadReceiver); - GIV(primFailCode) = reasonCode; - } - else { - /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), obj); - GIV(stackPointer) = sp; - } - + (GIV(primFailCode) = PrimErrBadArgument); + return; } + obj = instantiateClassindexableSize(longAt(GIV(stackPointer) + (1 * BytesPerWord)), size); + if (obj == null) { + /* begin instSpecOfClassFormat: */ + instSpec = (((usqInt) (((longAt(((longAt(GIV(stackPointer) + (1 * BytesPerWord))) + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1))) >> 16) & 0x1F; + /* begin primitiveFailFor: */ + reasonCode = (((instSpec >= 2) + && ((instSpec <= 4) + || (instSpec >= 9))) + && (!(instSpec >= 24)) + ? PrimErrNoMemory + : PrimErrBadReceiver); + GIV(primFailCode) = reasonCode; + } else { - GIV(primFailCode) = PrimErrBadArgument; + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), obj); + GIV(stackPointer) = sp; } + } /* InterpreterPrimitives>>#primitiveNextInstance */ @@ -41071,7 +41070,8 @@ if (!((GIV(argumentCount) < 1) || (((class & 3) == 0) && (objCouldBeClassObj(class))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } instance = initialInstanceOf(class); @@ -44115,7 +44115,7 @@ sqInt fillValue; sqInt hash; usqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -46247,7 +46247,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - sqInt freeChunk; + usqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -46286,8 +46286,8 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - sqInt smallObj; - sqInt start; + usqInt smallObj; + usqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -49228,7 +49228,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -63915,8 +63915,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - sqInt savedInHashes; - sqInt savedOutHashes; + usqInt savedInHashes; + usqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -64386,13 +64386,13 @@ or nil if out of memory. */ /* SpurMemoryManager>>#stringForCString: */ -sqInt +usqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; sqInt len; usqInt newObj; - sqInt newString; + usqInt newString; usqInt numBytes; sqInt numSlots; @@ -65447,7 +65447,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -65663,7 +65663,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -72753,26 +72753,27 @@ sqInt literal; sqInt objOop; sqInt objOop1; + sqInt objOop2; sqInt offset; - return (/* begin followLiteral:ofMethod: */ - (offset = (literalCountOfMethodHeader(methodHeaderOf(methodPointer))) - 1), - /* begin followField:ofObject: */ - (objOop1 = longAt((methodPointer + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord())))), - (((objOop1 & 3) == 0) - && (((longAt(objOop1)) & 0x3FFFFF) == 8) - ? (objOop1 = fixFollowedFieldofObjectwithInitialValue(offset + LiteralStart, methodPointer, objOop1)) + /* begin followLiteral:ofMethod: */ + offset = (literalCountOfMethodHeader(methodHeaderOf(methodPointer))) - 1; + /* begin followField:ofObject: */ + objOop2 = longAt((methodPointer + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); + if (((objOop2 & 3) == 0) + && (((longAt(objOop2)) & 0x3FFFFF) == 8)) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(offset + LiteralStart, methodPointer, objOop2); + } + literal = objOop2; + return (literal == GIV(nilObj) + ? literal + : (/* begin followField:ofObject: */ + (objOop = longAt((literal + BaseHeaderSize) + (ValueIndex << (shiftForWord())))), + (((objOop & 3) == 0) + && (((longAt(objOop)) & 0x3FFFFF) == 8) + ? (objOop = fixFollowedFieldofObjectwithInitialValue(ValueIndex, literal, objOop)) : 0), - (literal = objOop1), - (literal == GIV(nilObj) - ? literal - : (/* begin followField:ofObject: */ - (objOop = longAt((literal + BaseHeaderSize) + (ValueIndex << (shiftForWord())))), - (((objOop & 3) == 0) - && (((longAt(objOop)) & 0x3FFFFF) == 8) - ? (objOop = fixFollowedFieldofObjectwithInitialValue(ValueIndex, literal, objOop)) - : 0), - objOop))); + objOop)); } Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-07-18 21:59:56 UTC (rev 3408) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f from - StackInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + StackInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2173,7 +2173,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1422"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1426"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5808,15 +5808,8 @@ } GIV(lkupClass) = longAt((classTablePage + BaseHeaderSize) + (((long)(GIV(lkupClassTag) & ((1LL << 10) - 1))) << (shiftForWord()))); l190: /* end classAtIndex: */; - -# if NewspeakVM lookupOrdinarySend(); -# else /* NewspeakVM */ - lookupMethodInClass(GIV(lkupClass)); - -# endif /* NewspeakVM */ - /* begin internalizeIPandSP */ localIP = pointerForOop(GIV(instructionPointer)); localSP = pointerForOop(GIV(stackPointer)); @@ -15631,7 +15624,8 @@ if (!((GIV(argumentCount) < 1) || ((((longAt(GIV(stackPointer))) & 7) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer))))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } result = allInstancesOf(longAt(GIV(stackPointer))); @@ -16533,6 +16527,9 @@ sqInt hashOrError; char *sp; + + /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(argumentCount) > 0) { if (!((((longAt(GIV(stackPointer))) & 7) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { @@ -21196,7 +21193,7 @@ char *sp; /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((0 << 3) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((sqInt)0 << 3) | 1)); GIV(stackPointer) = sp; } @@ -22270,7 +22267,7 @@ char *sp; /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((0x3FFFFF << 3) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((sqInt)0x3FFFFF << 3) | 1)); GIV(stackPointer) = sp; } @@ -22315,7 +22312,7 @@ char *sp; /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((MillisecondClockMask << 3) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((sqInt)MillisecondClockMask << 3) | 1)); GIV(stackPointer) = sp; } @@ -22667,7 +22664,8 @@ if (!((GIV(argumentCount) < 1) || (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } @@ -22942,6 +22940,15 @@ sqInt value; spaceOkay = 0; + + /* For the mirror prims check that the class obj is actually a valid class. */ + + if (!((GIV(argumentCount) < 2) + || (addressCouldBeClassObj(longAt(GIV(stackPointer) + (1 * BytesPerWord)))))) { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((((oop1) & 7) == 1)) { @@ -23014,41 +23021,32 @@ goto l2; } l2: /* end positiveMachineIntegerValueOf: */; - - /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(primFailCode)) { - if (!((GIV(argumentCount) < 2) - || (addressCouldBeClassObj(longAt(GIV(stackPointer) + (1 * BytesPerWord)))))) { - GIV(primFailCode) = PrimErrBadArgument; - } - - if (!GIV(primFailCode)) { - /* positiveMachineIntegerValueOf: succeeds only for non-negative integers. */ - obj = instantiateClassindexableSize(longAt(GIV(stackPointer) + (1 * BytesPerWord)), size); - if (obj == null) { - /* begin instSpecOfClassFormat: */ - instSpec = (((usqInt) (((longAt(((longAt(GIV(stackPointer) + (1 * BytesPerWord))) + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3))) >> 16) & 0x1F; - /* begin primitiveFailFor: */ - reasonCode = (((instSpec >= 2) - && ((instSpec <= 4) - || (instSpec >= 9))) - && (!(instSpec >= 24)) - ? PrimErrNoMemory - : PrimErrBadReceiver); - GIV(primFailCode) = reasonCode; - } - else { - /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), obj); - GIV(stackPointer) = sp; - } - + (GIV(primFailCode) = PrimErrBadArgument); + return; } + obj = instantiateClassindexableSize(longAt(GIV(stackPointer) + (1 * BytesPerWord)), size); + if (obj == null) { + /* begin instSpecOfClassFormat: */ + instSpec = (((usqInt) (((longAt(((longAt(GIV(stackPointer) + (1 * BytesPerWord))) + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3))) >> 16) & 0x1F; + /* begin primitiveFailFor: */ + reasonCode = (((instSpec >= 2) + && ((instSpec <= 4) + || (instSpec >= 9))) + && (!(instSpec >= 24)) + ? PrimErrNoMemory + : PrimErrBadReceiver); + GIV(primFailCode) = reasonCode; + } else { - GIV(primFailCode) = PrimErrBadArgument; + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), obj); + GIV(stackPointer) = sp; } + } /* InterpreterPrimitives>>#primitiveNextInstance */ @@ -23223,7 +23221,7 @@ instance = accessibleObjectAfter(longAt(GIV(stackPointer))); if (instance == null) { /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((0 << 3) | 1)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((sqInt)0 << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -27148,7 +27146,8 @@ if (!((GIV(argumentCount) < 1) || (((class & 7) == 0) && (objCouldBeClassObj(class))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } instance = initialInstanceOf(class); @@ -63584,26 +63583,27 @@ sqInt literal; sqInt objOop; sqInt objOop1; + sqInt objOop2; sqInt offset; - return (/* begin followLiteral:ofMethod: */ - (offset = (literalCountOfMethodHeader(methodHeaderOf(methodPointer))) - 1), - /* begin followField:ofObject: */ - (objOop1 = longAt((methodPointer + BaseHeaderSize) + (((long)(offset + LiteralStart)) << (shiftForWord())))), - (((objOop1 & 7) == 0) - && (((longAt(objOop1)) & 0x3FFFFF) == 8) - ? (objOop1 = fixFollowedFieldofObjectwithInitialValue(offset + LiteralStart, methodPointer, objOop1)) + /* begin followLiteral:ofMethod: */ + offset = (literalCountOfMethodHeader(methodHeaderOf(methodPointer))) - 1; + /* begin followField:ofObject: */ + objOop2 = longAt((methodPointer + BaseHeaderSize) + (((long)(offset + LiteralStart)) << (shiftForWord()))); + if (((objOop2 & 7) == 0) + && (((longAt(objOop2)) & 0x3FFFFF) == 8)) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(offset + LiteralStart, methodPointer, objOop2); + } + literal = objOop2; + return (literal == GIV(nilObj) + ? literal + : (/* begin followField:ofObject: */ + (objOop = longAt((literal + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())))), + (((objOop & 7) == 0) + && (((longAt(objOop)) & 0x3FFFFF) == 8) + ? (objOop = fixFollowedFieldofObjectwithInitialValue(ValueIndex, literal, objOop)) : 0), - (literal = objOop1), - (literal == GIV(nilObj) - ? literal - : (/* begin followField:ofObject: */ - (objOop = longAt((literal + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())))), - (((objOop & 7) == 0) - && (((longAt(objOop)) & 0x3FFFFF) == 8) - ? (objOop = fixFollowedFieldofObjectwithInitialValue(ValueIndex, literal, objOop)) - : 0), - objOop))); + objOop)); } /* StackInterpreter>>#methodHeaderIndicatesLargeFrame: */ @@ -75910,10 +75910,10 @@ longAtput((result + BaseHeaderSize) + (26LL << (shiftForWord())), ((GIV(statMarkCount) << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(result))); - longAtput((result + BaseHeaderSize) + (27LL << (shiftForWord())), ((0 << 3) | 1)); + longAtput((result + BaseHeaderSize) + (27LL << (shiftForWord())), (((sqInt)0 << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(result))); - longAtput((result + BaseHeaderSize) + (28LL << (shiftForWord())), ((0 << 3) | 1)); + longAtput((result + BaseHeaderSize) + (28LL << (shiftForWord())), (((sqInt)0 << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(result))); longAtput((result + BaseHeaderSize) + (29LL << (shiftForWord())), ((GIV(statCompactPassCount) << 3) | 1)); @@ -76218,10 +76218,10 @@ result = ((GIV(statMarkCount) << 3) | 1); } if (arg == 28) { - result = ((0 << 3) | 1); + result = (((sqInt)0 << 3) | 1); } if (arg == 29) { - result = ((0 << 3) | 1); + result = (((sqInt)0 << 3) | 1); } if (arg == 30) { result = ((GIV(statCompactPassCount) << 3) | 1); Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspurstack64src/vm/interp.c 2015-07-18 21:59:56 UTC (rev 3408) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f from - StackInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + StackInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2170,7 +2170,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1422"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1426"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5799,15 +5799,8 @@ } GIV(lkupClass) = longAt((classTablePage + BaseHeaderSize) + (((long)(GIV(lkupClassTag) & ((1LL << 10) - 1))) << (shiftForWord()))); l190: /* end classAtIndex: */; - -# if NewspeakVM lookupOrdinarySend(); -# else /* NewspeakVM */ - lookupMethodInClass(GIV(lkupClass)); - -# endif /* NewspeakVM */ - /* begin internalizeIPandSP */ localIP = pointerForOop(GIV(instructionPointer)); localSP = pointerForOop(GIV(stackPointer)); @@ -15622,7 +15615,8 @@ if (!((GIV(argumentCount) < 1) || ((((longAt(GIV(stackPointer))) & 7) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer))))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } result = allInstancesOf(longAt(GIV(stackPointer))); @@ -16524,6 +16518,9 @@ sqInt hashOrError; char *sp; + + /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(argumentCount) > 0) { if (!((((longAt(GIV(stackPointer))) & 7) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { @@ -21187,7 +21184,7 @@ char *sp; /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((0 << 3) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((sqInt)0 << 3) | 1)); GIV(stackPointer) = sp; } @@ -22261,7 +22258,7 @@ char *sp; /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((0x3FFFFF << 3) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((sqInt)0x3FFFFF << 3) | 1)); GIV(stackPointer) = sp; } @@ -22306,7 +22303,7 @@ char *sp; /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((MillisecondClockMask << 3) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((sqInt)MillisecondClockMask << 3) | 1)); GIV(stackPointer) = sp; } @@ -22658,7 +22655,8 @@ if (!((GIV(argumentCount) < 1) || (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } @@ -22933,6 +22931,15 @@ sqInt value; spaceOkay = 0; + + /* For the mirror prims check that the class obj is actually a valid class. */ + + if (!((GIV(argumentCount) < 2) + || (addressCouldBeClassObj(longAt(GIV(stackPointer) + (1 * BytesPerWord)))))) { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + /* begin positiveMachineIntegerValueOf: */ oop1 = longAt(GIV(stackPointer)); if ((((oop1) & 7) == 1)) { @@ -23005,41 +23012,32 @@ goto l2; } l2: /* end positiveMachineIntegerValueOf: */; - - /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(primFailCode)) { - if (!((GIV(argumentCount) < 2) - || (addressCouldBeClassObj(longAt(GIV(stackPointer) + (1 * BytesPerWord)))))) { - GIV(primFailCode) = PrimErrBadArgument; - } - - if (!GIV(primFailCode)) { - /* positiveMachineIntegerValueOf: succeeds only for non-negative integers. */ - obj = instantiateClassindexableSize(longAt(GIV(stackPointer) + (1 * BytesPerWord)), size); - if (obj == null) { - /* begin instSpecOfClassFormat: */ - instSpec = (((usqInt) (((longAt(((longAt(GIV(stackPointer) + (1 * BytesPerWord))) + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3))) >> 16) & 0x1F; - /* begin primitiveFailFor: */ - reasonCode = (((instSpec >= 2) - && ((instSpec <= 4) - || (instSpec >= 9))) - && (!(instSpec >= 24)) - ? PrimErrNoMemory - : PrimErrBadReceiver); - GIV(primFailCode) = reasonCode; - } - else { - /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), obj); - GIV(stackPointer) = sp; - } - + (GIV(primFailCode) = PrimErrBadArgument); + return; } + obj = instantiateClassindexableSize(longAt(GIV(stackPointer) + (1 * BytesPerWord)), size); + if (obj == null) { + /* begin instSpecOfClassFormat: */ + instSpec = (((usqInt) (((longAt(((longAt(GIV(stackPointer) + (1 * BytesPerWord))) + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3))) >> 16) & 0x1F; + /* begin primitiveFailFor: */ + reasonCode = (((instSpec >= 2) + && ((instSpec <= 4) + || (instSpec >= 9))) + && (!(instSpec >= 24)) + ? PrimErrNoMemory + : PrimErrBadReceiver); + GIV(primFailCode) = reasonCode; + } else { - GIV(primFailCode) = PrimErrBadArgument; + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), obj); + GIV(stackPointer) = sp; } + } /* InterpreterPrimitives>>#primitiveNextInstance */ @@ -23214,7 +23212,7 @@ instance = accessibleObjectAfter(longAt(GIV(stackPointer))); if (instance == null) { /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((0 << 3) | 1)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((sqInt)0 << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -27139,7 +27137,8 @@ if (!((GIV(argumentCount) < 1) || (((class & 7) == 0) && (objCouldBeClassObj(class))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } instance = initialInstanceOf(class); @@ -63575,26 +63574,27 @@ sqInt literal; sqInt objOop; sqInt objOop1; + sqInt objOop2; sqInt offset; - return (/* begin followLiteral:ofMethod: */ - (offset = (literalCountOfMethodHeader(methodHeaderOf(methodPointer))) - 1), - /* begin followField:ofObject: */ - (objOop1 = longAt((methodPointer + BaseHeaderSize) + (((long)(offset + LiteralStart)) << (shiftForWord())))), - (((objOop1 & 7) == 0) - && (((longAt(objOop1)) & 0x3FFFFF) == 8) - ? (objOop1 = fixFollowedFieldofObjectwithInitialValue(offset + LiteralStart, methodPointer, objOop1)) + /* begin followLiteral:ofMethod: */ + offset = (literalCountOfMethodHeader(methodHeaderOf(methodPointer))) - 1; + /* begin followField:ofObject: */ + objOop2 = longAt((methodPointer + BaseHeaderSize) + (((long)(offset + LiteralStart)) << (shiftForWord()))); + if (((objOop2 & 7) == 0) + && (((longAt(objOop2)) & 0x3FFFFF) == 8)) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(offset + LiteralStart, methodPointer, objOop2); + } + literal = objOop2; + return (literal == GIV(nilObj) + ? literal + : (/* begin followField:ofObject: */ + (objOop = longAt((literal + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())))), + (((objOop & 7) == 0) + && (((longAt(objOop)) & 0x3FFFFF) == 8) + ? (objOop = fixFollowedFieldofObjectwithInitialValue(ValueIndex, literal, objOop)) : 0), - (literal = objOop1), - (literal == GIV(nilObj) - ? literal - : (/* begin followField:ofObject: */ - (objOop = longAt((literal + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())))), - (((objOop & 7) == 0) - && (((longAt(objOop)) & 0x3FFFFF) == 8) - ? (objOop = fixFollowedFieldofObjectwithInitialValue(ValueIndex, literal, objOop)) - : 0), - objOop))); + objOop)); } /* StackInterpreter>>#methodHeaderIndicatesLargeFrame: */ @@ -75901,10 +75901,10 @@ longAtput((result + BaseHeaderSize) + (26LL << (shiftForWord())), ((GIV(statMarkCount) << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(result))); - longAtput((result + BaseHeaderSize) + (27LL << (shiftForWord())), ((0 << 3) | 1)); + longAtput((result + BaseHeaderSize) + (27LL << (shiftForWord())), (((sqInt)0 << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(result))); - longAtput((result + BaseHeaderSize) + (28LL << (shiftForWord())), ((0 << 3) | 1)); + longAtput((result + BaseHeaderSize) + (28LL << (shiftForWord())), (((sqInt)0 << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(result))); longAtput((result + BaseHeaderSize) + (29LL << (shiftForWord())), ((GIV(statCompactPassCount) << 3) | 1)); @@ -76209,10 +76209,10 @@ result = ((GIV(statMarkCount) << 3) | 1); } if (arg == 28) { - result = ((0 << 3) | 1); + result = (((sqInt)0 << 3) | 1); } if (arg == 29) { - result = ((0 << 3) | 1); + result = (((sqInt)0 << 3) | 1); } if (arg == 30) { result = ((GIV(statCompactPassCount) << 3) | 1); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-07-16 23:33:11 UTC (rev 3407) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-07-18 21:59:56 UTC (rev 3408) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f from - StackInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 + StackInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1422 uuid: 72d0eb67-7dbb-463f-8481-c6677291e4f6 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1426 uuid: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2144,7 +2144,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1422"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1426"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5781,15 +5781,8 @@ } GIV(lkupClass) = longAt((classTablePage + BaseHeaderSize) + ((GIV(lkupClassTag) & ((1 << 10) - 1)) << (shiftForWord()))); l236: /* end classAtIndex: */; - -# if NewspeakVM lookupOrdinarySend(); -# else /* NewspeakVM */ - lookupMethodInClass(GIV(lkupClass)); - -# endif /* NewspeakVM */ - /* begin internalizeIPandSP */ localIP = pointerForOop(GIV(instructionPointer)); localSP = pointerForOop(GIV(stackPointer)); @@ -14986,7 +14979,8 @@ if (!((GIV(argumentCount) < 1) || ((((longAt(GIV(stackPointer))) & 3) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer))))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } result = allInstancesOf(longAt(GIV(stackPointer))); @@ -15961,6 +15955,9 @@ sqInt hashOrError; char *sp; + + /* For the mirror prims check that the class obj is actually a valid class. */ + if (GIV(argumentCount) > 0) { if (!((((longAt(GIV(stackPointer))) & 3) == 0) && (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { @@ -22256,7 +22253,8 @@ if (!((GIV(argumentCount) < 1) || (objCouldBeClassObj(longAt(GIV(stackPointer)))))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); + return; } @@ -22529,6 +22527,15 @@ sqInt value; spaceOkay = 0; + @@ Diff output truncated at 50000 characters. @@

1 0

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

18 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1427.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1427 Author: eem Time: 18 July 2015, 2:12:47.196 pm UUID: c5cb18c5-f69e-4e41-8f87-943a495659b4 Ancestors: VMMaker.oscog-eem.1426 Revert some of the cppIf: NewspeakVM changes; they are needed to hide nsSendCache variables from non-Newspeak VMs. =============== Diff against VMMaker.oscog-eem.1426 =============== Item was changed: ----- Method: Cogit>>checkIfValidOopRef:pc:cogMethod: (in category 'garbage collection') ----- checkIfValidOopRef: annotation pc: mcpc cogMethod: cogMethod "Check for a valid object reference, if any, at a map entry. Answer a code unique to each error for debugging." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> annotation = IsObjectReference ifTrue: [| literal | literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation checkValidOopReference: literal) ifFalse: [coInterpreter print: 'object ref leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]. + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache enclosingObject | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. [(objectRepresentation checkValidOopReference: nsSendCache selector) ifFalse: [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]. (enclosingObject := nsSendCache enclosingObject) ~= 0 ifTrue: [[(objectRepresentation checkValidOopReference: enclosingObject) ifFalse: [coInterpreter print: 'enclosing object leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]]]]. (self isPureSendAnnotation: annotation) ifTrue: [| entryPoint selectorOrCacheTag offset | entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint <= methodZoneBase ifTrue: [offset := entryPoint] ifFalse: [self offsetAndSendTableFor: entryPoint annotation: annotation into: [:off :table| offset := off]]. selectorOrCacheTag := backEnd inlineCacheTagAt: mcpc asInteger. (entryPoint > methodZoneBase and: [offset ~= cmNoCheckEntryOffset and: [(self cCoerceSimple: entryPoint - offset to: #'CogMethod *') cmType ~= CMOpenPIC]]) ifTrue: "linked non-super send, cacheTag is a cacheTag" [(objectRepresentation validInlineCacheTag: selectorOrCacheTag) ifFalse: [coInterpreter print: 'cache tag leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]] ifFalse: "unlinked send or super send; cacheTag is a selector" [(objectRepresentation checkValidOopReference: selectorOrCacheTag) ifFalse: [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>checkIfValidOopRefAndTarget:pc:cogMethod: (in category 'garbage collection') ----- checkIfValidOopRefAndTarget: annotation pc: mcpc cogMethod: cogMethod "Check for a valid object reference, if any, at a map entry. Answer a code unique to each error for debugging." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal entryPoint | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (self asserta: (objectRepresentation checkValidOopReference: literal)) ifFalse: [^1]. ((objectRepresentation couldBeObject: literal) and: [objectMemory isReallyYoungObject: literal]) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: [^2]]]. + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache classTag enclosingObject nsTargetMethod | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (self asserta: (objectRepresentation checkValidOopReference: nsSendCache selector)) ifFalse: [^9]. classTag := nsSendCache classTag. (self asserta: (classTag = 0 or: [objectRepresentation validInlineCacheTag: classTag])) ifFalse: [^10]. enclosingObject := nsSendCache enclosingObject. (self asserta: (enclosingObject = 0 or: [objectRepresentation checkValidOopReference: enclosingObject])) ifFalse: [^11]. entryPoint := nsSendCache target. entryPoint ~= 0 ifTrue: [ nsTargetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. (self asserta: (nsTargetMethod cmType = CMMethod)) ifFalse: [^12]]]]. (self isPureSendAnnotation: annotation) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmType = CMMethod) ifFalse: [^3]. self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:offset :cacheTag :tagCouldBeObject| tagCouldBeObject ifTrue: [(objectRepresentation couldBeObject: cacheTag) ifTrue: [(self asserta: (objectRepresentation checkValidOopReference: cacheTag)) ifFalse: [^4]] ifFalse: [(self asserta: (objectRepresentation validInlineCacheTag: cacheTag)) ifFalse: [^5]]. ((objectRepresentation couldBeObject: cacheTag) and: [objectMemory isReallyYoungObject: cacheTag]) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: [^6]]] ifFalse: [(self asserta: (objectRepresentation validInlineCacheTag: cacheTag)) ifFalse: [^7]]]. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: ["It's a linked send; find which kind." self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| (self asserta: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMClosedPIC or: [targetMethod cmType = CMOpenPIC]])) ifFalse: [^8]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>incrementUsageOfTargetIfLinkedSend:mcpc:ignored: (in category 'compaction') ----- incrementUsageOfTargetIfLinkedSend: annotation mcpc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. nsSendCache classTag ~= objectRepresentation illegalClassTag ifTrue: "send is linked" [ | targetMethod | entryPoint := nsSendCache target. targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: (self isPCWithinMethodZone: targetMethod). targetMethod cmUsageCount < (CMMaxUsageCount // 2) ifTrue: [targetMethod cmUsageCount: targetMethod cmUsageCount + 1]]]]. (self isPureSendAnnotation: annotation) ifTrue: [self assert: annotation ~= IsNSSendCall. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod cmUsageCount < (CMMaxUsageCount // 2) ifTrue: [targetMethod cmUsageCount: targetMethod cmUsageCount + 1]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markLiterals:pc:method: (in category 'garbage collection') ----- markLiterals: annotation pc: mcpc method: cogMethod "Mark and trace literals. Additionally in Newspeak, void push implicits that have unmarked classes." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation markAndTraceLiteral: literal in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]]. + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache sel eo | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. sel := nsSendCache selector. (objectMemory isForwarded: sel) ifFalse: [objectMemory markAndTrace: sel] ifTrue: [sel := objectMemory followForwarded: literal. nsSendCache selector: sel. self markAndTraceUpdatedLiteral: sel in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]. eo := nsSendCache enclosingObject. eo ~= 0 ifTrue: [(objectMemory isForwarded: eo) ifFalse: [objectMemory markAndTrace: eo] ifTrue: [eo := objectMemory followForwarded: literal. nsSendCache enclosingObject: eo. self markAndTraceUpdatedLiteral: eo in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]]]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | tagCouldBeObj ifTrue: [(objectRepresentation markAndTraceCacheTagLiteral: cacheTag in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: ["cacheTag is selector" codeModified := true]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markLiteralsAndUnlinkIfUnmarkedSend:pc:method: (in category 'garbage collection') ----- markLiteralsAndUnlinkIfUnmarkedSend: annotation pc: mcpc method: cogMethod "Mark and trace literals. Unlink sends that have unmarked cache tags or targets." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation markAndTraceLiteral: literal in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]]. + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache entryPoint targetMethod sel eo | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. entryPoint := nsSendCache target. entryPoint ~= 0 ifTrue: "Send is linked" [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. (self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger) ifTrue: [self voidNSSendCache: nsSendCache]]. sel := nsSendCache selector. (objectMemory isForwarded: sel) ifFalse: [objectMemory markAndTrace: sel] ifTrue: [sel := objectMemory followForwarded: literal. nsSendCache selector: sel. self markAndTraceUpdatedLiteral: sel in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]. eo := nsSendCache enclosingObject. eo ~= 0 ifTrue: [(objectMemory isForwarded: eo) ifFalse: [objectMemory markAndTrace: eo] ifTrue: [eo := objectMemory followForwarded: literal. nsSendCache enclosingObject: eo. self markAndTraceUpdatedLiteral: eo in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]]]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | | cacheTagMarked | cacheTagMarked := tagCouldBeObj and: [objectRepresentation cacheTagIsMarked: cacheTag]. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| (cacheTagMarked not or: [self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: ["Either the cacheTag is unmarked (e.g. new class) or the target has been freed (because it is unmarked), so unlink the send." self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable. objectRepresentation markAndTraceLiteral: targetMethod selector in: targetMethod at: (self addressOf: targetMethod selector put: [:val| targetMethod selector: val])]]] ifFalse: "cacheTag is selector" [(objectRepresentation markAndTraceCacheTagLiteral: cacheTag in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markYoungObjects:pc:method: (in category 'garbage collection') ----- markYoungObjects: annotation pc: mcpc method: cogMethod "Mark and trace young literals." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. objectRepresentation markAndTraceLiteralIfYoung: literal]. + self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: - NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. objectRepresentation markAndTraceLiteralIfYoung: nsSendCache selector. nsSendCache enclosingObject ~= 0 ifTrue: [objectRepresentation markAndTraceLiteralIfYoung: nsSendCache enclosingObject]]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | tagCouldBeObj ifTrue: [objectRepresentation markAndTraceLiteralIfYoung: cacheTag]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>relocateIfCallOrMethodReference:mcpc:delta: (in category 'compaction') ----- relocateIfCallOrMethodReference: annotation mcpc: mcpc delta: delta <var: #mcpc type: #'char *'> | entryPoint targetMethod unlinkedRoutine | <var: #targetMethod type: #'CogMethod *'> <var: #nsSendCache type: #'NSSendCache *'> + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: ["Retrieve the send cache before relocating the stub call. Fetching the send cache asserts the stub call points below all the cogged methods, but until this method is actually moved, the adjusted stub call may appear to point to somewhere in the method zone." nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. "Fix call to trampoline. This method is moving [delta] bytes, and calls are relative, so adjust the call by -[delta] bytes" backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated. nsSendCache target ~= 0 ifTrue: "Send is linked" [entryPoint := nsSendCache target. targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. targetMethod cmType = CMMethod ifTrue: "send target not freed; just relocate. The cache has an absolute target, so only adjust by the target method's displacement." [nsSendCache target: entryPoint + targetMethod objectHeader] ifFalse: "send target was freed, unlink" [self voidNSSendCache: nsSendCache]]. ^0]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint <= methodZoneBase ifTrue: "send is not linked; just relocate" [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated. ^0]. "It's a linked send; find which kind." self offsetAndSendTableFor: entryPoint annotation: annotation into: [:offset :sendTable| targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. targetMethod cmType ~= CMFree ifTrue: "send target not freed; just relocate." [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: (delta - targetMethod objectHeader) negated. SistaVM ifTrue: "See comment in planCompaction" [methodZone restorePICUsageCount: targetMethod]. ^0]. "Target was freed; map back to an unlinked send; but include this method's reocation" unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). unlinkedRoutine := unlinkedRoutine - delta. backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine. ^0]]. annotation = IsRelativeCall ifTrue: [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated. ^0]. annotation = IsAbsPCReference ifTrue: [backEnd relocateMethodReferenceBeforeAddress: mcpc asInteger by: delta]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>remapIfObjectRef:pc:hasYoung: (in category 'garbage collection') ----- remapIfObjectRef: annotation pc: mcpc hasYoung: hasYoungPtr <var: #mcpc type: #'char *'> <var: #targetMethod type: #'CogMethod *'> <var: #nsSendCache type: #'NSSendCache *'> annotation = IsObjectReference ifTrue: [| literal mappedLiteral | literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation couldBeObject: literal) ifTrue: [mappedLiteral := objectRepresentation remapObject: literal. literal ~= mappedLiteral ifTrue: [literalsManager storeLiteral: mappedLiteral atAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedLiteral]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]. + self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: - NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache oop mappedOop | nsSendCache := self nsSendCacheFromReturnAddress: mcpc. oop := nsSendCache selector. mappedOop := objectRepresentation remapObject: oop. oop ~= mappedOop ifTrue: [nsSendCache selector: mappedOop. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedOop]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]. oop := nsSendCache enclosingObject. oop ~= 0 ifTrue: [ mappedOop := objectRepresentation remapObject: oop. oop ~= mappedOop ifTrue: [nsSendCache enclosingObject: mappedOop. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedOop]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | | mappedCacheTag | (tagCouldBeObj and: [objectRepresentation couldBeObject: cacheTag]) ifTrue: [mappedCacheTag := objectRepresentation remapObject: cacheTag. cacheTag ~= mappedCacheTag ifTrue: [backEnd rewriteInlineCacheTag: mappedCacheTag at: mcpc asUnsignedInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedCacheTag]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]. hasYoungPtr ~= 0 ifTrue: ["Since the unlinking routines may rewrite the cacheTag to the send's selector, and since they don't have the cogMethod to hand and can't add it to youngReferrers, the method must remain in youngReferrers if the targetMethod's selector is young." entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :ignored| (objectMemory isYoung: targetMethod selector) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfFreeOrLinkedSend:pc:of: (in category 'in-line cacheing') ----- unlinkIfFreeOrLinkedSend: annotation pc: mcpc of: theSelector <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (entryPoint := nsSendCache target) ~= 0 ifTrue: [ | targetMethod | targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. (targetMethod cmType = CMFree or: [nsSendCache selector = theSelector]) ifTrue: [self voidNSSendCache: nsSendCache]]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| (targetMethod cmType = CMFree or: [targetMethod selector = theSelector]) ifTrue: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfInvalidClassSend:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfInvalidClassSend: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (nsSendCache classTag ~= objectRepresentation illegalClassTag and: [objectMemory isForwardedClassIndex: nsSendCache classTag]) ifTrue: [self voidNSSendCache: nsSendCache]]. "Should we check if the enclosing object's class is forwarded as well?" ^0 "keep scanning"]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send, but maybe a super send or linked to an OpenPIC, in which case the cache tag will be a selector...." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| ((self annotationIsForUncheckedEntryPoint: annotation) or: [targetMethod cmType = CMOpenPIC]) ifFalse: [(objectMemory isValidClassTag: (backEnd inlineCacheTagAt: mcpc asInteger)) ifFalse: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. nsSendCache classTag ~= objectRepresentation illegalClassTag ifTrue: "Send is linked" [self voidNSSendCache: nsSendCache]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:of: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc of: theSelector <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. nsSendCache selector = theSelector ifTrue: [self voidNSSendCache: nsSendCache]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod selector = theSelector ifTrue: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:to: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc to: theCogMethod <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (entryPoint := nsSendCache target) ~= 0 ifTrue: [ | targetMethod | targetMethod := entryPoint - cmNoCheckEntryOffset. targetMethod = theCogMethod ifTrue: [self voidNSSendCache: nsSendCache]]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod asInteger = theCogMethod ifTrue: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSendToFree:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfLinkedSendToFree: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> <var: #nsTargetMethod type: #'CogMethod *'> | entryPoint | + self cppIf: NewspeakVM ifTrue: - NewspeakVM ifTrue: [| nsSendCache nsTargetMethod | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (entryPoint := nsSendCache target) ~= 0 ifTrue: "It's a linked send." [nsTargetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. nsTargetMethod cmType = CMFree ifTrue: [self voidNSSendCache: nsSendCache]]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod cmType = CMFree ifTrue: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. ^0 "keep scanning"!

1 0

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

18 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1426.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1426 Author: eem Time: 18 July 2015, 1:54:29.051 pm UUID: 94ab92ba-c5c4-4953-8566-a4cd9c38df1f Ancestors: VMMaker.oscog-eem.1425 Fix at least one set of 64-bit issues caused by Slang. In particular the integerObjectOf: code resulted in (objectMemory integerObjectOf: MillisecondClockMask) evaluating to the -1 object, instead of the 16r1FFFFFFF object, which was the cause of the initially nresponsive 64-bit image on the real VM (no problem in the simulator). =============== Diff against VMMaker.oscog-eem.1425 =============== Item was changed: ----- Method: CCodeGenerator>>generateIntegerObjectOf:on:indent: (in category 'C translation') ----- generateIntegerObjectOf: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + | expr castToSqint | + expr := msgNode args first. + aStream nextPutAll: '(('. + "Note that the default type of an integer constant in C is int. Hence we /must/ + cast constants to long if in the 64-bit world, since e.g. in 64-bits + (int)(16r1FFFFF << 3) = (int)16rFFFFFFF8 = -8 + whereas + (long)(16r1FFFFF << 3) = (long) 16rFFFFFFF8 = 4294967288." + castToSqint := expr isConstant and: [vmClass isNil or: [vmClass objectMemoryClass wordSize = 8]]. + castToSqint ifTrue: + [aStream nextPutAll: '(sqInt)']. + self emitCExpression: expr on: aStream. - aStream - nextPutAll: '(('. - self emitCExpression: msgNode args first on: aStream. - aStream nextPutAll: ' << '; print: vmClass objectMemoryClass numSmallIntegerTagBits; nextPutAll: ') | 1)'!

1 0

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

18 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1425.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1425 Author: eem Time: 18 July 2015, 1:01:15.695 pm UUID: 940a2af5-eb00-4257-8328-aba1f471da49 Ancestors: VMMaker.oscog-eem.1424 Don't use cppIf: NewspeakVM(et al) to avoid leaving #if NewspeakVM everywhere. Instead rely on generation-time dead code removal. Both Newspeak and Saqueak VMs benefit from improved readability. Fix some primitiveFail[For:] calls in potential mirror primitives that did not return after falure, and could hence continue to do damage after detecting a failure condition. =============== Diff against VMMaker.oscog-eem.1424 =============== Item was changed: ----- Method: CoInterpreter>>internalFindNewMethodOrdinary (in category 'message sending') ----- internalFindNewMethodOrdinary "Find the compiled method to be run when the current messageSelector is sent to the given class, setting the values of newMethod and primitiveIndex." | ok | <inline: true> ok := self inlineLookupInMethodCacheSel: messageSelector classTag: lkupClassTag. ok ifTrue: [self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector] ifFalse: [self externalizeIPandSP. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: lkupClassTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: lkupClassTag) ifTrue: [lkupClassTag := self handleForwardedSendFaultForTag: lkupClassTag]. (self lookupInMethodCacheSel: messageSelector classTag: lkupClassTag) ifTrue: [^self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector]]. lkupClass := objectMemory classForClassTag: lkupClassTag. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [self lookupOrdinarySend] ifFalse: [self lookupMethodInClass: lkupClass]. self internalizeIPandSP. self addNewMethodToCache: lkupClass]! Item was changed: ----- Method: CoInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') ----- validInstructionPointer: instrPointer inMethod: aMethod framePointer: fp <var: #instrPointer type: #usqInt> <var: #aMethod type: #usqInt> <var: #fp type: #'char *'> | theInstrPointer cogMethod | <var: #theInstrPointer type: #usqInt> <var: #cogMethod type: #'CogMethod *'> instrPointer = cogit ceCannotResumePC ifTrue: [^self isMachineCodeFrame: fp]. instrPointer = cogit ceReturnToInterpreterPC ifTrue: [(self isMachineCodeFrame: fp) ifTrue: [^false]. theInstrPointer := self iframeSavedIP: fp] ifFalse: [theInstrPointer := instrPointer. + NewspeakVM - self cppIf: NewspeakVM ifTrue: [(self isMachineCodeFrame: fp) ifTrue: [cogMethod := self mframeHomeMethod: fp. ^theInstrPointer >= (cogMethod asUnsignedInteger + (cogit sizeof: CogMethod)) and: [theInstrPointer < (cogMethod asUnsignedInteger + cogMethod blockSize)]]] ifFalse: [| header | header := self rawHeaderOf: aMethod. ((self isCogMethodReference: header) and: [theInstrPointer < objectMemory startOfMemory]) ifTrue: [cogMethod := self cCoerceSimple: header to: #'CogMethod *'. ^theInstrPointer >= (header + (cogit sizeof: CogMethod)) and: [theInstrPointer < (header + cogMethod blockSize)]]]]. ^super validInstructionPointer: theInstrPointer inMethod: aMethod framePointer: fp! Item was changed: ----- Method: CogMethodZone>>clearCogCompiledCode (in category 'jit - api') ----- clearCogCompiledCode "Free all methods" | cogMethod | <var: #cogMethod type: #'CogMethod *'> + NewspeakVM ifTrue: [unpairedMethodList := nil]. - self cppIf: NewspeakVM ifTrue: [unpairedMethodList := nil]. cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. [cogMethod asUnsignedInteger < mzFreeStart] whileTrue: [cogMethod cmType = CMMethod ifTrue: [self freeMethod: cogMethod]. cogMethod := self methodAfter: cogMethod]. self manageFrom: baseAddress to: limitAddress! Item was changed: ----- Method: CogMethodZone>>compactCompiledCode (in category 'compaction') ----- compactCompiledCode | objectHeaderValue source dest bytes | <var: #source type: #'CogMethod *'> <var: #dest type: #'CogMethod *'> objectHeaderValue := objectMemory nullHeaderForMachineCodeMethod. source := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. openPICList := nil. methodCount := 0. + NewspeakVM ifTrue: [unpairedMethodList := nil]. - self cppIf: NewspeakVM ifTrue: [unpairedMethodList := nil]. [source < self limitZony and: [source cmType ~= CMFree]] whileTrue: [self assert: (cogit cogMethodDoesntLookKosher: source) = 0. source objectHeader: objectHeaderValue. source cmUsageCount > 0 ifTrue: [source cmUsageCount: source cmUsageCount // 2]. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [(source cmType = CMMethod and: [(coInterpreter rawHeaderOf: source methodObject) asInteger ~= source asInteger]) ifTrue: [source nextMethodOrIRCs: unpairedMethodList. unpairedMethodList := source asUnsignedInteger]]. SistaVM ifTrue: [self clearSavedPICUsageCount: source]. source cmType = CMOpenPIC ifTrue: [source nextOpenPIC: openPICList asUnsignedInteger. openPICList := source]. methodCount := methodCount + 1. source := self methodAfter: source]. source >= self limitZony ifTrue: [^self halt: 'no free methods; cannot compact.']. dest := source. [source < self limitZony] whileTrue: [self assert: (cogit maybeFreeCogMethodDoesntLookKosher: source) = 0. bytes := source blockSize. source cmType ~= CMFree ifTrue: [methodCount := methodCount + 1. objectMemory mem: dest mo: source ve: bytes. dest objectHeader: objectHeaderValue. dest cmType = CMMethod ifTrue: ["For non-Newspeak there should be a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only update the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger ifTrue: [coInterpreter rawHeaderOf: dest methodObject put: dest asInteger] ifFalse: [self assert: (cogit noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [dest nextMethodOrIRCs: unpairedMethodList. unpairedMethodList := dest asUnsignedInteger]]] ifFalse: [SistaVM ifTrue: [self clearSavedPICUsageCount: dest]. dest cmType = CMOpenPIC ifTrue: [dest nextOpenPIC: openPICList asUnsignedInteger. openPICList := dest]]. dest cmUsageCount > 0 ifTrue: [dest cmUsageCount: dest cmUsageCount // 2]. dest := coInterpreter cCoerceSimple: dest asUnsignedInteger + bytes to: #'CogMethod *']. source := coInterpreter cCoerceSimple: source asUnsignedInteger + bytes to: #'CogMethod *']. mzFreeStart := dest asUnsignedInteger. methodBytesFreedSinceLastCompaction := 0! Item was changed: ----- Method: CogMethodZone>>freeMethod: (in category 'compaction') ----- freeMethod: cogMethod <api> <var: #cogMethod type: #'CogMethod *'> <inline: false> self assert: cogMethod cmType ~= CMFree. self assert: ((cogit cogMethodDoesntLookKosher: cogMethod) = 0 or: [(cogit cogMethodDoesntLookKosher: cogMethod) = 23 and: [(cogit cCoerceSimple: cogMethod methodObject to: #'CogMethod *') cmType = CMFree]]). cogMethod cmType = CMMethod ifTrue: ["For non-Newspeak there should ne a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only reset the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: cogMethod methodObject) asInteger = cogMethod asInteger ifTrue: [coInterpreter rawHeaderOf: cogMethod methodObject put: cogMethod methodHeader. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [(objectRepresentation canPinObjects and: [cogMethod nextMethodOrIRCs ~= 0]) ifTrue: [objectRepresentation freeIRCs: cogMethod nextMethodOrIRCs]]] ifFalse: [self assert: (cogit noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [self removeFromUnpairedMethodList: cogMethod]]. cogit maybeFreeCountersOf: cogMethod]. cogMethod cmType = CMOpenPIC ifTrue: [self removeFromOpenPICList: cogMethod]. cogMethod cmRefersToYoung: false. cogMethod cmType: CMFree. methodBytesFreedSinceLastCompaction := methodBytesFreedSinceLastCompaction + cogMethod blockSize! Item was changed: ----- Method: CogMethodZone>>manageFrom:to: (in category 'initialization') ----- manageFrom: theStartAddress to: theLimitAddress <returnTypeC: #void> mzFreeStart := baseAddress := theStartAddress. youngReferrers := limitAddress := theLimitAddress. openPICList := nil. + NewspeakVM ifTrue: [unpairedMethodList := nil]. - self cppIf: NewspeakVM ifTrue: [unpairedMethodList := nil]. methodBytesFreedSinceLastCompaction := 0. methodCount := 0! Item was changed: ----- Method: Cogit>>checkIfValidOopRef:pc:cogMethod: (in category 'garbage collection') ----- checkIfValidOopRef: annotation pc: mcpc cogMethod: cogMethod "Check for a valid object reference, if any, at a map entry. Answer a code unique to each error for debugging." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> annotation = IsObjectReference ifTrue: [| literal | literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation checkValidOopReference: literal) ifFalse: [coInterpreter print: 'object ref leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache enclosingObject | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. [(objectRepresentation checkValidOopReference: nsSendCache selector) ifFalse: [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]. (enclosingObject := nsSendCache enclosingObject) ~= 0 ifTrue: [[(objectRepresentation checkValidOopReference: enclosingObject) ifFalse: [coInterpreter print: 'enclosing object leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]]]]. (self isPureSendAnnotation: annotation) ifTrue: [| entryPoint selectorOrCacheTag offset | entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint <= methodZoneBase ifTrue: [offset := entryPoint] ifFalse: [self offsetAndSendTableFor: entryPoint annotation: annotation into: [:off :table| offset := off]]. selectorOrCacheTag := backEnd inlineCacheTagAt: mcpc asInteger. (entryPoint > methodZoneBase and: [offset ~= cmNoCheckEntryOffset and: [(self cCoerceSimple: entryPoint - offset to: #'CogMethod *') cmType ~= CMOpenPIC]]) ifTrue: "linked non-super send, cacheTag is a cacheTag" [(objectRepresentation validInlineCacheTag: selectorOrCacheTag) ifFalse: [coInterpreter print: 'cache tag leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]] ifFalse: "unlinked send or super send; cacheTag is a selector" [(objectRepresentation checkValidOopReference: selectorOrCacheTag) ifFalse: [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>checkIfValidOopRefAndTarget:pc:cogMethod: (in category 'garbage collection') ----- checkIfValidOopRefAndTarget: annotation pc: mcpc cogMethod: cogMethod "Check for a valid object reference, if any, at a map entry. Answer a code unique to each error for debugging." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal entryPoint | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (self asserta: (objectRepresentation checkValidOopReference: literal)) ifFalse: [^1]. ((objectRepresentation couldBeObject: literal) and: [objectMemory isReallyYoungObject: literal]) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: [^2]]]. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache classTag enclosingObject nsTargetMethod | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (self asserta: (objectRepresentation checkValidOopReference: nsSendCache selector)) ifFalse: [^9]. classTag := nsSendCache classTag. (self asserta: (classTag = 0 or: [objectRepresentation validInlineCacheTag: classTag])) ifFalse: [^10]. enclosingObject := nsSendCache enclosingObject. (self asserta: (enclosingObject = 0 or: [objectRepresentation checkValidOopReference: enclosingObject])) ifFalse: [^11]. entryPoint := nsSendCache target. entryPoint ~= 0 ifTrue: [ nsTargetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. (self asserta: (nsTargetMethod cmType = CMMethod)) ifFalse: [^12]]]]. (self isPureSendAnnotation: annotation) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmType = CMMethod) ifFalse: [^3]. self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:offset :cacheTag :tagCouldBeObject| tagCouldBeObject ifTrue: [(objectRepresentation couldBeObject: cacheTag) ifTrue: [(self asserta: (objectRepresentation checkValidOopReference: cacheTag)) ifFalse: [^4]] ifFalse: [(self asserta: (objectRepresentation validInlineCacheTag: cacheTag)) ifFalse: [^5]]. ((objectRepresentation couldBeObject: cacheTag) and: [objectMemory isReallyYoungObject: cacheTag]) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: [^6]]] ifFalse: [(self asserta: (objectRepresentation validInlineCacheTag: cacheTag)) ifFalse: [^7]]]. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: ["It's a linked send; find which kind." self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| (self asserta: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMClosedPIC or: [targetMethod cmType = CMOpenPIC]])) ifFalse: [^8]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>cog:selector: (in category 'jit - api') ----- cog: aMethodObj selector: aSelectorOop "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> "In Newspeak we support annonymous accessors and hence tolerate the same method being cogged multiple times. But only if the method class association is nil." NewspeakVM ifTrue: [(coInterpreter methodHasCogMethod: aMethodObj) ifTrue: [cogMethod := coInterpreter cogMethodOf: aMethodObj. self deny: cogMethod selector = aSelectorOop. cogMethod selector = aSelectorOop ifTrue: [^cogMethod]. (coInterpreter methodClassAssociationOf: aMethodObj) ~= objectMemory nilObject ifTrue: [self warnMultiple: cogMethod selectors: aSelectorOop. ^nil]]] ifFalse: [self deny: (coInterpreter methodHasCogMethod: aMethodObj)]. "coInterpreter stringOf: aSelectorOop" coInterpreter compilationBreak: aSelectorOop point: (objectMemory lengthOf: aSelectorOop) isMNUCase: false. aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. + NewspeakVM ifTrue: + [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop. + cogMethod ifNotNil: + [(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue: + [self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader. + cogMethod methodObject: aMethodObj. + coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger]. + ^cogMethod]]. - self cppIf: NewspeakVM - ifTrue: [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop. - cogMethod ifNotNil: - [(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue: - [self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader. - cogMethod methodObject: aMethodObj. - coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger]. - ^cogMethod]]. "If the generators for the alternate bytecode set are missing then interpret." (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: [(self numElementsIn: generatorTable) <= 256 ifTrue: [^nil]. bytecodeSetOffset := 256] ifFalse: [bytecodeSetOffset := 0]. objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj. methodObj := aMethodObj. cogMethod := self compileCogMethod: aSelectorOop. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. self maybeFreeCounters. "Right now no errors should be reported, so nothing more to do." "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)." ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod! Item was changed: ----- Method: Cogit>>fillInMethodHeader:size:selector: (in category 'generate machine code') ----- fillInMethodHeader: method size: size selector: selector <returnTypeC: #'CogMethod *'> <var: #method type: #'CogMethod *'> <var: #originalMethod type: #'CogMethod *'> | methodHeader originalMethod | method cmType: CMMethod. method objectHeader: objectMemory nullHeaderForMachineCodeMethod. method blockSize: size. method methodObject: methodObj. methodHeader := coInterpreter rawHeaderOf: methodObj. "If the method has already been cogged (e.g. Newspeak accessors) then leave the original method attached to its cog method, but get the right header." (coInterpreter isCogMethodReference: methodHeader) ifTrue: [originalMethod := self cCoerceSimple: methodHeader to: #'CogMethod *'. self assert: originalMethod blockSize = size. methodHeader := originalMethod methodHeader. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [methodZone addToUnpairedMethodList: method]] ifFalse: [coInterpreter rawHeaderOf: methodObj put: method asInteger. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [method nextMethodOrIRCs: theIRCs]]. method methodHeader: methodHeader. method selector: selector. method cmNumArgs: (coInterpreter argumentCountOfMethodHeader: methodHeader). (method cmRefersToYoung: hasYoungReferent) ifTrue: [methodZone addToYoungReferrers: method]. method cmUsageCount: self initialMethodUsageCount. method cpicHasMNUCase: false. method cmUsesPenultimateLit: maxLitIndex >= ((objectMemory literalCountOfMethodHeader: methodHeader) - 2). method blockEntryOffset: (blockEntryLabel notNil ifTrue: [blockEntryLabel address - method asInteger] ifFalse: [0]). "This can be an error check since a large stackCheckOffset is caused by compiling a machine-code primitive, and hence depends on the Cogit, not the input method." needsFrame ifTrue: [stackCheckLabel address - method asInteger <= MaxStackCheckOffset ifFalse: [self error: 'too much code for stack check offset']]. method stackCheckOffset: (needsFrame ifTrue: [stackCheckLabel address - method asInteger] ifFalse: [0]). self assert: (backEnd callTargetFromReturnAddress: method asInteger + missOffset) = (self methodAbortTrampolineFor: method cmNumArgs). self assert: size = (methodZone roundUpLength: size). processor flushICacheFrom: method asUnsignedInteger to: method asUnsignedInteger + size. ^method! Item was changed: ----- Method: Cogit>>generateSendTrampolines (in category 'initialization') ----- generateSendTrampolines 0 to: NumSendTrampolines - 1 do: [:numArgs| ordinarySendTrampolines at: numArgs put: (self genTrampolineFor: #ceSend:super:to:numArgs: called: (self trampolineName: 'ceSend' numArgs: numArgs) arg: ClassReg arg: 0 arg: ReceiverResultReg arg: (self numArgsOrSendNumArgsReg: numArgs))]. "Generate these in the middle so they are within [firstSend, lastSend]." + NewspeakVM ifTrue: + [self generateNewspeakSendTrampolines]. + BytecodeSetHasDirectedSuperSend ifTrue: - self cppIf: NewspeakVM ifTrue: [self generateNewspeakSendTrampolines]. - self cppIf: BytecodeSetHasDirectedSuperSend ifTrue: [0 to: NumSendTrampolines - 1 do: [:numArgs| directedSuperSendTrampolines at: numArgs put: (self genTrampolineFor: #ceSend:above:to:numArgs: called: (self trampolineName: 'ceDirectedSuperSend' numArgs: numArgs) arg: ClassReg arg: TempReg arg: ReceiverResultReg arg: (self numArgsOrSendNumArgsReg: numArgs))]]. 0 to: NumSendTrampolines - 1 do: [:numArgs| superSendTrampolines at: numArgs put: (self genTrampolineFor: #ceSend:super:to:numArgs: called: (self trampolineName: 'ceSuperSend' numArgs: numArgs) arg: ClassReg arg: 1 arg: ReceiverResultReg arg: (self numArgsOrSendNumArgsReg: numArgs))]. firstSend := ordinarySendTrampolines at: 0. lastSend := superSendTrampolines at: NumSendTrampolines - 1! Item was changed: ----- Method: Cogit>>generateTrampolines (in category 'initialization') ----- generateTrampolines "Generate the run-time entries and exits at the base of the native code zone and update the base. Read the class-side method trampolines for documentation on the various trampolines" | methodZoneStart | methodZoneStart := methodZoneBase. methodLabel address: methodZoneStart. self allocateOpcodes: 80 bytecodes: 0. initialPC := 0. endPC := numAbstractOpcodes - 1. hasYoungReferent := false. self generateSendTrampolines. self generateMissAbortTrampolines. objectRepresentation generateObjectRepresentationTrampolines. self generateRunTimeTrampolines. + NewspeakVM ifTrue: [self generateNewspeakRuntime]. + SistaVM ifTrue: [self generateSistaRuntime]. - self cppIf: NewspeakVM ifTrue: [self generateNewspeakRuntime]. - self cppIf: SistaVM ifTrue: [self generateSistaRuntime]. self generateEnilopmarts. self generateTracingTrampolines. "finish up" self recordGeneratedRunTime: 'methodZoneBase' address: methodZoneBase. processor flushICacheFrom: methodZoneStart asUnsignedInteger to: methodZoneBase asUnsignedInteger! Item was changed: ----- Method: Cogit>>incrementUsageOfTargetIfLinkedSend:mcpc:ignored: (in category 'compaction') ----- incrementUsageOfTargetIfLinkedSend: annotation mcpc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. nsSendCache classTag ~= objectRepresentation illegalClassTag ifTrue: "send is linked" [ | targetMethod | entryPoint := nsSendCache target. targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: (self isPCWithinMethodZone: targetMethod). targetMethod cmUsageCount < (CMMaxUsageCount // 2) ifTrue: [targetMethod cmUsageCount: targetMethod cmUsageCount + 1]]]]. (self isPureSendAnnotation: annotation) ifTrue: [self assert: annotation ~= IsNSSendCall. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod cmUsageCount < (CMMaxUsageCount // 2) ifTrue: [targetMethod cmUsageCount: targetMethod cmUsageCount + 1]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markLiterals:pc:method: (in category 'garbage collection') ----- markLiterals: annotation pc: mcpc method: cogMethod "Mark and trace literals. Additionally in Newspeak, void push implicits that have unmarked classes." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation markAndTraceLiteral: literal in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]]. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache sel eo | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. sel := nsSendCache selector. (objectMemory isForwarded: sel) ifFalse: [objectMemory markAndTrace: sel] ifTrue: [sel := objectMemory followForwarded: literal. nsSendCache selector: sel. self markAndTraceUpdatedLiteral: sel in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]. eo := nsSendCache enclosingObject. eo ~= 0 ifTrue: [(objectMemory isForwarded: eo) ifFalse: [objectMemory markAndTrace: eo] ifTrue: [eo := objectMemory followForwarded: literal. nsSendCache enclosingObject: eo. self markAndTraceUpdatedLiteral: eo in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]]]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | tagCouldBeObj ifTrue: [(objectRepresentation markAndTraceCacheTagLiteral: cacheTag in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: ["cacheTag is selector" codeModified := true]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markLiteralsAndUnlinkIfUnmarkedSend:pc:method: (in category 'garbage collection') ----- markLiteralsAndUnlinkIfUnmarkedSend: annotation pc: mcpc method: cogMethod "Mark and trace literals. Unlink sends that have unmarked cache tags or targets." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation markAndTraceLiteral: literal in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]]. + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache entryPoint targetMethod sel eo | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. entryPoint := nsSendCache target. entryPoint ~= 0 ifTrue: "Send is linked" [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. (self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger) ifTrue: [self voidNSSendCache: nsSendCache]]. sel := nsSendCache selector. (objectMemory isForwarded: sel) ifFalse: [objectMemory markAndTrace: sel] ifTrue: [sel := objectMemory followForwarded: literal. nsSendCache selector: sel. self markAndTraceUpdatedLiteral: sel in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]. eo := nsSendCache enclosingObject. eo ~= 0 ifTrue: [(objectMemory isForwarded: eo) ifFalse: [objectMemory markAndTrace: eo] ifTrue: [eo := objectMemory followForwarded: literal. nsSendCache enclosingObject: eo. self markAndTraceUpdatedLiteral: eo in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]]]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | | cacheTagMarked | cacheTagMarked := tagCouldBeObj and: [objectRepresentation cacheTagIsMarked: cacheTag]. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| (cacheTagMarked not or: [self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: ["Either the cacheTag is unmarked (e.g. new class) or the target has been freed (because it is unmarked), so unlink the send." self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable. objectRepresentation markAndTraceLiteral: targetMethod selector in: targetMethod at: (self addressOf: targetMethod selector put: [:val| targetMethod selector: val])]]] ifFalse: "cacheTag is selector" [(objectRepresentation markAndTraceCacheTagLiteral: cacheTag in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markYoungObjects:pc:method: (in category 'garbage collection') ----- markYoungObjects: annotation pc: mcpc method: cogMethod "Mark and trace young literals." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. objectRepresentation markAndTraceLiteralIfYoung: literal]. + NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: - self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. objectRepresentation markAndTraceLiteralIfYoung: nsSendCache selector. nsSendCache enclosingObject ~= 0 ifTrue: [objectRepresentation markAndTraceLiteralIfYoung: nsSendCache enclosingObject]]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | tagCouldBeObj ifTrue: [objectRepresentation markAndTraceLiteralIfYoung: cacheTag]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>relocateIfCallOrMethodReference:mcpc:delta: (in category 'compaction') ----- relocateIfCallOrMethodReference: annotation mcpc: mcpc delta: delta <var: #mcpc type: #'char *'> | entryPoint targetMethod unlinkedRoutine | <var: #targetMethod type: #'CogMethod *'> <var: #nsSendCache type: #'NSSendCache *'> + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: ["Retrieve the send cache before relocating the stub call. Fetching the send cache asserts the stub call points below all the cogged methods, but until this method is actually moved, the adjusted stub call may appear to point to somewhere in the method zone." nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. "Fix call to trampoline. This method is moving [delta] bytes, and calls are relative, so adjust the call by -[delta] bytes" backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated. nsSendCache target ~= 0 ifTrue: "Send is linked" [entryPoint := nsSendCache target. targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. targetMethod cmType = CMMethod ifTrue: "send target not freed; just relocate. The cache has an absolute target, so only adjust by the target method's displacement." [nsSendCache target: entryPoint + targetMethod objectHeader] ifFalse: "send target was freed, unlink" [self voidNSSendCache: nsSendCache]]. ^0]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint <= methodZoneBase ifTrue: "send is not linked; just relocate" [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated. ^0]. "It's a linked send; find which kind." self offsetAndSendTableFor: entryPoint annotation: annotation into: [:offset :sendTable| targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. targetMethod cmType ~= CMFree ifTrue: "send target not freed; just relocate." [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: (delta - targetMethod objectHeader) negated. SistaVM ifTrue: "See comment in planCompaction" [methodZone restorePICUsageCount: targetMethod]. ^0]. "Target was freed; map back to an unlinked send; but include this method's reocation" unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). unlinkedRoutine := unlinkedRoutine - delta. backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine. ^0]]. annotation = IsRelativeCall ifTrue: [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated. ^0]. annotation = IsAbsPCReference ifTrue: [backEnd relocateMethodReferenceBeforeAddress: mcpc asInteger by: delta]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>remapIfObjectRef:pc:hasYoung: (in category 'garbage collection') ----- remapIfObjectRef: annotation pc: mcpc hasYoung: hasYoungPtr <var: #mcpc type: #'char *'> <var: #targetMethod type: #'CogMethod *'> <var: #nsSendCache type: #'NSSendCache *'> annotation = IsObjectReference ifTrue: [| literal mappedLiteral | literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation couldBeObject: literal) ifTrue: [mappedLiteral := objectRepresentation remapObject: literal. literal ~= mappedLiteral ifTrue: [literalsManager storeLiteral: mappedLiteral atAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedLiteral]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]. + NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: - self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache oop mappedOop | nsSendCache := self nsSendCacheFromReturnAddress: mcpc. oop := nsSendCache selector. mappedOop := objectRepresentation remapObject: oop. oop ~= mappedOop ifTrue: [nsSendCache selector: mappedOop. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedOop]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]. oop := nsSendCache enclosingObject. oop ~= 0 ifTrue: [ mappedOop := objectRepresentation remapObject: oop. oop ~= mappedOop ifTrue: [nsSendCache enclosingObject: mappedOop. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedOop]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | | mappedCacheTag | (tagCouldBeObj and: [objectRepresentation couldBeObject: cacheTag]) ifTrue: [mappedCacheTag := objectRepresentation remapObject: cacheTag. cacheTag ~= mappedCacheTag ifTrue: [backEnd rewriteInlineCacheTag: mappedCacheTag at: mcpc asUnsignedInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedCacheTag]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]. hasYoungPtr ~= 0 ifTrue: ["Since the unlinking routines may rewrite the cacheTag to the send's selector, and since they don't have the cogMethod to hand and can't add it to youngReferrers, the method must remain in youngReferrers if the targetMethod's selector is young." entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :ignored| (objectMemory isYoung: targetMethod selector) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfFreeOrLinkedSend:pc:of: (in category 'in-line cacheing') ----- unlinkIfFreeOrLinkedSend: annotation pc: mcpc of: theSelector <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (entryPoint := nsSendCache target) ~= 0 ifTrue: [ | targetMethod | targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. (targetMethod cmType = CMFree or: [nsSendCache selector = theSelector]) ifTrue: [self voidNSSendCache: nsSendCache]]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| (targetMethod cmType = CMFree or: [targetMethod selector = theSelector]) ifTrue: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfInvalidClassSend:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfInvalidClassSend: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (nsSendCache classTag ~= objectRepresentation illegalClassTag and: [objectMemory isForwardedClassIndex: nsSendCache classTag]) ifTrue: [self voidNSSendCache: nsSendCache]]. "Should we check if the enclosing object's class is forwarded as well?" ^0 "keep scanning"]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send, but maybe a super send or linked to an OpenPIC, in which case the cache tag will be a selector...." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| ((self annotationIsForUncheckedEntryPoint: annotation) or: [targetMethod cmType = CMOpenPIC]) ifFalse: [(objectMemory isValidClassTag: (backEnd inlineCacheTagAt: mcpc asInteger)) ifFalse: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. nsSendCache classTag ~= objectRepresentation illegalClassTag ifTrue: "Send is linked" [self voidNSSendCache: nsSendCache]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:of: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc of: theSelector <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. nsSendCache selector = theSelector ifTrue: [self voidNSSendCache: nsSendCache]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod selector = theSelector ifTrue: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:to: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc to: theCogMethod <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | entryPoint | + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (entryPoint := nsSendCache target) ~= 0 ifTrue: [ | targetMethod | targetMethod := entryPoint - cmNoCheckEntryOffset. targetMethod = theCogMethod ifTrue: [self voidNSSendCache: nsSendCache]]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod asInteger = theCogMethod ifTrue: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSendToFree:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfLinkedSendToFree: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> <var: #nsTargetMethod type: #'CogMethod *'> | entryPoint | + NewspeakVM ifTrue: - self cppIf: NewspeakVM ifTrue: [| nsSendCache nsTargetMethod | annotation = IsNSSendCall ifTrue: [nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. (entryPoint := nsSendCache target) ~= 0 ifTrue: "It's a linked send." [nsTargetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. nsTargetMethod cmType = CMFree ifTrue: [self voidNSSendCache: nsSendCache]]. ^0 "keep scanning"]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod cmType = CMFree ifTrue: [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. ^0 "keep scanning"! Item was changed: ----- Method: InterpreterPrimitives>>primitiveAllInstances (in category 'object access primitives') ----- primitiveAllInstances "Answer an array of all instances of the receiver that exist when the primitive is called, excluding any that may be garbage collected as a side effect of allocating the result array." <export: true> | result | + NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." + [(argumentCount < 1 + or: [(objectMemory isNonImmediate: self stackTop) + and: [self objCouldBeClassObj: self stackTop]]) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]]. - self cppIf: NewspeakVM - ifTrue: "For the mirror prims check that the class obj is actually a valid class." - [(argumentCount < 1 - or: [(objectMemory isNonImmediate: self stackTop) - and: [self objCouldBeClassObj: self stackTop]]) ifFalse: - [self primitiveFailFor: PrimErrBadArgument]]. result := objectMemory allInstancesOf: self stackTop. (objectMemory isIntegerObject: result) ifTrue: [objectMemory growToAccomodateContainerWithNumSlots: (objectMemory integerValueOf: result). result := objectMemory allInstancesOf: self stackTop. (objectMemory isIntegerObject: result) ifTrue: [^self primitiveFailFor: PrimErrNoMemory]]. self pop: argumentCount+1 thenPush: result! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBehaviorHash (in category 'object access primitives') ----- primitiveBehaviorHash | hashOrError | + NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." + [argumentCount > 0 ifTrue: + [((objectMemory isNonImmediate: self stackTop) + and: [self objCouldBeClassObj: self stackTop]) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]]]. - self cppIf: NewspeakVM - ifTrue: - [argumentCount > 0 ifTrue: - [((objectMemory isNonImmediate: self stackTop) - and: [self objCouldBeClassObj: self stackTop]) ifFalse: - [^self primitiveFailFor: PrimErrBadArgument]]]. self assert: ((objectMemory isNonImmediate: self stackTop) and: [self addressCouldBeClassObj: self stackTop]). hashOrError := objectMemory ensureBehaviorHash: self stackTop. hashOrError >= 0 ifTrue: [self pop: argumentCount + 1 thenPushInteger: hashOrError] ifFalse: [self primitiveFailFor: hashOrError negated]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNew (in category 'object access primitives') ----- primitiveNew + NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." + [(argumentCount < 1 + or: [self objCouldBeClassObj: self stackTop]) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]]. - self cppIf: NewspeakVM - ifTrue: "For the mirror prims check that the class obj is actually a valid class." - [(argumentCount < 1 - or: [self objCouldBeClassObj: self stackTop]) ifFalse: - [self primitiveFailFor: PrimErrBadArgument]]. objectMemory hasSpurMemoryManagerAPI ifTrue: ["Allocate a new fixed-size instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. This *will not* cause a GC :-)" (objectMemory instantiateClass: self stackTop) ifNotNil: [:obj| self pop: argumentCount + 1 thenPush: obj] ifNil: [self primitiveFailFor: ((objectMemory isFixedSizePointerFormat: (objectMemory instSpecOfClass: self stackTop)) ifTrue: [PrimErrNoMemory] ifFalse: [PrimErrBadReceiver])]] ifFalse: ["Allocate a new fixed-size instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. May cause a GC." | spaceOkay | "The following may cause GC!! Use var for result to permit inlining." spaceOkay := objectMemory sufficientSpaceToInstantiate: self stackTop indexableSize: 0. spaceOkay ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory instantiateClass: self stackTop indexableSize: 0)] ifFalse: [self primitiveFailFor: PrimErrNoMemory]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNewWithArg (in category 'object access primitives') ----- primitiveNewWithArg "Allocate a new indexable instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. May cause a GC." | size spaceOkay instSpec | + NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." + [(argumentCount < 2 + or: [self addressCouldBeClassObj: (self stackValue: 1)]) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]]. size := self positiveMachineIntegerValueOf: self stackTop. + self successful ifFalse:"positiveMachineIntegerValueOf: succeeds only for non-negative integers." + [^self primitiveFailFor: PrimErrBadArgument]. + objectMemory hasSpurMemoryManagerAPI - self cppIf: NewspeakVM - ifTrue: "For the mirror prims check that the class obj is actually a valid class." - [(argumentCount < 2 - or: [self addressCouldBeClassObj: (self stackValue: 1)]) ifFalse: - [self primitiveFailFor: PrimErrBadArgument]]. - self successful "positiveMachineIntegerValueOf: succeeds only for non-negative integers." ifTrue: + [(objectMemory instantiateClass: (self stackValue: 1) indexableSize: size) + ifNotNil: [:obj| self pop: argumentCount + 1 thenPush: obj] + ifNil: [instSpec := objectMemory instSpecOfClass: (self stackValue: 1). + self primitiveFailFor: (((objectMemory isIndexableFormat: instSpec) + and: [(objectMemory isCompiledMethodFormat: instSpec) not]) + ifTrue: [PrimErrNoMemory] + ifFalse: [PrimErrBadReceiver])]] + ifFalse: + [spaceOkay := objectMemory sufficientSpaceToInstantiate: (self stackValue: 1) indexableSize: size. + spaceOkay - [objectMemory hasSpurMemoryManagerAPI ifTrue: + [self + pop: argumentCount + 1 + thenPush: (objectMemory instantiateClass: (self stackValue: 1) indexableSize: size)] - [(objectMemory instantiateClass: (self stackValue: 1) indexableSize: size) - ifNotNil: [:obj| self pop: argumentCount + 1 thenPush: obj] - ifNil: [instSpec := objectMemory instSpecOfClass: (self stackValue: 1). - self primitiveFailFor: (((objectMemory isIndexableFormat: instSpec) - and: [(objectMemory isCompiledMethodFormat: instSpec) not]) - ifTrue: [PrimErrNoMemory] - ifFalse: [PrimErrBadReceiver])]] ifFalse: + [self primitiveFailFor: PrimErrNoMemory]]! - [spaceOkay := objectMemory sufficientSpaceToInstantiate: (self stackValue: 1) indexableSize: size. - spaceOkay - ifTrue: - [self - pop: argumentCount + 1 - thenPush: (objectMemory instantiateClass: (self stackValue: 1) indexableSize: size)] - ifFalse: - [self primitiveFailFor: PrimErrNoMemory]]] - ifFalse: - [self primitiveFailFor: PrimErrBadArgument]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSizeInBytesOfInstance (in category 'memory space primitives') ----- primitiveSizeInBytesOfInstance "Answer the byte size of an instance of the receiver. If num args > 0 then the last argument is a variable size and the size answered is the size of an instance of the receiver with that many indexable elements." <option: #SpurObjectMemory> | byteSize err | + NewspeakVM - self cppIf: NewspeakVM ifTrue: "Support VMMirror>>byteSizeOfInstanceOf:WithIndexableVariables:" [argumentCount > 2 ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]] ifFalse: [argumentCount > 1 ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]]. err := -1. argumentCount >= 1 ifTrue: [(objectMemory isIntegerObject: self stackTop) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. byteSize := objectMemory byteSizeOfInstanceOf: (self stackValue: 1) withIndexableSlots: (objectMemory integerValueOf: self stackTop) errInto: [:code| err := code]. err >= 0 ifTrue: [^self primitiveFailFor: err]. ^self pop: argumentCount + 1 thenPush: (self positive64BitIntegerFor: byteSize)]. byteSize := objectMemory byteSizeOfInstanceOf: (self stackValue: 0) errInto: [:code| err := code]. err >= 0 ifTrue: [^self primitiveFailFor: err]. self pop: 1 thenPushInteger: byteSize! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSomeInstance (in category 'object access primitives') ----- primitiveSomeInstance | class instance | class := self stackTop. + NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." + [(argumentCount < 1 + or: [(objectMemory isNonImmediate: class) + and: [self objCouldBeClassObj: class]]) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]]. - self cppIf: NewspeakVM - ifTrue: "For the mirror prims check that the class obj is actually a valid class." - [(argumentCount < 1 - or: [(objectMemory isNonImmediate: class) - and: [self objCouldBeClassObj: class]]) ifFalse: - [self primitiveFailFor: PrimErrBadArgument]]. instance := objectMemory initialInstanceOf: class. instance ifNil: [self primitiveFail] ifNotNil: [self pop: argumentCount+1 thenPush: instance]! Item was changed: ----- Method: StackInterpreter>>flushMethodCache (in category 'method lookup cache') ----- flushMethodCache "Flush the method cache. The method cache is flushed on every programming change and garbage collect." 1 to: MethodCacheSize do: [ :i | methodCache at: i put: 0 ]. + NewspeakVM ifTrue: + [1 to: NSMethodCacheSize do: [ :i | nsMethodCache at: i put: 0 ]]. - self cppIf: NewspeakVM - ifTrue: [1 to: NSMethodCacheSize do: [ :i | nsMethodCache at: i put: 0 ]]. lastMethodCacheProbeWrite := 0. "this for primitiveExternalMethod" + self flushAtCache! - self flushAtCache.! Item was changed: ----- Method: StackInterpreter>>flushMethodCacheFrom:to: (in category 'method lookup cache') ----- flushMethodCacheFrom: memStart to: memEnd "Flush entries in the method cache only if the oop address is within the given memory range. + This reduces over-aggressive cache clearing. Note the AtCache is fully flushed, 70% of the time - This reduces overagressive cache clearing. Note the AtCache is fully flushed, 70% of the time cache entries live in newspace, new objects die young" | probe | probe := 0. + 1 to: MethodCacheEntries do: + [:i | + (methodCache at: probe + MethodCacheSelector) = 0 ifFalse: + [((((self oop: (methodCache at: probe + MethodCacheSelector) isGreaterThanOrEqualTo: memStart) + and: [self oop: (methodCache at: probe + MethodCacheSelector) isLessThan: memEnd]) + or: [(self oop: (methodCache at: probe + MethodCacheClass) isGreaterThanOrEqualTo: memStart) + and: [self oop: (methodCache at: probe + MethodCacheClass) isLessThan: memEnd]]) + or: [(self oop: (methodCache at: probe + MethodCacheMethod) isGreaterThanOrEqualTo: memStart) + and: [self oop: (methodCache at: probe + MethodCacheMethod) isLessThan: memEnd]]) ifTrue: + [methodCache at: probe + MethodCacheSelector put: 0]]. - 1 to: MethodCacheEntries do: [:i | - (methodCache at: probe + MethodCacheSelector) = 0 - ifFalse: [((((self oop: (methodCache at: probe + MethodCacheSelector) isGreaterThanOrEqualTo: memStart) - and: [self oop: (methodCache at: probe + MethodCacheSelector) isLessThan: memEnd]) - or: [(self oop: (methodCache at: probe + MethodCacheClass) isGreaterThanOrEqualTo: memStart) - and: [self oop: (methodCache at: probe + MethodCacheClass) isLessThan: memEnd]]) - or: [(self oop: (methodCache at: probe + MethodCacheMethod) isGreaterThanOrEqualTo: memStart) - and: [self oop: (methodCache at: probe + MethodCacheMethod) isLessThan: memEnd]]) - ifTrue: [methodCache at: probe + MethodCacheSelector put: 0]]. probe := probe + MethodCacheEntrySize]. + NewspeakVM ifTrue: + [1 to: NSMethodCacheSize do: [ :i | nsMethodCache at: i put: 0]]. - self cppIf: NewspeakVM - ifTrue: [1 to: NSMethodCacheSize do: [ :i | nsMethodCache at: i put: 0 ]]. self flushAtCache! Item was changed: ----- Method: StackInterpreter>>internalFindNewMethodOrdinary (in category 'message sending') ----- internalFindNewMethodOrdinary "Find the compiled method to be run when the current messageSelector is sent to the class 'lkupClass', setting the values of 'newMethod' and 'primitiveIndex'." <inline: true> (self inlineLookupInMethodCacheSel: messageSelector classTag: lkupClassTag) ifFalse: ["entry was not found in the cache; look it up the hard way" self externalizeIPandSP. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: lkupClassTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: lkupClassTag) ifTrue: [lkupClassTag := self handleForwardedSendFaultForTag: lkupClassTag]. (self lookupInMethodCacheSel: messageSelector classTag: lkupClassTag) ifTrue: [^nil]]. lkupClass := objectMemory classForClassTag: lkupClassTag. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [self lookupOrdinarySend] ifFalse: [self lookupMethodInClass: lkupClass]. self internalizeIPandSP. self addNewMethodToCache: lkupClass]. ! Item was changed: ----- Method: StackInterpreter>>methodClassOf: (in category 'compiled methods') ----- methodClassOf: methodPointer <api> "Using a read barrier here simplifies the become implementation and costs very little because the class index and ValueIndex of the association almost certainly share a cache line." + | literal | + literal := self followLiteral: (objectMemory literalCountOf: methodPointer) - 1 ofMethod: methodPointer. + ^NewspeakVM - ^self cppIf: NewspeakVM ifTrue: + [literal = objectMemory nilObject - [| literal | - literal := self followLiteral: (objectMemory literalCountOf: methodPointer) - 1 ofMethod: methodPointer. - literal = objectMemory nilObject ifTrue: [literal] ifFalse: [objectMemory followField: ValueIndex ofObject: literal]] ifFalse: + [self assert: ((objectMemory isPointers: literal) and: [(objectMemory numSlotsOf: literal) > ValueIndex]). - [| literal | - literal := self followLiteral: (objectMemory literalCountOf: methodPointer) - 1 ofMethod: methodPointer. - self assert: ((objectMemory isPointers: literal) and: [(objectMemory numSlotsOf: literal) > ValueIndex]). objectMemory followField: ValueIndex ofObject: literal]! Item was changed: ----- Method: StackToRegisterMappingCogit>>generateSendTrampolines (in category 'initialization') ----- generateSendTrampolines "Override to generate code to push the register arg(s) for <= numRegArg arity sends." 0 to: NumSendTrampolines - 1 do: [:numArgs| ordinarySendTrampolines at: numArgs put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: numArgs: numArgs called: (self trampolineName: 'ceSend' numArgs: numArgs) arg: ClassReg arg: 0 arg: ReceiverResultReg arg: (self numArgsOrSendNumArgsReg: numArgs))]. "Generate these in the middle so they are within [firstSend, lastSend]." + NewspeakVM ifTrue: [self generateNewspeakSendTrampolines]. + BytecodeSetHasDirectedSuperSend ifTrue: - self cppIf: NewspeakVM ifTrue: [self generateNewspeakSendTrampolines]. - self cppIf: BytecodeSetHasDirectedSuperSend ifTrue: [0 to: NumSendTrampolines - 1 do: [:numArgs| directedSuperSendTrampolines at: numArgs put: (self genSendTrampolineFor: #ceSend:above:to:numArgs: numArgs: numArgs called: (self trampolineName: 'ceDirectedSuperSend' numArgs: numArgs) arg: ClassReg arg: TempReg arg: ReceiverResultReg arg: (self numArgsOrSendNumArgsReg: numArgs))]]. 0 to: NumSendTrampolines - 1 do: [:numArgs| superSendTrampolines at: numArgs put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: numArgs: numArgs called: (self trampolineName: 'ceSuperSend' numArgs: numArgs) arg: ClassReg arg: 1 arg: ReceiverResultReg arg: (self numArgsOrSendNumArgsReg: numArgs))]. firstSend := ordinarySendTrampolines at: 0. lastSend := superSendTrampolines at: NumSendTrampolines - 1!

1 0

Re: [Pharo-dev] Pharo 64bit planned?
by Eliot Miranda 18 Jul '15

18 Jul '15

Hi David, On Fri, Jul 17, 2015 at 3:22 PM, David <stormbyte(a)gmail.com> wrote: > I did not see any progress over the time in making a (stable) release > of pharo in 64 bit flavor. > > For servers, it is a common practice (and also a good one if no 32bit > executables are planned) to completelly disable 32bit support (by not > compiling any library in 32bit, disabling emulation of 32bit in > kernel), and also performance, as under 64bit, 32bit code runs slightly > slower. > > The above make enough reasons to make it interesting to have a 64bit > version of pharo, but... Is it intended/in progress? Or nothing really > at the moment? > 64-bit development of Spur is in progress. There is a somewhat functional 64-bit Squeak Spur image and a functional Linux 64-bit Stack interpreter. Coincidentally I'm currently working on an input event processing bug which only occurs in the real VM. You may know that the next release of Pharo (Pharo 6?) is intended to be a Spur release. Esteban Lorenzano is working on the Pharo Spur bootstrap. I am working in Squeak and my priorities are first, to get the Spur Squeak 64-bit image working fully on the Stack Interpreter and then to work on an x64 JIT VM. I expect that by the time Pharo 6 is ready to release, the 64-bit version will also be ready. Hope this helps. -- _,,,^..^,,,_ best, Eliot

1 1

Copy-on-write for a multithreaded VM
by Ben Coman 18 Jul '15

18 Jul '15

I am curious what are the issues holding us back from a multithreaded VM being mainstream, since I had a passing thought about a strategy for a partial-multi-threaded-VM. I see multi-threading been prototyped before with RoarVM [1] & HydraVM [2], and the CogBlog project page [3] says "While multi-threading seems like an obvious and important direction to take the system in, making the VM multi-threaded per-se **does not provide any benefit before the Smalltalk image is made thread-safe** and that is probably more work than providing a multi-threaded VM. Hence a potentially more profitable approach is to concentrate on federating multiple VMs running multiple images, communicating through the threaded FFI." So I agree it would be a big job to make the whole Image thread-safe, but I wonder if a useful subset would be threads that are unable to disturb the system state? This might cover a lot of needs for parallelism, for example: * Complex force layouts with Roassal * Web server worker threads * Screen rendering by #fullDraw: & #drawOn: A copy-on-write facility might provide this, such that any required system state changes require manual coding in the parent-thread to process a result object returned from the child-thread when it exits. This might be implemented by combining Spur's new features for: * immutability * lazy become forwarding Implementation might require an extra object header bit WriteCopied and a new class CopyOnWriteThread known by the VM. Whenever a child-COWT reads an object, if WriteCopied is not set, set both it and the Immutable bits. Any thread writing to that object will trigger the existing immutability handler, which now additionally, when WriteCopied is set: 1. Creates a new WriteCopiedIndirection object holding a. the old object b. the newly written object c. the thread that performed the write. 2. Sets the old object's forward-pointer to that. Later the forward-following code observes the LocalCopy bit and based on matching the current thread with that stored in 1c. unrolls the correct object. The child-COWT leaves the WriteCopied bit set so as to avoid immutability being set again. Actually that precludes using real-immutability in a COWT, so my description above is not ideal - but hopefully is enough to show intent. Could this avoid needing to make the whole image thread safe? and thus facilitate running Smalltalk worker threads across multiple CPUs? Actually, this might even be useful without running across multiple CPUs, since the cause of several intermittent Red-Screen-Of-Deaths was due to using multiple green-threads to improve UI interactivity. (For example forking update of Monticello lists to allow typing into search boxes. Here #drawOn: had "aList size" returning different values halfway through the algorithm. Where execution forked to provide this useful feature was the best place for code readability and intuitive understanding, but it was long path to trace through execution to discover the coupling between there and the rendering code. Certainly the fix is less readable that the original.) [1] https://github.com/smarr/RoarVM [2] http://squeakvm.org/~sig/hydravm/devnotes.html [3] http://www.mirandabanda.org/cogblog/cog-projects/ cheers -ben

3 2

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

18 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1424.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1424 Author: eem Time: 17 July 2015, 4:41:03.737 pm UUID: 56110fd1-2a81-4bc6-ad9c-e33cafbd2c71 Ancestors: VMMaker.oscog-eem.1423 Simulator: Allow the displayForm to be resized when the simulator window is resized. =============== Diff against VMMaker.oscog-eem.1423 =============== Item was changed: ----- Method: CogVMSimulator>>handleListenEvent: (in category 'I/O primitives support') ----- handleListenEvent: aMorphicEvent + "openAsMorph[NoTranscript] registered me for listen events via HandMorph>>addEventListener. + Transform the listen event and add it to my event queue. ALso check if the displayForm shoudl resize." + (displayForm ~~ fakeForm and: [displayForm extent ~= displayView extent]) ifTrue: + [| newForm | + newForm := Form + extent: displayView extent + depth: displayForm depth. + displayForm displayOn: newForm. + displayForm := newForm]. - "openAsMorph[NoTranscript] regsitered me for listen events via HandMorph>>addEventListener. - Transform the listen event and add it to my event queue." ((aMorphicEvent isMouse or: [aMorphicEvent isKeyboard]) and: [displayView bounds containsPoint: aMorphicEvent position]) ifTrue: [eventTransformer degenerateEvent: aMorphicEvent for: self]! Item was added: + ----- Method: SimulatorImageMorph>>extent: (in category 'geometry') ----- + extent: aPoint + "Override to restore the default resizing behaviour." + ^self perform: #extent: withArguments: {aPoint} inSuperclass: ImageMorph superclass! Item was changed: ----- Method: StackInterpreterSimulator>>handleListenEvent: (in category 'I/O primitives support') ----- handleListenEvent: aMorphicEvent + "openAsMorph[NoTranscript] registered me for listen events via HandMorph>>addEventListener. + Transform the listen event and add it to my event queue. ALso check if the displayForm shoudl resize." + (displayForm ~~ fakeForm and: [displayForm extent ~= displayView extent]) ifTrue: + [| newForm | + newForm := Form + extent: displayView extent + depth: displayForm depth. + displayForm displayOn: newForm. + displayForm := newForm]. - "openAsMorph[NoTranscript] regsitered me for listen events via HandMorph>>addEventListener. - Transform the listen event and add it to my event queue." ((aMorphicEvent isMouse or: [aMorphicEvent isKeyboard]) and: [displayView bounds containsPoint: aMorphicEvent position]) ifTrue: [eventTransformer degenerateEvent: aMorphicEvent for: self]!

1 0

[commit][3407] Update README generated by uploadvms to include description of ulimit procedure
by commits＠squeakvm.org 17 Jul '15

17 Jul '15

Revision: 3407 Author: eliot Date: 2015-07-16 16:33:11 -0700 (Thu, 16 Jul 2015) Log Message: ----------- Update README generated by uploadvms to include description of ulimit procedure to be able to use the "ht" VMs under daemontools. Modified Paths: -------------- branches/Cog/scripts/uploadvms Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2015-07-16 20:00:51 UTC (rev 3406) +++ branches/Cog/scripts/uploadvms 2015-07-16 23:33:11 UTC (rev 3407) @@ -192,9 +192,11 @@ non-blocking FFI calls. The archives containing "Spur" or "spur" are VMs using the new Spur object representation and garbage collector and should be used with Spur-format Squeak/Pharo/Croquet or Newspeak images. + Newspeak has moved to Spur and no longer supports non-Spur versions. + Linux There are two variants of the Linux VMs; those ending in "ht" have a - heartbeat thread, while those that don't, use an interval timer for the + heartbeat thread, while those that don't use an interval timer for the heartbeat (the Windows and Mac VMs have a threaded heartbeat). The threaded heartbeat is better (for example, signals from the interval timer interfere with system calls, etc), but to use it one must have a kernel @@ -215,8 +217,17 @@ Only new processes will have the new security settings. Users must log out and log back in for the limits to take effect. Services must stop - and then restart for the changes to take effect. + and then restart for the changes to take effect. To use this VM as a + daemon, e.g. under daemontools, you'll need to raise the limit manually. + Make sure you're using bash and before your launch command, raise the max + thread priority limit with ulimit -r 2, e.g. versions of the following + script will work on ubuntu + #!/bin/bash + cd /path/to/squeak/directory + ulimit -r 2 + exec setuidgid <account> ./coglinuxht/squeak -vm display-null -vm sound-null squeak.image + Windows The Windows VMs are "dpiAware", which means that by default the display is not scaled and display pixels are mapped 1 to 1 to the screen. If this behaviour is not desired you can enable scaling by either editing the

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2015