Vm-dev August 2015

vm-dev@lists.squeakfoundation.org

37 participants
78 discussions

Re: [squeak-dev] ByteArray accessors for 64-bit manipulation
by Eliot Miranda 01 Sep '15

01 Sep '15

Hi Chrises, my vote would be to write these as 12 numbered primitives, (2,4 & 8 bytes) * (at: & at:put:) * (big & little endian) because they can be performance critical and implementing them like this means the maximum efficiency in both 32-bit and 64-bit Spur, plus the possibility of the JIT implementing the primitives. On Sun, Aug 30, 2015 at 10:01 PM, Chris Cunningham <cunningham.cb(a)gmail.com> wrote: > Hi Chris, > > I'm all for having the fastest that in the image that works. If you could > make your version handle endianess, then I'm all for including it (at least > in the 3 variants that are faster). My first use for this (interface for > KAFKA) apparently requires bigEndianess, so I really want that supported. > > It might be best to keep my naming, though - it follows the name pattern > that is already in the class. Or will yours also support 128? > > -cbc > > On Sun, Aug 30, 2015 at 2:38 PM, Chris Muller <asqueaker(a)gmail.com> wrote: > >> Hi Chris, I think these methods belong in the image with the fastest >> implementation we can do. >> >> I implemented 64-bit unsigned access for Ma Serializer back in 2005. >> I modeled my implementation after Andreas' original approach which >> tries to avoid LI arithmetic. I was curious whether your >> implementations would be faster, because if they are then it could >> benefit Magma. After loading "Ma Serializer" 1.5 (or head) into a >> trunk image, I used the following script to take comparison >> measurements: >> >> | smallN largeN maBa cbBa | smallN := ((2 raisedTo: 13) to: (2 >> raisedTo: 14)) atRandom. >> largeN := ((2 raisedTo: 63) to: (2 raisedTo: 64)) atRandom. >> maBa := ByteArray new: 8. >> cbBa := ByteArray new: 8. >> maBa maUint: 64 at: 0 put: largeN. >> cbBa unsignedLong64At: 1 put: largeN bigEndian: false. >> self assert: (cbBa maUnsigned64At: 1) = (maBa unsignedLong64At: 1 >> bigEndian: false). >> { 'cbc smallN write' -> [ cbBa unsignedLong64At: 1 put: smallN >> bigEndian: false] bench. >> 'ma smallN write' -> [cbBa maUint: 64 at: 0 put: smallN ] bench. >> 'cbc smallN access' -> [ cbBa unsignedLong64At: 1 bigEndian: false. ] >> bench. >> 'ma smallN access' -> [ cbBa maUnsigned64At: 1] bench. >> 'cbc largeN write' -> [ cbBa unsignedLong64At: 1 put: largeN >> bigEndian: false] bench. >> 'ma largeN write' -> [cbBa maUint: 64 at: 0 put: largeN ] bench. >> 'cbc largeN access' -> [ cbBa unsignedLong64At: 1 bigEndian: false ] >> bench. >> 'ma largeN access' -> [ cbBa maUnsigned64At: 1] bench. >> } >> >> Here are the results: >> >> 'cbc smallN write'->'3,110,000 per second. 322 nanoseconds per run.' . >> 'ma smallN write'->'4,770,000 per second. 210 nanoseconds per run.' . >> 'cbc smallN access'->'4,300,000 per second. 233 nanoseconds per run.' . >> 'ma smallN access'->'16,400,000 per second. 60.9 nanoseconds per run.' . >> 'cbc largeN write'->'907,000 per second. 1.1 microseconds per run.' . >> 'ma largeN write'->'6,620,000 per second. 151 nanoseconds per run.' . >> 'cbc largeN access'->'1,900,000 per second. 527 nanoseconds per run.' . >> 'ma largeN access'->'1,020,000 per second. 982 nanoseconds per run.' >> >> It looks like your 64-bit access is 86% faster for accessing the >> high-end of the 64-bit range, but slower in the other 3 metrics. >> Noticeably, it was only 14% as fast for writing the high-end of the >> 64-bit range, and similarly as much slower for small-number access.. >> >> >> On Fri, Aug 28, 2015 at 6:01 PM, Chris Cunningham >> <cunningham.cb(a)gmail.com> wrote: >> > Hi. >> > >> > I've committed a change to the inbox with changes to allow >> getting/putting >> > 64bit values to ByteArrays (similar to 32 and 16 bit accessors). Could >> this >> > be added to trunk? >> > >> > Also, first time I used the selective commit function - very nice! the >> > changes I didn't want committed didn't, in fact, get commited. Just the >> > desirable bits! >> > >> > -cbc >> > >> > >> > >> >> > > > > -- _,,,^..^,,,_ best, Eliot

7 13

[commit][3429] CogVM source as per VMMaker.oscog-eem.1446
by commits＠squeakvm.org 31 Aug '15

31 Aug '15

