Vm-dev August 2015

vm-dev@lists.squeakfoundation.org

37 participants
78 discussions

[commit][3427] CogVM source as per VMMaker.oscog-eem.1441
by commits＠squeakvm.org 22 Aug '15

22 Aug '15

Revision: 3427 Author: eliot Date: 2015-08-21 20:39:38 -0700 (Fri, 21 Aug 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1441 Modify Spur ImageSegment load to become the segmentWordArray into an Array of the loaded objects if load is successful, hence decoupling ImageSegment from the assumption that objects are allocated in order. Fix use count printing in printStackPagesInUse et al. Newspeak Use the isFooMethod: level method privacy accessors to test in two remaining lookup routines, restricting AccessModifierPublic et al to the inner accessors. Enable access control in 64-bit Newspeak VMs as well. 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/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-20 19:28:03 UTC (rev 3426) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-08-22 03:39:38 UTC (rev 3427) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CCodeGenerator VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-08-20 19:28:03 UTC (rev 3426) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-08-22 03:39:38 UTC (rev 3427) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 from - CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CoInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -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.1439"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1441"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18328,7 +18328,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -53447,13 +53447,13 @@ /* This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. - It will return as its value the original array of roots, and the erstwhile - segmentWordArray will - have been truncated to a size of one word, i.e. retaining the version - stamp. If this primitive - should fail, the segmentWordArray will, sadly, have been reduced to an - unrecognizable and - unusable jumble. But what more could you have done with it anyway? */ + It will return as its value the original array of roots, and the + segmentWordArray will become an + array of the loaded objects. If this primitive should fail, the + segmentWordArray will, sadly, have + been reduced to an unrecognizable and unusable jumble. But what more could + you have done + with it anyway? */ /* SpurMemoryManager>>#loadImageSegmentFrom:outPointers: */ static sqInt @@ -53467,11 +53467,17 @@ sqInt classRef; sqInt errorCode; sqInt errorCode1; + sqInt fillIdx; sqInt hash; sqInt i; sqInt iLimiT; + sqInt loadedObjectsArray; sqInt mappedOop; + usqInt newObj; + usqInt numBytes; + sqInt numLoadedObjects; usqInt numOutPointers; + sqInt numSegObjs; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -53590,15 +53596,17 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); + numSegObjs = 0; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); while (objOop1 < segmentLimit) { + numSegObjs += 1; if (((((usqInt) (longAt(objOop1 + 4))) >> 23) & 1) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ @@ -53607,14 +53615,14 @@ if (classIndex & TopHashBit) { if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } } else { @@ -53623,11 +53631,11 @@ if (((oop1 = (classIndex * 8) + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } if (((long32At(oop1 + 4)) & 0x3FFFFF) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } } for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -53636,18 +53644,18 @@ if (oop1 & TopOopBit) { if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + (oop1 << (shiftForWord()))); } else { if ((oop1 & (8 - 1)) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } if (((mappedOop = oop1 + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } } /* begin storePointerUnchecked:ofObject:withValue: */ @@ -53657,11 +53665,52 @@ } objOop1 = objectAfterlimit(objOop1, segmentLimit); } - errorCode = 0; -l2: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; - if (errorCode != 0) { + errorCode = -numSegObjs; +l3: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; + if (errorCode > 0) { return errorCode; } + numLoadedObjects = -errorCode; + /* begin allocateSlots:format:classIndex: */ + if (numLoadedObjects >= 0xFF) { + newObj = GIV(freeStart) + BaseHeaderSize; + numBytes = (BaseHeaderSize + BaseHeaderSize) + ((numLoadedObjects + (numLoadedObjects & 1)) * BytesPerOop); + } + else { + newObj = GIV(freeStart); + numBytes = BaseHeaderSize + ((numLoadedObjects <= 1 + ? 8 + : (numLoadedObjects + (numLoadedObjects & 1)) * BytesPerOop)); + } + if ((GIV(freeStart) + numBytes) > GIV(scavengeThreshold)) { + if (!GIV(needGCFlag)) { + /* begin scheduleScavenge */ + GIV(needGCFlag) = 1; + forceInterruptCheck(); + } + loadedObjectsArray = allocateSlotsInOldSpacebytesformatclassIndex(numLoadedObjects, numBytes, 2, ClassArrayCompactIndex); + goto l1; + } + if (numLoadedObjects >= 0xFF) { + + /* for header parsing we put a saturated slot count in the prepended overflow size word */ + + flag("endianness"); + longAtput(GIV(freeStart), numLoadedObjects); + longAtput(GIV(freeStart) + 4, 0xFF << 24); + long64Atput(newObj, (((((usqLong) 0xFF)) << 56) + (2 << 24)) + ClassArrayCompactIndex); + } + else { + long64Atput(newObj, (((((usqLong) numLoadedObjects)) << 56) + (2 << 24)) + ClassArrayCompactIndex); + } + assert((numBytes % (allocationUnit())) == 0); + assert((newObj % (allocationUnit())) == 0); + GIV(freeStart) += numBytes; + loadedObjectsArray = newObj; +l1: /* end allocateSlots:format:classIndex: */; + if (!(loadedObjectsArray)) { + return PrimErrNoMemory; + } /* begin enterClassesIntoClassTableFrom:to: */ objOop = objectAfter(objectStartingAt(segmentStart)); while ((objOop < segmentLimit) @@ -53677,26 +53726,31 @@ objOop = objectAfterlimit(objOop, segmentLimit); } errorCode = errorCode1; - goto l1; + goto l2; } objOop = objectAfterlimit(objOop, segmentLimit); } errorCode = 0; -l1: /* end enterClassesIntoClassTableFrom:to: */; +l2: /* end enterClassesIntoClassTableFrom:to: */; if (errorCode != 0) { return errorCode; } - /* begin assignClassIndicesAndPinFrom:to:outPointers: */ + /* begin assignClassIndicesAndPinFrom:to:outPointers:filling: */ /* begin objectStartingAt: */ numSlots5 = byteAt(segmentStart + 7); objOop2 = (numSlots5 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); + fillIdx = 0; while (objOop2 < segmentLimit) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(loadedObjectsArray))); + longAtput((loadedObjectsArray + BaseHeaderSize) + (fillIdx << (shiftForWord())), objOop2); /* In the segment, class indices are offset indexes into the segment data, or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ + fillIdx += 1; classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; if (classRef & TopHashBit) { classOop = longAt((outPointerArray + BaseHeaderSize) + ((classRef - TopHashBit) << (shiftForWord()))); @@ -53754,6 +53808,31 @@ else { byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } + /* begin forward:to: */ + /* begin set:classIndexTo:formatTo: */ + assert(((8 >= 0) && (8 <= (classIndexMask())))); + assert(((7 >= 0) && (7 <= (formatMask())))); + flag("endianness"); + longAtput(segmentWordArray, ((longAt(segmentWordArray)) & ((unsigned int)~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); + /* begin storePointer:ofForwarder:withValue: */ + assert(isForwarded(segmentWordArray)); + assert(!(isOopForwarded(loadedObjectsArray))); + if (isOldObject(segmentWordArray)) { + + /* most stores into young objects */ + + if (((loadedObjectsArray & 3) == 0) + && (oopisLessThan(loadedObjectsArray, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(segmentWordArray))) >> 29) & 1) != 0)) { + remember(segmentWordArray); + } + } + } + longAtput((segmentWordArray + BaseHeaderSize) + (0 << (shiftForWord())), loadedObjectsArray); + if ((byteAt(segmentWordArray + 7)) == 0) { + byteAtput(segmentWordArray + 7, 1); + } runLeakCheckerFor(GCModeImageSegment); /* begin objectStartingAt: */ numSlots1 = byteAt(segmentStart + 7); @@ -65003,7 +65082,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -65244,7 +65323,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65348,7 +65427,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -75528,10 +75607,9 @@ n = 0; do { if (!(isFree(page))) { - printStackPageuseCount(page, n); + printStackPageuseCount(page, (n += 1)); /* begin cr */ printf("\n"); - n += 1; } } while(((page = (page->prevPage))) != (mostRecentlyUsedPage())); } @@ -75563,10 +75641,9 @@ n = 0; for (i = 0; i < GIV(numStackPages); i += 1) { if (!(isFree(stackPageAt(i)))) { - printStackPageuseCount(stackPageAt(i), n); + printStackPageuseCount(stackPageAt(i), (n += 1)); /* begin cr */ printf("\n"); - n += 1; } } } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-08-20 19:28:03 UTC (rev 3426) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-08-22 03:39:38 UTC (rev 3427) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-20 19:28:03 UTC (rev 3426) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-22 03:39:38 UTC (rev 3427) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 from - CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CoInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2417,7 +2417,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.1439"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1441"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18337,7 +18337,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -53456,13 +53456,13 @@ /* This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. - It will return as its value the original array of roots, and the erstwhile - segmentWordArray will - have been truncated to a size of one word, i.e. retaining the version - stamp. If this primitive - should fail, the segmentWordArray will, sadly, have been reduced to an - unrecognizable and - unusable jumble. But what more could you have done with it anyway? */ + It will return as its value the original array of roots, and the + segmentWordArray will become an + array of the loaded objects. If this primitive should fail, the + segmentWordArray will, sadly, have + been reduced to an unrecognizable and unusable jumble. But what more could + you have done + with it anyway? */ /* SpurMemoryManager>>#loadImageSegmentFrom:outPointers: */ static sqInt @@ -53476,11 +53476,17 @@ sqInt classRef; sqInt errorCode; sqInt errorCode1; + sqInt fillIdx; sqInt hash; sqInt i; sqInt iLimiT; + sqInt loadedObjectsArray; sqInt mappedOop; + usqInt newObj; + usqInt numBytes; + sqInt numLoadedObjects; usqInt numOutPointers; + sqInt numSegObjs; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -53599,15 +53605,17 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); + numSegObjs = 0; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); while (objOop1 < segmentLimit) { + numSegObjs += 1; if (((((usqInt) (longAt(objOop1 + 4))) >> 23) & 1) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ @@ -53616,14 +53624,14 @@ if (classIndex & TopHashBit) { if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } } else { @@ -53632,11 +53640,11 @@ if (((oop1 = (classIndex * 8) + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } if (((long32At(oop1 + 4)) & 0x3FFFFF) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } } for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -53645,18 +53653,18 @@ if (oop1 & TopOopBit) { if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + (oop1 << (shiftForWord()))); } else { if ((oop1 & (8 - 1)) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } if (((mappedOop = oop1 + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } } /* begin storePointerUnchecked:ofObject:withValue: */ @@ -53666,11 +53674,52 @@ } objOop1 = objectAfterlimit(objOop1, segmentLimit); } - errorCode = 0; -l2: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; - if (errorCode != 0) { + errorCode = -numSegObjs; +l3: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; + if (errorCode > 0) { return errorCode; } + numLoadedObjects = -errorCode; + /* begin allocateSlots:format:classIndex: */ + if (numLoadedObjects >= 0xFF) { + newObj = GIV(freeStart) + BaseHeaderSize; + numBytes = (BaseHeaderSize + BaseHeaderSize) + ((numLoadedObjects + (numLoadedObjects & 1)) * BytesPerOop); + } + else { + newObj = GIV(freeStart); + numBytes = BaseHeaderSize + ((numLoadedObjects <= 1 + ? 8 + : (numLoadedObjects + (numLoadedObjects & 1)) * BytesPerOop)); + } + if ((GIV(freeStart) + numBytes) > GIV(scavengeThreshold)) { + if (!GIV(needGCFlag)) { + /* begin scheduleScavenge */ + GIV(needGCFlag) = 1; + forceInterruptCheck(); + } + loadedObjectsArray = allocateSlotsInOldSpacebytesformatclassIndex(numLoadedObjects, numBytes, 2, ClassArrayCompactIndex); + goto l1; + } + if (numLoadedObjects >= 0xFF) { + + /* for header parsing we put a saturated slot count in the prepended overflow size word */ + + flag("endianness"); + longAtput(GIV(freeStart), numLoadedObjects); + longAtput(GIV(freeStart) + 4, 0xFF << 24); + long64Atput(newObj, (((((usqLong) 0xFF)) << 56) + (2 << 24)) + ClassArrayCompactIndex); + } + else { + long64Atput(newObj, (((((usqLong) numLoadedObjects)) << 56) + (2 << 24)) + ClassArrayCompactIndex); + } + assert((numBytes % (allocationUnit())) == 0); + assert((newObj % (allocationUnit())) == 0); + GIV(freeStart) += numBytes; + loadedObjectsArray = newObj; +l1: /* end allocateSlots:format:classIndex: */; + if (!(loadedObjectsArray)) { + return PrimErrNoMemory; + } /* begin enterClassesIntoClassTableFrom:to: */ objOop = objectAfter(objectStartingAt(segmentStart)); while ((objOop < segmentLimit) @@ -53686,26 +53735,31 @@ objOop = objectAfterlimit(objOop, segmentLimit); } errorCode = errorCode1; - goto l1; + goto l2; } objOop = objectAfterlimit(objOop, segmentLimit); } errorCode = 0; -l1: /* end enterClassesIntoClassTableFrom:to: */; +l2: /* end enterClassesIntoClassTableFrom:to: */; if (errorCode != 0) { return errorCode; } - /* begin assignClassIndicesAndPinFrom:to:outPointers: */ + /* begin assignClassIndicesAndPinFrom:to:outPointers:filling: */ /* begin objectStartingAt: */ numSlots5 = byteAt(segmentStart + 7); objOop2 = (numSlots5 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); + fillIdx = 0; while (objOop2 < segmentLimit) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(loadedObjectsArray))); + longAtput((loadedObjectsArray + BaseHeaderSize) + (fillIdx << (shiftForWord())), objOop2); /* In the segment, class indices are offset indexes into the segment data, or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ + fillIdx += 1; classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; if (classRef & TopHashBit) { classOop = longAt((outPointerArray + BaseHeaderSize) + ((classRef - TopHashBit) << (shiftForWord()))); @@ -53763,6 +53817,31 @@ else { byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } + /* begin forward:to: */ + /* begin set:classIndexTo:formatTo: */ + assert(((8 >= 0) && (8 <= (classIndexMask())))); + assert(((7 >= 0) && (7 <= (formatMask())))); + flag("endianness"); + longAtput(segmentWordArray, ((longAt(segmentWordArray)) & ((unsigned int)~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); + /* begin storePointer:ofForwarder:withValue: */ + assert(isForwarded(segmentWordArray)); + assert(!(isOopForwarded(loadedObjectsArray))); + if (isOldObject(segmentWordArray)) { + + /* most stores into young objects */ + + if (((loadedObjectsArray & 3) == 0) + && (oopisLessThan(loadedObjectsArray, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(segmentWordArray))) >> 29) & 1) != 0)) { + remember(segmentWordArray); + } + } + } + longAtput((segmentWordArray + BaseHeaderSize) + (0 << (shiftForWord())), loadedObjectsArray); + if ((byteAt(segmentWordArray + 7)) == 0) { + byteAtput(segmentWordArray + 7, 1); + } runLeakCheckerFor(GCModeImageSegment); /* begin objectStartingAt: */ numSlots1 = byteAt(segmentStart + 7); @@ -65012,7 +65091,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -65253,7 +65332,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65357,7 +65436,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -75537,10 +75616,9 @@ n = 0; do { if (!(isFree(page))) { - printStackPageuseCount(page, n); + printStackPageuseCount(page, (n += 1)); /* begin cr */ printf("\n"); - n += 1; } } while(((page = (page->prevPage))) != (mostRecentlyUsedPage())); } @@ -75572,10 +75650,9 @@ n = 0; for (i = 0; i < GIV(numStackPages); i += 1) { if (!(isFree(stackPageAt(i)))) { - printStackPageuseCount(stackPageAt(i), n); + printStackPageuseCount(stackPageAt(i), (n += 1)); /* begin cr */ printf("\n"); - n += 1; } } } Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-20 19:28:03 UTC (rev 3426) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-22 03:39:38 UTC (rev 3427) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 from - StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + StackInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2177,7 +2177,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1441"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -41403,13 +41403,13 @@ /* This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. - It will return as its value the original array of roots, and the erstwhile - segmentWordArray will - have been truncated to a size of one word, i.e. retaining the version - stamp. If this primitive - should fail, the segmentWordArray will, sadly, have been reduced to an - unrecognizable and - unusable jumble. But what more could you have done with it anyway? */ + It will return as its value the original array of roots, and the + segmentWordArray will become an + array of the loaded objects. If this primitive should fail, the + segmentWordArray will, sadly, have + been reduced to an unrecognizable and unusable jumble. But what more could + you have done + with it anyway? */ /* SpurMemoryManager>>#loadImageSegmentFrom:outPointers: */ static sqInt @@ -41423,6 +41423,7 @@ sqInt classRef; sqInt errorCode; sqInt errorCode1; + sqInt fillIdx; sqInt followingWord; sqInt followingWord1; sqInt followingWord2; @@ -41434,8 +41435,13 @@ sqInt hash; sqInt i; sqInt iLimiT; + sqInt loadedObjectsArray; sqInt mappedOop; + usqInt newObj; + usqInt numBytes; + sqInt numLoadedObjects; usqInt numOutPointers; + sqInt numSegObjs; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -41564,15 +41570,17 @@ numOutPointers = (numSlots5 == 0xFF ? ((usqInt) (((unsigned long)(((long)(longAt(outPointerArray - BaseHeaderSize))) << 8)))) >> 8 : numSlots5); + numSegObjs = 0; /* begin objectStartingAt: */ numSlots14 = byteAt(segmentStart + 7); objOop1 = (numSlots14 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); while (objOop1 < segmentLimit) { + numSegObjs += 1; if (((((usqInt) (longAt(objOop1))) >> 55) & 1) != 0) { errorCode = PrimErrInappropriate; - goto l5; + goto l6; } /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ @@ -41581,14 +41589,14 @@ if (classIndex & TopHashBit) { if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l5; + goto l6; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + (((long)(classIndex - TopHashBit)) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { errorCode = PrimErrInappropriate; - goto l5; + goto l6; } } else { @@ -41597,11 +41605,11 @@ if (((oop1 = (classIndex * 8) + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l5; + goto l6; } if (((long32At(oop1 + 4)) & 0x3FFFFF) != 0) { errorCode = PrimErrInappropriate; - goto l5; + goto l6; } } for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -41610,18 +41618,18 @@ if (oop1 & TopOopBit) { if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l5; + goto l6; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + (((long)oop1) << (shiftForWord()))); } else { if ((oop1 & (8 - 1)) != 0) { errorCode = PrimErrInappropriate; - goto l5; + goto l6; } if (((mappedOop = oop1 + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l5; + goto l6; } } /* begin storePointerUnchecked:ofObject:withValue: */ @@ -41645,20 +41653,64 @@ followingWordAddress2 = (objOop1 + BaseHeaderSize) + slotBytes3; if (oopisGreaterThanOrEqualTo(followingWordAddress2, segmentLimit)) { objOop1 = segmentLimit; - goto l4; + goto l5; } flag("endianness"); followingWord2 = longAt(followingWordAddress2); objOop1 = ((((usqInt) followingWord2) >> 56) == 0xFF ? followingWordAddress2 + BaseHeaderSize : followingWordAddress2); - l4: /* end objectAfter:limit: */; + l5: /* end objectAfter:limit: */; } - errorCode = 0; -l5: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; - if (errorCode != 0) { + errorCode = -numSegObjs; +l6: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; + if (errorCode > 0) { return errorCode; } + numLoadedObjects = -errorCode; + /* begin allocateSlots:format:classIndex: */ + if (numLoadedObjects >= 0xFF) { + if ((((usqInt) numLoadedObjects) >> 56) > 0) { + loadedObjectsArray = null; + goto l1; + } + newObj = GIV(freeStart) + BaseHeaderSize; + numBytes = (BaseHeaderSize + BaseHeaderSize) + (numLoadedObjects * BytesPerOop); + } + else { + newObj = GIV(freeStart); + numBytes = BaseHeaderSize + ((numLoadedObjects < 1 + ? 8 + : numLoadedObjects * BytesPerOop)); + } + if ((GIV(freeStart) + numBytes) > GIV(scavengeThreshold)) { + if (!GIV(needGCFlag)) { + /* begin scheduleScavenge */ + GIV(needGCFlag) = 1; + forceInterruptCheck(); + } + loadedObjectsArray = allocateSlotsInOldSpacebytesformatclassIndex(numLoadedObjects, numBytes, 2, ClassArrayCompactIndex); + goto l1; + } + if (numLoadedObjects >= 0xFF) { + + /* for header parsing we put a saturated slot count in the prepended overflow size word */ + + flag("endianness"); + longAtput(GIV(freeStart), (0xFFLL << 56) + numLoadedObjects); + longAtput(newObj, ((((long)(((usqLong) 0xFF))) << 56) + (2LL << 24)) + ClassArrayCompactIndex); + } + else { + longAtput(newObj, ((((long)(((usqLong) numLoadedObjects))) << 56) + (2LL << 24)) + ClassArrayCompactIndex); + } + assert((numBytes % (allocationUnit())) == 0); + assert((newObj % (allocationUnit())) == 0); + GIV(freeStart) += numBytes; + loadedObjectsArray = newObj; +l1: /* end allocateSlots:format:classIndex: */; + if (!(loadedObjectsArray)) { + return PrimErrNoMemory; + } /* begin enterClassesIntoClassTableFrom:to: */ objOop = objectAfter(objectStartingAt(segmentStart)); while ((objOop < segmentLimit) @@ -41686,17 +41738,17 @@ followingWordAddress = (objOop + BaseHeaderSize) + slotBytes2; if (oopisGreaterThanOrEqualTo(followingWordAddress, segmentLimit)) { objOop = segmentLimit; - goto l1; + goto l3; } flag("endianness"); followingWord = longAt(followingWordAddress); objOop = ((((usqInt) followingWord) >> 56) == 0xFF ? followingWordAddress + BaseHeaderSize : followingWordAddress); - l1: /* end objectAfter:limit: */; + l3: /* end objectAfter:limit: */; } errorCode = errorCode1; - goto l3; + goto l4; } /* begin objectAfter:limit: */ /* begin addressAfter: */ @@ -41724,21 +41776,26 @@ l2: /* end objectAfter:limit: */; } errorCode = 0; -l3: /* end enterClassesIntoClassTableFrom:to: */; +l4: /* end enterClassesIntoClassTableFrom:to: */; if (errorCode != 0) { return errorCode; } - /* begin assignClassIndicesAndPinFrom:to:outPointers: */ + /* begin assignClassIndicesAndPinFrom:to:outPointers:filling: */ /* begin objectStartingAt: */ numSlots6 = byteAt(segmentStart + 7); objOop2 = (numSlots6 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); + fillIdx = 0; while (objOop2 < segmentLimit) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(loadedObjectsArray))); + longAtput((loadedObjectsArray + BaseHeaderSize) + (((long)fillIdx) << (shiftForWord())), objOop2); /* In the segment, class indices are offset indexes into the segment data, or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ + fillIdx += 1; classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; if (classRef & TopHashBit) { classOop = longAt((outPointerArray + BaseHeaderSize) + (((long)(classRef - TopHashBit)) << (shiftForWord()))); @@ -41801,14 +41858,14 @@ followingWordAddress3 = (objOop2 + BaseHeaderSize) + slotBytes4; if (oopisGreaterThanOrEqualTo(followingWordAddress3, segmentLimit)) { objOop2 = segmentLimit; - goto l6; + goto l7; } flag("endianness"); followingWord3 = longAt(followingWordAddress3); objOop2 = ((((usqInt) followingWord3) >> 56) == 0xFF ? followingWordAddress3 + BaseHeaderSize : followingWordAddress3); - l6: /* end objectAfter:limit: */; + l7: /* end objectAfter:limit: */; } if ((byteAt(segmentWordArray + 7)) == 0xFF) { /* begin rawOverflowSlotsOf:put: */ @@ -41819,6 +41876,30 @@ else { byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } + /* begin forward:to: */ + /* begin set:classIndexTo:formatTo: */ + assert(((8 >= 0) && (8 <= (classIndexMask())))); + assert(((7 >= 0) && (7 <= (formatMask())))); + longAtput(segmentWordArray, ((longAt(segmentWordArray)) & (~((0x1FLL << 24) + 0x3FFFFF))) + (8 + (7LL << 24))); + /* begin storePointer:ofForwarder:withValue: */ + assert(isForwarded(segmentWordArray)); + assert(!(isOopForwarded(loadedObjectsArray))); + if (isOldObject(segmentWordArray)) { + + /* most stores into young objects */ + + if (((loadedObjectsArray & 7) == 0) + && (oopisLessThan(loadedObjectsArray, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(segmentWordArray))) >> 29) & 1) != 0)) { + remember(segmentWordArray); + } + } + } + longAtput((segmentWordArray + BaseHeaderSize) + (0LL << (shiftForWord())), loadedObjectsArray); + if ((byteAt(segmentWordArray + 7)) == 0) { + byteAtput(segmentWordArray + 7, 1); + } runLeakCheckerFor(GCModeImageSegment); /* begin objectStartingAt: */ numSlots1 = byteAt(segmentStart + 7); @@ -66755,10 +66836,9 @@ n = 0; do { if (!(isFree(page))) { - printStackPageuseCount(page, n); + printStackPageuseCount(page, (n += 1)); /* begin cr */ printf("\n"); - n += 1; } } while(((page = (page->prevPage))) != (mostRecentlyUsedPage())); } @@ -66790,10 +66870,9 @@ n = 0; for (i = 0; i < GIV(numStackPages); i += 1) { if (!(isFree(stackPageAt(i)))) { - printStackPageuseCount(stackPageAt(i), n); + printStackPageuseCount(stackPageAt(i), (n += 1)); /* begin cr */ printf("\n"); - n += 1; } } } Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2015-08-20 19:28:03 UTC (rev 3426) +++ branches/Cog/nsspurstack64src/vm/interp.c 2015-08-22 03:39:38 UTC (rev 3427) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 from - StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + StackInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2174,7 +2174,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1441"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -41394,13 +41394,13 @@ /* This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. - It will return as its value the original array of roots, and the erstwhile - segmentWordArray will - have been truncated to a size of one word, i.e. retaining the version - stamp. If this primitive - should fail, the segmentWordArray will, sadly, have been reduced to an - unrecognizable and - unusable jumble. But what more could you have done with it anyway? */ + It will return as its value the original array of roots, and the + segmentWordArray will become an + array of the loaded objects. If this primitive should fail, the + segmentWordArray will, sadly, have + been reduced to an unrecognizable and unusable jumble. But what more could + you have done + with it anyway? */ /* SpurMemoryManager>>#loadImageSegmentFrom:outPointers: */ static sqInt @@ -41414,6 +41414,7 @@ sqInt classRef; sqInt errorCode; sqInt errorCode1; + sqInt fillIdx; sqInt followingWord; sqInt followingWord1; sqInt followingWord2; @@ -41425,8 +41426,13 @@ sqInt hash; sqInt i; sqInt iLimiT; + sqInt loadedObjectsArray; sqInt mappedOop; + usqInt newObj; + usqInt numBytes; + sqInt numLoadedObjects; usqInt numOutPointers; + sqInt numSegObjs; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -41555,15 +41561,17 @@ numOutPointers = (numSlots5 == 0xFF ? ((usqInt) (((unsigned long)(((long)(longAt(outPointerArray - BaseHeaderSize))) << 8)))) >> 8 : numSlots5); + numSegObjs = 0; /* begin objectStartingAt: */ numSlots14 = byteAt(segmentStart + 7); objOop1 = (numSlots14 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); while (objOop1 < segmentLimit) { + numSegObjs += 1; if (((((usqInt) (longAt(objOop1))) >> 55) & 1) != 0) { errorCode = PrimErrInappropriate; - goto l5; + goto l6; } /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ @@ -41572,14 +41580,14 @@ if (classIndex & TopHashBit) { if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l5; + goto l6; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + (((long)(classIndex - TopHashBit)) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { errorCode = PrimErrInappropriate; - goto l5; + goto l6; } } else { @@ -41588,11 +41596,11 @@ if (((oop1 = (classIndex * 8) + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l5; + goto l6; } if (((long32At(oop1 + 4)) & 0x3FFFFF) != 0) { errorCode = PrimErrInappropriate; - goto l5; + goto l6; } } for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -41601,18 +41609,18 @@ if (oop1 & TopOopBit) { if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l5; + goto l6; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + (((long)oop1) << (shiftForWord()))); } else { if ((oop1 & (8 - 1)) != 0) { errorCode = PrimErrInappropriate; - goto l5; + goto l6; } if (((mappedOop = oop1 + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l5; + goto l6; } } /* begin storePointerUnchecked:ofObject:withValue: */ @@ -41636,20 +41644,64 @@ followingWordAddress2 = (objOop1 + BaseHeaderSize) + slotBytes3; if (oopisGreaterThanOrEqualTo(followingWordAddress2, segmentLimit)) { objOop1 = segmentLimit; - goto l4; + goto l5; } flag("endianness"); followingWord2 = longAt(followingWordAddress2); objOop1 = ((((usqInt) followingWord2) >> 56) == 0xFF ? followingWordAddress2 + BaseHeaderSize : followingWordAddress2); - l4: /* end objectAfter:limit: */; + l5: /* end objectAfter:limit: */; } - errorCode = 0; -l5: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; - if (errorCode != 0) { + errorCode = -numSegObjs; +l6: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; + if (errorCode > 0) { return errorCode; } + numLoadedObjects = -errorCode; + /* begin allocateSlots:format:classIndex: */ + if (numLoadedObjects >= 0xFF) { + if ((((usqInt) numLoadedObjects) >> 56) > 0) { + loadedObjectsArray = null; + goto l1; + } + newObj = GIV(freeStart) + BaseHeaderSize; + numBytes = (BaseHeaderSize + BaseHeaderSize) + (numLoadedObjects * BytesPerOop); + } + else { + newObj = GIV(freeStart); + numBytes = BaseHeaderSize + ((numLoadedObjects < 1 + ? 8 + : numLoadedObjects * BytesPerOop)); + } + if ((GIV(freeStart) + numBytes) > GIV(scavengeThreshold)) { + if (!GIV(needGCFlag)) { + /* begin scheduleScavenge */ + GIV(needGCFlag) = 1; + forceInterruptCheck(); + } + loadedObjectsArray = allocateSlotsInOldSpacebytesformatclassIndex(numLoadedObjects, numBytes, 2, ClassArrayCompactIndex); + goto l1; + } + if (numLoadedObjects >= 0xFF) { + + /* for header parsing we put a saturated slot count in the prepended overflow size word */ + + flag("endianness"); + longAtput(GIV(freeStart), (0xFFLL << 56) + numLoadedObjects); + longAtput(newObj, ((((long)(((usqLong) 0xFF))) << 56) + (2LL << 24)) + ClassArrayCompactIndex); + } + else { + longAtput(newObj, ((((long)(((usqLong) numLoadedObjects))) << 56) + (2LL << 24)) + ClassArrayCompactIndex); + } + assert((numBytes % (allocationUnit())) == 0); + assert((newObj % (allocationUnit())) == 0); + GIV(freeStart) += numBytes; + loadedObjectsArray = newObj; +l1: /* end allocateSlots:format:classIndex: */; + if (!(loadedObjectsArray)) { + return PrimErrNoMemory; + } /* begin enterClassesIntoClassTableFrom:to: */ objOop = objectAfter(objectStartingAt(segmentStart)); while ((objOop < segmentLimit) @@ -41677,17 +41729,17 @@ followingWordAddress = (objOop + BaseHeaderSize) + slotBytes2; if (oopisGreaterThanOrEqualTo(followingWordAddress, segmentLimit)) { objOop = segmentLimit; - goto l1; + goto l3; } flag("endianness"); followingWord = longAt(followingWordAddress); objOop = ((((usqInt) followingWord) >> 56) == 0xFF ? followingWordAddress + BaseHeaderSize : followingWordAddress); - l1: /* end objectAfter:limit: */; + l3: /* end objectAfter:limit: */; } errorCode = errorCode1; - goto l3; + goto l4; } /* begin objectAfter:limit: */ /* begin addressAfter: */ @@ -41715,21 +41767,26 @@ l2: /* end objectAfter:limit: */; } errorCode = 0; -l3: /* end enterClassesIntoClassTableFrom:to: */; +l4: /* end enterClassesIntoClassTableFrom:to: */; if (errorCode != 0) { return errorCode; } - /* begin assignClassIndicesAndPinFrom:to:outPointers: */ + /* begin assignClassIndicesAndPinFrom:to:outPointers:filling: */ /* begin objectStartingAt: */ numSlots6 = byteAt(segmentStart + 7); objOop2 = (numSlots6 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); + fillIdx = 0; while (objOop2 < segmentLimit) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(loadedObjectsArray))); + longAtput((loadedObjectsArray + BaseHeaderSize) + (((long)fillIdx) << (shiftForWord())), objOop2); /* In the segment, class indices are offset indexes into the segment data, or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ + fillIdx += 1; classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; if (classRef & TopHashBit) { classOop = longAt((outPointerArray + BaseHeaderSize) + (((long)(classRef - TopHashBit)) << (shiftForWord()))); @@ -41792,14 +41849,14 @@ followingWordAddress3 = (objOop2 + BaseHeaderSize) + slotBytes4; if (oopisGreaterThanOrEqualTo(followingWordAddress3, segmentLimit)) { objOop2 = segmentLimit; - goto l6; + goto l7; } flag("endianness"); followingWord3 = longAt(followingWordAddress3); objOop2 = ((((usqInt) followingWord3) >> 56) == 0xFF ? followingWordAddress3 + BaseHeaderSize : followingWordAddress3); - l6: /* end objectAfter:limit: */; + l7: /* end objectAfter:limit: */; } if ((byteAt(segmentWordArray + 7)) == 0xFF) { /* begin rawOverflowSlotsOf:put: */ @@ -41810,6 +41867,30 @@ else { byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } + /* begin forward:to: */ + /* begin set:classIndexTo:formatTo: */ + assert(((8 >= 0) && (8 <= (classIndexMask())))); + assert(((7 >= 0) && (7 <= (formatMask())))); + longAtput(segmentWordArray, ((longAt(segmentWordArray)) & (~((0x1FLL << 24) + 0x3FFFFF))) + (8 + (7LL << 24))); + /* begin storePointer:ofForwarder:withValue: */ + assert(isForwarded(segmentWordArray)); + assert(!(isOopForwarded(loadedObjectsArray))); + if (isOldObject(segmentWordArray)) { + + /* most stores into young objects */ + + if (((loadedObjectsArray & 7) == 0) + && (oopisLessThan(loadedObjectsArray, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(segmentWordArray))) >> 29) & 1) != 0)) { + remember(segmentWordArray); + } + } + } + longAtput((segmentWordArray + BaseHeaderSize) + (0LL << (shiftForWord())), loadedObjectsArray); + if ((byteAt(segmentWordArray + 7)) == 0) { + byteAtput(segmentWordArray + 7, 1); + } runLeakCheckerFor(GCModeImageSegment); /* begin objectStartingAt: */ numSlots1 = byteAt(segmentStart + 7); @@ -66746,10 +66827,9 @@ n = 0; do { if (!(isFree(page))) { - printStackPageuseCount(page, n); + printStackPageuseCount(page, (n += 1)); /* begin cr */ printf("\n"); - n += 1; } } while(((page = (page->prevPage))) != (mostRecentlyUsedPage())); } @@ -66781,10 +66861,9 @@ n = 0; for (i = 0; i < GIV(numStackPages); i += 1) { if (!(isFree(stackPageAt(i)))) { - printStackPageuseCount(stackPageAt(i), n); + printStackPageuseCount(stackPageAt(i), (n += 1)); /* begin cr */ printf("\n"); - n += 1; } } } Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-20 19:28:03 UTC (rev 3426) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-22 03:39:38 UTC (rev 3427) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 from - StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 + StackInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1441 uuid: c41d605b-7d2e-4ecc-95e1-b295119106a7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2148,7 +2148,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1441"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -38426,13 +38426,13 @@ /* This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. - It will return as its value the original array of roots, and the erstwhile - segmentWordArray will - have been truncated to a size of one word, i.e. retaining the version - stamp. If this primitive - should fail, the segmentWordArray will, sadly, have been reduced to an - unrecognizable and - unusable jumble. But what more could you have done with it anyway? */ + It will return as its value the original array of roots, and the + segmentWordArray will become an + array of the loaded objects. If this primitive should fail, the + segmentWordArray will, sadly, have + been reduced to an unrecognizable and unusable jumble. But what more could + you have done + with it anyway? */ /* SpurMemoryManager>>#loadImageSegmentFrom:outPointers: */ static sqInt @@ -38446,11 +38446,17 @@ sqInt classRef; sqInt errorCode; sqInt errorCode1; + sqInt fillIdx; sqInt hash; sqInt i; sqInt iLimiT; + sqInt loadedObjectsArray; sqInt mappedOop; + usqInt newObj; + usqInt numBytes; + sqInt numLoadedObjects; usqInt numOutPointers; + sqInt numSegObjs; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -38569,15 +38575,17 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); + numSegObjs = 0; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF ? segmentStart + BaseHeaderSize : segmentStart); while (objOop1 < segmentLimit) { + numSegObjs += 1; if (((((usqInt) (longAt(objOop1 + 4))) >> 23) & 1) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ @@ -38586,14 +38594,14 @@ if (classIndex & TopHashBit) { if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } } else { @@ -38602,11 +38610,11 @@ if (((oop1 = (classIndex * 8) + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } if (((long32At(oop1 + 4)) & 0x3FFFFF) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } } for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -38615,18 +38623,18 @@ if (oop1 & TopOopBit) { if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } mappedOop = longAt((outPointerArray + BaseHeaderSize) + (oop1 << (shiftForWord()))); } else { if ((oop1 & (8 - 1)) != 0) { errorCode = PrimErrInappropriate; - goto l2; + goto l3; } if (((mappedOop = oop1 + segmentStart)) >= segmentLimit) { errorCode = PrimErrBadIndex; - goto l2; + goto l3; } } /* begin storePointerUnchecked:ofObject:withValue: */ @@ -38636,11 +38644,52 @@ } objOop1 = objectAfterlimit(objOop1, segmentLimit); } - errorCode = 0; -l2: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; - if (errorCode != 0) { + errorCode = -numSegObjs; +l3: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; + if (errorCode > 0) { return errorCode; } + numLoadedObjects = -errorCode; + /* begin allocateSlots:format:classIndex: */ + if (numLoadedObjects >= 0xFF) { + newObj = GIV(freeStart) + BaseHeaderSize; + numBytes = (BaseHeaderSize + BaseHeaderSize) + ((numLoadedObjects + (numLoadedObjects & 1)) * BytesPerOop); + } + else { + newObj = GIV(freeStart); + numBytes = BaseHeaderSize + ((numLoadedObjects <= 1 + ? 8 + : (numLoadedObjects + (numLoadedObjects & 1)) * BytesPerOop)); + } @@ Diff output truncated at 50000 characters. @@

1 0

ARM Sim (was Re: Fwd: [squeak-dev] Questionable comment)
by Chris Cunningham 22 Aug '15

22 Aug '15

On Fri, Aug 21, 2015 at 5:12 PM, tim Rowledge <tim(a)rowledge.org> wrote: > > > On 21-08-2015, at 4:58 PM, Chris Cunningham <cunningham.cb(a)gmail.com> > wrote: > > Yes. I had loaded the VMMaker to look at the ARM jit code (I'm working > on an ARM simulator - fun project), > > Do tell... > A colleague ran across http://gedrap.github.io/xs-vm/ and coded it in his language, and challenged me to do it in Squeak as well. So I did. And was then inspired to take it further and visualize what was going in the CPU while it was happening. The ASM isn't really finished, nor is the viewer, but it will handle a variety of aSM code listings I've seen for learning ARM ASM. What I have now parses the code into objects, and will then simulate running the code, and showing the 'state' of the CPU while running, like: [image: Inline image 1] It's not really ready to announce yet, but if you are interested, it is at: MCHttpRepository location: 'http://www.smalltalkhub.com/mc/cbc/ARMAssembler/main' user: '' password: '' load both XS-ArmAsmVm and Armvm viewer. Use: vm := XSVM new. "GCD via Euclid" vm assemble: ' MOV R0, #40 ; R0 is a MOV R1, #25 ; R1 is b again CMP R0, R1 SUBGT R0, R0, R1 SUBLT R1, R1, R0 BNE again halt SWI #0' vm view. vm prepForStep. vm step. "once for each instruction step, or vm run to just run until end" My current struggle is to remember (or re-learn) how registers handle carry and overflow, and how to get Squeak to simulate that. It's a little challenging with just Integers. -cbc

2 1

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

22 Aug '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1441.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1441 Author: eem Time: 21 August 2015, 6:18:57.387 pm UUID: c41d605b-7d2e-4ecc-95e1-b295119106a7 Ancestors: VMMaker.oscog-eem.1440 Modify Spur ImageSegment load to become the segmentWordArray into an Array of the loaded objects if load is successful, hence decoupling ImageSegment from the assumption that objects are allocated in order. Fix the (unused) ByteArray>>long64At: extension method to do what it advertises. =============== Diff against VMMaker.oscog-eem.1440 =============== Item was changed: ----- Method: ByteArray>>long64At: (in category '*VMMaker-accessing') ----- long64At: index "Answer a 64-bit integer in Smalltalk order (little-endian)." | n1 n2 | + n1 := self unsignedLongAt: index bigEndian: false. + n2 := self unsignedLongAt: index+4 bigEndian: false. + ^(n2 bitShift: 32) + n1! - n1 := self unsignedLongAt: index bigEndian: true. - n2 := self unsignedLongAt: index+4 bigEndian: true. - ^(n1 bitShift: 32) + n2! Item was removed: - ----- Method: SpurMemoryManager>>assignClassIndicesAndPinFrom:to:outPointers: (in category 'image segment in/out') ----- - assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray - "This is part of loadImageSegmentFrom:outPointers:. - Make a final pass, assigning the real class indices and/or pinning pinned objects." - | objOop | - objOop := self objectStartingAt: segmentStart. - [objOop < segmentLimit] whileTrue: - [| classRef classOop classIndex | - "In the segment, class indices are offset indexes into the segment data, - or into outPointers. See mapOopsFrom:to:outPointers:outHashes:." - classRef := (self classIndexOf: objOop) - self firstClassIndexPun. - classOop := (classRef anyMask: TopHashBit) - ifTrue: [self fetchPointer: classRef - TopHashBit ofObject: outPointerArray] - ifFalse: [classRef * self allocationUnit + segmentStart]. - classIndex := self rawHashBitsOf: classOop. - self assert: (classIndex > self lastClassIndexPun - and: [(self classOrNilAtIndex: classIndex) = classOop]). - self setClassIndexOf: objOop to: classIndex. - ((self isInNewSpace: objOop) - and: [self isPinned: objOop]) ifTrue: - [| oldClone | - oldClone := self cloneInOldSpaceForPinning: objOop. - oldClone ~= 0 ifTrue: - [self setIsPinnedOf: oldClone to: true. - self forward: objOop to: oldClone]]. - objOop := self objectAfter: objOop limit: segmentLimit]. - ! Item was added: + ----- Method: SpurMemoryManager>>assignClassIndicesAndPinFrom:to:outPointers:filling: (in category 'image segment in/out') ----- + assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray filling: loadedObjectsArray + "This is part of loadImageSegmentFrom:outPointers:. + Make a final pass, assigning the real class indices and/or pinning pinned objects." + | fillIdx objOop | + objOop := self objectStartingAt: segmentStart. + fillIdx := 0. + [objOop < segmentLimit] whileTrue: + [| classRef classOop classIndex | + self storePointerUnchecked: fillIdx ofObject: loadedObjectsArray withValue: objOop. + fillIdx := fillIdx + 1. + "In the segment, class indices are offset indexes into the segment data, + or into outPointers. See mapOopsFrom:to:outPointers:outHashes:." + classRef := (self classIndexOf: objOop) - self firstClassIndexPun. + classOop := (classRef anyMask: TopHashBit) + ifTrue: [self fetchPointer: classRef - TopHashBit ofObject: outPointerArray] + ifFalse: [classRef * self allocationUnit + segmentStart]. + classIndex := self rawHashBitsOf: classOop. + self assert: (classIndex > self lastClassIndexPun + and: [(self classOrNilAtIndex: classIndex) = classOop]). + self setClassIndexOf: objOop to: classIndex. + ((self isInNewSpace: objOop) + and: [self isPinned: objOop]) ifTrue: + [| oldClone | + oldClone := self cloneInOldSpaceForPinning: objOop. + oldClone ~= 0 ifTrue: + [self setIsPinnedOf: oldClone to: true. + self forward: objOop to: oldClone]]. + objOop := self objectAfter: objOop limit: segmentLimit]. + ! Item was changed: ----- Method: SpurMemoryManager>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray "This primitive is called from Squeak as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. + It will return as its value the original array of roots, and the segmentWordArray will become an + array of the loaded objects. If this primitive should fail, the segmentWordArray will, sadly, have + been reduced to an unrecognizable and unusable jumble. But what more could you have done + with it anyway?" - It will return as its value the original array of roots, and the erstwhile segmentWordArray will - have been truncated to a size of one word, i.e. retaining the version stamp. If this primitive - should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and - unusable jumble. But what more could you have done with it anyway?" <inline: false> + | segmentLimit segmentStart segVersion errorCode numLoadedObjects loadedObjectsArray | - | segmentLimit segmentStart segVersion errorCode | segmentLimit := self numSlotsOf: segmentWordArray. (self objectBytesForSlots: segmentLimit) < (self allocationUnit "version info" + self baseHeaderSize "one object header") ifTrue: [^PrimErrBadArgument]. "Verify format. If the format is wrong, word-swap (since ImageSegment data are 32-bit longs). If it is still wrong, undo the damage and fail." segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: [self reverseBytesIn32BitWordsFrom: segmentWordArray + self baseHeaderSize to: (self addressAfter: segmentWordArray). segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: [self reverseBytesIn32BitWordsFrom: segmentWordArray + self baseHeaderSize to: (self addressAfter: segmentWordArray). ^PrimErrBadArgument]]. segmentStart := segmentWordArray + self baseHeaderSize + self allocationUnit. segmentLimit := segmentLimit * self bytesPerOop + segmentWordArray + self baseHeaderSize. "Notionally reverse the Byte type objects if the data is from opposite endian machine. Test top byte. $d on the Mac or $s on the PC. Rest of word is equal. If Spur is ever ported to big-endian machines then the segment may have to be byte/word swapped, but so far it only runs on little-endian machines, so for now just fail if endinanness is wrong." self flag: #endianness. (segVersion >> 24 bitAnd: 16rFF) ~= (self imageSegmentVersion >> 24 bitAnd: 16rFF) ifTrue: "Reverse the byte-type objects once" [true ifTrue: [^PrimErrBadArgument] ifFalse: [self byteSwapByteObjectsFrom: (self objectStartingAt: segmentStart) to: segmentLimit flipFloatsIf: false]]. "scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until a second pass." errorCode := self mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray. + errorCode > 0 ifTrue: - errorCode ~= 0 ifTrue: [^errorCode]. + numLoadedObjects := errorCode negated. + loadedObjectsArray := self allocateSlots: numLoadedObjects format: self arrayFormat classIndex: ClassArrayCompactIndex. + loadedObjectsArray ifNil: + [^PrimErrNoMemory]. "Scan for classes contained in the segment, entering them into the class table. Classes are at the front, after the root array and have the remembered bit set." errorCode := self enterClassesIntoClassTableFrom: segmentStart to: segmentLimit. errorCode ~= 0 ifTrue: [^errorCode]. + "Make a final pass, assigning class indices and/or pinning pinned objects and collecting the loaded objects in loadedObjectsArray" + self assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray filling: loadedObjectsArray. - "Make a final pass, assigning class indices and/or pinning pinned objects" - self assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray. + "Evaporate the container, leaving the newly loaded objects in place." - "Finally evaporate the container, leaving the newly loaded objects in place." (self hasOverflowHeader: segmentWordArray) ifTrue: [self rawOverflowSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop] ifFalse: [self rawNumSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop]. + + "Finally forward the segmentWordArray to the loadedObjectsArray" + self forward: segmentWordArray to: loadedObjectsArray. self runLeakCheckerFor: GCModeImageSegment. ^self objectStartingAt: segmentStart! Item was changed: ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until the second pass in assignClassIndicesAndPinFrom:to:outPointers:." + | numOutPointers numSegObjs objOop | - | numOutPointers objOop | numOutPointers := self numSlotsOf: outPointerArray. + numSegObjs := 0. objOop := self objectStartingAt: segmentStart. [objOop < segmentLimit] whileTrue: [| classIndex hash oop mappedOop | + numSegObjs := numSegObjs + 1. (self isMarked: objOop) ifTrue: [^PrimErrInappropriate]. classIndex := (self classIndexOf: objOop) - self firstClassIndexPun. "validate the class ref, but don't update it until any internal classes have been added to the class table." (classIndex anyMask: TopHashBit) ifTrue: [classIndex - TopHashBit >= numOutPointers ifTrue: [^PrimErrBadIndex]. mappedOop := self fetchPointer: classIndex - TopHashBit ofObject: outPointerArray. hash := self rawHashBitsOf: mappedOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]) ifFalse: [^PrimErrInappropriate]] ifFalse: "The class is contained within the segment." [(oop := classIndex * self allocationUnit + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex]. (self rawHashBitsOf: oop) ~= 0 ifTrue: [^PrimErrInappropriate]]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(oop anyMask: TopOopBit) ifTrue: [(oop := oop - TopOopBit / self bytesPerOop) >= numOutPointers ifTrue: [^PrimErrBadIndex]. mappedOop := self fetchPointer: oop ofObject: outPointerArray] ifFalse: [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: [^PrimErrInappropriate]. (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex]]. self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. objOop := self objectAfter: objOop limit: segmentLimit]. + ^numSegObjs negated! - ^0!

1 0

Fwd: [squeak-dev] Questionable comment
by Chris Cunningham 22 Aug '15

22 Aug '15

sorry, wrong list. Will do it right in future. Mostly. -cbc ---------- Forwarded message ---------- From: Chris Cunningham <cunningham.cb(a)gmail.com> Date: Fri, Aug 21, 2015 at 4:16 PM Subject: Re: [squeak-dev] Questionable comment To: The general-purpose Squeak developers list < squeak-dev(a)lists.squeakfoundation.org> Hi Eliot, On Thu, Aug 20, 2015 at 9:25 PM, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > Hi Chris, > > On Wed, Aug 19, 2015 at 1:06 PM, Chris Cunningham <cunningham.cb(a)gmail.com > > wrote: > >> well, not questionable - bad. >> >> (in ByteArray) >> >> long64At: index >> "Answer a 64-bit integer in Smalltalk order (little-endian)." >> | n1 n2 | >> n1 := self unsignedLongAt: index bigEndian: true. >> n2 := self unsignedLongAt: index+4 bigEndian: true. >> >> These are obviously bigEndian now, nto litte-endian. >> >> Does this mean Smalltalk order (or now Squeak order) has changed? >> > > This is not for general purpose. The method is part of VMMaker. Let's > take it to vm-dev. > It's a simple mistake. If you look at long64At:put: you'll see the > comment is correct: > Yes. I had loaded the VMMaker to look at the ARM jit code (I'm working on an ARM simulator - fun project), and then forgot I had it loaded. then later, I needed to pull 64-bit integers out of a structure (while writing a KAFKA interface) and stumbled on this. I think a generalized 64 bit put/access would be useful, and maybe even a general 128 bit too (although I have no need for it at this time). > long64At: index put: val > "I store 64-bit integers in Smalltalk (little-endian) order." > self unsignedLongAt: index put: (val bitAnd: 16rFFFFFFFF) bigEndian: false. > self unsignedLongAt: index+4 put: (val bitShift: -32) bigEndian: false. > ^val > > I'm now confused. Not only is the comment wrong, but it looks like the code is wrong. The get (#long64At:) is actually getting the 64-bit integer in big-endian order (as witnessed by the two sub-calls, too), while the put it truly doing it in little-endian format. Or am I missing something? -cbc > Thanks for finding this! > > > >> -cbc >> >> >> >> > > > -- > _,,,^..^,,,_ > best, Eliot > > > >