Revision: 3429 Author: eliot Date: 2015-08-31 14:10:05 -0700 (Mon, 31 Aug 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1446 Spur: Implement ephemeron queue primitive. Add an image flag that controls the finalization support (StackInterpreter instVar newFinalization). If unset, finalization is as currently expected; WeakArray finalizes all WeakArrays in its registries on each finalization (which does not scale!). If set, then both fired ephemerons and bereaved weak arrays are added to the finalization queue and the finalization semaphore is signalled. In this regime the image is expected to send mourn to each element of the queue, and weak arrays will send themselves finalize in mourn, side-stepping the finalizeValues steps and rendering WeakArray's FinalizationDependents and WeakRegistry obsolete. The bit is set via Smalltalk vmParameterAt: 48 put: ((Smalltalk vmParameterAt: 48) bitOr: 64). Rename ephemeronQueue to mournQueue to reflect more general use of the queue. ThreadedFFIPlugin Added ThreadedFFIPlugin>>#primitiveLoadSymbolFromModule (copy and adapt from IA32ABIPlugin). Newspeak: Fix bug from refactoring in VMMaker.oscog-eem.1438 - lookupProtected:startingAt:rule: should return the actual lookup rule, not 0. Rename local variable lookupClass to currentClass in a few places to avoid confusion with instance variable lkupClass. The actual receiver of an MNU from an outer send is not necessarily the method receiver: Fix bug in MNU for cogged dynamic super sends - should start looking for #doesNotUnderstand: in the superclass not the receiver class. Unify MNU lookup between absent and present receiver sends as a result. Further fix outer send MNU by not confusing lkupClass and lkupClassTag. Push setting lkupClassTag down to clarify it is for new cache entries. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h 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/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/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/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/vm/cogit.h 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-08-22 16:40:42 UTC (rev 3428) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-08-31 21:10:05 UTC (rev 3429) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 + CCodeGenerator VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-08-22 16:40:42 UTC (rev 3428) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-08-31 21:10:05 UTC (rev 3429) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 from - CoInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 + CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1446 uuid: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -221,7 +221,6 @@ #if !defined(EnforceAccessControl) /* Allow EnforceAccessControl to be overridden on the compiler command line */ # define EnforceAccessControl 1 #endif -#define EphemeronQueueRootIndex 4098 #define ExcessSignalsIndex 2 #define ExternalObjectsArray 38 #define ExtraRootsSize 2048 @@ -293,6 +292,7 @@ #define MillisecondClockMask 0x1FFFFFFF #define MinBackwardJumpCountForCompile 40 #define MixinIndex 3 +#define MournQueueRootIndex 4098 #define MULTIPLEBYTECODESETS 1 #define MyListIndex 3 #define NewspeakVM 1 @@ -701,6 +701,7 @@ extern sqInt primitiveFail(void); extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt primitiveFailureCode(void); +static void primitiveFetchNextMourner(void); static void primitiveFloatAdd(void); static void primitiveFloatAt(void); static void primitiveFloatAtPut(void); @@ -1188,6 +1189,7 @@ static sqInt pushOnUnscannedEphemeronsStack(sqInt anEphemeron) NoDbgRegParms; extern void pushRemappableOop(sqInt oop); static sqInt pushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; +static void queueMourner(sqInt anEphemeronOrWeakArray) NoDbgRegParms; static sqInt rawHashBitsOf(sqInt objOop) NoDbgRegParms; static void rebuildFreeListsForPigCompact(void); extern sqInt remapObj(sqInt objOop); @@ -1380,13 +1382,13 @@ extern void loadInitialContext(void); extern void longPrintOop(sqInt oop); extern sqInt longStoreBytecodeForHeader(sqInt methodHeader); -static sqInt lookupDnuPresent(void); static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag) NoDbgRegParms; static sqInt lookupLexicalfromrule(sqInt selector, sqInt mixin, sqInt rule) NoDbgRegParms; static sqInt lookupMethodInClass(sqInt class) NoDbgRegParms; +static sqInt lookupMNU(void); static sqInt lookupMNUInClass(sqInt class) NoDbgRegParms; static sqInt lookupOrdinaryNoMNUEtcInClass(sqInt class) NoDbgRegParms; -static void lookupOrdinarySend(void); +static sqInt lookupOrdinarySend(void); static sqInt lookupProtectedstartingAtrule(sqInt selector, sqInt mixinApplication, sqInt rule) NoDbgRegParms; extern sqInt lookupSelectorinClass(sqInt selector, sqInt class); extern sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue); @@ -1554,7 +1556,6 @@ static void primitiveInstVarAt(void); static void primitiveInstVarAtPut(void); EXPORT(sqInt) primitiveLongRunningPrimitive(void); -EXPORT(sqInt) primitiveMakeEphemeron(void); static void primitiveObjectPointsTo(void); static void primitivePerform(void); static void primitivePin(void); @@ -1585,8 +1586,8 @@ _iss usqInt freeStart; _iss sqInt specialObjectsOop; _iss sqInt argumentCount; -_iss sqInt messageSelector; _iss sqInt bytecodeSetSelector; +_iss sqInt messageSelector; _iss usqInt instructionPointer; _iss usqInt newMethod; _iss sqInt markStack; @@ -1649,10 +1650,11 @@ _iss sqInt extraRootCount; _iss sqInt growHeadroom; _iss sqInt invalidObjStackPage; -_iss sqInt methodDictLinearSearchLimit; _iss sqInt previousRememberedSetSize; _iss sqInt classNameIndex; -_iss sqInt ephemeronQueue; +_iss sqInt methodDictLinearSearchLimit; +_iss sqInt pendingFinalizationSignals; +_iss sqInt mournQueue; _iss sqInt tenureCriterion; _iss sqInt metaclassNumSlots; _iss sqInt preemptionYields; @@ -1667,6 +1669,7 @@ _iss sqInt highestRunnableProcessPriority; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; +_iss sqInt newFinalization; _iss usqLong statCheckForEvents; _iss usqLong statGCEndUsecs; _iss sqInt weakList; @@ -1675,12 +1678,10 @@ _iss sqInt firstSegmentSize; _iss usqLong gcStartUsecs; _iss usqInt lowSpaceThreshold; -_iss sqInt noThreadingOfGUIThread; -_iss sqInt pendingFinalizationSignals; -_iss sqInt processHasThreadId; _iss sqInt rememberedSetLimit; _iss sqInt shrinkThreshold; _iss usqLong statIOProcessEvents; +_iss sqInt imageHeaderFlags; _iss sqInt lastHash; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt longRunningPrimitiveCheckSequenceNumber; @@ -1727,7 +1728,6 @@ _iss sqInt tenuringProportion; _iss sqInt classByteArrayCompactIndex; _iss sqInt gcSemaphoreIndex; -_iss sqInt imageHeaderFlags; _iss usqLong longRunningPrimitiveGCUsecs; _iss sqInt overflowLimit; _iss StackPage * overflowedPage; @@ -1977,7 +1977,7 @@ /* 169 */ primitiveNotIdentical, /* 170 */ primitiveAsCharacter, /* 171 */ primitiveImmediateAsInteger, - /* 172 */ (void (*)(void))0, + /* 172 */ primitiveFetchNextMourner, /* 173 */ primitiveSlotAt, /* 174 */ primitiveSlotAtPut, /* 175 */ primitiveBehaviorHash, @@ -2414,7 +2414,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.1441"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1446"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -13689,7 +13689,7 @@ GIV(localAbsentReceiverOrZero) = 0; GIV(localAbsentReceiver) = methodReceiver; - /* For use by MNU */ + /* MNU lookup starts here. */ GIV(lkupClass) = (((tagBits1 = methodReceiver & 3)) != 0 ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord()))) @@ -16717,7 +16717,6 @@ else { assert(!((isOopForwarded(GIV(messageSelector))))); assert(!((isForwardedClassTag(methodReceiverClassTag)))); - GIV(lkupClassTag) = methodReceiverClassTag; /* begin lookupDynamicSuperSendNoMNU: */ GIV(localAbsentReceiver) = methodReceiver; GIV(localAbsentReceiverOrZero) = 0; @@ -16735,10 +16734,12 @@ errSelIdx = lookupProtectedNoMNUstartingAtrule(GIV(messageSelector), GIV(lkupClass), LookupRuleDynamicSuper); if (errSelIdx != 0) { assert(errSelIdx == SelectorDoesNotUnderstand); - handleMNUInMachineCodeToclassForMessage(errSelIdx, methodReceiver, classAtIndex(methodReceiverClassTag)); + assert(GIV(localAbsentReceiver) == methodReceiver); + handleMNUInMachineCodeToclassForMessage(errSelIdx, methodReceiver, GIV(lkupClass)); /* begin unreachable */ error("UNREACHABLE"); } + GIV(lkupClassTag) = methodReceiverClassTag; addNewMethodToNSCache(LookupRuleDynamicSuper); } if (((GIV(newMethod) & 3) == 0) @@ -16880,7 +16881,6 @@ else { assert(!((isOopForwarded(GIV(messageSelector))))); assert(!((isForwardedClassTag(methodReceiverClassTag)))); - GIV(lkupClassTag) = methodReceiverClassTag; /* begin lookupImplicitReceiverSendNoMNU: */ GIV(messageSelector) = (((GIV(messageSelector) & 3) == 0) && (((longAt(GIV(messageSelector))) & 0x3FFFFF) == 8) @@ -17042,10 +17042,12 @@ l1: /* end lookupImplicitReceiverSendNoMNU: */; if (errSelIdx != 0) { assert(errSelIdx == SelectorDoesNotUnderstand); - handleMNUInMachineCodeToclassForMessage(errSelIdx, methodReceiver, classAtIndex(methodReceiverClassTag)); + assert(GIV(localAbsentReceiver) == methodReceiver); + handleMNUInMachineCodeToclassForMessage(errSelIdx, methodReceiver, GIV(lkupClass)); /* begin unreachable */ error("UNREACHABLE"); } + GIV(lkupClassTag) = methodReceiverClassTag; addNewMethodToNSCache(LookupRuleImplicit); } longAtput(GIV(stackPointer) + ((GIV(argumentCount) + 1) * BytesPerWord), GIV(localAbsentReceiver)); @@ -17611,14 +17613,18 @@ else { assert(!((isOopForwarded(GIV(messageSelector))))); assert(!((isForwardedClassTag(methodReceiverClassTag)))); - GIV(lkupClassTag) = methodReceiverClassTag; errSelIdx = lookupOuterSendNoMNUdepth(methodReceiver, depth); if (errSelIdx != 0) { assert(errSelIdx == SelectorDoesNotUnderstand); - handleMNUInMachineCodeToclassForMessage(errSelIdx, methodReceiver, classAtIndex(methodReceiverClassTag)); + longAtput(GIV(stackPointer) + ((GIV(argumentCount) + 1) * BytesPerWord), GIV(localAbsentReceiver)); + handleMNUInMachineCodeToclassForMessage(errSelIdx, GIV(localAbsentReceiver), GIV(lkupClass)); /* begin unreachable */ error("UNREACHABLE"); } + + /* Successful lookup cached under the sender's class */ + + GIV(lkupClassTag) = methodReceiverClassTag; addNewMethodToNSCache(depth); } longAtput(GIV(stackPointer) + ((GIV(argumentCount) + 1) * BytesPerWord), GIV(localAbsentReceiver)); @@ -17770,14 +17776,15 @@ else { assert(!((isOopForwarded(GIV(messageSelector))))); assert(!((isForwardedClassTag(methodReceiverClassTag)))); - GIV(lkupClassTag) = methodReceiverClassTag; errSelIdx = lookupOuterSendNoMNUdepth(methodReceiver, 0); if (errSelIdx != 0) { assert(errSelIdx == SelectorDoesNotUnderstand); - handleMNUInMachineCodeToclassForMessage(errSelIdx, methodReceiver, classAtIndex(methodReceiverClassTag)); + assert(GIV(localAbsentReceiver) == methodReceiver); + handleMNUInMachineCodeToclassForMessage(errSelIdx, methodReceiver, GIV(lkupClass)); /* begin unreachable */ error("UNREACHABLE"); } + GIV(lkupClassTag) = methodReceiverClassTag; addNewMethodToNSCache(LookupRuleSelf); } if (((GIV(newMethod) & 3) == 0) @@ -20285,7 +20292,7 @@ receiverClass = fetchClassOfNonImm(GIV(localAbsentReceiver)); } - /* For use by MNU */ + /* MNU lookup starts here. */ GIV(lkupClass) = receiverClass; mixinApplication = findApplicationOfTargetMixinstartingAtBehavior(mixin, receiverClass); @@ -20582,12 +20589,12 @@ static sqInt lookupProtectedNoMNUstartingAtrule(sqInt selector, sqInt mixinApplication, sqInt rule) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt currentClass; sqInt dictionary; sqInt found; sqInt hash; sqInt index; usqInt length; - sqInt lookupClass; usqInt mask; sqInt methodArray; sqInt nextSelector; @@ -20601,13 +20608,13 @@ sqInt objOop5; sqInt wrapAround; - lookupClass = mixinApplication; - while (!(lookupClass == GIV(nilObj))) { + currentClass = mixinApplication; + while (!(currentClass == GIV(nilObj))) { /* begin followObjField:ofObject: */ - objOop = longAt((lookupClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord()))); + objOop = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord()))); assert(isNonImmediate(objOop)); if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, lookupClass, objOop); + objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop); } dictionary = objOop; /* begin lookupMethodInDictionary: */ @@ -20722,12 +20729,12 @@ return 0; } /* begin followField:ofObject: */ - objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); + objOop1 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); if (((objOop1 & 3) == 0) && (((longAt(objOop1)) & 0x3FFFFF) == 8)) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, lookupClass, objOop1); + objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop1); } - lookupClass = objOop1; + currentClass = objOop1; } return SelectorDoesNotUnderstand; } @@ -25437,10 +25444,9 @@ GIV(imageFloatsBigEndian) = ((headerFlags & 2) == 0 ? 1 : 0); - GIV(processHasThreadId) = (headerFlags & 4) != 0; GIV(flagInterpretedMethods) = (headerFlags & 8) != 0; GIV(preemptionYields) = (headerFlags & 16) == 0; - GIV(noThreadingOfGUIThread) = (headerFlags & 32) != 0; + GIV(newFinalization) = (headerFlags & 64) != 0; /* begin getWord32FromFile:swap: */ w8 = 0; @@ -32314,7 +32320,7 @@ usqInt newObj; usqInt numBytes; sqInt numSlots; - sqInt s; + usqInt s; char *sp; sqInt sz; @@ -34341,6 +34347,24 @@ return GIV(primFailCode); } + /* InterpreterPrimitives>>#primitiveFetchNextMourner */ +static void +primitiveFetchNextMourner(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt mourner; + char *sp; + + mourner = popObjStack(GIV(mournQueue)); + if (mourner == null) { + GIV(primFailCode) = PrimErrNotFound; + } + else { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), mourner); + GIV(stackPointer) = sp; + } +} + /* InterpreterPrimitives>>#primitiveFloatAdd */ static void primitiveFloatAdd(void) @@ -37991,7 +38015,7 @@ sqInt err; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38117,7 +38141,7 @@ sqInt i; usqInt instSpec; sqInt literalCount; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -44016,7 +44040,7 @@ sqInt fillValue; sqInt hash; usqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -45112,11 +45136,10 @@ assert(isEphemeron(ephemeron)); assert(!(isScavengeSurvivor(keyOfEphemeron(ephemeron)))); /* begin fireEphemeron: */ - /* begin queueEphemeron: */ - assert((isNonImmediate(ephemeron)) - && ((formatOf(ephemeron)) == (ephemeronFormat()))); - pushonObjStack(ephemeron, GIV(ephemeronQueue)); + queueMourner(ephemeron); + /* begin signalFinalization: */ forceInterruptCheck(); + GIV(pendingFinalizationSignals) += 1; /* begin storePointerUnchecked:ofObject:withValue: */ valuePointer = copyAndForward(keyOfEphemeron(ephemeron)); assert(!(isForwarded(ephemeron))); @@ -45167,11 +45190,10 @@ ephemeron1 = referent; assert(!(isScavengeSurvivor(keyOfEphemeron(ephemeron1)))); /* begin fireEphemeron: */ - /* begin queueEphemeron: */ - assert((isNonImmediate(ephemeron1)) - && ((formatOf(ephemeron1)) == (ephemeronFormat()))); - pushonObjStack(ephemeron1, GIV(ephemeronQueue)); + queueMourner(ephemeron1); + /* begin signalFinalization: */ forceInterruptCheck(); + GIV(pendingFinalizationSignals) += 1; /* begin storePointerUnchecked:ofObject:withValue: */ valuePointer1 = copyAndForward(keyOfEphemeron(ephemeron1)); assert(!(isForwarded(ephemeron1))); @@ -45260,7 +45282,7 @@ /* Process a weak survivor on the weakList. Those of its fields which have not survived the scavenge should be nilled, and if any - are, the coInterpreter should be informed via signalFinalization:. + are, the coInterpreter should be informed via fireFinalization:. Answer if the weakObj has any young referents. */ /* SpurGenerationScavenger>>#processWeakSurvivor: */ @@ -45328,6 +45350,10 @@ } } if (weakObjShouldMourn) { + /* begin fireFinalization: */ + if (GIV(newFinalization)) { + queueMourner(weakObj); + } /* begin signalFinalization: */ forceInterruptCheck(); GIV(pendingFinalizationSignals) += 1; @@ -46148,7 +46174,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - sqInt freeChunk; + usqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -46187,7 +46213,7 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - sqInt smallObj; + usqInt smallObj; sqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; @@ -49129,7 +49155,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -49874,7 +49900,7 @@ /* begin followForwardedObjStacks */ followForwardedInObjStackatIndex(GIV(markStack), MarkStackRootIndex); followForwardedInObjStackatIndex(GIV(weaklingStack), WeaklingStackRootIndex); - followForwardedInObjStackatIndex(GIV(ephemeronQueue), EphemeronQueueRootIndex); + followForwardedInObjStackatIndex(GIV(mournQueue), MournQueueRootIndex); mapInterpreterOops(); /* begin followRememberedForwardersAndForgetFreeObjectsForPigCompact */ index = 0; @@ -50290,8 +50316,8 @@ case WeaklingStackRootIndex: GIV(weaklingStack) = freeOrNewPage; break; - case EphemeronQueueRootIndex: - GIV(ephemeronQueue) = freeOrNewPage; + case MournQueueRootIndex: + GIV(mournQueue) = freeOrNewPage; break; default: error("Case not found and no otherwise clause"); @@ -51126,8 +51152,8 @@ case WeaklingStackRootIndex: GIV(weaklingStack) = stackOrNil; break; - case EphemeronQueueRootIndex: - GIV(ephemeronQueue) = stackOrNil; + case MournQueueRootIndex: + GIV(mournQueue) = stackOrNil; break; default: error("Case not found and no otherwise clause"); @@ -52246,7 +52272,7 @@ l1: /* end setHiddenRootsObj: */; GIV(markStack) = swizzleObjStackAt(MarkStackRootIndex); GIV(weaklingStack) = swizzleObjStackAt(WeaklingStackRootIndex); - GIV(ephemeronQueue) = swizzleObjStackAt(EphemeronQueueRootIndex); + GIV(mournQueue) = swizzleObjStackAt(MournQueueRootIndex); assert(validObjStacks()); assert(isEmptyObjStack(GIV(markStack))); assert(isEmptyObjStack(GIV(weaklingStack))); @@ -53471,7 +53497,7 @@ sqInt hash; sqInt i; sqInt iLimiT; - sqInt loadedObjectsArray; + usqInt loadedObjectsArray; sqInt mappedOop; usqInt newObj; usqInt numBytes; @@ -55612,7 +55638,7 @@ /* begin markAndTraceHiddenRoots */ markAndTraceObjStackandContents(GIV(markStack), 0); markAndTraceObjStackandContents(GIV(weaklingStack), 0); - markAndTraceObjStackandContents(GIV(ephemeronQueue), 1); + markAndTraceObjStackandContents(GIV(mournQueue), 1); setIsMarkedOfto(longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (RememberedSetRootIndex << (shiftForWord()))), 1); setIsMarkedOfto(freeListsObj(), 1); if (((((usqInt) (longAt(GIV(classTableFirstPage)))) >> 24) & 0x1F) == 4) { @@ -59561,7 +59587,6 @@ static void markWeaklingsAndMarkAndFireEphemerons(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt anEphemeron; sqInt contextSize; sqInt contextSize1; sqInt contextSize2; @@ -59627,6 +59652,7 @@ sqInt sp2; sqInt topIndex; sqInt weakling; + sqInt weakReferenceOop; numStrongSlots = 0; numStrongSlots1 = 0; @@ -59933,13 +59959,13 @@ assert(!(noUnscannedEphemerons())); assert(allUnscannedEphemeronsAreActive()); for (p = ((GIV(unscannedEphemerons).start)); p <= (((GIV(unscannedEphemerons).top)) - BytesPerWord); p += 1) { - /* begin queueEphemeron: */ - anEphemeron = longAt(p); - assert((isNonImmediate(anEphemeron)) - && ((formatOf(anEphemeron)) == (ephemeronFormat()))); - pushonObjStack(anEphemeron, GIV(ephemeronQueue)); + /* begin fireEphemeron: */ + queueMourner(longAt(p)); + /* begin signalFinalization: */ + weakReferenceOop = longAt(p); + forceInterruptCheck(); + GIV(pendingFinalizationSignals) += 1; } - forceInterruptCheck(); } /* begin markAllUnscannedEphemerons */ assert(!(noUnscannedEphemerons())); @@ -60536,7 +60562,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -60976,6 +61002,10 @@ } anyUnmarked = anyUnmarked1; if (anyUnmarked) { + /* begin fireFinalization: */ + if (GIV(newFinalization)) { + queueMourner(weakling); + } /* begin signalFinalization: */ forceInterruptCheck(); GIV(pendingFinalizationSignals) += 1; @@ -61790,8 +61820,8 @@ case WeaklingStackRootIndex: GIV(weaklingStack) = nextPage; break; - case EphemeronQueueRootIndex: - GIV(ephemeronQueue) = nextPage; + case MournQueueRootIndex: + GIV(mournQueue) = nextPage; break; default: error("Case not found and no otherwise clause"); @@ -63286,6 +63316,30 @@ return noCheckPushonObjStack(objOop, objStack); } + +/* Add the ephemeron to the queue and make it non-ephemeral, to avoid + subsequent firing. + Alas this means that other ephemerons on the same object not identified in + this sccavenge + or GC will not fire until later. But that's life. */ + + /* SpurMemoryManager>>#queueMourner: */ +static void +queueMourner(sqInt anEphemeronOrWeakArray) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + assert((isNonImmediate(anEphemeronOrWeakArray)) + && (((formatOf(anEphemeronOrWeakArray)) == (ephemeronFormat())) + || ((formatOf(anEphemeronOrWeakArray)) == (weakArrayFormat())))); + assert(!((isonObjStack(anEphemeronOrWeakArray, GIV(mournQueue))))); + pushonObjStack(anEphemeronOrWeakArray, GIV(mournQueue)); + if (((((usqInt) (longAt(anEphemeronOrWeakArray))) >> 24) & 0x1F) == 5) { + /* begin setFormatOf:to: */ + assert(((1 >= 0) && (1 <= (formatMask())))); + flag("endianness"); + longAtput(anEphemeronOrWeakArray, ((longAt(anEphemeronOrWeakArray)) & ((unsigned int)~(0x1F << 24))) + (1 << 24)); + } +} + /* SpurMemoryManager>>#rawHashBitsOf: */ static sqInt rawHashBitsOf(sqInt objOop) @@ -63895,8 +63949,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - sqInt savedInHashes; - sqInt savedOutHashes; + usqInt savedInHashes; + usqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -64372,7 +64426,7 @@ sqInt formatField; sqInt len; usqInt newObj; - sqInt newString; + usqInt newString; usqInt numBytes; sqInt numSlots; @@ -64884,8 +64938,8 @@ || (isValidObjStack(GIV(markStack)))) && (((GIV(weaklingStack) == GIV(nilObj)) || (isValidObjStack(GIV(weaklingStack)))) - && ((GIV(ephemeronQueue) == GIV(nilObj)) - || (isValidObjStack(GIV(ephemeronQueue))))); + && ((GIV(mournQueue) == GIV(nilObj)) + || (isValidObjStack(GIV(mournQueue))))); } @@ -65082,7 +65136,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -65323,7 +65377,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65427,7 +65481,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -65643,7 +65697,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -70567,171 +70621,6 @@ } -/* A present receiver send lookup failed. Replace the arguments on the stack - with a Message and lookup #doesNotUndestand:. - IN: lkupClass - IN: messageSelector - IN: argumentCount - OUT: newMethod - OUT: primitiveIndex - RESULT: LookupRuleMNU */ - - /* StackInterpreter>>#lookupDnuPresent */ -static sqInt -lookupDnuPresent(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt currentClass; - sqInt dictionary; - sqInt found; - sqInt hash; - sqInt index; - usqInt length; - usqInt mask; - sqInt methodArray; - sqInt nextSelector; - usqInt numSlots; - sqInt objOop; - sqInt objOop1; - sqInt objOop11; - sqInt objOop2; - sqInt objOop3; - sqInt objOop4; - sqInt objOop5; - sqInt wrapAround; - - createActualMessageTo(GIV(lkupClass)); - GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << (shiftForWord()))); - currentClass = GIV(lkupClass); - while (currentClass != GIV(nilObj)) { - /* begin followObjField:ofObject: */ - objOop = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord()))); - assert(isNonImmediate(objOop)); - if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop); - } - dictionary = objOop; - /* begin lookupMethodInDictionary: */ - /* begin numSlotsOf: */ - flag("endianness"); - assert((classIndexOf(dictionary)) > (isForwardedObjectClassIndexPun())); - numSlots = byteAt(dictionary + 7); - length = (numSlots == 0xFF - ? longAt(dictionary - BaseHeaderSize) - : numSlots); - - /* Use linear search on small dictionaries; its cheaper. - Also the limit can be set to force linear search of all dictionaries, which supports the - booting of images that need rehashing (e.g. because a tracer has generated an image - with different hashes but hasn't rehashed it yet.) */ - - mask = (length - SelectorStart) - 1; - if (mask <= GIV(methodDictLinearSearchLimit)) { - index = 0; - while (index <= mask) { - nextSelector = longAt((dictionary + BaseHeaderSize) + ((index + SelectorStart) << (shiftForWord()))); - if (((nextSelector & 3) == 0) - && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) { - nextSelector = fixFollowedFieldofObjectwithInitialValue(index + SelectorStart, dictionary, nextSelector); - } - if (nextSelector == GIV(messageSelector)) { - /* begin followObjField:ofObject: */ - objOop5 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord()))); - assert(isNonImmediate(objOop5)); - if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { - objOop5 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop5); - } - methodArray = objOop5; - /* begin followField:ofObject: */ - objOop11 = longAt((methodArray + BaseHeaderSize) + (index << (shiftForWord()))); - if (((objOop11 & 3) == 0) - && (((longAt(objOop11)) & 0x3FFFFF) == 8)) { - objOop11 = fixFollowedFieldofObjectwithInitialValue(index, methodArray, objOop11); - } - GIV(newMethod) = objOop11; - found = 1; - goto l1; - } - index += 1; - } - found = 0; - goto l1; - } - - /* It is assumed that there are some nils in this dictionary, and search will - stop when one is encountered. However, if there are no nils, then wrapAround - will be detected the second time the loop gets to the end of the table. */ - - index = SelectorStart + (mask & (((GIV(messageSelector) & 3) != 0 - ? ((GIV(messageSelector) & 1) - ? (GIV(messageSelector) >> 1) - : ((usqInt) (((usqInt)GIV(messageSelector)))) >> 2) - : (/* begin hashBitsOf: */ - (objOop4 = GIV(messageSelector)), - (hash = (long32At(objOop4 + 4)) & 0x3FFFFF), - (hash == 0 - ? ((hash = (newObjectHash()) & 0x3FFFFF), - /* begin setHashBitsOf:to: */ - flag("endianness"), - assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))), - long32Atput(objOop4 + 4, ((((long32At(objOop4 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash)) - : 0), - hash)))); - wrapAround = 0; - while (1) { - nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord()))); - if (nextSelector == GIV(nilObj)) { - found = 0; - goto l1; - } - if (((nextSelector & 3) == 0) - && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) { - nextSelector = fixFollowedFieldofObjectwithInitialValue(index + SelectorStart, dictionary, nextSelector); - } - if (nextSelector == GIV(messageSelector)) { - /* begin followObjField:ofObject: */ - objOop2 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord()))); - assert(isNonImmediate(objOop2)); - if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { - objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop2); - } - methodArray = objOop2; - /* begin followField:ofObject: */ - objOop3 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord()))); - if (((objOop3 & 3) == 0) - && (((longAt(objOop3)) & 0x3FFFFF) == 8)) { - objOop3 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop3); - } - GIV(newMethod) = objOop3; - found = 1; - goto l1; - } - index += 1; - if (index == length) { - if (wrapAround) { - found = 0; - goto l1; - } - wrapAround = 1; - index = SelectorStart; - } - } - found = 0; - l1: /* end lookupMethodInDictionary: */; - if (found) { - return LookupRuleMNU; - } - /* begin followField:ofObject: */ - objOop1 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); - if (((objOop1 & 3) == 0) - && (((longAt(objOop1)) & 0x3FFFFF) == 8)) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop1); - } - currentClass = objOop1; - } - error("Recursive not understood error encountered"); -} - - /* This method implements a simple method lookup cache. If an entry for the given selector and classTag is found in the cache, set the values of 'newMethod' and @@ -70813,7 +70702,7 @@ ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << (shiftForWord()))) : fetchClassOfNonImm(GIV(localAbsentReceiver))); - /* For use by MNU */ + /* MNU lookup starts here. */ GIV(lkupClass) = receiverClass; mixinApplication = findApplicationOfTargetMixinstartingAtBehavior(mixin, receiverClass); @@ -71110,6 +70999,176 @@ } +/* A send lookup failed. Replace the arguments on the stack with a Message + and lookup + #doesNotUndestand: starting at lkupClass. Note that MNU lookup ignores + access modifiers. + This makes it different from an ordinary send of #doesNotUnderstand:, + which must only + find public methods. + IN: lkupClass + IN: messageSelector + IN: argumentCount + OUT: newMethod + OUT: primitiveIndex + RESULT: LookupRuleMNU */ + + /* StackInterpreter>>#lookupMNU */ +static sqInt +lookupMNU(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt currentClass; + sqInt dictionary; + sqInt found; + sqInt hash; + sqInt index; + usqInt length; + usqInt mask; + sqInt methodArray; + sqInt nextSelector; + usqInt numSlots; + sqInt objOop; + sqInt objOop1; + sqInt objOop11; + sqInt objOop2; + sqInt objOop3; + sqInt objOop4; + sqInt objOop5; + sqInt wrapAround; + + createActualMessageTo(GIV(lkupClass)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << (shiftForWord()))); + currentClass = GIV(lkupClass); + while (currentClass != GIV(nilObj)) { + /* begin followObjField:ofObject: */ + objOop = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop); + } + dictionary = objOop; + /* begin lookupMethodInDictionary: */ + /* begin numSlotsOf: */ + flag("endianness"); + assert((classIndexOf(dictionary)) > (isForwardedObjectClassIndexPun())); + numSlots = byteAt(dictionary + 7); + length = (numSlots == 0xFF + ? longAt(dictionary - BaseHeaderSize) + : numSlots); + + /* Use linear search on small dictionaries; its cheaper. + Also the limit can be set to force linear search of all dictionaries, which supports the + booting of images that need rehashing (e.g. because a tracer has generated an image + with different hashes but hasn't rehashed it yet.) */ + + mask = (length - SelectorStart) - 1; + if (mask <= GIV(methodDictLinearSearchLimit)) { + index = 0; + while (index <= mask) { + nextSelector = longAt((dictionary + BaseHeaderSize) + ((index + SelectorStart) << (shiftForWord()))); + if (((nextSelector & 3) == 0) + && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) { + nextSelector = fixFollowedFieldofObjectwithInitialValue(index + SelectorStart, dictionary, nextSelector); + } + if (nextSelector == GIV(messageSelector)) { + /* begin followObjField:ofObject: */ + objOop5 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord()))); + assert(isNonImmediate(objOop5)); + if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { + objOop5 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop5); + } + methodArray = objOop5; + /* begin followField:ofObject: */ + objOop11 = longAt((methodArray + BaseHeaderSize) + (index << (shiftForWord()))); + if (((objOop11 & 3) == 0) + && (((longAt(objOop11)) & 0x3FFFFF) == 8)) { + objOop11 = fixFollowedFieldofObjectwithInitialValue(index, methodArray, objOop11); + } + GIV(newMethod) = objOop11; + found = 1; + goto l1; + } + index += 1; + } + found = 0; + goto l1; + } + + /* It is assumed that there are some nils in this dictionary, and search will + stop when one is encountered. However, if there are no nils, then wrapAround + will be detected the second time the loop gets to the end of the table. */ + + index = SelectorStart + (mask & (((GIV(messageSelector) & 3) != 0 + ? ((GIV(messageSelector) & 1) + ? (GIV(messageSelector) >> 1) + : ((usqInt) (((usqInt)GIV(messageSelector)))) >> 2) + : (/* begin hashBitsOf: */ + (objOop4 = GIV(messageSelector)), + (hash = (long32At(objOop4 + 4)) & 0x3FFFFF), + (hash == 0 + ? ((hash = (newObjectHash()) & 0x3FFFFF), + /* begin setHashBitsOf:to: */ + flag("endianness"), + assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))), + long32Atput(objOop4 + 4, ((((long32At(objOop4 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash)) + : 0), + hash)))); + wrapAround = 0; + while (1) { + nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord()))); + if (nextSelector == GIV(nilObj)) { + found = 0; + goto l1; + } + if (((nextSelector & 3) == 0) + && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) { + nextSelector = fixFollowedFieldofObjectwithInitialValue(index + SelectorStart, dictionary, nextSelector); + } + if (nextSelector == GIV(messageSelector)) { + /* begin followObjField:ofObject: */ + objOop2 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord()))); + assert(isNonImmediate(objOop2)); + if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop2); + } + methodArray = objOop2; + /* begin followField:ofObject: */ + objOop3 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord()))); + if (((objOop3 & 3) == 0) + && (((longAt(objOop3)) & 0x3FFFFF) == 8)) { + objOop3 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop3); + } + GIV(newMethod) = objOop3; + found = 1; + goto l1; + } + index += 1; + if (index == length) { + if (wrapAround) { + found = 0; + goto l1; + } + wrapAround = 1; + index = SelectorStart; + } + } + found = 0; + l1: /* end lookupMethodInDictionary: */; + if (found) { + return LookupRuleMNU; + } + /* begin followField:ofObject: */ + objOop1 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); + if (((objOop1 & 3) == 0) + && (((longAt(objOop1)) & 0x3FFFFF) == 8)) { + objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop1); + } + currentClass = objOop1; + } + error("Recursive not understood error encountered"); +} + + /* Lookup messageSelector in class. Answer 0 on success. Answer the splObj: index for the error selector to use on failure rather than performing MNU processing etc. */ @@ -71488,11 +71547,11 @@ IN: argumentCount OUT: newMethod OUT: primitiveIndex - RESULT: LookupOrdinary or LookupDNU + RESULT: LookupRuleOrdinary or LookupRuleMNU */ /* StackInterpreter>>#lookupOrdinarySend */ -static void +static sqInt lookupOrdinarySend(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt currentClass; @@ -71633,11 +71692,10 @@ l1: /* end lookupMethodInDictionary: */; if (found) { if ((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPublic) { - return; + return LookupRuleOrdinary; } if ((accessModifierOfMethod(GIV(newMethod))) == AccessModifierProtected) { - lookupDnuPresent(); - return; + return lookupMNU(); } } /* begin followField:ofObject: */ @@ -71648,8 +71706,7 @@ } currentClass = objOop1; } - lookupDnuPresent(); - return; + return lookupMNU(); } @@ -71664,49 +71721,30 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt currentClass; sqInt dictionary; - sqInt dictionary1; sqInt found; - sqInt found1; sqInt hash; - sqInt hash1; sqInt index; - sqInt index1; usqInt length; - usqInt length1; - sqInt lookupClass; usqInt mask; - usqInt mask1; sqInt methodArray; - sqInt methodArray1; sqInt nextSelector; - sqInt nextSelector1; usqInt numSlots; - usqInt numSlots1; sqInt objOop; sqInt objOop1; sqInt objOop11; - sqInt objOop12; sqInt objOop2; - sqInt objOop21; - sqInt objOop22; sqInt objOop3; - sqInt objOop31; - sqInt objOop32; sqInt objOop4; - sqInt objOop41; sqInt objOop5; - sqInt objOop6; - sqInt tagBits; sqInt wrapAround; - sqInt wrapAround1; - lookupClass = mixinApplication; - while (!(lookupClass == GIV(nilObj))) { + currentClass = mixinApplication; + while (!(currentClass == GIV(nilObj))) { /* begin followObjField:ofObject: */ - objOop = longAt((lookupClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord()))); + objOop = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord()))); assert(isNonImmediate(objOop)); if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, lookupClass, objOop); + objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop); } dictionary = objOop; /* begin lookupMethodInDictionary: */ @@ -71788,19 +71826,19 @@ } if (nextSelector == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop21 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord()))); - assert(isNonImmediate(objOop21)); - if (((longAt(objOop21)) & (0x3FFFFF - 8)) == 0) { - objOop21 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop21); + objOop2 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord()))); + assert(isNonImmediate(objOop2)); + if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop2); } - methodArray = objOop21; + methodArray = objOop2; /* begin followField:ofObject: */ - objOop31 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord()))); - if (((objOop31 & 3) == 0) - && (((longAt(objOop31)) & 0x3FFFFF) == 8)) { - objOop31 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop31); + objOop3 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord()))); + if (((objOop3 & 3) == 0) + && (((longAt(objOop3)) & 0x3FFFFF) == 8)) { + objOop3 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop3); } - GIV(newMethod) = objOop31; + GIV(newMethod) = objOop3; found = 1; goto l1; } @@ -71818,151 +71856,17 @@ l1: /* end lookupMethodInDictionary: */; if (found && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { - return 0; + return rule; } /* begin followField:ofObject: */ - objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); + objOop1 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); if (((objOop1 & 3) == 0) && (((longAt(objOop1)) & 0x3FFFFF) == 8)) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, lookupClass, objOop1); + objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop1); } - lookupClass = objOop1; + currentClass = objOop1; } - /* begin lookupDnuAbsent */ - createActualMessageTo(GIV(lkupClass)); - GIV(lkupClass) = (((tagBits = GIV(localAbsentReceiver) & 3)) != 0 - ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << (shiftForWord()))) - : fetchClassOfNonImm(GIV(localAbsentReceiver))); - GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << (shiftForWord()))); - currentClass = GIV(lkupClass); - while (currentClass != GIV(nilObj)) { - /* begin followObjField:ofObject: */ - objOop2 = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord()))); - assert(isNonImmediate(objOop2)); - if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { - objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop2); - } - dictionary1 = objOop2; - /* begin lookupMethodInDictionary: */ - /* begin numSlotsOf: */ - flag("endianness"); - assert((classIndexOf(dictionary1)) > (isForwardedObjectClassIndexPun())); - numSlots1 = byteAt(dictionary1 + 7); - length1 = (numSlots1 == 0xFF - ? longAt(dictionary1 - BaseHeaderSize) - : numSlots1); - - /* Use linear search on small dictionaries; its cheaper. - Also the limit can be set to force linear search of all dictionaries, which supports the - booting of images that need rehashing (e.g. because a tracer has generated an image - with different hashes but hasn't rehashed it yet.) */ - - mask1 = (length1 - SelectorStart) - 1; - if (mask1 <= GIV(methodDictLinearSearchLimit)) { - index1 = 0; - while (index1 <= mask1) { - nextSelector1 = longAt((dictionary1 + BaseHeaderSize) + ((index1 + SelectorStart) << (shiftForWord()))); - if (((nextSelector1 & 3) == 0) - && (((longAt(nextSelector1)) & 0x3FFFFF) == 8)) { - nextSelector1 = fixFollowedFieldofObjectwithInitialValue(index1 + SelectorStart, dictionary1, nextSelector1); - } - if (nextSelector1 == GIV(messageSelector)) { - /* begin followObjField:ofObject: */ - objOop6 = longAt((dictionary1 + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord()))); - assert(isNonImmediate(objOop6)); - if (((longAt(objOop6)) & (0x3FFFFF - 8)) == 0) { - objOop6 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary1, objOop6); - } - methodArray1 = objOop6; - /* begin followField:ofObject: */ - objOop12 = longAt((methodArray1 + BaseHeaderSize) + (index1 << (shiftForWord()))); - if (((objOop12 & 3) == 0) - && (((longAt(objOop12)) & 0x3FFFFF) == 8)) { - objOop12 = fixFollowedFieldofObjectwithInitialValue(index1, methodArray1, objOop12); - } - GIV(newMethod) = objOop12; - found1 = 1; - goto l2; - } - index1 += 1; - } - found1 = 0; - goto l2; - } - - /* It is assumed that there are some nils in this dictionary, and search will - stop when one is encountered. However, if there are no nils, then wrapAround - will be detected the second time the loop gets to the end of the table. */ - - index1 = SelectorStart + (mask1 & (((GIV(messageSelector) & 3) != 0 - ? ((GIV(messageSelector) & 1) - ? (GIV(messageSelector) >> 1) - : ((usqInt) (((usqInt)GIV(messageSelector)))) >> 2) - : (/* begin hashBitsOf: */ - (objOop41 = GIV(messageSelector)), - (hash1 = (long32At(objOop41 + 4)) & 0x3FFFFF), - (hash1 == 0 - ? ((hash1 = (newObjectHash()) & 0x3FFFFF), - /* begin setHashBitsOf:to: */ - flag("endianness"), - assert(((hash1 >= 0) && (hash1 <= (identityHashHalfWordMask())))), - long32Atput(objOop41 + 4, ((((long32At(objOop41 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash1)) - : 0), - hash1)))); - wrapAround1 = 0; - while (1) { - nextSelector1 = longAt((dictionary1 + BaseHeaderSize) + (index1 << (shiftForWord()))); - if (nextSelector1 == GIV(nilObj)) { - found1 = 0; - goto l2; - } - if (((nextSelector1 & 3) == 0) - && (((longAt(nextSelector1)) & 0x3FFFFF) == 8)) { - nextSelector1 = fixFollowedFieldofObjectwithInitialValue(index1 + SelectorStart, dictionary1, nextSelector1); - } - if (nextSelector1 == GIV(messageSelector)) { - /* begin followObjField:ofObject: */ - objOop22 = longAt((dictionary1 + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord()))); - assert(isNonImmediate(objOop22)); - if (((longAt(objOop22)) & (0x3FFFFF - 8)) == 0) { - objOop22 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary1, objOop22); - } - methodArray1 = objOop22; - /* begin followField:ofObject: */ - objOop32 = longAt((methodArray1 + BaseHeaderSize) + ((index1 - SelectorStart) << (shiftForWord()))); - if (((objOop32 & 3) == 0) - && (((longAt(objOop32)) & 0x3FFFFF) == 8)) { - objOop32 = fixFollowedFieldofObjectwithInitialValue(index1 - SelectorStart, methodArray1, objOop32); - } - GIV(newMethod) = objOop32; - found1 = 1; - goto l2; - } - index1 += 1; - if (index1 == length1) { - if (wrapAround1) { - found1 = 0; - goto l2; - } - wrapAround1 = 1; - index1 = SelectorStart; - } - } - found1 = 0; - l2: /* end lookupMethodInDictionary: */; - if (found1) { - return LookupRuleMNU; - } - /* begin followField:ofObject: */ - objOop3 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); - if (((objOop3 & 3) == 0) - && (((longAt(objOop3)) & 0x3FFFFF) == 8)) { - objOop3 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop3); - } - currentClass = objOop3; - } - error("Recursive not understood error encountered"); - return null; + return lookupMNU(); } @@ -78862,17 +78766,15 @@ putLongtoFile(GIV(specialObjectsOop), f); putLongtoFile(newObjectHash(), f); putLongtoFile(ioScreenSize(), f); - putLongtoFile((((((GIV(fullScreenFlag) + ((VMBIGENDIAN + putLongtoFile(((((GIV(fullScreenFlag) + ((VMBIGENDIAN ? 0 - : 2))) + ((GIV(processHasThreadId) - ? 4 - : 0))) + ((GIV(flagInterpretedMethods) + : 2))) + ((GIV(flagInterpretedMethods) ? 8 : 0))) + ((GIV(preemptionYields) ? 0 - : 16))) + ((GIV(noThreadingOfGUIThread) - ? 32 - : 0))) + (((GIV(imageHeaderFlags) | 0x3F) - 0x3F)), f); + : 16))) + ((GIV(newFinalization) + ? 0 + : 64))) + (((GIV(imageHeaderFlags) | 91) - 91)), f); putWord32toFile(extraVMMemory, f); putShorttoFile(desiredNumStackPages, f); putShorttoFile((desiredCogCodeSize + 0x3FF) / 1024, f); @@ -81538,35 +81440,6 @@ } -/* Turn the receiver into an ephemeron. - TEMPORARY. For testing ephemeron handling in the VM only. - Ephemerons should be instantiated from a suitable class. */ - - /* StackInterpreterPrimitives>>#primitiveMakeEphemeron */ -EXPORT(sqInt) -primitiveMakeEphemeron(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt reasonCode; - - if (!((((longAt(GIV(stackPointer))) & 3) == 0) - && ((((((usqInt) (longAt(longAt(GIV(stackPointer))))) >> 24) & 0x1F) <= 1) - || (((((usqInt) (longAt(longAt(GIV(stackPointer))))) >> 24) & 0x1F) == 5)))) { - /* begin primitiveFailFor: */ - reasonCode = (GIV(argumentCount) == 0 - ? PrimErrBadReceiver - : PrimErrBadArgument); - return (GIV(primFailCode) = reasonCode); - } - /* begin setFormatOf:to: */ - assert(((5 >= 0) && (5 <= (formatMask())))); - flag("endianness"); - longAtput(longAt(GIV(stackPointer)), ((longAt(longAt(GIV(stackPointer)))) & ((unsigned int)~(0x1F << 24))) + (5 << 24)); - /* begin pop: */ - GIV(stackPointer) += GIV(argumentCount) * BytesPerWord; - null; -} - - /* This primitive is assumed to be fast (see e.g. MethodDictionary>>includesKey:) so make it so. N.B. Works forrectly for cogged methods too. */ @@ -82788,15 +82661,13 @@ assert(!(isForwarded(result))); longAtput((result + BaseHeaderSize) + (46 << (shiftForWord())), valuePointer15); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer16 = (((((((GIV(processHasThreadId) - ? 1 - : 0)) + ((GIV(flagInterpretedMethods) + valuePointer16 = (((((((GIV(flagInterpretedMethods) ? 2 - : 0))) + ((GIV(preemptionYields) + : 0)) + ((GIV(preemptionYields) ? 0 - : 4))) + ((GIV(noThreadingOfGUIThread) - ? 8 - : 0))) << 1) | 1); + : 4))) + ((GIV(newFinalization) + ? 16 + : 0))) + ((((((usqInt) GIV(imageHeaderFlags)) >> 2) | ((2 + 4) + 16)) - ((2 + 4) + 16)))) << 1) | 1); assert(!(isForwarded(result))); longAtput((result + BaseHeaderSize) + (47 << (shiftForWord())), valuePointer16); /* begin storePointerUnchecked:ofObject:withValue: */ @@ -83130,15 +83001,13 @@ result = getDesiredCogCodeSize(); } if (arg == 48) { - result = (((((((GIV(processHasThreadId) - ? 1 - : 0)) + ((GIV(flagInterpretedMethods) + result = (((((((GIV(flagInterpretedMethods) ? 2 - : 0))) + ((GIV(preemptionYields) + : 0)) + ((GIV(preemptionYields) ? 0 - : 4))) + ((GIV(noThreadingOfGUIThread) - ? 8 - : 0))) << 1) | 1); + : 4))) + ((GIV(newFinalization) + ? 16 + : 0))) + ((((((usqInt) GIV(imageHeaderFlags)) >> 2) | ((2 + 4) + 16)) - ((2 + 4) + 16)))) << 1) | 1); } if (arg == 49) { result = (((ioGetMaxExtSemTableSize()) << 1) | 1); @@ -83332,26 +83201,23 @@ } if (index == 48) { if (arg >= 0) { - result = ((((((((((GIV(processHasThreadId) - ? 1 - : 0)) + ((GIV(flagInterpretedMethods) + result = ((((((((((GIV(flagInterpretedMethods) ? 2 - : 0))) + ((GIV(preemptionYields) + : 0)) + ((GIV(preemptionYields) ? 0 - : 4))) + ((GIV(noThreadingOfGUIThread) - ? 8 - : 0))) << 1) | 1)) << 1) | 1); + : 4))) + ((GIV(newFinalization) + ? 16 + : 0))) + ((((((usqInt) GIV(imageHeaderFlags)) >> 2) | ((2 + 4) + 16)) - ((2 + 4) + 16)))) << 1) | 1)) << 1) | 1); /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin setCogVMFlags: */ - if ((((usqInt)arg)) > 15) { + if ((((usqInt)arg)) > 0x1F) { GIV(primFailCode) = PrimErrUnsupported; goto l1; } - GIV(processHasThreadId) = (arg & 1) != 0; GIV(flagInterpretedMethods) = (arg & 2) != 0; GIV(preemptionYields) = (arg & 4) == 0; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1446.mcz
by commits＠source.squeak.org 31 Aug '15

31 Aug '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1446.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1446 Author: eem Time: 31 August 2015, 11:59:47.399 am UUID: 9ab44a24-1f54-4c21-b99a-3977d5ecc0a1 Ancestors: VMMaker.oscog-EstebanLorenzano.1445 Implement ephemeron queue primitive. Add an image flag that controls the finalization support (StackInterpreter instVar newFinalization). If unset, finalization is as currently expected; WeakArray finalizes all WeakArrays in its registries on each finalization (which does not scale!). If set, then both fired ephemerons and bereaved weak arrays are added to the finalization queue and the finalization semaphore is signalled. In this regime the image is expected to send mourn to each element of the queue, and weak arrays will send themselves finalize in mourn, side-stepping the finalizeValues steps and rendering WeakArray's FinalizationDependents and WeakRegistry obsolete. The bit is set via Smalltalk vmParameterAt: 48 put: ((Smalltalk vmParameterAt: 48) bitOr: 64). Rename ephemeronQueue to mournQueue to reflect the more general use of the queue. Reorganize the getting/setting of the image header VM flags so that processHasThreadId & noThreadingOfGUIThread are now inst vars of CoInterpreterMT, not CoInterpreter. =============== Diff against VMMaker.oscog-EstebanLorenzano.1445 =============== Item was changed: StackInterpreterPrimitives subclass: #CoInterpreter + instanceVariableNames: 'cogit cogMethodZone gcMode cogCodeSize desiredCogCodeSize heapBase lastCoggableInterpretedBlockMethod reenterInterpreter deferSmash deferredSmash primTraceLog primTraceLogIndex traceLog traceLogIndex traceSources cogCompiledCodeCompactionCalledFor statCodeCompactionCount statCodeCompactionUsecs lastUncoggableInterpretedBlockMethod flagInterpretedMethods maxLiteralCountForCompile minBackwardJumpCountForCompile' - instanceVariableNames: 'cogit cogMethodZone gcMode cogCodeSize desiredCogCodeSize heapBase lastCoggableInterpretedBlockMethod reenterInterpreter deferSmash deferredSmash primTraceLog primTraceLogIndex traceLog traceLogIndex traceSources cogCompiledCodeCompactionCalledFor statCodeCompactionCount statCodeCompactionUsecs lastUncoggableInterpretedBlockMethod processHasThreadId flagInterpretedMethods maxLiteralCountForCompile minBackwardJumpCountForCompile noThreadingOfGUIThread' classVariableNames: 'CSCallbackEnter CSCallbackLeave CSCheckEvents CSEnterCriticalSection CSExitCriticalSection CSOwnVM CSResume CSSignal CSSuspend CSSwitchIfNeccessary CSThreadBind CSThreadSchedulingLoop CSWait CSYield HasBeenReturnedFromMCPC MFMethodFlagFrameIsMarkedFlag MinBackwardJumpCountForCompile PrimTraceLogSize ReturnToInterpreter RumpCStackSize TraceBlockActivation TraceBlockCreation TraceBufferSize TraceCodeCompaction TraceContextSwitch TraceDisownVM TraceFullGC TraceIncrementalGC TraceIsFromInterpreter TraceIsFromMachineCode TraceOwnVM TracePreemptDisowningThread TracePrimitiveFailure TracePrimitiveRetry TraceSources TraceStackOverflow TraceThreadSwitch TraceVMCallback TraceVMCallbackReturn' poolDictionaries: 'CogMethodConstants VMStackFrameOffsets' category: 'VMMaker-JIT'! !CoInterpreter commentStamp: '<historical>' prior: 0! I am a variant of the StackInterpreter that can co-exist with the Cog JIT. I interpret unjitted methods, either because they have been found for the first time or because they are judged to be too big to JIT. See CogMethod class's comment for method interoperability.! Item was changed: ----- Method: CoInterpreter>>getCogVMFlags (in category 'internal interpreter access') ----- getCogVMFlags "Answer an array of flags indicating various properties of the Cog VM. + These are the same as the image header flags shifted right two bits (excluding float order and full screen flags). + Bit 0: specific to CoInterpreterMT - Bit 0: implies the image's Process class has threadId as its 3rd inst var (zero relative) Bit 1: if set, methods that are interpreted will have the flag bit set in their header + Bit 2: if set, implies preempting a process does not put it to the back of its run queue + Bit 3: specific to CoInterpreterMT + Bit 4: if set, implies preempting a process does not put it to the back of its run queue" + ^objectMemory integerObjectOf: (flagInterpretedMethods ifTrue: [2] ifFalse: [0]) + + (preemptionYields ifTrue: [0] ifFalse: [4]) + + (newFinalization ifTrue: [16] ifFalse: [0]) + + (imageHeaderFlags >> 2 bitClear: 2 + 4 + 16)! - Bit 2: if set, implies preempting a process does not put it to the back of its run queue" - ^objectMemory integerObjectOf: (processHasThreadId ifTrue: [1] ifFalse: [0]) - + (flagInterpretedMethods ifTrue: [2] ifFalse: [0]) - + (preemptionYields ifTrue: [0] ifFalse: [4]) - + (noThreadingOfGUIThread ifTrue: [8] ifFalse: [0])! Item was changed: ----- Method: CoInterpreter>>getImageHeaderFlags (in category 'image save/restore') ----- getImageHeaderFlags "Answer the flags that are contained in the 7th long of the image header." ^fullScreenFlag "0 or 1" + (VMBIGENDIAN ifTrue: [0] ifFalse: [2]) "this is the imageFloatsLittleEndian flag" - + (processHasThreadId ifTrue: [4] ifFalse: [0]) + (flagInterpretedMethods ifTrue: [8] ifFalse: [0]) + + (preemptionYields ifTrue: [0] ifFalse: [16r10]) + + (newFinalization ifTrue: [0] ifFalse: [16r40]) + + (imageHeaderFlags bitClear: 16r5B) "these are any flags we do not recognize"! - + (preemptionYields ifTrue: [0] ifFalse: [16]) - + (noThreadingOfGUIThread ifTrue: [32] ifFalse: [0]) - + (imageHeaderFlags bitClear: 63) "these are any flags we do not recognize"! Item was changed: ----- Method: CoInterpreter>>setCogVMFlags: (in category 'internal interpreter access') ----- setCogVMFlags: flags "Set an array of flags indicating various properties of the Cog VM. Bit 0: if set, implies the image's Process class has threadId as its 3rd inst var (zero relative) Bit 1: if set, methods that are interpreted will have the flag bit set in their header Bit 2: if set, implies preempting a process does not put it to the back of its run queue Bit 3: if set, implies a threaded VM will not dosown the VM if owned by the GUI thread." + flags asUnsignedInteger > 31 ifTrue: - flags asUnsignedInteger > 15 ifTrue: [^self primitiveFailFor: PrimErrUnsupported]. - processHasThreadId := (flags bitAnd: 1) ~= 0. flagInterpretedMethods := (flags bitAnd: 2) ~= 0. preemptionYields := (flags bitAnd: 4) = 0. + newFinalization := (flags bitAnd: 16) ~= 0! - noThreadingOfGUIThread := (flags bitAnd: 8) ~= 0! Item was changed: ----- Method: CoInterpreter>>setImageHeaderFlagsFrom: (in category 'image save/restore') ----- setImageHeaderFlagsFrom: headerFlags "Set the flags that are contained in the 7th long of the image header." imageHeaderFlags := headerFlags. "so as to preserve unrecognised flags." fullScreenFlag := headerFlags bitAnd: 1. imageFloatsBigEndian := (headerFlags bitAnd: 2) = 0 ifTrue: [1] ifFalse: [0]. - processHasThreadId := (headerFlags bitAnd: 4) ~= 0. flagInterpretedMethods := (headerFlags bitAnd: 8) ~= 0. preemptionYields := (headerFlags bitAnd: 16) = 0. + newFinalization := (headerFlags bitAnd: 64) ~= 0. - noThreadingOfGUIThread := (headerFlags bitAnd: 32) ~= 0. (SistaVM and: [flagInterpretedMethods]) ifTrue: [self print: 'warning, flagInterpretedMethods inoperable in Sista VMs.'; cr]! Item was changed: CoInterpreterPrimitives subclass: #CoInterpreterMT + instanceVariableNames: 'cogThreadManager checkThreadActivation maxWaitingPriority foreignCallbackPriority deferThreadSwitch disowningVMThread disownCount foreignCallbackProcessSlot willNotThreadWarnCount activeProcessAffined relinquishing processHasThreadId noThreadingOfGUIThread' - instanceVariableNames: 'cogThreadManager checkThreadActivation maxWaitingPriority foreignCallbackPriority deferThreadSwitch disowningVMThread disownCount foreignCallbackProcessSlot willNotThreadWarnCount activeProcessAffined relinquishing' classVariableNames: 'DisownFlagsShift DisownVMForProcessorRelinquish LockGUIThreadFlag LockGUIThreadShift OwnVMForeignThreadFlag ProcessUnaffinedOnDisown ReturnToThreadSchedulingLoop VMAlreadyOwnedHenceDoNotDisown' poolDictionaries: 'VMThreadingConstants' category: 'VMMaker-Multithreading'! Item was added: + ----- Method: CoInterpreterMT>>getCogVMFlags (in category 'internal interpreter access') ----- + getCogVMFlags + "Answer an array of flags indicating various properties of the Cog VM. + These are the same as the image header flags shifted right two bits (excluding float order and full screen flags). + Bit 0: implies the image's Process class has threadId as its 3rd inst var (zero relative) + Bit 1: if set, methods that are interpreted will have the flag bit set in their header + Bit 2: if set, implies preempting a process does not put it to the back of its run queue + Bit 3: if set, implies the GUI will run on the first thread and event queues will not be accessed from other threads + Bit 4: if set, implies the new finalizartion scheme where WeakArrays are queued" + ^objectMemory integerObjectOf: (processHasThreadId ifTrue: [1] ifFalse: [0]) + + (flagInterpretedMethods ifTrue: [2] ifFalse: [0]) + + (preemptionYields ifTrue: [0] ifFalse: [4]) + + (noThreadingOfGUIThread ifTrue: [8] ifFalse: [0]) + + (newFinalization ifTrue: [16] ifFalse: [0]) + + (imageHeaderFlags >> 2 bitClear: 1 + 2 + 4 + 8 + 16)! Item was added: + ----- Method: CoInterpreterMT>>getImageHeaderFlags (in category 'image save/restore') ----- + getImageHeaderFlags + "Answer the flags that are contained in the 7th long of the image header." + ^fullScreenFlag "0 or 1" + + (VMBIGENDIAN ifTrue: [0] ifFalse: [2]) "this is the imageFloatsLittleEndian flag" + + (processHasThreadId ifTrue: [0] ifFalse: [4]) + + (flagInterpretedMethods ifTrue: [8] ifFalse: [0]) + + (preemptionYields ifTrue: [0] ifFalse: [16r10]) + + (noThreadingOfGUIThread ifTrue: [16r20] ifFalse: [0]) + + (newFinalization ifTrue: [0] ifFalse: [16r40]) + + (imageHeaderFlags bitClear: 16r7F) "these are any flags we do not recognize"! Item was added: + ----- Method: CoInterpreterMT>>setCogVMFlags: (in category 'internal interpreter access') ----- + setCogVMFlags: flags + "Set an array of flags indicating various properties of the Cog VM. + Bit 0: if set, implies the image's Process class has threadId as its 3rd inst var (zero relative) + Bit 1: if set, methods that are interpreted will have the flag bit set in their header + Bit 2: if set, implies preempting a process does not put it to the back of its run queue + Bit 3: if set, implies a threaded VM will not dosown the VM if owned by the GUI thread." + flags asUnsignedInteger > 31 ifTrue: + [^self primitiveFailFor: PrimErrUnsupported]. + processHasThreadId := (flags bitAnd: 1) ~= 0. + flagInterpretedMethods := (flags bitAnd: 2) ~= 0. + preemptionYields := (flags bitAnd: 4) = 0. + noThreadingOfGUIThread := (flags bitAnd: 8) ~= 0. + newFinalization := (flags bitAnd: 16) ~= 0! Item was changed: ----- Method: CoInterpreterMT>>setImageHeaderFlagsFrom: (in category 'image save/restore') ----- setImageHeaderFlagsFrom: headerFlags "Set the flags that are contained in the 7th long of the image header." imageHeaderFlags := headerFlags. "so as to preserve unrecognised flags." fullScreenFlag := headerFlags bitAnd: 1. imageFloatsBigEndian := (headerFlags bitAnd: 2) = 0 ifTrue: [1] ifFalse: [0]. processHasThreadId := (headerFlags bitAnd: 4) ~= 0. flagInterpretedMethods := (headerFlags bitAnd: 8) ~= 0. preemptionYields := (headerFlags bitAnd: 16) = 0. noThreadingOfGUIThread := (headerFlags bitAnd: 32) ~= 0. + newFinalization := (headerFlags bitAnd: 64) ~= 0. processHasThreadId ifFalse: [self print: 'warning, processHasThreadId flag is unset; cannot function as a threaded VM if so.'; cr]! Item was changed: VMClass subclass: #InterpreterPrimitives + instanceVariableNames: 'objectMemory messageSelector argumentCount newMethod primFailCode profileMethod profileProcess profileSemaphore nextProfileTick preemptionYields newFinalization' - instanceVariableNames: 'objectMemory messageSelector argumentCount newMethod primFailCode profileMethod profileProcess profileSemaphore nextProfileTick preemptionYields' classVariableNames: 'CrossedX EndOfRun MillisecondClockMask' poolDictionaries: 'VMBasicConstants VMBytecodeConstants VMMethodCacheConstants VMObjectIndices VMSqueakClassIndices VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !InterpreterPrimitives commentStamp: 'eem 12/11/2012 17:11' prior: 0! InterpreterPrimitives implements most of the VM's core primitives. It is the root of the interpreter hierarchy so as to share the core primitives amongst the varioius interpreters. Instance Variables argumentCount: <Integer> messageSelector: <Integer> newMethod: <Integer> nextProfileTick: <Integer> objectMemory: <ObjectMemory> (simulation only) preemptionYields: <Boolean> primFailCode: <Integer> profileMethod: <Integer> profileProcess: <Integer> profileSemaphore: <Integer> argumentCount - the number of arguments of the current message messageSelector - the oop of the selector of the current message newMethod - the oop of the result of looking up the current message nextProfileTick - the millisecond clock value of the next profile tick (if profiling is in effect) objectMemory - the memory manager and garbage collector that manages the heap preemptionYields - a boolean controlling the process primitives. If true (old, incorrect, blue-book semantics) a preempted process is sent to the back of its run-queue. If false, a process preempted by a higher-priority process is put back at the head of its run queue, hence preserving cooperative scheduling within priorities. primFailCode - primtiive success/failure flag, 0 for success, otherwise the reason code for failure profileMethod - the oop of the method at the time nextProfileTick was reached profileProcess - the oop of the activeProcess at the time nextProfileTick was reached profileSemaphore - the oop of the semaphore to signal when nextProfileTick is reached ! Item was added: + ----- Method: InterpreterPrimitives>>primitiveFetchNextMourner (in category 'memory space primitives') ----- + primitiveFetchNextMourner + <option: #SpurObjectMemory> + objectMemory dequeueMourner + ifNil: [self primitiveFailFor: PrimErrNotFound] + ifNotNil: [:mourner| self pop: 1 thenPush: mourner]! Item was changed: ----- Method: SpurGenerationScavenger>>processWeakSurvivor: (in category 'weakness and ephemerality') ----- processWeakSurvivor: weakObj "Process a weak survivor on the weakList. Those of its fields which have not survived the scavenge should be nilled, and if any + are, the coInterpreter should be informed via fireFinalization:. - are, the coInterpreter should be informed via signalFinalization:. Answer if the weakObj has any young referents." | weakObjShouldMourn hasYoungReferents numStrongSlots | weakObjShouldMourn := hasYoungReferents := false. "N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve" numStrongSlots := manager numFixedSlotsOf: weakObj. 0 to: numStrongSlots - 1 do: [:i| | referent | referent := manager fetchPointer: i ofObject: weakObj. ((manager isNonImmediate: referent) and: [manager isYoungObject: referent]) ifTrue: [hasYoungReferents := true]]. numStrongSlots to: (manager numSlotsOf: weakObj) - 1 do: [:i| | referent | referent := manager fetchPointer: i ofObject: weakObj. "Referent could be forwarded due to scavenging or a become:, don't assume." (manager isNonImmediate: referent) ifTrue: [(manager isForwarded: referent) ifTrue: [referent := manager followForwarded: referent. "weakObj is either young or already in remembered table; no need to check" self assert: ((manager isReallyYoungObject: weakObj) or: [manager isRemembered: weakObj]). manager storePointerUnchecked: i ofObject: weakObj withValue: referent]. (self isMaybeOldScavengeSurvivor: referent) ifTrue: [(manager isYoungObject: referent) ifTrue: [hasYoungReferents := true]] ifFalse: [weakObjShouldMourn := true. manager storePointerUnchecked: i ofObject: weakObj withValue: manager nilObject]]]. weakObjShouldMourn ifTrue: + [coInterpreter fireFinalization: weakObj]. - [coInterpreter signalFinalization: weakObj]. ^hasYoungReferents! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>initialize (in category 'class initialization') ----- initialize "SpurMemoryManager initialize" BitsPerByte := 8. "Initialize at least the become constants for the Spur bootstrap where the old ObjectMemory simulator is used before a Spur simulator is created.." self initializeSpurObjectRepresentationConstants. "Pig compact can be repeated to compact better. Experience shows that 3 times compacts very well, desirable for snapshots. But this is overkill for normal GCs." CompactionPassesForGC := 2. CompactionPassesForSnapshot := 3. "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty. The list goes through ObjStackNextx. We don't want to shrink objStacks, since they're used in GC and its good to keep their memory around. So unused pages created by popping emptying pages are kept on the ObjStackFreex list. ObjStackNextx must be the last field for swizzleObjStackAt:." ObjStackPageSlots := 4092. "+ double header = 16k bytes per page in 32-bits" ObjStackTopx := 0. ObjStackMyx := 1. ObjStackFreex := 2. ObjStackNextx := 3. ObjStackFixedSlots := 4. ObjStackLimit := ObjStackPageSlots - ObjStackFixedSlots. "The hiddenHootsObject contains the classTable pages and up to 8 additional objects. Currently we use four; the three objStacks, the mark stack, the weaklings and the + mourn queue, and the rememberedSet." - ephemeron queue, and the rememberedSet." MarkStackRootIndex := self basicNew classTableRootSlots. WeaklingStackRootIndex := MarkStackRootIndex + 1. + MournQueueRootIndex := MarkStackRootIndex + 2. - EphemeronQueueRootIndex := MarkStackRootIndex + 2. RememberedSetRootIndex := MarkStackRootIndex + 3. MarkObjectsForEnumerationPrimitives := false. "The remap buffer support is for compatibility; Spur doesn't GC during allocation. Eventually this should die." RemapBufferSize := 25. "Extra roots are for plugin support." ExtraRootsSize := 2048 "max. # of external roots"! Item was added: + ----- Method: SpurMemoryManager>>dequeueMourner (in category 'weakness and ephemerality') ----- + dequeueMourner + "Answer the top mourner (ephemeron or weak array) from the queue or + nil if the queue is empty. We don't care about order; ephemerons are + fired in an arbitrary order based on where they are in the heap." + ^self popObjStack: mournQueue! Item was removed: - ----- Method: SpurMemoryManager>>ephemeronQueue (in category 'spur bootstrap') ----- - ephemeronQueue - ^ephemeronQueue! Item was changed: ----- Method: SpurMemoryManager>>fireAllUnscannedEphemerons (in category 'weakness and ephemerality') ----- fireAllUnscannedEphemerons self assert: (self noUnscannedEphemerons) not. self assert: self allUnscannedEphemeronsAreActive. unscannedEphemerons start to: unscannedEphemerons top - self wordSize do: [:p| + coInterpreter fireEphemeron: (self longAt: p)]! - self queueEphemeron: (self longAt: p)]. - coInterpreter forceInterruptCheck! Item was changed: ----- Method: SpurMemoryManager>>followForwardedObjStacks (in category 'compaction') ----- followForwardedObjStacks "Compaction will move objStack pages as well as ordinary objects. So they need their slots followed." self followForwardedInObjStack: markStack atIndex: MarkStackRootIndex. self followForwardedInObjStack: weaklingStack atIndex: WeaklingStackRootIndex. + self followForwardedInObjStack: mournQueue atIndex: MournQueueRootIndex! - self followForwardedInObjStack: ephemeronQueue atIndex: EphemeronQueueRootIndex! Item was changed: ----- Method: SpurMemoryManager>>initializeObjectMemory: (in category 'initialization') ----- initializeObjectMemory: bytesToShift "Initialize object memory variables at startup time. Assume endOfMemory at al are initialised by the image-reading code via setHeapBase:memoryLimit:endOfMemory:. endOfMemory is assumed to point to the end of the last object in the image. Assume: image reader also initializes the following variables: specialObjectsOop lastHash" <inline: false> | freeListObj | "Catch mis-initializations leading to bad translations to C" self assert: self baseHeaderSize = self baseHeaderSize. self assert: (self maxSlotsForAlloc * self wordSize) asInteger > 0. self bootstrapping ifFalse: [self initSegmentBridgeWithBytes: self bridgeSize at: endOfMemory - self bridgeSize]. segmentManager adjustSegmentSwizzlesBy: bytesToShift. "image may be at a different address; adjust oops for new location" self adjustAllOopsBy: bytesToShift. specialObjectsOop := segmentManager swizzleObj: specialObjectsOop. "heavily used special objects" nilObj := self splObj: NilObject. falseObj := self splObj: FalseObject. trueObj := self splObj: TrueObject. "In Cog we insist that nil, true & false are next to each other (Cogit generates tighter conditional branch code as a result). In addition, Spur places the free lists and class table root page immediately following them." self assert: nilObj = oldSpaceStart. self assert: falseObj = (self objectAfter: nilObj). self assert: trueObj = (self objectAfter: falseObj). freeListObj := self objectAfter: trueObj. self setHiddenRootsObj: (self objectAfter: freeListObj). markStack := self swizzleObjStackAt: MarkStackRootIndex. weaklingStack := self swizzleObjStackAt: WeaklingStackRootIndex. + mournQueue := self swizzleObjStackAt: MournQueueRootIndex. - ephemeronQueue := self swizzleObjStackAt: EphemeronQueueRootIndex. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self initializeFreeSpacePostLoad: freeListObj. segmentManager collapseSegmentsPostSwizzle. self computeFreeSpacePostSwizzle. self initializeOldSpaceFirstFree: freeOldSpaceStart. "initializes endOfMemory, freeStart, free space" self initializeNewSpaceVariables. scavenger initializeRememberedSet. segmentManager checkSegments. numCompactionPasses := CompactionPassesForGC. "These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi." growHeadroom := 16*1024*1024. "headroom when growing" shrinkThreshold := 32*1024*1024. "free space before shrinking" self setHeapSizeAtPreviousGC. heapGrowthToSizeGCRatio := 0.333333. "By default GC after scavenge if heap has grown by a third since the last GC"! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceHiddenRoots (in category 'gc - global') ----- markAndTraceHiddenRoots "The hidden roots hold both the class table pages and the obj stacks, + and hence need special treatment. The obj stacks must be marked + specially; their pages must be marked, but only the contents of the + mournQueue should be marked. + - and hence need special treatment. - The obj stacks must be marked specially; their pages must be marked, - but only the contents of the ephemeronQueue should be marked. If a class table page is weak we can mark and trace the hiddenRoots, which will not trace through class table pages because they are weak. But if class table pages are strong, we must mark the pages and *not* trace them so that only classes reachable from the true roots will be marked, and unreachable classes will be left unmarked." self markAndTraceObjStack: markStack andContents: false. self markAndTraceObjStack: weaklingStack andContents: false. + self markAndTraceObjStack: mournQueue andContents: true. - self markAndTraceObjStack: ephemeronQueue andContents: true. self setIsMarkedOf: self rememberedSetObj to: true. self setIsMarkedOf: self freeListsObj to: true. (self isWeakNonImm: classTableFirstPage) ifTrue: [^self markAndTrace: hiddenRootsObj]. self setIsMarkedOf: hiddenRootsObj to: true. self markAndTrace: classTableFirstPage. 1 to: numClassTablePages - 1 do: [:i| self setIsMarkedOf: (self fetchPointer: i ofObject: hiddenRootsObj) to: true]! Item was added: + ----- Method: SpurMemoryManager>>mournQueue (in category 'spur bootstrap') ----- + mournQueue + ^mournQueue! Item was changed: ----- Method: SpurMemoryManager>>nilUnmarkedWeaklingSlots (in category 'weakness and ephemerality') ----- nilUnmarkedWeaklingSlots "Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack." <inline: #never> "for profiling" self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'nilling...'; flush]. self eassert: [self allOldMarkedWeakObjectsOnWeaklingStack]. weaklingStack = nilObj ifTrue: [^self]. self objStack: weaklingStack from: 0 do: [:weakling| | anyUnmarked | anyUnmarked := self nilUnmarkedWeaklingSlotsIn: weakling. anyUnmarked ifTrue: + [coInterpreter fireFinalization: weakling]]. - [coInterpreter signalFinalization: weakling]]. self emptyObjStack: weaklingStack! Item was changed: ----- Method: SpurMemoryManager>>queueEphemeron: (in category 'weakness and ephemerality') ----- queueEphemeron: anEphemeron + "Add the ephemeron to the queue and make it non-ephemeral, to avoid subsequent firing. + Alas this means that other ephemerons on the same object not identified in this sccavenge + or GC will not fire until later. But that's life." self assert: ((self isNonImmediate: anEphemeron) and: [(self formatOf: anEphemeron) = self ephemeronFormat]). + self deny: (self is: anEphemeron onObjStack: mournQueue). + self push: anEphemeron onObjStack: mournQueue. + self setFormatOf: anEphemeron to: self nonIndexablePointerFormat! - self push: anEphemeron onObjStack: ephemeronQueue! Item was added: + ----- Method: SpurMemoryManager>>queueMourner: (in category 'weakness and ephemerality') ----- + queueMourner: anEphemeronOrWeakArray + "Add the ephemeron to the queue and make it non-ephemeral, to avoid subsequent firing. + Alas this means that other ephemerons on the same object not identified in this sccavenge + or GC will not fire until later. But that's life." + self assert: ((self isNonImmediate: anEphemeronOrWeakArray) + and: [(self formatOf: anEphemeronOrWeakArray) = self ephemeronFormat + or: [(self formatOf: anEphemeronOrWeakArray) = self weakArrayFormat]]). + self deny: (self is: anEphemeronOrWeakArray onObjStack: mournQueue). + self push: anEphemeronOrWeakArray onObjStack: mournQueue. + (self formatOf: anEphemeronOrWeakArray) = self ephemeronFormat ifTrue: + [self setFormatOf: anEphemeronOrWeakArray to: self nonIndexablePointerFormat]! Item was changed: ----- Method: SpurMemoryManager>>storePointer:ofObjStack:withValue: (in category 'object access') ----- storePointer: fieldIndex ofObjStack: objStackPage withValue: thang self assert: (self formatOf: objStackPage) = self wordIndexableFormat. self cCode: [] inSmalltalk: [fieldIndex caseOf: { [ObjStackTopx] -> [self assert: (thang between: 0 and: ObjStackLimit)]. + [ObjStackMyx] -> [self assert: (thang between: MarkStackRootIndex and: MournQueueRootIndex)]. - [ObjStackMyx] -> [self assert: (thang between: MarkStackRootIndex and: EphemeronQueueRootIndex)]. [ObjStackFreex] -> [self assert: (thang = 0 or: [(self addressCouldBeObj: thang) and: [(self numSlotsOfAny: thang) = ObjStackPageSlots and: [(self formatOf: thang) = self wordIndexableFormat]]])]. [ObjStackNextx] -> [self assert: (thang = 0 or: [(self addressCouldBeObj: thang) and: [(self numSlotsOfAny: thang) = ObjStackPageSlots and: [(self formatOf: thang) = self wordIndexableFormat]]])]. } otherwise: []]. ^self longAt: objStackPage + self baseHeaderSize + (fieldIndex << self shiftForWord) put: thang! Item was changed: ----- Method: SpurMemoryManager>>updateRootOfObjStackAt:with: (in category 'obj stacks') ----- updateRootOfObjStackAt: objStackRootIndex with: newRootPage self storePointer: objStackRootIndex ofObject: hiddenRootsObj withValue: newRootPage. objStackRootIndex caseOf: { + [MarkStackRootIndex] -> [markStack := newRootPage]. + [WeaklingStackRootIndex] -> [weaklingStack := newRootPage]. + [MournQueueRootIndex] -> [mournQueue := newRootPage] }. - [MarkStackRootIndex] -> [markStack := newRootPage]. - [WeaklingStackRootIndex] -> [weaklingStack := newRootPage]. - [EphemeronQueueRootIndex] -> [ephemeronQueue := newRootPage] }. ^newRootPage! Item was changed: ----- Method: SpurMemoryManager>>validObjStacks (in category 'obj stacks') ----- validObjStacks ^(markStack = nilObj or: [self isValidObjStack: markStack]) and: [(weaklingStack = nilObj or: [self isValidObjStack: weaklingStack]) + and: [mournQueue = nilObj or: [self isValidObjStack: mournQueue]]]! - and: [ephemeronQueue = nilObj or: [self isValidObjStack: ephemeronQueue]]]! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter>>fireEphemeron: (in category 'finalization') ----- fireEphemeron: ephemeron <option: #SpurObjectMemory> + objectMemory queueMourner: ephemeron. + self signalFinalization: ephemeron! - objectMemory queueEphemeron: ephemeron. - self forceInterruptCheck! Item was added: + ----- Method: StackInterpreter>>fireFinalization: (in category 'finalization') ----- + fireFinalization: weakling + <option: #SpurObjectMemory> + newFinalization ifTrue: + [objectMemory queueMourner: weakling]. + self signalFinalization: weakling! Item was changed: ----- Method: StackInterpreter>>getCogVMFlags (in category 'internal interpreter access') ----- getCogVMFlags "Answer an array of flags indicating various properties of the Cog VM. + These are the same as the image header flags shifted right two bits (excluding float order and full screen flags). + Bit 0: specific to CoInterpreterMT + Bit 1: specific to CoInterpreter + Bit 2: if set, implies preempting a process does not put it to the back of its run queue + Bit 3: specific to CoInterpreterMT + Bit 4: if set, implies the new finalizartion scheme where WeakArrays are queued" + ^objectMemory integerObjectOf: (preemptionYields ifTrue: [0] ifFalse: [4]) + + (newFinalization ifTrue: [16] ifFalse: [0]) + + (imageHeaderFlags >> 2 bitClear: 4 + 16)! - Bit 2: if set, implies preempting a process does not put it to the back of its run queue" - ^objectMemory integerObjectOf: (preemptionYields ifTrue: [0] ifFalse: [4])! Item was changed: ----- Method: StackInterpreter>>getImageHeaderFlags (in category 'image save/restore') ----- getImageHeaderFlags "Answer the flags that are contained in the 7th long of the image header." ^fullScreenFlag "0 or 1" + (VMBIGENDIAN ifTrue: [0] ifFalse: [2]) "this is the imageFloatsLittleEndian flag" + (preemptionYields ifTrue: [0] ifFalse: [16r10]) + + (newFinalization ifTrue: [0] ifFalse: [16r40]) + + (imageHeaderFlags bitClear: 16r53) "these are any flags we do not recognize"! - + (imageHeaderFlags bitClear: 16r13) "these are any flags we do not recognize"! Item was changed: ----- Method: StackInterpreter>>setCogVMFlags: (in category 'internal interpreter access') ----- setCogVMFlags: flags "Set an array of flags indicating various properties of the Cog VM. + Bit 2: if set, implies preempting a process does not put it to the back of its run queue + Bit 4: if set, implies the new finalizartion scheme where WeakArrays are queued" + flags asUnsignedInteger > 31 ifTrue: - Bit 2: if set, implies preempting a process does not put it to the back of its run queue" - flags asUnsignedInteger > 7 ifTrue: [^self primitiveFailFor: PrimErrUnsupported]. + preemptionYields := (flags bitAnd: 4) = 0. + newFinalization := (flags bitAnd: 16) ~= 0! - preemptionYields := (flags bitAnd: 4) = 0! Item was changed: ----- Method: StackInterpreter>>setImageHeaderFlagsFrom: (in category 'image save/restore') ----- setImageHeaderFlagsFrom: headerFlags "Set the flags that are contained in the 7th long of the image header." imageHeaderFlags := headerFlags. "so as to preserve unrecognised flags." fullScreenFlag := headerFlags bitAnd: 1. imageFloatsBigEndian := (headerFlags bitAnd: 2) = 0 ifTrue: [1] ifFalse: [0]. + preemptionYields := (headerFlags bitAnd: 16) = 0. + newFinalization := (headerFlags bitAnd: 64) ~= 0.! - preemptionYields := (headerFlags bitAnd: 16) = 0! Item was removed: - ----- Method: StackInterpreterPrimitives>>primitiveMakeEphemeron (in category 'system control primitives') ----- - primitiveMakeEphemeron - "Turn the receiver into an ephemeron. - TEMPORARY. For testing ephemeron handling in the VM only. - Ephemerons should be instantiated from a suitable class." - <export: true> - <option: #SpurObjectMemory> - ((objectMemory isNonImmediate: self stackTop) - and: [objectMemory isFixedSizePointerFormat: (objectMemory formatOf: self stackTop)]) ifFalse: - [^self primitiveFailFor: (argumentCount = 0 - ifTrue: [PrimErrBadReceiver] - ifFalse: [PrimErrBadArgument])]. - objectMemory - setFormatOf: self stackTop - to: objectMemory ephemeronFormat. - self pop: argumentCount!

1 0

can I have access to http://source.squeak.org/FFI?
by Esteban Lorenzano 28 Aug '15

28 Aug '15

So I can commit my changes to FFI (added ExternalAddress>>#loadSymbol:fromModule: method and corresponding test). thanks! Esteban

3 4

VM Maker: VMMaker.oscog-EstebanLorenzano.1445.mcz
by commits＠source.squeak.org 28 Aug '15

28 Aug '15

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1445.mcz ==================== Summary ==================== Name: VMMaker.oscog-EstebanLorenzano.1445 Author: EstebanLorenzano Time: 28 August 2015, 2:53:43.289316 pm UUID: 30a4eca9-7084-44ad-afec-ec964765b8a8 Ancestors: VMMaker.oscog-rmacnak.1444 adding ThreadedFFIPlugin>>#primitiveLoadSymbolFromModule (copy and adapt from IA32ABIPlugin) =============== Diff against VMMaker.oscog-rmacnak.1444 =============== Item was added: + ----- Method: ThreadedFFIPlugin>>primitiveLoadSymbolFromModule (in category 'primitives') ----- + primitiveLoadSymbolFromModule + "Attempt to find the address of a symbol in a loaded library. + loadSymbol: aSymbol fromModule: moduleName + <primitive: 'primitiveLoadSymbolFromModule' error: errorCode module: 'SqueakFFIPrims'> + " + <export: true> + + | symbol module moduleHandle address oop ptr | + + <var: #address type: #'void *'> + <var: #ptr type:'unsigned int *'> + + interpreterProxy methodArgumentCount = 2 ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadNumArgs]. + + module := interpreterProxy stackValue: 0. + symbol := interpreterProxy stackValue: 1. + + moduleHandle := self ffiLoadCalloutModule: module. + address := interpreterProxy + ioLoadSymbol: (self cCoerce: (interpreterProxy firstIndexableField: symbol) to: #sqInt) + OfLength: (interpreterProxy byteSizeOf: symbol) + FromModule: moduleHandle. + (interpreterProxy failed + or: [address = 0]) ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrNotFound]. + + oop := interpreterProxy + instantiateClass: interpreterProxy classExternalAddress + indexableSize: 4. + ptr := interpreterProxy firstIndexableField: oop. + ptr at: 0 put: address. + + interpreterProxy methodReturnValue: oop!

1 0

Interfacing with the i/o pins on the Raspberry Pi et al
by Eliot Miranda 26 Aug '15

26 Aug '15

Hi All, I'm curious about interfacing Squeak with the i/o pins on the Raspberry Pi et al. Should we write a plugin? Does the FFI work just fine? What's a good guide? Who's done this already? What was good/bad about the approach you (if it is you) took? _,,,^..^,,,_ best, Eliot

6 7

using FFI to load symbols?
by Esteban Lorenzano 26 Aug '15

26 Aug '15

Hi, I’m trying to access symbols through FFI (like, for instance, to access char **environ variable from libc). I know the vm has implemented ioLoadModule: moduleNameIndex OfLength: moduleNameLength ioLoadSymbol: functionNameIndex OfLength: functionNameLength FromModule: moduleHandle … but well, since this functions are implemented inside the executable and not in an external module, I cannot access them through a regular FFI call. I suppose this can be like that because of security reasons, but I really need them (this is part of my effort to provide a replacement to NativeBoost on Pharo)… I really want to go back to use the FFI Plugin. Is there a way to do this? If not, would you agree if I add a primitive “loadSymbol:fromModule:” to ThreadedFFIPlugin? (I know, I could fork it, but I’m really trying to get aligned with the current implementation of the VM and I do not want to start again with the problem :P) thanks! Esteban

2 1

OSX code signing
by Ben Coman 26 Aug '15

26 Aug '15

What are the future plans for dealing with OSX code signing? I read [1] that "With the release of OS X 10.10 DP 5 and 10.9.5, Apple changed the code signing format, especially regarding these resource rules. [...] The main change is that now you cannot exclude resources from being signed. You used to be able to use a file called ResourceRules.plist inside of the signed bundle to specify files which should not be considered when checking if the seal of a bundle was broken. As of the version 2 code signing, this does not work anymore. All code and resources must be signed — no exceptions. " My question arises from reviewing PharoTour chapter in UPBE [2], where downloading the zip and running the app produces the dreaded {youApp} is an application downloaded from the Internet. Are you sure you want to open it?" Sure any aspiring programmer should know their way around this, but still its not very inviting. So if we can no longer store a writable Image under the Resources folder, what are the alternatives? 1. Deliver app with read-only Image under the Resources folder. The INI file can define the location of the writeable Image under ../{user}/Library/. When the VM starts, if the writable Image file does not exist, the VM transparently copies the read-only Image from resources to the writable location. 2. Use a launcher application like PharoLauncher. 3. For a "portable" app (e.g. on USB stick) push the app down one folder, so rather than putting the Win/Lin executables inside the OSX app, the top level folder contains folders Windows, Linux, Common, and the app. cheers -ben [1] https://www.objc.io/issues/17-security/inside-code-signing/ [2] https://ci.inria.fr/pharo-contribution/job/UpdatedPharoByExample/lastSucces…

1 0

VM Maker: VMMaker.oscog-rmacnak.1444.mcz
by commits＠source.squeak.org 26 Aug '15

26 Aug '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1444.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1444 Author: rmacnak Time: 25 August 2015, 9:05:48.306 pm UUID: 2ffc3ab7-87d2-43b1-b719-6d4cf96765b5 Ancestors: VMMaker.oscog-rmacnak.1443 Fix bug from refactoring in VMMaker.oscog-eem.1438 - lookupProtected:startingAt:rule: should return the actual lookup rule, not 0. Fix bug in MNU for cogged dynamic super sends - should start looking for #doesNotUnderstand: in the superclass not the receiver class. Unify MNU lookup between absent and present receiver sends as a result. Rename local variable lookupClass to currentClass in a few places to avoid confusion with instance variable lkupClass. =============== Diff against VMMaker.oscog-rmacnak.1443 =============== Item was changed: ----- Method: CoInterpreter>>lookupDynamicSuperSendNoMNU: (in category 'message sending') ----- lookupDynamicSuperSendNoMNU: methodReceiver "Do the full lookup for a Newspeak super send. IN: messageSelector IN: argumentCount OUT: localAbsentReceiver OUT: newMethod OUT: primitiveIndex RESULT: 0 or SelectorDoesNotUnderstand" | methodMixin methodMixinApplication | localAbsentReceiver := methodReceiver. localAbsentReceiverOrZero := 0. methodMixin := self methodClassOf: method. methodMixinApplication := self findApplicationOfTargetMixin: methodMixin startingAtBehavior: (objectMemory fetchClassOf: localAbsentReceiver). + lkupClass := self superclassOf: methodMixinApplication. "MNU lookup starts here." - lkupClass := self superclassOf: methodMixinApplication. "For use by MNU" ^self lookupProtectedNoMNU: messageSelector startingAt: lkupClass rule: LookupRuleDynamicSuper! Item was changed: ----- Method: CoInterpreter>>lookupImplicitReceiverSendNoMNU: (in category 'message sending') ----- lookupImplicitReceiverSendNoMNU: methodReceiver "Do the full lookup for an implicit receiver send. IN: messageSelector IN: argumentCount OUT: localAbsentReceiver OUT: localAbsentReceiverOrZero OUT: newMethod OUT: primitiveIndex RESULT: 0 or SelectorDoesNotUnderstand" | candidateReceiver candidateMixin candidateMixinApplication dictionary found | messageSelector := objectMemory followMaybeForwarded: messageSelector. candidateReceiver := methodReceiver. self deny: (objectMemory isForwarded: method). candidateMixin := self methodClassOf: method. localAbsentReceiverOrZero := 0. [self deny: (objectMemory isForwarded: candidateMixin). self deny: (objectMemory isForwarded: candidateReceiver). candidateMixinApplication := self findApplicationOfTargetMixin: candidateMixin startingAtBehavior: (objectMemory fetchClassOf: candidateReceiver). self deny: (candidateMixinApplication = 0). self deny: (candidateMixinApplication = objectMemory nilObject). self deny: (objectMemory isForwarded: candidateMixinApplication). self assert: (self addressCouldBeClassObj: candidateMixinApplication). dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: candidateMixinApplication. found := self lookupMethodInDictionary: dictionary. found ifTrue: [localAbsentReceiver := candidateReceiver. ^self lookupLexicalNoMNU: messageSelector from: candidateMixin rule: LookupRuleImplicit]. candidateMixin := objectMemory followObjField: EnclosingMixinIndex ofObject: candidateMixin. self deny: (objectMemory isForwarded: candidateMixin). candidateMixin = objectMemory nilObject] whileFalse: [localAbsentReceiverOrZero := candidateReceiver := objectMemory followObjField: EnclosingObjectIndex ofObject: candidateMixinApplication]. "There is no lexically visible method, so the implicit receiver is the method receiver." localAbsentReceiverOrZero := 0. localAbsentReceiver := methodReceiver. + lkupClass := objectMemory fetchClassOf: methodReceiver. "MNU lookup starts here." - lkupClass := objectMemory fetchClassOf: methodReceiver. "For use by MNU" ^self lookupProtectedNoMNU: messageSelector startingAt: lkupClass rule: LookupRuleImplicit.! Item was changed: ----- Method: CoInterpreter>>lookupLexicalNoMNU:from:rule: (in category 'message sending') ----- lookupLexicalNoMNU: selector from: mixin rule: rule "A shared part of the lookup for implicit receiver sends that found a lexically visible method, and self and outer sends." | receiverClass mixinApplication dictionary found | receiverClass := objectMemory fetchClassOf: localAbsentReceiver. + lkupClass := receiverClass. "MNU lookup starts here." - lkupClass := receiverClass. "For use by MNU" mixinApplication := self findApplicationOfTargetMixin: mixin startingAtBehavior: receiverClass. dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod)]) ifTrue: [^0]. ^self lookupProtectedNoMNU: selector startingAt: receiverClass rule: rule! Item was changed: ----- Method: CoInterpreter>>lookupProtectedNoMNU:startingAt:rule: (in category 'message sending') ----- lookupProtectedNoMNU: selector startingAt: mixinApplication rule: rule "A shared part of the lookup for self, outer or implicit receiver sends that did not find a private lexically visible method, and (Newspeak) super sends." + | currentClass dictionary found | + currentClass := mixinApplication. + [currentClass = objectMemory nilObject] whileFalse: + [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. - | lookupClass dictionary found | - lookupClass := mixinApplication. - [lookupClass = objectMemory nilObject] whileFalse: - [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: lookupClass. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod) not]) ifTrue: [^0]. + currentClass := self superclassOf: currentClass]. - lookupClass := self superclassOf: lookupClass]. ^SelectorDoesNotUnderstand! Item was removed: - ----- Method: StackInterpreter>>lookupDnuAbsent (in category 'message sending') ----- - lookupDnuAbsent - "An absent receiver send lookup failed. Replace the arguments on the stack with - a Message and lookup #doesNotUndestand:. - IN: lkupClass - IN: messageSelector - IN: argumentCount - OUT: newMethod - OUT: primitiveIndex - RESULT: LookupRuleMNU" - - | currentClass dictionary found | - self createActualMessageTo: lkupClass. - lkupClass := objectMemory fetchClassOf: localAbsentReceiver. - messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. - currentClass := lkupClass. - [currentClass ~= objectMemory nilObject] whileTrue: - [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. - found := self lookupMethodInDictionary: dictionary. - found ifTrue: [^LookupRuleMNU]. - currentClass := self superclassOf: currentClass]. - - self error: 'Recursive not understood error encountered' - ! Item was removed: - ----- Method: StackInterpreter>>lookupDnuPresent (in category 'message sending') ----- - lookupDnuPresent - "A present receiver send lookup failed. Replace the arguments on the stack with - a Message and lookup #doesNotUndestand:. - IN: lkupClass - IN: messageSelector - IN: argumentCount - OUT: newMethod - OUT: primitiveIndex - RESULT: LookupRuleMNU" - <option: #NewspeakVM> - | currentClass dictionary found | - self createActualMessageTo: lkupClass. - messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. - currentClass := lkupClass. - [currentClass ~= objectMemory nilObject] whileTrue: - [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. - found := self lookupMethodInDictionary: dictionary. - found ifTrue: [^LookupRuleMNU]. - currentClass := self superclassOf: currentClass]. - - self error: 'Recursive not understood error encountered'! Item was changed: ----- Method: StackInterpreter>>lookupDynamicSuperSend (in category 'message sending') ----- lookupDynamicSuperSend "Do the full lookup for a Newspeak super send. IN: messageSelector IN: argumentCount OUT: localAbsentReceiver OUT: newMethod OUT: primitiveIndex RESULT: LookupRuleDynamicSuper or LookupRuleMNU" | methodMixin methodMixinApplication | localAbsentReceiver := self receiver. localAbsentReceiverOrZero := 0. methodMixin := self methodClassOf: method. methodMixinApplication := self findApplicationOfTargetMixin: methodMixin startingAtBehavior: (objectMemory fetchClassOf: localAbsentReceiver). + lkupClass := self superclassOf: methodMixinApplication. "MNU lookup starts here." - lkupClass := self superclassOf: methodMixinApplication. "For use by MNU" ^self lookupProtected: messageSelector startingAt: lkupClass rule: LookupRuleDynamicSuper! Item was changed: ----- Method: StackInterpreter>>lookupImplicitReceiverSend (in category 'message sending') ----- lookupImplicitReceiverSend "Do the full lookup for an implicit receiver send. IN: messageSelector IN: argumentCount OUT: localAbsentReceiver OUT: localAbsentReceiverOrZero OUT: newMethod OUT: primitiveIndex RESULT: LookupRuleImplicit or LookupRuleMNU" | methodReceiver candidateReceiver candidateMixin candidateMixinApplication dictionary found | messageSelector := objectMemory followMaybeForwarded: messageSelector. methodReceiver := self receiver. candidateReceiver := methodReceiver. self deny: (objectMemory isForwarded: method). candidateMixin := self methodClassOf: method. localAbsentReceiverOrZero := 0. [self deny: (objectMemory isForwarded: candidateMixin). self deny: (objectMemory isForwarded: candidateReceiver). candidateMixinApplication := self findApplicationOfTargetMixin: candidateMixin startingAtBehavior: (objectMemory fetchClassOf: candidateReceiver). self deny: (candidateMixinApplication = 0). self deny: (candidateMixinApplication = objectMemory nilObject). self deny: (objectMemory isForwarded: candidateMixinApplication). self assert: (self addressCouldBeClassObj: candidateMixinApplication). dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: candidateMixinApplication. found := self lookupMethodInDictionary: dictionary. found ifTrue: [localAbsentReceiver := candidateReceiver. ^self lookupLexical: messageSelector from: candidateMixin rule: LookupRuleImplicit]. candidateMixin := objectMemory followObjField: EnclosingMixinIndex ofObject: candidateMixin. self deny: (objectMemory isForwarded: candidateMixin). candidateMixin = objectMemory nilObject] whileFalse: [localAbsentReceiverOrZero := candidateReceiver := objectMemory followObjField: EnclosingObjectIndex ofObject: candidateMixinApplication]. "There is no lexically visible method, so the implicit receiver is the method receiver." localAbsentReceiverOrZero := 0. localAbsentReceiver := methodReceiver. + lkupClass := objectMemory fetchClassOf: methodReceiver. "MNU lookup starts here." - lkupClass := objectMemory fetchClassOf: methodReceiver. "For use by MNU" ^self lookupProtected: messageSelector startingAt: lkupClass rule: LookupRuleImplicit.! Item was changed: ----- Method: StackInterpreter>>lookupLexical:from:rule: (in category 'message sending') ----- lookupLexical: selector from: mixin rule: rule "A shared part of the lookup for implicit receiver sends that found a lexically visible method, and self and outer sends." | receiverClass mixinApplication dictionary found | receiverClass := objectMemory fetchClassOf: localAbsentReceiver. + lkupClass := receiverClass. "MNU lookup starts here." - lkupClass := receiverClass. "For use by MNU" mixinApplication := self findApplicationOfTargetMixin: mixin startingAtBehavior: receiverClass. dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod)]) ifTrue: [^rule]. ^self lookupProtected: selector startingAt: receiverClass rule: rule ! Item was added: + ----- Method: StackInterpreter>>lookupMNU (in category 'message sending') ----- + lookupMNU + "A send lookup failed. Replace the arguments on the stack with a Message and lookup + #doesNotUndestand: starting at lkupClass. Note that MNU lookup ignores access modifiers. + This makes it different from an ordinary send of #doesNotUnderstand:, which must only + find public methods. + IN: lkupClass + IN: messageSelector + IN: argumentCount + OUT: newMethod + OUT: primitiveIndex + RESULT: LookupRuleMNU" + + | currentClass dictionary found | + self createActualMessageTo: lkupClass. + messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. + currentClass := lkupClass. + [currentClass ~= objectMemory nilObject] whileTrue: + [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. + found := self lookupMethodInDictionary: dictionary. + found ifTrue: [^LookupRuleMNU]. + currentClass := self superclassOf: currentClass]. + + self error: 'Recursive not understood error encountered' + ! Item was changed: ----- Method: StackInterpreter>>lookupOrdinarySend (in category 'message sending') ----- lookupOrdinarySend "Do the full lookup for an ordinary send (i.e., a Newspeak or Smalltalk ordinary send or a Smalltalk super send). IN: lkupClass IN: messageSelector IN: argumentCount OUT: newMethod OUT: primitiveIndex + RESULT: LookupRuleOrdinary or LookupRuleMNU" - RESULT: LookupOrdinary or LookupDNU" <option: #NewspeakVM> | currentClass dictionary found | self assert: (self addressCouldBeClassObj: lkupClass). currentClass := lkupClass. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. found := self lookupMethodInDictionary: dictionary. found ifTrue: [(self isPublicMethod: newMethod) ifTrue: + [^LookupRuleOrdinary]. - [^self]. (self isProtectedMethod: newMethod) ifTrue: + [^self lookupMNU]]. - [^self lookupDnuPresent]]. currentClass := self superclassOf: currentClass]. + ^self lookupMNU! - ^self lookupDnuPresent! Item was changed: ----- Method: StackInterpreter>>lookupProtected:startingAt:rule: (in category 'message sending') ----- lookupProtected: selector startingAt: mixinApplication rule: rule "A shared part of the lookup for self, outer or implicit receiver sends that did not find a private lexically visible method, and (Newspeak) super sends." + | currentClass dictionary found | + currentClass := mixinApplication. + [currentClass = objectMemory nilObject] whileFalse: + [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. - | lookupClass dictionary found | - lookupClass := mixinApplication. - [lookupClass = objectMemory nilObject] whileFalse: - [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: lookupClass. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod) not]) ifTrue: + [^rule]. + currentClass := self superclassOf: currentClass]. + ^self lookupMNU! - [^0]. - lookupClass := self superclassOf: lookupClass]. - ^self lookupDnuAbsent!

1 0

Re: MaxLiterals (was: Re: [squeak-dev] Daily Commit Log)
by Ben Coman 26 Aug '15

26 Aug '15

Would it be benficial/possible to have a primtive returning a dictionary of limits compiled into the VM? I am thinking of a case where the VM might be compiled to run in an embedded environment (e.g. robotics). Then these limits would only need changing in one spot. How big would such a list be? cheers -ben On Wed, Aug 26, 2015 at 4:50 AM, Levente Uzonyi <leves(a)elte.hu> wrote: > I guess then we should change a few 255s and 65535s to 32767. I've uploaded > Compiler-ul.307, and Kernel-ul.946 to the Inbox with some changes. There may > be more methods with the obsolete limit in the image, and my changes may not > be correct. Please review them! > > Levente > > On Tue, 25 Aug 2015, Eliot Miranda wrote: > >> >> >> On Tue, Aug 25, 2015 at 10:40 AM, Levente Uzonyi <leves(a)elte.hu> wrote: >> Hi Eliot, >> >> That was me who updated the method, because if was failing. >> CompilerTest #testMaxLiterals verifies a certain literal limit, and >> checks if adding one more literal will make the compilation fail. >> >> >> Ah, OK. I just wanted to point out that the limit is 32767, not 65535. >> >> >> >> Levente >> >> On Tue, 25 Aug 2015, Eliot Miranda wrote: >> >> Hi Tobias, >> >> Sent from my iPhone >> >> On Aug 22, 2015, at 2:55 PM, commits(a)source.squeak.org >> wrote: >> >> Changes to Trunk (http://source.squeak.org/trunk.html) >> in the last 24 hours: >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008871.html >> >> Name: Tests-ul.325 >> Ancestors: Tests-topa.324 >> >> Increased maxLiterals in CompilerTest's #testMaxLiterals >> and #testMaxLiteralsWithClassReferenceInClosure to make them pass again. >> In theory Spur supports literals up to 65535, but I >> think the compiler will have to be changed to be able to use that many. >> >> >> In the end I made the literal limit 32767, leaving bit 15 for >> a flag identifying methods generated by the dynamic optimizer, when we have >> one. >> >> Why do you think the compiler needs modifying to allow for >> more than 255 literals? I think it's a bytecode set issue, not a compiler >> issue. Both the Newspeak V4 and Sista V1 bytecode >> sets support 64k literals. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008872.html >> >> Name: Tests-ul.326 >> Ancestors: Tests-ul.325 >> >> PointTest's #testNormal and #testTheta seem to get >> decompiled correctly. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008873.html >> >> Name: Collections-ul.644 >> Ancestors: Collections-ul.643 >> >> Extracted and enhanced Bitset from WideCharacterSet. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008874.html >> >> Name: CollectionsTests-ul.247 >> Ancestors: CollectionsTests-ul.246 >> >> Added BitSetTest. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008875.html >> >> Name: Collections-ul.645 >> Ancestors: Collections-ul.644 >> >> Use the extracted Bitset in WideCharacterSet: >> - decreased chunk size from 65536 to 256. This should >> give a purpose to use a dictionary instread of an array for map, because its >> size will have a chance to be larger than >> 64. >> - byteArrayMap is always initialized, so there's no need >> to use the method to reference it, nor to check if it's initialized >> - moved #remove: behavior to #remove:ifAbsent:, just >> like it's done by most collections. Kept the existing behavior of #remove: >> to not signal an error when the character is >> not in the collection. >> - use #atAllPut: to clear the byteArrayMap in >> #removeAll, because it should be faster than allocating a new instance >> - improved #size's performance >> - migrate instances on-the-fly >> - migrate any unmigrated instaces during the postscript >> - removed the unused methods >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008876.html >> >> Name: Collections-ul.646 >> Ancestors: Collections-ul.645 >> >> - removed migration code from WideCharacterSet >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008877.html >> >> Name: Tools-eem.631 >> Ancestors: Tools-ul.630 >> >> Remove the become[Un]Compact messages from MethodFinder >> as these are going away. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008878.html >> >> Name: System-eem.758 >> Ancestors: System-ul.757 >> >> Reimplement the post-load enumeration of loaded objects >> to use the revised primitive available in the VMMaker.oscog-eem.1441 /3427 >> VMs that becomes the loaded segment into >> an Array of the loaded objects. Hence endMarker >> disappears and allObjectsDo: is trivially implemented as do: sent to the >> segment. >> >> This change requires users to upgrade their VMs but as >> the alternative is crashes in ImageSegment loads this is acceptable. AFAIA >> this fixes ImageSegments in Spur but they >> clearly need pounding on. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008879.html >> >> Name: SMBase-eem.134 >> Ancestors: SMBase-bf.133 >> >> Reimplement the post-load enumeration of loaded objects >> to use the revised primitive available in the VMMaker.oscog-eem.1441 /3427 >> VMs that becomes the loaded segment into >> an Array of the loaded objects. Hence endMarker >> disappears and allObjectsDo: is trivially implemented as do: sent to the >> segment. >> >> This change requires users to upgrade their VMs but as >> the alternative is crashes in ImageSegment loads this is acceptable. AFAIA >> this fixes ImageSegments in Spur but they >> clearly need pounding on. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008880.html >> >> Name: KernelTests-eem.297 >> Ancestors: KernelTests-ul.296 >> >> Remove the compact class index tests from >> LargeNegativeInteger as the compact class code is going away. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008881.html >> >> Name: Kernel-eem.944 >> Ancestors: Kernel-ul.943 >> >> Nuke the compact class support in Kernel and the >> ClassBuilder. Spur has a regular 64-bit object header format with no >> special cases. >> >> Fix CompiledMethod>>at:ifAbsent: to work with the >> initialPC to endPC range and run the ifAbsent: block for indices outside >> this range. >> >> Categorize isCompiledMethodClass correctly. >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008882.html >> >> Name: Collections-ul.647 >> Ancestors: Collections-ul.646 >> >> - in Spur we can speed up Character >> #sameAs: by using >> #== >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008883.html >> >> Name: Regex-Core-ul.40 >> Ancestors: Regex-Core-ul.39 >> >> RxsPredicate: >> - added \t \n escapes for tab and lf >> - unified all single character predicates as >> #beCharacter: >> - postscript reinitializes the dictionary >> >> RxMatchOptimizer: >> - removed lookarounds, because they were never used, >> just collected >> - all collections get initialized lazily >> - CharacterSet are used for storing characters >> - IdentitySets are used where unique objects are stored >> (e.g. symbols) >> - use #== and #~~ for character comparison >> (Spur-specific change) >> >> RxMatcher: >> - reuse previous markerPositions >> - use String >> #new:streamContents: where possible >> - use #== and #~~ for character comparison >> (Spur-specific change) >> - quick returns in #tryMatch >> >> General: >> - renamed RxmLookahaed to RxmLookahead >> - in RxmPredicate >> #matchAgainst: use the fact that >> aMatcher is providing a ReadStream of characters, so nil means end of stream >> - reimplemented RxmSubstring >> >> ============================================= >> >> >> http://lists.squeakfoundation.org/pipermail/packages/2015-August/008884.html >> >> Name: Regex-Tests-Core-ul.1 >> Ancestors: >> >> - tests from Pharo >> >> ============================================= >> >> >> >> >> >> >> >> -- >> _,,,^..^,,,_ >> best, Eliot >> > > >

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2015