2 1

Re: [Vm-dev] nested structures with FFI?
by Max Leske 21 Aug '15

21 Aug '15

> On 20 Aug 2015, at 21:28, vm-dev-request(a)lists.squeakfoundation.org wrote: > > Message: 1 > Date: Thu, 20 Aug 2015 17:51:43 +0200 > From: Esteban Lorenzano <estebanlm(a)gmail.com <mailto:estebanlm@gmail.com>> > Subject: [Vm-dev] nested structures with FFI? > To: Squeak Virtual Machine Development Discussion > <vm-dev(a)lists.squeakfoundation.org <mailto:vm-dev@lists.squeakfoundation.org>> > Message-ID: <4F31ED4B-6246-43D6-B85B-7215D8570D28(a)gmail.com <mailto:4F31ED4B-6246-43D6-B85B-7215D8570D28@gmail.com>> > Content-Type: text/plain; charset=utf-8 > > Hi, > > I’m doing some tests with nested structures (to handle the conversion of NativeBoost-FFI to regular FFI) and I’m having some problems when accessing fields in the nested structure. > For example, this tests: > > FFITestNestingStructure class>>#fieldsDesc > ^ #( > byte one; > FFITestStructure nested; > ) > > FFITestStructure class>>#fieldsDesc > ^ #( > byte byte; > short short; > long long; > float float; > double double; > int64 int64; > ) > > (definition is NB-compatible, so do not take the differences with regular FFI into account) > > testNestedStructure > | s1 | > > s1 := FFITestNestingStructure new. > s1 nested byte: 42. > self assert: s1 nested byte = 42 > > testExternallyAllocatedNestedStructure > | s1 | > > s1 := FFITestNestingStructure externalNew. > self assert: s1 getHandle class = ExternalAddress. > s1 nested byte: 42. > self assert: s1 nested byte = 42 > > > fails always because > > s1 nested byte = 0. > > (which is obviously bad). > > I remember Eliot saying that structures with FFI was not being optimal, and I wonder (before start digging more in deep) if this could have something to do? I use nested structs in NB for the libgit2 bindings and they work as advertised. There can be problems if some structure is packed (i.e. uses non-4-byte alignment for some field) but that shouldn’t apply in your test case. Not sure if this helps you in any way but I thought I’d let you know :) Cheers, Max > > cheers, > Esteban

3 7

Re: [squeak-dev] Questionable comment
by Eliot Miranda 21 Aug '15

21 Aug '15

Hi Chris, On Wed, Aug 19, 2015 at 1:06 PM, Chris Cunningham <cunningham.cb(a)gmail.com> wrote: > well, not questionable - bad. > > (in ByteArray) > > long64At: index > "Answer a 64-bit integer in Smalltalk order (little-endian)." > | n1 n2 | > n1 := self unsignedLongAt: index bigEndian: true. > n2 := self unsignedLongAt: index+4 bigEndian: true. > > These are obviously bigEndian now, nto litte-endian. > > Does this mean Smalltalk order (or now Squeak order) has changed? > This is not for general purpose. The method is part of VMMaker. Let's take it to vm-dev. It's a simple mistake. If you look at long64At:put: you'll see the comment is correct: long64At: index put: val "I store 64-bit integers in Smalltalk (little-endian) order." self unsignedLongAt: index put: (val bitAnd: 16rFFFFFFFF) bigEndian: false. self unsignedLongAt: index+4 put: (val bitShift: -32) bigEndian: false. ^val Thanks for finding this! > -cbc > > > > -- _,,,^..^,,,_ best, Eliot

1 0

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

20 Aug '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1440.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1440 Author: eem Time: 20 August 2015, 1:44:11.242 pm UUID: afa0373e-0470-4a3b-bdac-0345416dbe0e Ancestors: VMMaker.oscog-eem.1439 Fix use count printing in printStackPagesInUse et al. Nuke the unnecerssary Glue configurations. One can already override EnforceAccessControl on the command line. =============== Diff against VMMaker.oscog-eem.1439 =============== Item was changed: ----- Method: StackInterpreter>>printStackPageListInUse (in category 'debug printing') ----- printStackPageListInUse | page n | <inline: false> <var: #page type: #'StackPage *'> page := stackPages mostRecentlyUsedPage. n := 0. [(stackPages isFree: page) ifFalse: + [self printStackPage: page useCount: (n := n + 1); cr]. - [self printStackPage: page useCount: n; cr. - n := n + 1]. (page := page prevPage) ~= stackPages mostRecentlyUsedPage] whileTrue! Item was changed: ----- Method: StackInterpreter>>printStackPagesInUse (in category 'debug printing') ----- printStackPagesInUse | n | n := 0. 0 to: numStackPages - 1 do: [:i| (stackPages isFree: (stackPages stackPageAt: i)) ifFalse: + [self printStackPage: (stackPages stackPageAt: i) useCount: (n := n + 1); cr]]! - [self printStackPage: (stackPages stackPageAt: i) useCount: n; cr. - n := n + 1]]! Item was removed: - ----- Method: VMMaker class>>generateAllGlueConfigurationsUnderVersionControl (in category 'configurations') ----- - generateAllGlueConfigurationsUnderVersionControl - self generateGlueSpurStackVM; - generateGlueSpurCogVM! Item was removed: - ----- Method: VMMaker class>>generateGlueSpurCogVM (in category 'configurations') ----- - generateGlueSpurCogVM - "No primitives since we can use those from the Cog Spur Newspeak VM" - ^VMMaker - generate: CoInterpreter - and: StackToRegisterMappingCogit - with: #( ObjectMemory Spur32BitCoMemoryManager - MULTIPLEBYTECODESETS true - NewspeakVM true - EnforceAccessControl false) - to: (FileDirectory default directoryNamed: self sourceTree, '/nsnacspursrc') fullName - platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName - including: #()! Item was removed: - ----- Method: VMMaker class>>generateGlueSpurStackVM (in category 'configurations') ----- - generateGlueSpurStackVM - "No primitives since we can use those from the Cog Spur Newspeak VM" - ^VMMaker - generate: StackInterpreter - with: #( ObjectMemory Spur32BitMemoryManager - MULTIPLEBYTECODESETS true - NewspeakVM true - FailImbalancedPrimitives false - EnforceAccessControl false) - to: (FileDirectory default directoryNamed: self sourceTree, '/nsnacspurstacksrc') fullName - platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName - including: #()!

1 0

Squeak 5 Image Segment Work [was [squeak-dev] [ANN] Squeak 5]
by Eliot Miranda 20 Aug '15

20 Aug '15

Hi All, but especially Tobias, as we know, ImageSegments are broken in Spur. They work occasionally, but when stressed the VM ends up crashing. The fundamental issue is that the ImageSegment code makes assumptions about object ordering that Spur violates. For example, here's ImageSegment's install: install "This operation retrieves the segment if necessary from file storage, installs it in memory, and replaces (using become:) all the root stubs with the reconstructed roots of the segment." | newRoots | state = #onFile ifTrue: [self readFromFile]. state = #onFileWithSymbols ifTrue: [self readFromFileWithSymbols. endMarker := segment nextObject. "for enumeration of objects" endMarker == 0 ifTrue: [endMarker := 'End' clone]]. (state = #active) | (state = #imported) ifFalse: [self errorWrongState]. newRoots := self loadSegmentFrom: segment outPointers: outPointers. state = #imported ifTrue: ["just came in from exported file" arrayOfRoots := newRoots] ifFalse: [ arrayOfRoots elementsForwardIdentityTo: newRoots]. state := #inactive. Beeper beepPrimitive So before the image segment bytes (the segment inst var) is loaded, the object after it is assigned to endMarker, and if there isn't an object after segment, a new object ('End' clone) is assigned to endMarker. This makes the assumption that objects are allocated in a strict order, and therefore endMarker will always be the object after segment. Loading the segment via "newRoots := self loadSegmentFrom: segment outPointers: outPointers" then turns segment into a zero-length WordArray and its contents into the objects loaded by the segment. Therefore, in the V3 system, the objects loaded from segment can be enumerated starting at segment nextObject and repeating until endMarker is found: allObjectsDo: aBlock "Enumerate all objects that came from this segment. NOTE this assumes that the segment was created (and extracted). After the segment has been installed (install), this method allows you to enumerate its objects." | obj | endMarker == nil ifTrue: [ ^ self error: 'Just extract and install, don''t writeToFile:']. segment size ~= 1 ifTrue: [ ^ self error: 'Vestigial segment size must be 1 (version word)']. obj := segment nextObject. "Start with the next object after the vestigial header" [obj == endMarker] whileFalse: "Stop at the next object after the full segment" [aBlock value: obj. obj := obj nextObject]. "Step through the objects installed from the segment." Now, as written, this just won't work in Spur. a) the only place where there is any kind of stable order to objects is in oldSpace, so segment /has/ to be forced to old space to have any chance of its objects being in order when it gets converted from bytes to objects. b) 'End' clone will be in newSpace and so endMarker isn't reliable unless it was obtained by segment nextObject when segment was already in oldSpace. So it is perhaps possible to fix ImageSegments in Spur by forcing segment to oldSpace and being more careful with endMarker. But I think there is a better way. If the set of objects the segment contains can be obtained some how then this set can be simply enumerated, not depending on nextObject. The primitive has to answer the array of roots, so its result can't be changed to be the entire array. But segment could be becomed into an Array of all the objects in segment prior to it being loaded, in which case the above would become install "This operation retrieves the segment if necessary from file storage, installs it in memory, and replaces (using become:) all the root stubs with the reconstructed roots of the segment." | newRoots | state = #onFile ifTrue: [self readFromFile]. state = #onFileWithSymbols ifTrue: [self readFromFileWithSymbols]. (state = #active) | (state = #imported) ifFalse: [self errorWrongState]. newRoots := self loadSegmentFrom: segment outPointers: outPointers. state = #imported ifTrue: "just came in from exported file" [arrayOfRoots := newRoots] ifFalse: [arrayOfRoots elementsForwardIdentityTo: newRoots]. state := #inactive. Beeper beepPrimitive allObjectsDo: aBlock "Enumerate all objects that came from this segment. NOTE this assumes that the segment was created (and extracted). After the segment has been installed (install), this method allows you to enumerate its objects." | obj | segment isArray ifFalse: [^ self error: 'Segment hasn''t been loaded?']. segment do: aBlock and the endMarker instVar would be deleted. I am willing and ready to modify the primitive to convert the segment correctly. Who will volunteer to rewrite the image-level ImageSegment code to use the new primitive? On Wed, Aug 12, 2015 at 10:40 PM, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > Hi Tobias, > > On Wed, Aug 12, 2015 at 10:18 PM, Tobias Pape <Das.Linux(a)gmx.de> wrote: > >> Hi all >> On 13.08.2015, at 02:15, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: >> >> > Hi Tobias, >> > >> > forget that. I found it. THis right? >> > >> > Trunk test suite for Spur >> > Using existing cogspur r.3410 >> > cp -r /var/lib/jenkins/workspace/Trunk/default/target/cogspur.r3410 >> /tmp/d20150812-28620-etbikj >> > image test suite >> > VM: /tmp/d20150812-28620-etbikj/cogspur.r3410/cogspurlinuxht/bin/squeak >> > /tmp/d20150812-28620-etbikj/cogspur.r3410/cogspurlinuxht/bin/squeak >> -version >> > /var/lib/jenkins/workspace/Trunk/default/tests.st >> > spawning command 0 with timeout 1800 seconds: >> "/tmp/d20150812-28620-etbikj/cogspur.r3410/cogspurlinuxht/bin/squeak" >> "-vm-sound-null" "-vm-display-null" >> "/var/lib/jenkins/workspace/Trunk/default/target/SpurPostTestTrunkImage.image" >> "../tests.st" >> > (Command started with PID 28643) >> > 2015-08-12T23:31:48.17+01:00: Loading Hudson build tools... from >> /var/lib/jenkins/workspace/Trunk/default/target/HudsonBuildTools.st >> > 2015-08-12T23:31:48.388+01:00: Running tests... >> > setsockopt: Protocol not available >> > setsockopt: Protocol not available >> > 28646:error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown >> protocol:s23_clnt.c:612: >> > >> > Recursive not understood error encountered >> > >> > >> > I bet this is ImageSegment related. >> >> It sure is. >> >> BitmapStreamTests>testMatrixTransform2x3WithImageSegment >> sends >> BitmapStreamTests>validateImageSegment >> > > Basically the ImageSegment code has been working in Spur on a hope and a > prayer. The code assumes objects are allocated in chronological order and > that this order is preserved, not so with Spur. So post image segment > loading someObject/nextObject is used to enumerate the objects loaded. > This can't work reliably in Spur. I *think* (ok I hope) that I've > implemented the segment load primitive in Spur to answer an Array of the > objects loaded, so that these can be explicitly enumerated. > > So the job is a) to check that I have indeed implemented the primitive to > do this and b) to rewrite the image segment loading code in the light of > this. > > David, this is an example of something that isn't back portable and should > not be back-ported. > > The most strange thing is that I cannot reproduce this on my Mac… >> There the test does not crash the image… >> > > Well then it may be a signed/unsigned bug in image loading instead. On > linux the image typically gets loaded quite high in the address space and > so a good portion of the heap ends up above 0x7FFFFFFF, or negative > territory if misinterpreted as signed integers. On Mac and Windows the > image tends to get loaded quite low and so has to be pretty big to fall > foul of signedness issues. > > > Busy right now but will check tomorrow. > > >> Best regards >> -Tobias >> >> >> > >> > On Wed, Aug 12, 2015 at 5:11 PM, Eliot Miranda <eliot.miranda(a)gmail.com> >> wrote: >> > Hi Tobias, >> > >> > On Wed, Aug 12, 2015 at 12:49 PM, Tobias Pape <Das.Linux(a)gmx.de> wrote: >> > >> > On 12.08.2015, at 20:55, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: >> > >> > > Hi All, >> > > >> > > >> > > Fabio's kindly done most of the changes. But some questions >> remain for more general discussion. See below. >> > > >> > > Fabio, thanks so much for doing this, and so quickly! >> > > >> > > On Tue, Aug 11, 2015 at 8:51 PM, Eliot Miranda < >> eliot.miranda(a)gmail.com> wrote: >> > > Hi All, >> > > >> > > who will update http://squeak.org/downloads/ to include the 5.0 >> release? >> > > >> > > a) I suggest that the 5.0 all-in-one have a line in the left-hand >> table that includes the 4.6 release and that it precede the 4.6 release in >> the list. >> > > >> > > Done. >> > > >> > > >> > > b) the Trunk link points to TrunkImage.zip which contains a non-Spur >> image. >> > > >> > > So this is the biggie. What should we do? >> > > >> > > - add a Trunk 5.0 build with a different link? (Noooooo) >> > > >> > > - change http://build.squeak.org/job/SqueakTrunk to build what it >> says (Yessss please, who can do this?) >> > >> > Done: build.squeak.org/job/Trunk/ >> > But as I said several times, Spur/trunk test just crash for month… >> > >> > can you point me to the crash? I'm looking at >> http://build.squeak.org/job/Trunk/default/lastBuild/#showFailuresLink >> and see 8 test failures but no crash. >> > >> > >> > > >> > > - add a Squeak 4.6 build job? Is that even worth it any more >> considering 4.6 is released and stable? If it is then what should it >> build? David? >> > > >> > > >> > > c) Spur VMs need to be linked to by an added line in the Virtual >> Machines list. >> > > >> > > Not applicable. the VM links point to the root of my site so they >> effectively point to both old and Spur VMs. >> > > >> > > >> > > d) Spur imagers need to be included in the Image and Changes list >> under Custom Installation >> > > >> > > Done. >> > > >> > > >> > > >> > > e) The SqueakV50.sources file also needs to be included in the >> Current Sources list. >> > > >> > > Done. >> > > >> > > >> > > f) we could start a History list for the 5.0 line >> > > >> > > This is probably quite a big reorg on the page and not urgent. >> > > >> > > >> > > So there are a few things to fix before 5.0 is freely downloadable. >> > > >> > > On Tue, Aug 11, 2015 at 8:23 PM, Chris Muller <ma.chris.m(a)gmail.com> >> wrote: >> > > In the 17 months since Squeak 4.5 was released, a huge development >> > > effort took place to create the next generation virtual-machine for >> > > the Squeak / Pharo / Newspeak family of programming systems. Squeak >> > > is the modern incarnation of the Smalltalk-80 programming environment >> > > originally developed at the Xerox PARC. >> > > >> > > "Squeak 5" introduces this new VM and associated new memory model, >> > > collectively referred to as "Spur". Presented [1] by Eliot Miranda >> > > and Clément Béra at the 2015 International Symposium on Memory >> > > Management, this new VM affords Squeak applications a significant >> > > boost in performance and memory management. Among other >> > > optimizations, the #become operation no longer requires a memory scan. >> > > Object pinning and ephemerons are also now supported. The release >> > > notes [2] provide more details. >> > > >> > > The new memory model requires a new image file format. Although this >> > > new format results in about a 15% increased memory requirement for the >> > > same number of 4.x objects, a new segmented heap allows memory to be >> > > given back to the OS when its no longer needed, a great benefit for >> > > application servers. >> > > >> > > As forward compatibility is as important to the Squeak community as >> > > backward compatibility, Squeak 5 is delivers an image with identical >> > > content as the recent 4.6 release. Although this new Squeak 5 VM >> > > cannot open images saved under the prior 4.x Cog format, objects and >> > > code can be easily exported from the 4.x image and then imported into >> > > Squeak 5. Applications whose code runs strictly above the Smalltalk >> > > meta layer will prove remarkably compatible with the new format, most >> > > applications will require no changes whatsotever. >> > > >> > > Squeak 5 is the result of monumental effort by a tiny group of very >> > > talented people, but its also just the beginning of yet a new effort; >> > > Spur is just a stepping stone to a more ambitious goals planned over >> > > the next five years. >> > > >> > > [1] -- A Partial Read Barrier for Efficient Support of Live >> > > Object-oriented Programming >> > > >> http://conf.researchr.org/event/ismm-2015/ismm-2015-papers-a-partial-read-b… >> > > >> > > [2] -- Squeak 5 Release Notes >> > > http://wiki.squeak.org/squeak/6207 >> >> >> >> >> > > > -- > _,,,^..^,,,_ > best, Eliot > -- _,,,^..^,,,_ best, Eliot

8 12

Re: [Pharo-dev] [Moose-dev] Re: Object new foo
by Eliot Miranda 20 Aug '15

20 Aug '15

Hi Vincent, does the image lock up when you execute Exception signal? The two functions you see looping are part of the implementation of primitives 195 & 196, findNextUnwindContextUpTo: (primitiveFindNextUnwindContext) & terminateTo: (primitiveTerminateTo). So if the image locks up the question is, is what is creating a circular structure of contexts, the VM or the image? I am willing to take a look at an image that contains the case. If you can create an image which enters the lop on start-up without my having to do anything I'm happy to take a look. On Wed, Aug 19, 2015 at 3:22 PM, Vincent BLONDEAU < vincent.blondeau(a)polytech-lille.net> wrote: > Hi, > > > > On last Moose image, I debugged the VM and executed “Exception signal”. > > I paused the VM and saw that 2 methods are looping together in > gcc3x-cointerp.c: > > static sqInt findMethodWithPrimitiveFromContextUpToContext(sqInt > primitive, sqInt senderContext, sqInt homeContext); > > static sqInt findMethodWithPrimitiveFromFPUpToContext(sqInt primitive, > char *startFP, sqInt homeContext); > > > > The image is looping only when the debugger is launch on Error (not by > launching it by the script below). > > > > Maybe someone on the Pharo mailing list knows what is happening? > > > > Thanks in advance, > > > > Cheers, > > Vincent > > > > *De :* moose-dev-bounces(a)iam.unibe.ch [mailto: > moose-dev-bounces(a)iam.unibe.ch] *De la part de* Andrei Chis > *Envoyé :* mardi 18 août 2015 10:53 > *À :* Moose-related development > *Objet :* [Moose-dev] Re: Object new foo > > > > Hi Vincent, > > > > You example will also kill the Pharo debugger :) > > The issue is that you pass 'Processor activeProcess' which gets terminated > when you close the debugger. > > When you open the debugger you need to make sure the process > > on which it is opened is suspended and can get terminated with no problem. > > > > A different way to redo the example would be: > > > > context := Context > > sender: nil > > receiver: {1 . 2 . 2} > > method: (OrderedCollection>>#add:) > > arguments: #(10). > > process := Process > > forContext: context > > priority: Processor userInterruptPriority. > > GTGenericStackDebugger openOn: (DebugSession process: process context: > context). > > > > There is a basic test for opening the debugger > in GTGenericStackDebuggerSmokeTest but more could help. > > > > Cheers, > > Andrei > > > > > > On Mon, Aug 17, 2015 at 11:53 PM, Vincent BLONDEAU < > vincent.blondeau(a)polytech-lille.net> wrote: > > Indeed. Maybe some tests has to be added.. > > > > But for now, it seems that the debugger is crashing the image… Not just by > launching it: > > GTGenericStackDebugger openOn: (DebugSession process: Processor > activeProcess context: (Context > > sender: nil > > receiver: {1 . 2 . 2} > > method: (OrderedCollection>>#add: ) > > arguments: #(10))) > > > > But when an exception is thrown, its seems that we fall into an infinite > loop around the primitive 199. Maybe the context is not well set? > > > > Cheers, > > Vincent > > > > > > > > *De :* moose-dev-bounces(a)iam.unibe.ch [mailto: > moose-dev-bounces(a)iam.unibe.ch] *De la part de* Alexandre Bergel > *Envoyé :* lundi 17 août 2015 13:26 > *À :* Moose-related development > *Objet :* [Moose-dev] Re: Object new foo > > > > This is weird that such bug can be introduced and no alarm is raised > > > > Alexandre > > > Le 17 août 2015 à 08:03, Jan Kurš <kurs(a)iam.unibe.ch> a écrit : > > Yep I had this problem (falled back to previous version), I suspected > debugger being the reason. > > Cheers Jan > > > > On Sun, 16 Aug 2015 03:05 Alexandre Bergel <alexandre.bergel(a)me.com> > wrote: > > in Moose 6.0 simply freezes. > Anyone else sees this? > > Alexandre > -- > _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: > Alexandre Bergel http://www.bergel.eu > ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;. > > > > _______________________________________________ > Moose-dev mailing list > Moose-dev(a)iam.unibe.ch > https://www.iam.unibe.ch/mailman/listinfo/moose-dev > > _______________________________________________ > Moose-dev mailing list > Moose-dev(a)iam.unibe.ch > https://www.iam.unibe.ch/mailman/listinfo/moose-dev > > > _______________________________________________ > Moose-dev mailing list > Moose-dev(a)iam.unibe.ch > https://www.iam.unibe.ch/mailman/listinfo/moose-dev > > > -- _,,,^..^,,,_ best, Eliot

1 0

[commit][3426] Doh! The EnforceAccessControl define is already set-up for C compiler command-
by commits＠squeakvm.org 20 Aug '15

20 Aug '15

Revision: 3426 Author: eliot Date: 2015-08-20 12:28:03 -0700 (Thu, 20 Aug 2015) Log Message: ----------- Doh! The EnforceAccessControl define is already set-up for C compiler command- line override. Use this and nuke the nac versions of the New3speak sources. Modified Paths: -------------- branches/Cog/build.linux32x86/glue.cog.spur/build/mvm branches/Cog/build.linux32x86/glue.cog.spur/build.assert/mvm branches/Cog/build.linux32x86/glue.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/glue.cog.spur/build.debug/mvm branches/Cog/build.linux32x86/glue.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/glue.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 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 Removed Paths: ------------- branches/Cog/nsnacspursrc/ branches/Cog/nsnacspurstacksrc/ Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32x86/glue.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/glue.cog.spur/build/mvm 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.linux32x86/glue.cog.spur/build/mvm 2015-08-20 19:28:03 UTC (rev 3426) @@ -28,7 +28,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ - CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/glue.cog.spur/build.assert/mvm 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.linux32x86/glue.cog.spur/build.assert/mvm 2015-08-20 19:28:03 UTC (rev 3426) @@ -24,7 +24,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ - CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/glue.cog.spur/build.assert.itimerheartbeat/mvm 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.linux32x86/glue.cog.spur/build.assert.itimerheartbeat/mvm 2015-08-20 19:28:03 UTC (rev 3426) @@ -24,7 +24,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ - CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ + CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/glue.cog.spur/build.debug/mvm 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.linux32x86/glue.cog.spur/build.debug/mvm 2015-08-20 19:28:03 UTC (rev 3426) @@ -24,7 +24,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ - CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/glue.cog.spur/build.debug.itimerheartbeat/mvm 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.linux32x86/glue.cog.spur/build.debug.itimerheartbeat/mvm 2015-08-20 19:28:03 UTC (rev 3426) @@ -24,7 +24,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ - CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ + CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/glue.cog.spur/build.itimerheartbeat/mvm 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.linux32x86/glue.cog.spur/build.itimerheartbeat/mvm 2015-08-20 19:28:03 UTC (rev 3426) @@ -28,7 +28,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ - CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ + CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426) @@ -759,7 +759,7 @@ 737D7E2513BAB68900347756 /* cogmethod.h */, ); name = vm; - path = ../../nsnacspursrc/vm; + path = ../../nsspursrc/vm; sourceTree = "<group>"; }; F5F8AE0802EB4E090100013C /* Mac OS */ = { @@ -1457,6 +1457,7 @@ GCC_OPTIMIZATION_LEVEL = 1; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "MULTIPLEBYTECODESETS=1", @@ -1500,6 +1501,7 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "MULTIPLEBYTECODESETS=1", @@ -1535,6 +1537,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "VM_LABEL(foo)=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "MULTIPLEBYTECODESETS=1", @@ -1591,6 +1594,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "MULTIPLEBYTECODESETS=1", @@ -1645,6 +1649,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "MULTIPLEBYTECODESETS=1", @@ -1688,6 +1693,7 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "MULTIPLEBYTECODESETS=1", @@ -1716,6 +1722,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "MULTIPLEBYTECODESETS=1", @@ -1748,6 +1755,7 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "MULTIPLEBYTECODESETS=1", Modified: branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426) @@ -27,7 +27,7 @@ 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsnacspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; Modified: branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426) @@ -16,7 +16,7 @@ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 7308DE360B9614A4003B7CCD /* UnixOSProcessPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = UnixOSProcessPlugin.c; path = ../../../nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c; sourceTree = "<group>"; }; 73662FE60F53864E00C64E7F /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = Cross/vm/sqMemoryAccess.h; sourceTree = "<group>"; }; - 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsnacspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73662FE80F53864E00C64E7F /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "Mac OS/vm/config.h"; sourceTree = "<group>"; }; 73662FE90F53864E00C64E7F /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "Mac OS/vm/sqConfig.h"; sourceTree = "<group>"; }; 73662FEA0F53864E00C64E7F /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "Mac OS/vm/sqPlatformSpecific.h"; sourceTree = "<group>"; }; Modified: branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426) @@ -745,7 +745,7 @@ 737D7E2413BAB68900347756 /* vmCallback.h */, ); name = vm; - path = ../../nsnacspurstacksrc/vm; + path = ../../nsspurstacksrc/vm; sourceTree = "<group>"; }; F5F8AE0802EB4E090100013C /* Mac OS */ = { @@ -1436,6 +1436,7 @@ GCC_OPTIMIZATION_LEVEL = 1; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "MULTIPLEBYTECODESETS=1", @@ -1478,6 +1479,7 @@ ARCHS = i386; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "MULTIPLEBYTECODESETS=1", @@ -1512,6 +1514,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "VM_LABEL(foo)=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "MULTIPLEBYTECODESETS=1", @@ -1567,6 +1570,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "MULTIPLEBYTECODESETS=1", @@ -1620,6 +1624,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "MULTIPLEBYTECODESETS=1", @@ -1662,6 +1667,7 @@ ARCHS = i386; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "MULTIPLEBYTECODESETS=1", @@ -1688,6 +1694,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "DEBUGVM=0", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "MULTIPLEBYTECODESETS=1", @@ -1718,6 +1725,7 @@ ARCHS = i386; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", + "EnforceAccessControl=0", "USE_GLOBAL_STRUCT=0", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "MULTIPLEBYTECODESETS=1", Modified: branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426) @@ -27,7 +27,7 @@ 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsnacspurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; Modified: branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426) @@ -16,7 +16,7 @@ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 7308DE360B9614A4003B7CCD /* UnixOSProcessPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = UnixOSProcessPlugin.c; path = ../../../nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c; sourceTree = "<group>"; }; 73662FE60F53864E00C64E7F /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = Cross/vm/sqMemoryAccess.h; sourceTree = "<group>"; }; - 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsnacspurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73662FE80F53864E00C64E7F /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "Mac OS/vm/config.h"; sourceTree = "<group>"; }; 73662FE90F53864E00C64E7F /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "Mac OS/vm/sqConfig.h"; sourceTree = "<group>"; }; 73662FEA0F53864E00C64E7F /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "Mac OS/vm/sqPlatformSpecific.h"; sourceTree = "<group>"; }; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-08-20 19:28:03 UTC (rev 3426) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1436 uuid: 9d2442c4-2066-4ffd-a215-e7e2b6cb8eed + CCodeGenerator VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-08-20 19:28:03 UTC (rev 3426) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 from - CoInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1253,7 +1253,6 @@ static usqInt totalBytesInSegments(void); static sqInt writeImageSegmentsToFile(sqImageFile aBinaryStream) NoDbgRegParms; static sqInt writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSegment, sqImageFile aBinaryStream) NoDbgRegParms; -static sqInt accessModifierOfMethodHeader(sqInt header) NoDbgRegParms; static sqInt accessModifierOfMethod(sqInt methodObj) NoDbgRegParms; extern sqInt activeProcess(void); static void addLastLinktoList(sqInt proc, sqInt aList) NoDbgRegParms; @@ -2415,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.1435"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1439"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18329,7 +18328,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -20719,7 +20718,7 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found - && ((accessModifierOfMethodHeader(methodHeaderOf(GIV(newMethod)))) != AccessModifierPrivate)) { + && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { return 0; } /* begin followField:ofObject: */ @@ -60458,7 +60457,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -65245,7 +65244,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65584,22 +65583,6 @@ return nWritten; } - -/* accessModifier bits: - 00 public - 01 private - 10 protected - 11 undefined */ - - /* StackInterpreter>>#accessModifierOfMethodHeader: */ -static sqInt -accessModifierOfMethodHeader(sqInt header) -{ - return (EnforceAccessControl - ? (((usqInt) header) >> MethodHeaderFlagBitPosition) & 3 - : AccessModifierPublic); -} - /* StackInterpreter>>#accessModifierOfMethod: */ static sqInt accessModifierOfMethod(sqInt methodObj) @@ -71755,8 +71738,8 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found - && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) { - return rule; + && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { + return 0; } /* begin followField:ofObject: */ objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-08-20 19:28:03 UTC (rev 3426) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-20 19:28:03 UTC (rev 3426) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 from - CoInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1256,7 +1256,6 @@ static usqInt totalBytesInSegments(void); static sqInt writeImageSegmentsToFile(sqImageFile aBinaryStream) NoDbgRegParms; static sqInt writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSegment, sqImageFile aBinaryStream) NoDbgRegParms; -static sqInt accessModifierOfMethodHeader(sqInt header) NoDbgRegParms; static sqInt accessModifierOfMethod(sqInt methodObj) NoDbgRegParms; extern sqInt activeProcess(void); static void addLastLinktoList(sqInt proc, sqInt aList) NoDbgRegParms; @@ -2418,7 +2417,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.1435"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1439"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18338,7 +18337,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -20728,7 +20727,7 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found - && ((accessModifierOfMethodHeader(methodHeaderOf(GIV(newMethod)))) != AccessModifierPrivate)) { + && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { return 0; } /* begin followField:ofObject: */ @@ -60467,7 +60466,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -65254,7 +65253,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65593,22 +65592,6 @@ return nWritten; } - -/* accessModifier bits: - 00 public - 01 private - 10 protected - 11 undefined */ - - /* StackInterpreter>>#accessModifierOfMethodHeader: */ -static sqInt -accessModifierOfMethodHeader(sqInt header) -{ - return (EnforceAccessControl - ? (((usqInt) header) >> MethodHeaderFlagBitPosition) & 3 - : AccessModifierPublic); -} - /* StackInterpreter>>#accessModifierOfMethod: */ static sqInt accessModifierOfMethod(sqInt methodObj) @@ -71764,8 +71747,8 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found - && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) { - return rule; + && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { + return 0; } /* begin followField:ofObject: */ objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-20 19:28:03 UTC (rev 3426) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 from - StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -209,7 +209,7 @@ #define EnclosingObjectIndex 4 #define EndOfRun 0x101 #if !defined(EnforceAccessControl) /* Allow EnforceAccessControl to be overridden on the compiler command line */ -# define EnforceAccessControl 0 +# define EnforceAccessControl 1 #endif #define EphemeronQueueRootIndex 4098 #define ExcessSignalsIndex 2 @@ -2177,7 +2177,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1435"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -61418,8 +61418,8 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found - && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) { - return rule; + && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { + return 0; } /* begin followField:ofObject: */ objOop1 = longAt((lookupClass + BaseHeaderSize) + (((long)SuperclassIndex) << (shiftForWord()))); Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/nsspurstack64src/vm/interp.c 2015-08-20 19:28:03 UTC (rev 3426) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 from - StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -206,7 +206,7 @@ #define EnclosingObjectIndex 4 #define EndOfRun 0x101 #if !defined(EnforceAccessControl) /* Allow EnforceAccessControl to be overridden on the compiler command line */ -# define EnforceAccessControl 0 +# define EnforceAccessControl 1 #endif #define EphemeronQueueRootIndex 4098 #define ExcessSignalsIndex 2 @@ -2174,7 +2174,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1435"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -61409,8 +61409,8 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found - && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) { - return rule; + && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { + return 0; } /* begin followField:ofObject: */ objOop1 = longAt((lookupClass + BaseHeaderSize) + (((long)SuperclassIndex) << (shiftForWord()))); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-20 19:28:03 UTC (rev 3426) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 from - StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2148,7 +2148,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1435"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -56843,8 +56843,8 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found - && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) { - return rule; + && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { + return 0; } /* begin followField:ofObject: */ objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-19 23:57:42 UTC (rev 3425) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-20 19:28:03 UTC (rev 3426) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 from - StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 + StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2145,7 +2145,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1435"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -56834,8 +56834,8 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found - && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) { - return rule; + && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) { + return 0; } /* begin followField:ofObject: */ objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Aug 19 16:54:51 PDT 2015 + Thu Aug 20 12:26:45 PDT 2015

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