Vm-dev July 2014

vm-dev@lists.squeakfoundation.org

22 participants
157 discussions

[commit][3054] CogVM source as per VMMaker.oscog-eem.832
by commits＠squeakvm.org 24 Jul '14

24 Jul '14

Revision: 3054 Author: eliot Date: 2014-07-24 01:23:09 -0700 (Thu, 24 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.832 Spur: More rationalization of the class table management post become. Now no post become scan of the class table is necessary at all. Fix bug in assigning parameter 55 (growth ratio at which to do a global GC). Fix printStringOf: (used in e.g. frame print) to not print crs that would cause previous info to be overwritten. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-07-23 12:31:11 UTC (rev 3053) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-07-24 08:23:09 UTC (rev 3054) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.832 uuid: afcb9ff1-804f-4aae-b052-a709b5a26470 from - CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 + CoInterpreter VMMaker.oscog-eem.832 uuid: afcb9ff1-804f-4aae-b052-a709b5a26470 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.832 uuid: afcb9ff1-804f-4aae-b052-a709b5a26470 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -939,6 +939,7 @@ static sqInt ephemeronFormat(void); static sqInt existInstancesInNewSpaceOf(sqInt classObj) NoDbgRegParms; static void expungeDuplicateAndUnmarkedClasses(sqInt expungeUnmarked) NoDbgRegParms; +static void expungeFromClassTable(sqInt aBehavior) NoDbgRegParms; sqInt falseObject(void); sqInt fetchByteofObject(sqInt byteIndex, sqInt objOop); static sqInt fetchClassOfNonImm(sqInt objOop) NoDbgRegParms; @@ -1012,6 +1013,7 @@ sqInt isForwarded(sqInt objOop); static sqInt isFreeObject(sqInt objOop) NoDbgRegParms; sqInt isImmediate(sqInt oop); +static sqInt isInClassTable(sqInt objOop) NoDbgRegParms; sqInt isIndexable(sqInt objOop); static sqInt isInEden(sqInt objOop) NoDbgRegParms; static sqInt isInFutureSpace(sqInt address) NoDbgRegParms; @@ -1073,6 +1075,7 @@ sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); static void nilUnmarkedWeaklingSlots(void) NeverInline; +static sqInt noCheckClassAtIndex(sqInt classIndex) NoDbgRegParms; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -1102,6 +1105,7 @@ static void printFreeTreeChunk(sqInt chunkOrZero) NoDbgRegParms; void printInstancesOf(sqInt aClassOop); void printInstancesWithClassIndex(sqInt classIndex); +void printInvalidClassTableEntries(void); void printMethodReferencesTo(sqInt anOop); void printObjectsFromto(sqInt startAddress, sqInt endAddress); static void printObjStackPagemyIndexpageType(sqInt objStackPage, sqInt myx, sqInt pageType) NoDbgRegParms; @@ -1140,6 +1144,7 @@ static sqInt totalFreeListBytes(void); sqInt trueObject(void); static void unlinkSolitaryFreeTreeNode(sqInt freeTreeNode) NoDbgRegParms; +static sqInt validClassTableHashes(void); static sqInt validClassTableRootPages(void); static sqInt validObjStacks(void); sqInt vmEndianness(void); @@ -1370,7 +1375,7 @@ void printStackPages(void); void printStackPagesInUse(void); static void printStackPage(StackPage *page) NoDbgRegParms; -static sqInt printStringOf(sqInt oop) NoDbgRegParms; +static void printStringOf(sqInt oop) NoDbgRegParms; void print(char *s); void pushBool(sqInt trueOrFalse); static sqInt pushedReceiverOrClosureOfFrame(char *theFP) NoDbgRegParms; @@ -1524,18 +1529,18 @@ _iss StackPage * mostRecentlyUsedPage; _iss sqInt numStackPages; _iss SpurNewSpaceSpace pastSpace; +_iss sqInt classTableFirstPage; _iss usqInt newSpaceStart; -_iss sqInt classTableFirstPage; _iss usqInt oldSpaceStart; _iss sqInt markStack; _iss sqInt profileProcess; _iss SpurNewSpaceSpace futureSpace; _iss sqInt longRunningPrimitiveCheckSemaphore; +_iss sqInt numClassTablePages; _iss sqInt numRememberedEphemerons; _iss sqInt profileSemaphore; _iss sqInt jmpDepth; _iss sqLong nextProfileTick; -_iss sqInt numClassTablePages; _iss sqInt profileMethod; _iss sqInt classNameIndex; _iss sqInt futureSurvivorStart; @@ -1547,12 +1552,12 @@ _iss sqInt ephemeronList; _iss usqInt freeOldSpaceStart; _iss sqInt tenureThreshold; +_iss sqInt classTableIndex; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt growHeadroom; -_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; @@ -1561,7 +1566,6 @@ _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; _iss sqInt numSegInfos; -_iss sqInt becomeEffectsFlags; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; @@ -1571,6 +1575,7 @@ _iss usqLong statCheckForEvents; _iss usqLong statGCEndUsecs; _iss sqInt weakList; +_iss sqInt becomeEffectsFlags; _iss sqInt cogCodeSize; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt flagInterpretedMethods; @@ -2311,7 +2316,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.831"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.832"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -41939,7 +41944,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt copyHashFlag) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt c; - sqInt classOrNil; sqInt classTablePage; sqInt clone1; sqInt clone2; @@ -41954,7 +41958,6 @@ sqInt fmt; sqInt fmt1; sqInt fmt2; - sqInt hashBits; sqInt headerPointer; sqInt headerPointer1; sqLong headerTemp; @@ -41964,14 +41967,11 @@ sqInt i2; sqInt i3; sqInt i4; - sqInt i5; sqInt iLimiT; sqInt iLimiT1; sqInt iLimiT2; sqInt iLimiT3; sqInt iLimiT4; - sqInt j; - sqInt jLimiT; sqInt last; sqInt list; sqInt m; @@ -41983,8 +41983,10 @@ sqInt numLiterals; sqInt numLiterals1; sqInt o1ClassIndex; + sqInt o1HashBits; sqInt o1HasYoung; sqInt o2ClassIndex; + sqInt o2HashBits; sqInt o2HasYoung; sqInt obj; sqInt obj1; @@ -42010,7 +42012,6 @@ sqInt objOop9; sqInt oop; sqInt oop1; - sqInt page; sqInt procLists; sqInt referent; sqInt referent1; @@ -42024,7 +42025,6 @@ sqInt referent4; sqInt referent41; sqInt referent5; - sqInt referent51; sqInt referent6; sqInt referent7; sqInt referent8; @@ -42076,14 +42076,14 @@ contextSize = (sp >> 1); l2: /* end fetchStackPointerOf: */; fieldOffset = (CtxtTempFrameStart + contextSize) * BytesPerOop; - goto l3; + goto l1; } fieldOffset = (((numSlotsOf(array1)) - 1) * BytesPerOop) + (BaseHeaderSize); - goto l3; + goto l1; } if (fmt < 24) { fieldOffset = 0; - goto l3; + goto l1; } /* begin literalCountOfHeader: */ /* begin headerOf: */ @@ -42096,7 +42096,7 @@ ? (((usqInt) headerPointer) >> 1) & 0xFFFF : (((usqInt) headerPointer) >> 10) & 0xFF); fieldOffset = (((numLiterals + LiteralStart) - 1) * BytesPerOop) + (BaseHeaderSize); - l3: /* end lastPointerOf: */; + l1: /* end lastPointerOf: */; /* same size as array2 */ @@ -42105,7 +42105,7 @@ oop = longAt(array1 + fieldOffset); if ((oop & 3) != 0) { ec = PrimErrInappropriate; - goto l4; + goto l3; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ @@ -42120,13 +42120,13 @@ } if (((((usqInt) (longAt(oop))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; - goto l4; + goto l3; } effectsFlags = effectsFlags | (becomeEffectFlagsFor(oop)); oop = longAt(array2 + fieldOffset); if ((oop & 3) != 0) { ec = PrimErrInappropriate; - goto l4; + goto l3; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ @@ -42141,14 +42141,14 @@ } if (((((usqInt) (longAt(oop))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; - goto l4; + goto l3; } effectsFlags = effectsFlags | (becomeEffectFlagsFor(oop)); fieldOffset -= BytesPerOop; } GIV(becomeEffectsFlags) = effectsFlags; ec = 0; - l4: /* end containsOnlyValidBecomeObjects:and: */; + l3: /* end containsOnlyValidBecomeObjects:and: */; } else { followForwardedObjectFieldstoDepth(array2, 0); @@ -42166,20 +42166,20 @@ sp1 = longAt((array1 + (BaseHeaderSize)) + (StackPointerIndex << 2)); if (!((sp1 & 1))) { contextSize1 = 0; - goto l6; + goto l5; } assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array1))); contextSize1 = (sp1 >> 1); - l6: /* end fetchStackPointerOf: */; + l5: /* end fetchStackPointerOf: */; fieldOffset1 = (CtxtTempFrameStart + contextSize1) * BytesPerOop; - goto l5; + goto l4; } fieldOffset1 = (((numSlotsOf(array1)) - 1) * BytesPerOop) + (BaseHeaderSize); - goto l5; + goto l4; } if (fmt1 < 24) { fieldOffset1 = 0; - goto l5; + goto l4; } /* begin literalCountOfHeader: */ /* begin headerOf: */ @@ -42192,7 +42192,7 @@ ? (((usqInt) headerPointer1) >> 1) & 0xFFFF : (((usqInt) headerPointer1) >> 10) & 0xFF); fieldOffset1 = (((numLiterals1 + LiteralStart) - 1) * BytesPerOop) + (BaseHeaderSize); - l5: /* end lastPointerOf: */; + l4: /* end lastPointerOf: */; /* same size as array2 */ @@ -42201,7 +42201,7 @@ oop1 = longAt(array1 + fieldOffset1); if ((oop1 & 3) != 0) { ec = PrimErrInappropriate; - goto l7; + goto l6; } if (((longAt(oop1)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ @@ -42216,14 +42216,14 @@ } if (((((usqInt) (longAt(oop1))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; - goto l7; + goto l6; } effectsFlags1 = effectsFlags1 | (becomeEffectFlagsFor(oop1)); fieldOffset1 -= BytesPerOop; } GIV(becomeEffectsFlags) = effectsFlags1; ec = 0; - l7: /* end containsOnlyValidBecomeObjects: */; + l6: /* end containsOnlyValidBecomeObjects: */; } if (ec != 0) { return ec; @@ -42250,7 +42250,7 @@ /* At first blush it would appear unnecessary to use followField: here since the validation in become:with:twoWay:copyHash: follows forwarders. But - there's nothing to ensure all elements of each array is unique and doesn't + there's nothing to ensure all elements of each array are unique and don't appear in the other array. So the enumeration could encounter an object already becommed earlier in the same enumeration. */ @@ -42317,15 +42317,15 @@ longAtput(obj2 + 4, ((((longAt(obj2 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + temp1); } o1HasYoung = (o2HasYoung = 0); - for (i5 = 0, iLimiT4 = ((numSlotsOf(obj1)) - 1); i5 <= iLimiT4; i5 += 1) { - temp1 = longAt((obj1 + (BaseHeaderSize)) + (i5 << 2)); - temp2 = longAt((obj2 + (BaseHeaderSize)) + (i5 << 2)); + for (i4 = 0, iLimiT4 = ((numSlotsOf(obj1)) - 1); i4 <= iLimiT4; i4 += 1) { + temp1 = longAt((obj1 + (BaseHeaderSize)) + (i4 << 2)); + temp2 = longAt((obj2 + (BaseHeaderSize)) + (i4 << 2)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(obj1))); - longAtput((obj1 + (BaseHeaderSize)) + (i5 << 2), temp2); + longAtput((obj1 + (BaseHeaderSize)) + (i4 << 2), temp2); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(obj2))); - longAtput((obj2 + (BaseHeaderSize)) + (i5 << 2), temp1); + longAtput((obj2 + (BaseHeaderSize)) + (i4 << 2), temp1); if (((temp2 & 3) == 0) && ((((usqInt) temp2)) < (((usqInt) GIV(newSpaceLimit))))) { o1HasYoung = 1; @@ -42357,92 +42357,95 @@ } } } + assert((o1ClassIndex == 0) + || ((rawHashBitsOf(classAtIndex(o1ClassIndex))) == o1ClassIndex)); + assert((o2ClassIndex == 0) + || ((rawHashBitsOf(classAtIndex(o2ClassIndex))) == o2ClassIndex)); + goto l8; } + /* begin outOfPlaceBecome:and:copyHashFlag: */ + clone1 = (((longAt(obj1)) & 0x3FFFFF) == ClassMethodContextCompactIndex + ? cloneContext(obj1) + : clone(obj1)); + clone2 = (((longAt(obj2)) & 0x3FFFFF) == ClassMethodContextCompactIndex + ? cloneContext(obj2) + : clone(obj2)); + if (copyHashFlag) { + /* begin setHashBitsOf:to: */ + flag("endianness"); + assert(((((longAt(obj2 + 4)) & 0x3FFFFF) >= 0) && (((longAt(obj2 + 4)) & 0x3FFFFF) <= (identityHashHalfWordMask())))); + longAtput(clone1 + 4, ((((longAt(clone1 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + ((longAt(obj2 + 4)) & 0x3FFFFF)); + /* begin setHashBitsOf:to: */ + flag("endianness"); + assert(((((longAt(obj1 + 4)) & 0x3FFFFF) >= 0) && (((longAt(obj1 + 4)) & 0x3FFFFF) <= (identityHashHalfWordMask())))); + longAtput(clone2 + 4, ((((longAt(clone2 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + ((longAt(obj1 + 4)) & 0x3FFFFF)); + } else { - /* begin outOfPlaceBecome:and:copyHashFlag: */ - clone1 = (((longAt(obj1)) & 0x3FFFFF) == ClassMethodContextCompactIndex - ? cloneContext(obj1) - : clone(obj1)); - clone2 = (((longAt(obj2)) & 0x3FFFFF) == ClassMethodContextCompactIndex - ? cloneContext(obj2) - : clone(obj2)); - if (copyHashFlag) { - /* begin setHashBitsOf:to: */ - flag("endianness"); - assert(((((longAt(obj2 + 4)) & 0x3FFFFF) >= 0) && (((longAt(obj2 + 4)) & 0x3FFFFF) <= (identityHashHalfWordMask())))); - longAtput(clone1 + 4, ((((longAt(clone1 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + ((longAt(obj2 + 4)) & 0x3FFFFF)); - /* begin setHashBitsOf:to: */ - flag("endianness"); - assert(((((longAt(obj1 + 4)) & 0x3FFFFF) >= 0) && (((longAt(obj1 + 4)) & 0x3FFFFF) <= (identityHashHalfWordMask())))); - longAtput(clone2 + 4, ((((longAt(clone2 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + ((longAt(obj1 + 4)) & 0x3FFFFF)); - } - else { - /* begin setHashBitsOf:to: */ - flag("endianness"); - assert(((((longAt(obj1 + 4)) & 0x3FFFFF) >= 0) && (((longAt(obj1 + 4)) & 0x3FFFFF) <= (identityHashHalfWordMask())))); - longAtput(clone1 + 4, ((((longAt(clone1 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + ((longAt(obj1 + 4)) & 0x3FFFFF)); - /* begin setHashBitsOf:to: */ - flag("endianness"); - assert(((((longAt(obj2 + 4)) & 0x3FFFFF) >= 0) && (((longAt(obj2 + 4)) & 0x3FFFFF) <= (identityHashHalfWordMask())))); - longAtput(clone2 + 4, ((((longAt(clone2 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + ((longAt(obj2 + 4)) & 0x3FFFFF)); - } - /* begin forward:to: */ - /* begin set:classIndexTo:formatTo: */ - assert(((8 >= 0) && (8 <= (classIndexMask())))); - assert(((7 >= 0) && (7 <= (formatMask())))); + /* begin setHashBitsOf:to: */ flag("endianness"); - longAtput(obj1, ((longAt(obj1)) & (~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); - /* begin storePointer:ofForwarder:withValue: */ - assert(isForwarded(obj1)); - assert(!(isOopForwarded(clone2))); - if (isOldObject(obj1)) { + assert(((((longAt(obj1 + 4)) & 0x3FFFFF) >= 0) && (((longAt(obj1 + 4)) & 0x3FFFFF) <= (identityHashHalfWordMask())))); + longAtput(clone1 + 4, ((((longAt(clone1 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + ((longAt(obj1 + 4)) & 0x3FFFFF)); + /* begin setHashBitsOf:to: */ + flag("endianness"); + assert(((((longAt(obj2 + 4)) & 0x3FFFFF) >= 0) && (((longAt(obj2 + 4)) & 0x3FFFFF) <= (identityHashHalfWordMask())))); + longAtput(clone2 + 4, ((((longAt(clone2 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + ((longAt(obj2 + 4)) & 0x3FFFFF)); + } + /* begin forward:to: */ + /* begin set:classIndexTo:formatTo: */ + assert(((8 >= 0) && (8 <= (classIndexMask())))); + assert(((7 >= 0) && (7 <= (formatMask())))); + flag("endianness"); + longAtput(obj1, ((longAt(obj1)) & (~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); + /* begin storePointer:ofForwarder:withValue: */ + assert(isForwarded(obj1)); + assert(!(isOopForwarded(clone2))); + if (isOldObject(obj1)) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((clone2 & 3) == 0) - && ((((usqInt) clone2)) < (((usqInt) GIV(newSpaceLimit))))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(obj1))) >> 29) & 1) != 0)) { - remember(obj1); - } + if (((clone2 & 3) == 0) + && ((((usqInt) clone2)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(obj1))) >> 29) & 1) != 0)) { + remember(obj1); } } - longAtput((obj1 + (BaseHeaderSize)) + (0 << 2), clone2); - if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); - byteAtput(obj1 + 7, 1); - } - /* begin forward:to: */ - /* begin set:classIndexTo:formatTo: */ - assert(((8 >= 0) && (8 <= (classIndexMask())))); - assert(((7 >= 0) && (7 <= (formatMask())))); - flag("endianness"); - longAtput(obj2, ((longAt(obj2)) & (~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); - /* begin storePointer:ofForwarder:withValue: */ - assert(isForwarded(obj2)); - assert(!(isOopForwarded(clone1))); - if (isOldObject(obj2)) { + } + longAtput((obj1 + (BaseHeaderSize)) + (0 << 2), clone2); + if ((byteAt(obj1 + 7)) == 0) { + /* begin setRawNumSlotsOf:to: */ + flag("endian"); + byteAtput(obj1 + 7, 1); + } + /* begin forward:to: */ + /* begin set:classIndexTo:formatTo: */ + assert(((8 >= 0) && (8 <= (classIndexMask())))); + assert(((7 >= 0) && (7 <= (formatMask())))); + flag("endianness"); + longAtput(obj2, ((longAt(obj2)) & (~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); + /* begin storePointer:ofForwarder:withValue: */ + assert(isForwarded(obj2)); + assert(!(isOopForwarded(clone1))); + if (isOldObject(obj2)) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((clone1 & 3) == 0) - && ((((usqInt) clone1)) < (((usqInt) GIV(newSpaceLimit))))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(obj2))) >> 29) & 1) != 0)) { - remember(obj2); - } + if (((clone1 & 3) == 0) + && ((((usqInt) clone1)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(obj2))) >> 29) & 1) != 0)) { + remember(obj2); } } - longAtput((obj2 + (BaseHeaderSize)) + (0 << 2), clone1); - if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); - byteAtput(obj2 + 7, 1); - } } + longAtput((obj2 + (BaseHeaderSize)) + (0 << 2), clone1); + if ((byteAt(obj2 + 7)) == 0) { + /* begin setRawNumSlotsOf:to: */ + flag("endian"); + byteAtput(obj2 + 7, 1); + } if (copyHashFlag) { - goto l9; + goto l8; } if (o1ClassIndex != 0) { if (o2ClassIndex != 0) { @@ -42455,10 +42458,10 @@ classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) o1ClassIndex) >> 10) << 2)); if (classTablePage == GIV(nilObj)) { tmp = null; - goto l8; + goto l7; } tmp = longAt((classTablePage + (BaseHeaderSize)) + ((o1ClassIndex & ((1 << 10) - 1)) << 2)); - l8: /* end classAtIndex: */; + l7: /* end classAtIndex: */; classAtIndexput(o1ClassIndex, obj2); classAtIndexput(o2ClassIndex, tmp); } @@ -42466,19 +42469,14 @@ /* o2 wasn't in the table; put it there */ - if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent9 & 3) == 0) - && (((longAt(referent9)) & 0x3FFFFF) == 8)) { - referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); - } - newObj2 = referent9; + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent9 & 3) == 0) + && (((longAt(referent9)) & 0x3FFFFF) == 8)) { + referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); } - else { - newObj2 = obj1; - } + newObj2 = referent9; assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -42489,19 +42487,14 @@ } else { if (o2ClassIndex != 0) { - if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); - } - newObj1 = referent13; + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); } - else { - newObj1 = obj2; - } + newObj1 = referent13; assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -42510,7 +42503,7 @@ classAtIndexput(o2ClassIndex, newObj1); } } - l9: /* end doBecome:and:copyHash: */; + l8: /* end doBecome:and:copyHash: */; /* begin followField:ofObject: */ objOop = longAt((array1 + (BaseHeaderSize)) + (i << 2)); if (((objOop & 3) == 0) @@ -42554,6 +42547,8 @@ obj21 = objOop6; if (obj11 != obj21) { /* begin doBecome:to:copyHash: */ + o1HashBits = (longAt(obj11 + 4)) & 0x3FFFFF; + o2HashBits = (longAt(obj21 + 4)) & 0x3FFFFF; /* begin forward:to: */ /* begin set:classIndexTo:formatTo: */ assert(((8 >= 0) && (8 <= (classIndexMask())))); @@ -42582,17 +42577,30 @@ byteAtput(obj11 + 7, 1); } if (copyHashFlag) { + /* begin setHashBitsOf:to: */ + flag("endianness"); + assert(((o1HashBits >= 0) && (o1HashBits <= (identityHashHalfWordMask())))); + longAtput(obj21 + 4, ((((longAt(obj21 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + o1HashBits); + } + if ((o1HashBits != 0) + && ((classAtIndex(o1HashBits)) == obj11)) { + expungeFromClassTable(obj11); + } + else { + o1HashBits = 0; + } + assert(!((isForwarded(obj21)))); + if (o1HashBits != 0) { + if (o2HashBits == 0) { - /* silently refuse to change the hash of classes; this shouldn't happen anyway. */ + /* obj2 has no hash; we're free to assign one */ - hashBits = (longAt(obj21 + 4)) & 0x3FFFFF; - if ((classAtIndex(hashBits)) != obj21) { - hashBits = (longAt(obj11 + 4)) & 0x3FFFFF; /* begin setHashBitsOf:to: */ flag("endianness"); - assert(((hashBits >= 0) && (hashBits <= (identityHashHalfWordMask())))); - longAtput(obj21 + 4, ((((longAt(obj21 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hashBits); + assert(((o1HashBits >= 0) && (o1HashBits <= (identityHashHalfWordMask())))); + longAtput(obj21 + 4, ((((longAt(obj21 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + o1HashBits); } + classAtIndexput(o1HashBits, obj21); } /* begin followField:ofObject: */ objOop4 = longAt((array1 + (BaseHeaderSize)) + (i1 << 2)); @@ -42609,63 +42617,23 @@ if (((longAt(GIV(specialObjectsOop))) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(specialObjectsOop))); - referent5 = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (0 << 2)); - while (((referent5 & 3) == 0) - && (((longAt(referent5)) & 0x3FFFFF) == 8)) { - referent5 = longAt((referent5 + (BaseHeaderSize)) + (0 << 2)); + referent4 = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (0 << 2)); + while (((referent4 & 3) == 0) + && (((longAt(referent4)) & 0x3FFFFF) == 8)) { + referent4 = longAt((referent4 + (BaseHeaderSize)) + (0 << 2)); } - GIV(specialObjectsOop) = referent5; + GIV(specialObjectsOop) = referent4; } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); - /* begin postBecomeOrCompactScanClassTable: */ - assert(validClassTableRootPages()); - if (!(GIV(becomeEffectsFlags) & BecamePointerObjectFlag)) { - goto l1; - } - for (i2 = 0; i2 < GIV(numClassTablePages); i2 += 1) { - page = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (i2 << 2)); - assert(!(isForwarded(page))); - for (j = 0, jLimiT = ((numSlotsOf(page)) - 1); j <= jLimiT; j += 1) { - classOrNil = longAt((page + (BaseHeaderSize)) + (j << 2)); - if (classOrNil != GIV(nilObj)) { - if (((longAt(classOrNil)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(classOrNil)); - referent = longAt((classOrNil + (BaseHeaderSize)) + (0 << 2)); - while (((referent & 3) == 0) - && (((longAt(referent)) & 0x3FFFFF) == 8)) { - referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); - } - classOrNil = referent; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(page))); - if (isOldObject(page)) { - - /* most stores into young objects */ - - if (((classOrNil & 3) == 0) - && ((((usqInt) classOrNil)) < (((usqInt) GIV(newSpaceLimit))))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(page))) >> 29) & 1) != 0)) { - remember(page); - } - } - } - longAtput((page + (BaseHeaderSize)) + (j << 2), classOrNil); - } - } - } - } -l1: /* end postBecomeOrCompactScanClassTable: */; /* begin postBecomeAction: */ followForwardingPointersInStackZone(GIV(becomeEffectsFlags)); if (GIV(becomeEffectsFlags) != 0) { if (GIV(becomeEffectsFlags) & BecameCompiledMethodFlag) { /* begin followForwardedMethodsInMethodCache */ - for (i3 = 0; i3 < MethodCacheSize; i3 += MethodCacheEntrySize) { - c = GIV(methodCache)[i3 + MethodCacheClass]; - s = GIV(methodCache)[i3 + MethodCacheSelector]; - m = GIV(methodCache)[i3 + MethodCacheMethod]; + for (i2 = 0; i2 < MethodCacheSize; i2 += MethodCacheEntrySize) { + c = GIV(methodCache)[i2 + MethodCacheClass]; + s = GIV(methodCache)[i2 + MethodCacheSelector]; + m = GIV(methodCache)[i2 + MethodCacheMethod]; if ((c != 0) && ((s != 0) && ((m != 0) @@ -42673,13 +42641,13 @@ && (((longAt(m)) & 0x3FFFFF) == 8))))) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(m)); - referent1 = longAt((m + (BaseHeaderSize)) + (0 << 2)); - while (((referent1 & 3) == 0) - && (((longAt(referent1)) & 0x3FFFFF) == 8)) { - referent1 = longAt((referent1 + (BaseHeaderSize)) + (0 << 2)); + referent = longAt((m + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); } - m = referent1; - GIV(methodCache)[i3 + MethodCacheMethod] = m; + m = referent; + GIV(methodCache)[i2 + MethodCacheMethod] = m; } } /* begin followForwardedMethodsInMethodZone */ @@ -42874,18 +42842,18 @@ } longAtput((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ExternalObjectsArray << 2), xArray); } - for (i4 = 0, iLimiT3 = ((numSlotsOf(xArray)) - 1); i4 <= iLimiT3; i4 += 1) { + for (i3 = 0, iLimiT3 = ((numSlotsOf(xArray)) - 1); i3 <= iLimiT3; i3 += 1) { /* begin followSemaphoreIn:at: */ - obj = longAt((xArray + (BaseHeaderSize)) + (i4 << 2)); + obj = longAt((xArray + (BaseHeaderSize)) + (i3 << 2)); if (((longAt(obj)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(obj)); - referent51 = longAt((obj + (BaseHeaderSize)) + (0 << 2)); - while (((referent51 & 3) == 0) - && (((longAt(referent51)) & 0x3FFFFF) == 8)) { - referent51 = longAt((referent51 + (BaseHeaderSize)) + (0 << 2)); + referent5 = longAt((obj + (BaseHeaderSize)) + (0 << 2)); + while (((referent5 & 3) == 0) + && (((longAt(referent5)) & 0x3FFFFF) == 8)) { + referent5 = longAt((referent5 + (BaseHeaderSize)) + (0 << 2)); } - obj = referent51; + obj = referent5; /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(xArray))); if (isOldObject(xArray)) { @@ -42900,45 +42868,46 @@ } } } - longAtput((xArray + (BaseHeaderSize)) + (i4 << 2), obj); + longAtput((xArray + (BaseHeaderSize)) + (i3 << 2), obj); } } /* begin followForwardingPointersInProfileState */ if (((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(profileProcess))); - referent2 = longAt((GIV(profileProcess) + (BaseHeaderSize)) + (0 << 2)); - while (((referent2 & 3) == 0) - && (((longAt(referent2)) & 0x3FFFFF) == 8)) { - referent2 = longAt((referent2 + (BaseHeaderSize)) + (0 << 2)); + referent1 = longAt((GIV(profileProcess) + (BaseHeaderSize)) + (0 << 2)); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + (BaseHeaderSize)) + (0 << 2)); } - GIV(profileProcess) = referent2; + GIV(profileProcess) = referent1; } if (((longAt(GIV(profileMethod))) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(profileMethod))); - referent3 = longAt((GIV(profileMethod) + (BaseHeaderSize)) + (0 << 2)); - while (((referent3 & 3) == 0) - && (((longAt(referent3)) & 0x3FFFFF) == 8)) { - referent3 = longAt((referent3 + (BaseHeaderSize)) + (0 << 2)); + referent2 = longAt((GIV(profileMethod) + (BaseHeaderSize)) + (0 << 2)); + while (((referent2 & 3) == 0) + && (((longAt(referent2)) & 0x3FFFFF) == 8)) { + referent2 = longAt((referent2 + (BaseHeaderSize)) + (0 << 2)); } - GIV(profileMethod) = referent3; + GIV(profileMethod) = referent2; } if (((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(profileSemaphore))); - referent4 = longAt((GIV(profileSemaphore) + (BaseHeaderSize)) + (0 << 2)); - while (((referent4 & 3) == 0) - && (((longAt(referent4)) & 0x3FFFFF) == 8)) { - referent4 = longAt((referent4 + (BaseHeaderSize)) + (0 << 2)); + referent3 = longAt((GIV(profileSemaphore) + (BaseHeaderSize)) + (0 << 2)); + while (((referent3 & 3) == 0) + && (((longAt(referent3)) & 0x3FFFFF) == 8)) { + referent3 = longAt((referent3 + (BaseHeaderSize)) + (0 << 2)); } - GIV(profileSemaphore) = referent4; + GIV(profileSemaphore) = referent3; } } cogitPostGCAction(GIV(gcMode)); GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); GIV(gcMode) = 0; GIV(becomeEffectsFlags) = 0; + assert(validClassTableHashes()); if ((checkForLeaks & 4) != 0) { /* begin runLeakCheckerForFullGC: */ runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(1, 0, 1); @@ -43805,7 +43774,8 @@ assert((classIndex <= (tagMask())) || (classIndex >= (arrayClassIndexPun()))); assert((objOop == GIV(nilObj)) - || (((rawHashBitsOf(objOop)) == classIndex) + || ((((rawHashBitsOf(objOop)) == classIndex) + || ((classAtIndex(rawHashBitsOf(objOop))) == objOop)) && (objCouldBeClassObj(objOop)))); classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); if (classTablePage == GIV(nilObj)) { @@ -45376,6 +45346,33 @@ } } + +/* Remove aBehavior from the class table. */ + +static void +expungeFromClassTable(sqInt aBehavior) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classIndex; + sqInt classTablePage; + sqInt majorIndex; + sqInt minorIndex; + + assert(isInClassTable(aBehavior)); + classIndex = (longAt(aBehavior + 4)) & 0x3FFFFF; + majorIndex = ((usqInt) classIndex) >> 10; + minorIndex = classIndex & ((1 << 10) - 1); + classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (majorIndex << 2)); + assert(classTablePage != GIV(classTableFirstPage)); + assert((numSlotsOf(classTablePage)) == (classTablePageSize())); + assert((fetchPointerofObject(minorIndex, classTablePage)) == aBehavior); + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(classTablePage))); + longAtput((classTablePage + (BaseHeaderSize)) + (minorIndex << 2), GIV(nilObj)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } +} + sqInt falseObject(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -47416,6 +47413,16 @@ return (oop & 3) != 0; } +static sqInt +isInClassTable(sqInt objOop) +{ + sqInt hash; + + hash = (longAt(objOop + 4)) & 0x3FFFFF; + return (hash != 0) + && ((classAtIndex(hash)) == objOop); +} + sqInt isIndexable(sqInt objOop) { @@ -49613,7 +49620,19 @@ emptyObjStack(GIV(weaklingStack)); } +static sqInt +noCheckClassAtIndex(sqInt classIndex) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classTablePage; + classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + return null; + } + return longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); +} + + /* Push an element on an objStack. Split from push:onObjStack: for testing. */ static sqInt @@ -50792,6 +50811,49 @@ } +/* Print the objects in the classTable that have bad hashes. */ + +void +printInvalidClassTableEntries(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classOrNil; + sqInt hash; + sqInt i; + sqInt j; + sqInt jLimiT; + sqInt page; + + if (!(validClassTableRootPages())) { + print("class table invalid; cannot print"); + /* begin cr */ + printf("\n"); + return; + } + for (i = 0; i < GIV(numClassTablePages); i += 1) { + page = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (i << 2)); + for (j = 0, jLimiT = ((1 << 10) - 1); j <= jLimiT; j += 1) { + classOrNil = longAt((page + (BaseHeaderSize)) + (j << 2)); + if (classOrNil != GIV(nilObj)) { + if ((((longAt(classOrNil)) & (0x3FFFFF - 8)) == 0) + || ((((hash = (longAt(classOrNil + 4)) & 0x3FFFFF)) == 0) + || ((noCheckClassAtIndex(hash)) != classOrNil))) { + print("entry "); + printHex((i * (1 << 10)) + j); + print(" oop "); + printHex(classOrNil); + print(" hash "); + printHex(hash); + print(" => "); + printHex(classAtIndex(hash)); + /* begin cr */ + printf("\n"); + } + } + } + } +} + + /* Scan the heap printing the oops of any and all methods that refer to anOop */ void @@ -52204,6 +52266,46 @@ } +/* Check the hashes of classes in the table. The tricky thing here is that + classes may be duplicated + in the table. So each entry ,ust be in the table at its hash, even if it + is elsewhere in the table. */ + +static sqInt +validClassTableHashes(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classOrNil; + sqInt hash; + sqInt i; + sqInt j; + sqInt jLimiT; + sqInt page; + + if (!(validClassTableRootPages())) { + return 0; + } + for (i = 0; i < GIV(numClassTablePages); i += 1) { + page = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (i << 2)); + for (j = 0, jLimiT = ((1 << 10) - 1); j <= jLimiT; j += 1) { + classOrNil = longAt((page + (BaseHeaderSize)) + (j << 2)); + if (classOrNil != GIV(nilObj)) { + if (((longAt(classOrNil)) & (0x3FFFFF - 8)) == 0) { + return 0; + } + hash = (longAt(classOrNil + 4)) & 0x3FFFFF; + if (hash == 0) { + return 0; + } + if ((noCheckClassAtIndex(hash)) != classOrNil) { + return 0; + } + } + } + } + return 1; +} + + /* Answer if hiddenRootsObj is of the right size with the expected contents, and if numClassTablePages is correct. */ @@ -58735,17 +58837,15 @@ && (((fieldOop = longAt((objOop + (BaseHeaderSize)) + (SuperclassIndex << 2))), (((fieldOop & 3) == 0) && ((((((usqInt) (longAt(fieldOop))) >> 24) & 0x1F) <= 5) - || ((((longAt(fieldOop + 4)) & 0x3FFFFF) == 0) - && ((((fieldOop & 3) == 0) + || ((((fieldOop & 3) == 0) && (((longAt(fieldOop)) & 0x3FFFFF) == 8)) - && (isPointers(followForwarded(fieldOop))))))) + && (isPointers(followForwarded(fieldOop)))))) && (((fieldOop = longAt((objOop + (BaseHeaderSize)) + (MethodDictionaryIndex << 2))), (((fieldOop & 3) == 0) && ((((((usqInt) (longAt(fieldOop))) >> 24) & 0x1F) <= 5) - || ((((longAt(fieldOop + 4)) & 0x3FFFFF) == 0) - && ((((fieldOop & 3) == 0) + || ((((fieldOop & 3) == 0) && (((longAt(fieldOop)) & 0x3FFFFF) == 8)) - && (isPointers(followForwarded(fieldOop))))))) + && (isPointers(followForwarded(fieldOop)))))) && (((longAt((objOop + (BaseHeaderSize)) + (InstanceSpecificationIndex << 2))) & 1))))))); } @@ -61235,7 +61335,7 @@ printf("\n"); } -static sqInt +static void printStringOf(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt cnt; @@ -61245,14 +61345,14 @@ sqInt max; if ((oop & 3) != 0) { - return null; + return; } if (!(addressCouldBeObj(oop))) { - return null; + return; } fmt = (((usqInt) (longAt(oop))) >> 24) & 0x1F; if (fmt < 16) { - return null; + return; } cnt = ((((max = 128)) < ((len = lengthOfformat(oop, (((usqInt) (longAt(oop))) >> 24) & 0x1F)))) ? ((max = 128)) : ((len = lengthOfformat(oop, (((usqInt) (longAt(oop))) >> 24) & 0x1F)))); i = 0; @@ -61266,6 +61366,16 @@ } else { while (i < cnt) { + if ((byteAt((oop + (BaseHeaderSize)) + i)) == 13) { + + /* Character cr asInteger */ + + print("<CR>"); + if ((i + 1) < len) { + print("..."); + } + return; + } /* begin printChar: */ putchar(byteAt((oop + (BaseHeaderSize)) + i)); i += 1; @@ -67687,6 +67797,7 @@ aDouble = 0.0; l3: /* end floatValueOf: */; GIV(heapGrowthToSizeGCRatio) = aDouble; + GIV(primFailCode) = 0; } if (!GIV(primFailCode)) { /* begin pop:thenPush: */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-07-23 12:31:11 UTC (rev 3053) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-07-24 08:23:09 UTC (rev 3054) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.832 uuid: afcb9ff1-804f-4aae-b052-a709b5a26470 */ @@ -230,6 +230,7 @@ void printFreeTree(void); void printInstancesOf(sqInt aClassOop); void printInstancesWithClassIndex(sqInt classIndex); +void printInvalidClassTableEntries(void); void printMethodReferencesTo(sqInt anOop); void printObjectsFromto(sqInt startAddress, sqInt endAddress); void printObjStack(sqInt objStack); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-23 12:31:11 UTC (rev 3053) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-24 08:23:09 UTC (rev 3054) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.832 uuid: afcb9ff1-804f-4aae-b052-a709b5a26470 from - CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 + CoInterpreter VMMaker.oscog-eem.832 uuid: afcb9ff1-804f-4aae-b052-a709b5a26470 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.832 uuid: afcb9ff1-804f-4aae-b052-a709b5a26470 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -942,6 +942,7 @@ static sqInt ephemeronFormat(void); static sqInt existInstancesInNewSpaceOf(sqInt classObj) NoDbgRegParms; static void expungeDuplicateAndUnmarkedClasses(sqInt expungeUnmarked) NoDbgRegParms; +static void expungeFromClassTable(sqInt aBehavior) NoDbgRegParms; sqInt falseObject(void); sqInt fetchByteofObject(sqInt byteIndex, sqInt objOop); static sqInt fetchClassOfNonImm(sqInt objOop) NoDbgRegParms; @@ -1015,6 +1016,7 @@ sqInt isForwarded(sqInt objOop); static sqInt isFreeObject(sqInt objOop) NoDbgRegParms; sqInt isImmediate(sqInt oop); +static sqInt isInClassTable(sqInt objOop) NoDbgRegParms; sqInt isIndexable(sqInt objOop); static sqInt isInEden(sqInt objOop) NoDbgRegParms; static sqInt isInFutureSpace(sqInt address) NoDbgRegParms; @@ -1076,6 +1078,7 @@ sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); static void nilUnmarkedWeaklingSlots(void) NeverInline; +static sqInt noCheckClassAtIndex(sqInt classIndex) NoDbgRegParms; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -1105,6 +1108,7 @@ static void printFreeTreeChunk(sqInt chunkOrZero) NoDbgRegParms; void printInstancesOf(sqInt aClassOop); void printInstancesWithClassIndex(sqInt classIndex); +void printInvalidClassTableEntries(void); void printMethodReferencesTo(sqInt anOop); void printObjectsFromto(sqInt startAddress, sqInt endAddress); static void printObjStackPagemyIndexpageType(sqInt objStackPage, sqInt myx, sqInt pageType) NoDbgRegParms; @@ -1143,6 +1147,7 @@ static sqInt totalFreeListBytes(void); sqInt trueObject(void); static void unlinkSolitaryFreeTreeNode(sqInt freeTreeNode) NoDbgRegParms; +static sqInt validClassTableHashes(void); static sqInt validClassTableRootPages(void); static sqInt validObjStacks(void); sqInt vmEndianness(void); @@ -1373,7 +1378,7 @@ void printStackPages(void); void printStackPagesInUse(void); static void printStackPage(StackPage *page) NoDbgRegParms; -static sqInt printStringOf(sqInt oop) NoDbgRegParms; +static void printStringOf(sqInt oop) NoDbgRegParms; void print(char *s); void pushBool(sqInt trueOrFalse); static sqInt pushedReceiverOrClosureOfFrame(char *theFP) NoDbgRegParms; @@ -1527,18 +1532,18 @@ _iss StackPage * mostRecentlyUsedPage; _iss sqInt numStackPages; _iss SpurNewSpaceSpace pastSpace; +_iss sqInt classTableFirstPage; _iss usqInt newSpaceStart; -_iss sqInt classTableFirstPage; _iss usqInt oldSpaceStart; _iss sqInt markStack; _iss sqInt profileProcess; _iss SpurNewSpaceSpace futureSpace; _iss sqInt longRunningPrimitiveCheckSemaphore; +_iss sqInt numClassTablePages; _iss sqInt numRememberedEphemerons; _iss sqInt profileSemaphore; _iss sqInt jmpDepth; _iss sqLong nextProfileTick; -_iss sqInt numClassTablePages; _iss sqInt profileMethod; _iss sqInt classNameIndex; _iss sqInt futureSurvivorStart; @@ -1550,12 +1555,12 @@ _iss sqInt ephemeronList; _iss usqInt freeOldSpaceStart; _iss sqInt tenureThreshold; +_iss sqInt classTableIndex; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt growHeadroom; -_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; @@ -1564,7 +1569,6 @@ _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; _iss sqInt numSegInfos; -_iss sqInt becomeEffectsFlags; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; @@ -1574,6 +1578,7 @@ _iss usqLong statCheckForEvents; _iss usqLong statGCEndUsecs; _iss sqInt weakList; +_iss sqInt becomeEffectsFlags; _iss sqInt cogCodeSize; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt flagInterpretedMethods; @@ -2314,7 +2319,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.831"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.832"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -41948,7 +41953,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt copyHashFlag) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt c; - sqInt classOrNil; sqInt classTablePage; sqInt clone1; sqInt clone2; @@ -41963,7 +41967,6 @@ sqInt fmt; sqInt fmt1; sqInt fmt2; - sqInt hashBits; sqInt headerPointer; sqInt headerPointer1; sqLong headerTemp; @@ -41973,14 +41976,11 @@ sqInt i2; sqInt i3; sqInt i4; - sqInt i5; sqInt iLimiT; sqInt iLimiT1; sqInt iLimiT2; sqInt iLimiT3; sqInt iLimiT4; - sqInt j; - sqInt jLimiT; sqInt last; sqInt list; sqInt m; @@ -41992,8 +41992,10 @@ sqInt numLiterals; sqInt numLiterals1; sqInt o1ClassIndex; + sqInt o1HashBits; sqInt o1HasYoung; sqInt o2ClassIndex; + sqInt o2HashBits; sqInt o2HasYoung; sqInt obj; sqInt obj1; @@ -42019,7 +42021,6 @@ sqInt objOop9; sqInt oop; sqInt oop1; - sqInt page; sqInt procLists; sqInt referent; sqInt referent1; @@ -42033,7 +42034,6 @@ sqInt referent4; sqInt referent41; sqInt referent5; - sqInt referent51; sqInt referent6; sqInt referent7; sqInt referent8; @@ -42085,14 +42085,14 @@ contextSize = (sp >> 1); l2: /* end fetchStackPointerOf: */; fieldOffset = (CtxtTempFrameStart + contextSize) * BytesPerOop; - goto l3; + goto l1; } fieldOffset = (((numSlotsOf(array1)) - 1) * BytesPerOop) + (BaseHeaderSize); - goto l3; + goto l1; } if (fmt < 24) { fieldOffset = 0; - goto l3; + goto l1; } /* begin literalCountOfHeader: */ /* begin headerOf: */ @@ -42105,7 +42105,7 @@ ? (((usqInt) headerPointer) >> 1) & 0xFFFF : (((usqInt) headerPointer) >> 10) & 0xFF); fieldOffset = (((numLiterals + LiteralStart) - 1) * BytesPerOop) + (BaseHeaderSize); - l3: /* end lastPointerOf: */; + l1: /* end lastPointerOf: */; /* same size as array2 */ @@ -42114,7 +42114,7 @@ oop = longAt(array1 + fieldOffset); if ((oop & 3) != 0) { ec = PrimErrInappropriate; - goto l4; + goto l3; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ @@ -42129,13 +42129,13 @@ } if (((((usqInt) (longAt(oop))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; - goto l4; + goto l3; } effectsFlags = effectsFlags | (becomeEffectFlagsFor(oop)); oop = longAt(array2 + fieldOffset); if ((oop & 3) != 0) { ec = PrimErrInappropriate; - goto l4; + goto l3; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ @@ -42150,14 +42150,14 @@ } if (((((usqInt) (longAt(oop))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; - goto l4; + goto l3; } effectsFlags = effectsFlags | (becomeEffectFlagsFor(oop)); fieldOffset -= BytesPerOop; } GIV(becomeEffectsFlags) = effectsFlags; ec = 0; - l4: /* end containsOnlyValidBecomeObjects:and: */; + l3: /* end containsOnlyValidBecomeObjects:and: */; } else { followForwardedObjectFieldstoDepth(array2, 0); @@ -42175,20 +42175,20 @@ sp1 = longAt((array1 + (BaseHeaderSize)) + (StackPointerIndex << 2)); if (!((sp1 & 1))) { contextSize1 = 0; - goto l6; + goto l5; } assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array1))); contextSize1 = (sp1 >> 1); - l6: /* end fetchStackPointerOf: */; + l5: /* end fetchStackPointerOf: */; fieldOffset1 = (CtxtTempFrameStart + contextSize1) * BytesPerOop; - goto l5; + goto l4; } fieldOffset1 = (((numSlotsOf(array1)) - 1) * BytesPerOop) + (BaseHeaderSize); - goto l5; + goto l4; } if (fmt1 < 24) { fieldOffset1 = 0; - goto l5; + goto l4; } /* begin literalCountOfHeader: */ /* begin headerOf: */ @@ -42201,7 +42201,7 @@ ? (((usqInt) headerPointer1) >> 1) & 0xFFFF : (((usqInt) headerPointer1) >> 10) & 0xFF); fieldOffset1 = (((numLiterals1 + LiteralStart) - 1) * BytesPerOop) + (BaseHeaderSize); - l5: /* end lastPointerOf: */; + l4: /* end lastPointerOf: */; /* same size as array2 */ @@ -42210,7 +42210,7 @@ oop1 = longAt(array1 + fieldOffset1); if ((oop1 & 3) != 0) { ec = PrimErrInappropriate; - goto l7; + goto l6; } if (((longAt(oop1)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ @@ -42225,14 +42225,14 @@ } if (((((usqInt) (longAt(oop1))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; - goto l7; + goto l6; } effectsFlags1 = effectsFlags1 | (becomeEffectFlagsFor(oop1)); fieldOffset1 -= BytesPerOop; } GIV(becomeEffectsFlags) = effectsFlags1; ec = 0; - l7: /* end containsOnlyValidBecomeObjects: */; + l6: /* end containsOnlyValidBecomeObjects: */; } if (ec != 0) { return ec; @@ -42259,7 +42259,7 @@ /* At first blush it would appear unnecessary to use followField: here since the validation in become:with:twoWay:copyHash: follows forwarders. But - there's nothing to ensure all elements of each array is unique and doesn't + there's nothing to ensure all elements of each array are unique and don't appear in the other array. So the enumeration could encounter an object already becommed earlier in the same enumeration. */ @@ -42326,15 +42326,15 @@ longAtput(obj2 + 4, ((((longAt(obj2 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + temp1); } o1HasYoung = (o2HasYoung = 0); - for (i5 = 0, iLimiT4 = ((numSlotsOf(obj1)) - 1); i5 <= iLimiT4; i5 += 1) { - temp1 = longAt((obj1 + (BaseHeaderSize)) + (i5 << 2)); - temp2 = longAt((obj2 + (BaseHeaderSize)) + (i5 << 2)); + for (i4 = 0, iLimiT4 = ((numSlotsOf(obj1)) - 1); i4 <= iLimiT4; i4 += 1) { + temp1 = longAt((obj1 + (BaseHeaderSize)) + (i4 << 2)); + temp2 = longAt((obj2 + (BaseHeaderSize)) + (i4 << 2)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(obj1))); - longAtput((obj1 + (BaseHeaderSize)) + (i5 << 2), temp2); + longAtput((obj1 + (BaseHeaderSize)) + (i4 << 2), temp2); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(obj2))); - longAtput((obj2 + (BaseHeaderSize)) + (i5 << 2), temp1); + longAtput((obj2 + (BaseHeaderSize)) + (i4 << 2), temp1); if (((temp2 & 3) == 0) && ((((usqInt) temp2)) < (((usqInt) GIV(newSpaceLimit))))) { o1HasYoung = 1; @@ -42366,92 +42366,95 @@ } } } + assert((o1ClassIndex == 0) + || ((rawHashBitsOf(classAtIndex(o1ClassIndex))) == o1ClassIndex)); + assert((o2ClassIndex == 0) @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.832.mcz
by commits＠source.squeak.org 24 Jul '14

24 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.832.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.832 Author: eem Time: 23 July 2014, 12:37:57.226 pm UUID: afcb9ff1-804f-4aae-b052-a709b5a26470 Ancestors: VMMaker.oscog-eem.831 Spur: More rationalization of the class table management post become. Fix bug in assigning parameter 55. Fix printStringOf: (used in e.g. frame print) to not print crs that would cause previous info to be overwritten. =============== Diff against VMMaker.oscog-eem.831 =============== Item was changed: ----- Method: SpurMemoryManager>>become:with:twoWay:copyHash: (in category 'become api') ----- become: array1 with: array2 twoWay: twoWayFlag copyHash: copyHashFlag "All references to each object in array1 are swapped with all references to the corresponding object in array2. That is, all pointers to one object are replaced with with pointers to the other. The arguments must be arrays of the same length. Answers PrimNoErr if the primitive succeeds, otherwise a relevant error code." "Implementation: Uses lazy forwarding to defer updating references until message send." | ec | self assert: becomeEffectsFlags = 0. self leakCheckBecome ifTrue: [self runLeakCheckerForFullGC: true]. (self isArray: array1) ifFalse: [^PrimErrBadReceiver]. ((self isArray: array2) and: [(self numSlotsOf: array1) = (self numSlotsOf: array2)]) ifFalse: [^PrimErrBadArgument]. (twoWayFlag or: [copyHashFlag]) ifTrue: [ec := self containsOnlyValidBecomeObjects: array1 and: array2] ifFalse: [self followForwardedObjectFields: array2 toDepth: 0. ec := self containsOnlyValidBecomeObjects: array1]. ec ~= 0 ifTrue: [^ec]. coInterpreter preBecomeAction. twoWayFlag ifTrue: [self innerBecomeObjectsIn: array1 and: array2 copyHash: copyHashFlag] ifFalse: [self innerBecomeObjectsIn: array1 to: array2 copyHash: copyHashFlag]. self followSpecialObjectsOop. - self postBecomeOrCompactScanClassTable: becomeEffectsFlags. coInterpreter postBecomeAction: becomeEffectsFlags. becomeEffectsFlags := 0. + self assert: self validClassTableHashes. self leakCheckBecome ifTrue: [self runLeakCheckerForFullGC: true]. ^PrimNoErr "success"! Item was changed: ----- Method: SpurMemoryManager>>classAtIndex:put: (in category 'class table') ----- classAtIndex: classIndex put: objOop "for become & GC of classes" | classTablePage | self assert: (classIndex <= self tagMask or: [classIndex >= self arrayClassIndexPun]). self assert: (objOop = nilObj + or: [((self rawHashBitsOf: objOop) = classIndex "normal entry" + or: [(self classAtIndex: (self rawHashBitsOf: objOop)) = objOop]) "become forces duplicate entry" - or: [(self rawHashBitsOf: objOop) = classIndex and: [coInterpreter objCouldBeClassObj: objOop]]). classTablePage := self fetchPointer: classIndex >> self classTableMajorIndexShift ofObject: hiddenRootsObj. classTablePage = nilObj ifTrue: [self error: 'attempt to add class to empty page']. ^self storePointer: (classIndex bitAnd: self classTableMinorIndexMask) ofObject: classTablePage withValue: objOop! Item was changed: ----- Method: SpurMemoryManager>>doBecome:and:copyHash: (in category 'become implementation') ----- doBecome: obj1 and: obj2 copyHash: copyHashFlag + "Inner dispatch for two-way become. + N.B. At least in current two-way become use copyHashFlag is false." - "Inner dispatch for two-way become" | o1ClassIndex o2ClassIndex | copyHashFlag ifFalse: ["in-lined classIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] for speed." o1ClassIndex := self rawHashBitsOf: obj1. (o1ClassIndex ~= 0 and: [(self classAtIndex: o1ClassIndex) ~= obj1]) ifTrue: [o1ClassIndex := 0]. o2ClassIndex := self rawHashBitsOf: obj2. (o2ClassIndex ~= 0 and: [(self classAtIndex: o2ClassIndex) ~= obj2]) ifTrue: [o2ClassIndex := 0]]. + (self numSlotsOf: obj1) = (self numSlotsOf: obj2) ifTrue: + [self inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag. + self assert: (o1ClassIndex = 0 + or: [(self rawHashBitsOf: (self classAtIndex: o1ClassIndex)) = o1ClassIndex]). + self assert: (o2ClassIndex = 0 + or: [(self rawHashBitsOf: (self classAtIndex: o2ClassIndex)) = o2ClassIndex]). + ^self]. + self outOfPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag. - (self numSlotsOf: obj1) = (self numSlotsOf: obj2) - ifTrue: - [self inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag] - ifFalse: - [self outOfPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag]. "if copyHashFlag then nothing changes, since hashes were also swapped." copyHashFlag ifTrue: [^self]. "if copyHash is false then the classTable entries must be updated." o1ClassIndex ~= 0 ifTrue: [o2ClassIndex ~= 0 ifTrue: "both were in the table; just swap entries" [| tmp | tmp := self classAtIndex: o1ClassIndex. self classAtIndex: o1ClassIndex put: obj2. self classAtIndex: o2ClassIndex put: tmp] ifFalse: "o2 wasn't in the table; put it there" [| newObj2 | + newObj2 := self followForwarded: obj1. - (self isForwarded: obj1) - ifTrue: [newObj2 := self followForwarded: obj1] - ifFalse: [newObj2 := obj1]. self assert: (self rawHashBitsOf: newObj2) = 0. self setHashBitsOf: newObj2 to: o1ClassIndex. self classAtIndex: o1ClassIndex put: newObj2]] ifFalse: [o2ClassIndex ~= 0 ifTrue: [| newObj1 | + newObj1 := self followForwarded: obj2. - (self isForwarded: obj2) - ifTrue: [newObj1 := self followForwarded: obj2] - ifFalse: [newObj1 := obj2]. self assert: (self rawHashBitsOf: newObj1) = 0. self setHashBitsOf: newObj1 to: o2ClassIndex. self classAtIndex: o2ClassIndex put: newObj1]]! Item was changed: ----- Method: SpurMemoryManager>>doBecome:to:copyHash: (in category 'become implementation') ----- doBecome: obj1 to: obj2 copyHash: copyHashFlag + | o1HashBits o2HashBits | + o1HashBits := self rawHashBitsOf: obj1. + o2HashBits := self rawHashBitsOf: obj2. - | hashBits | self forward: obj1 to: obj2. + copyHashFlag ifTrue: [self setHashBitsOf: obj2 to: o1HashBits]. + "obj1 is on its way out. Remove it from the classTable" + (o1HashBits ~= 0 and: [(self classAtIndex: o1HashBits) = obj1]) + ifTrue: [self expungeFromClassTable: obj1] + ifFalse: [o1HashBits := 0]. "= 0 implies was not in class table" + self deny: (self isForwarded: obj2). + "o1HashBits ~= 0 implies obj1 was in class table and hence may have had instances. + Therefore o1HashBits needs to refer to obj2 (put obj2 in table at o1HashBits)." + o1HashBits ~= 0 ifTrue: + [o2HashBits = 0 ifTrue: "obj2 has no hash; we're free to assign one" + [self setHashBitsOf: obj2 to: o1HashBits]. + self classAtIndex: o1HashBits put: obj2]! - copyHashFlag ifTrue: - [hashBits := self rawHashBitsOf: obj2. - "silently refuse to change the hash of classes; this shouldn't happen anyway." - (self classAtIndex: hashBits) ~= obj2 ifTrue: - [hashBits := self rawHashBitsOf: obj1. - self setHashBitsOf: obj2 to: hashBits]]! Item was changed: ----- Method: SpurMemoryManager>>innerBecomeObjectsIn:and:copyHash: (in category 'become implementation') ----- innerBecomeObjectsIn: array1 and: array2 copyHash: copyHashFlag "Inner loop of two-way become." 0 to: (self numSlotsOf: array1) - 1 do: [:i| | obj1 obj2 | "At first blush it would appear unnecessary to use followField: here since the validation in become:with:twoWay:copyHash: follows forwarders. But + there's nothing to ensure all elements of each array are unique and don't - there's nothing to ensure all elements of each array is unique and doesn't appear in the other array. So the enumeration could encounter an object already becommed earlier in the same enumeration." obj1 := self followField: i ofObject: array1. obj2 := self followField: i ofObject: array2. obj1 ~= obj2 ifTrue: [self doBecome: obj1 and: obj2 copyHash: copyHashFlag. self followField: i ofObject: array1. self followField: i ofObject: array2]]! Item was changed: ----- Method: SpurMemoryManager>>isInClassTable: (in category 'class table') ----- isInClassTable: objOop | hash | hash := self rawHashBitsOf: objOop. + ^hash ~= 0 + and: [(self classAtIndex: hash) = objOop]! - hash = 0 ifTrue: - [false]. - ^(self classAtIndex: hash) = objOop! Item was added: + ----- Method: SpurMemoryManager>>noCheckClassAtIndex: (in category 'class table') ----- + noCheckClassAtIndex: classIndex + | classTablePage | + classTablePage := self fetchPointer: classIndex >> self classTableMajorIndexShift + ofObject: hiddenRootsObj. + classTablePage = nilObj ifTrue: + [^nil]. + ^self + fetchPointer: (classIndex bitAnd: self classTableMinorIndexMask) + ofObject: classTablePage! Item was removed: - ----- Method: SpurMemoryManager>>postBecomeOrCompactScanClassTable: (in category 'become implementation') ----- - postBecomeOrCompactScanClassTable: effectsFlags - "Scan the class table post-become (iff a pointer object or compiled method was becommed), - or post-compact. - Note that one-way become can cause duplications in the class table. - When can these be eliminated? We use the classTableBitmap to mark classTable entries - (not the classes themselves, since marking a class doesn't help in knowing if its index is used). - On image load, and during incrememtal scan-mark and full GC, classIndices are marked. - We can somehow avoid following classes from the classTable until after this mark phase." - self assert: self validClassTableRootPages. - - (effectsFlags anyMask: BecamePointerObjectFlag) ifFalse: [^self]. - - 0 to: numClassTablePages - 1 do: - [:i| | page | - page := self fetchPointer: i ofObject: hiddenRootsObj. - self assert: (self isForwarded: page) not. - 0 to: (self numSlotsOf: page) - 1 do: - [:j| | classOrNil | - classOrNil := self fetchPointer: j ofObject: page. - classOrNil ~= nilObj ifTrue: - [(self isForwarded: classOrNil) ifTrue: - [classOrNil := self followForwarded: classOrNil. - self storePointer: j ofObject: page withValue: classOrNil]]]]! Item was added: + ----- Method: SpurMemoryManager>>printInvalidClassTableEntries (in category 'class table') ----- + printInvalidClassTableEntries + "Print the objects in the classTable that have bad hashes." + <api> + self validClassTableRootPages ifFalse: + [coInterpreter print: 'class table invalid; cannot print'; cr. + ^self]. + + 0 to: numClassTablePages - 1 do: + [:i| | page | + page := self fetchPointer: i ofObject: hiddenRootsObj. + 0 to: self classTablePageSize - 1 do: + [:j| | classOrNil hash | + classOrNil := self fetchPointer: j ofObject: page. + classOrNil ~= nilObj ifTrue: + [((self isForwarded: classOrNil) + or: [(hash := self rawHashBitsOf: classOrNil) = 0 + or: [(self noCheckClassAtIndex: hash) ~= classOrNil]]) ifTrue: + [coInterpreter + print: 'entry '; printHex: i * self classTablePageSize + j; + print: ' oop '; printHex: classOrNil; + print: ' hash '; printHex: hash; print: ' => '; printHex: (self classAtIndex: hash); + cr]]]]! Item was changed: ----- Method: SpurMemoryManager>>setHeapGrowthToSizeGCRatio: (in category 'accessing') ----- setHeapGrowthToSizeGCRatio: aDouble <var: #aDouble type: #double> + heapGrowthToSizeGCRatio := aDouble. + ^0! - heapGrowthToSizeGCRatio := aDouble! Item was removed: - ----- Method: SpurMemoryManager>>sweepToFollowForwarders (in category 'compaction') ----- - sweepToFollowForwarders - "sweep, following forwarders in all live objects, and answering the first forwarder or free object." - | lowestFree | - lowestFree := 0. - self allOldSpaceEntitiesDo: - [:o| - ((self isFreeObject: o) or: [self isForwarded: o]) - ifTrue: - [lowestFree = 0 ifTrue: - [lowestFree := o]] - ifFalse: - [0 to: (self numPointerSlotsOf: o) - 1 do: - [:i| | f | - f := self fetchPointer: i ofObject: o. - (self isOopForwarded: f) ifTrue: - [f := self followForwarded: f. - self storePointer: i ofObject: o withValue: f]]]]. - ^lowestFree - ! Item was added: + ----- Method: SpurMemoryManager>>validClassTableHashes (in category 'class table') ----- + validClassTableHashes + "Check the hashes of classes in the table. The tricky thing here is that classes may be duplicated + in the table. So each entry ,ust be in the table at its hash, even if it is elsewhere in the table." + + self validClassTableRootPages ifFalse: + [^false]. + + 0 to: numClassTablePages - 1 do: + [:i| | page | + page := self fetchPointer: i ofObject: hiddenRootsObj. + 0 to: self classTablePageSize - 1 do: + [:j| | classOrNil hash | + classOrNil := self fetchPointer: j ofObject: page. + classOrNil ~= nilObj ifTrue: + [(self isForwarded: classOrNil) ifTrue: + [^0]. + hash := self rawHashBitsOf: classOrNil. + hash = 0 ifTrue: + [^false]. + (self noCheckClassAtIndex: hash) ~= classOrNil ifTrue: + [^false]]]]. + + ^true! Item was changed: ----- Method: StackInterpreter>>objCouldBeClassObj: (in category 'debug support') ----- objCouldBeClassObj: objOop "Answer if objOop looks like a class object. WIth Spur be lenient if the object doesn't yet have a hash (i.e. is not yet in the classTable), and accept forwarding pointers." <inline: false> | fieldOop | ^(objectMemory isPointersNonImm: objOop) and: [(objectMemory numSlotsOf: objOop) > InstanceSpecificationIndex and: [fieldOop := objectMemory fetchPointer: SuperclassIndex ofObject: objOop. ((objectMemory isNonImmediate: fieldOop) and:[ (objectMemory isPointersNonImm: fieldOop) + or: [(objectMemory isOopForwarded: fieldOop) + and: [objectMemory isPointers: (objectMemory followForwarded: fieldOop)]]]) - or: [(objectMemory rawHashBitsOf: fieldOop) = 0 - and: [(objectMemory isOopForwarded: fieldOop) - and: [objectMemory isPointers: (objectMemory followForwarded: fieldOop)]]]]) and: [fieldOop := objectMemory fetchPointer: MethodDictionaryIndex ofObject: objOop. ((objectMemory isNonImmediate: fieldOop) and:[ (objectMemory isPointersNonImm: fieldOop) + or: [(objectMemory isOopForwarded: fieldOop) + and: [objectMemory isPointers: (objectMemory followForwarded: fieldOop)]]]) - or: [(objectMemory rawHashBitsOf: fieldOop) = 0 - and: [(objectMemory isOopForwarded: fieldOop) - and: [objectMemory isPointers: (objectMemory followForwarded: fieldOop)]]]]) and: [(objectMemory isIntegerObject: (objectMemory fetchPointer: InstanceSpecificationIndex ofObject: objOop))]]]]! Item was changed: ----- Method: StackInterpreter>>printStringOf: (in category 'debug printing') ----- printStringOf: oop | fmt len cnt max i | <inline: false> (objectMemory isImmediate: oop) ifTrue: [^nil]. (objectMemory addressCouldBeObj: oop) ifFalse: [^nil]. fmt := objectMemory formatOf: oop. fmt < objectMemory firstByteFormat ifTrue: [^nil]. cnt := (max := 128) min: (len := objectMemory lengthOf: oop). i := 0. ((objectMemory is: oop instanceOf: (objectMemory splObj: ClassByteArray) compactClassIndex: classByteArrayCompactIndex) or: [(self isInstanceOfClassLargePositiveInteger: oop) or: [(self isInstanceOfClassLargeNegativeInteger: oop)]]) ifTrue: [[i < cnt] whileTrue: [self printHex: (objectMemory fetchByte: i ofObject: oop). i := i + 1]] ifFalse: [[i < cnt] whileTrue: + [self cCode: + [(objectMemory fetchByte: i ofObject: oop) = 13 "Character cr asInteger" ifTrue: + [self print: '<CR>'. + i + 1 < len ifTrue: + [self print: '...']. + ^self]]. + self printChar: (objectMemory fetchByte: i ofObject: oop). - [self printChar: (objectMemory fetchByte: i ofObject: oop). i := i + 1]]. len > max ifTrue: [self print: '...']. self flush!

1 0

[commit][3053] VMMaker 4.13.7
by commits＠squeakvm.org 23 Jul '14

23 Jul '14

Revision: 3053 Author: lewis Date: 2014-07-23 05:31:11 -0700 (Wed, 23 Jul 2014) Log Message: ----------- VMMaker 4.13.7 Add the improved LargeIntegersPlugin implementation by Nicolas Cellier Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins/ZipPlugin/ZipPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/ckformat.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2014-03-12T12:58:08.131+01:00--- */ +/* --- Automatically generated from class ImageFormat 2014-07-20T19:58:46.598+01:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:52 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:23 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - ADPCMCodecPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + ADPCMCodecPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 12 March 2014 (i)" + "ADPCMCodecPlugin 20 July 2014 (i)" #else - "ADPCMCodecPlugin 12 March 2014 (e)" + "ADPCMCodecPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:58:07 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:45 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 */ @@ -88,9 +88,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 12 March 2014 (i)" + "AioPlugin 20 July 2014 (i)" #else - "AioPlugin 12 March 2014 (e)" + "AioPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:52 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:23 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - AsynchFilePlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + AsynchFilePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 12 March 2014 (i)" + "AsynchFilePlugin 20 July 2014 (i)" #else - "AsynchFilePlugin 12 March 2014 (e)" + "AsynchFilePlugin 20 July 2014 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:55 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:27 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - BalloonEnginePlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + BalloonEnginePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 12 March 2014 (i)" + "B2DPlugin 20 July 2014 (i)" #else - "B2DPlugin 12 March 2014 (e)" + "B2DPlugin 20 July 2014 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:58:01 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:35 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - B3DAcceleratorPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + B3DAcceleratorPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 12 March 2014 (i)" + "B3DAcceleratorPlugin 20 July 2014 (i)" #else - "B3DAcceleratorPlugin 12 March 2014 (e)" + "B3DAcceleratorPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:53 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:23 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - BMPReadWriterPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + BMPReadWriterPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 12 March 2014 (i)" + "BMPReadWriterPlugin 20 July 2014 (i)" #else - "BMPReadWriterPlugin 12 March 2014 (e)" + "BMPReadWriterPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:56 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:28 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - BitBltSimulation VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + BitBltSimulation * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -256,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 12 March 2014 (i)" + "BitBltPlugin 20 July 2014 (i)" #else - "BitBltPlugin 12 March 2014 (e)" + "BitBltPlugin 20 July 2014 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:58:02 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:37 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - CameraPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + CameraPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "CameraPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 12 March 2014 (i)" + "CameraPlugin 20 July 2014 (i)" #else - "CameraPlugin 12 March 2014 (e)" + "CameraPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:58:02 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:37 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - ClipboardExtendedPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + ClipboardExtendedPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 12 March 2014 (i)" + "ClipboardExtendedPlugin 20 July 2014 (i)" #else - "ClipboardExtendedPlugin 12 March 2014 (e)" + "ClipboardExtendedPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:56 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:29 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - CroquetPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + CroquetPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 12 March 2014 (i)" + "CroquetPlugin 20 July 2014 (i)" #else - "CroquetPlugin 12 March 2014 (e)" + "CroquetPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:58:02 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:37 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665 */ @@ -143,9 +143,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 12 March 2014 (i)" + "DBusPlugin 20 July 2014 (i)" #else - "DBusPlugin 12 March 2014 (e)" + "DBusPlugin 20 July 2014 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:56 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:29 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - DSAPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + DSAPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "DSAPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "DSAPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 12 March 2014 (i)" + "DSAPrims 20 July 2014 (i)" #else - "DSAPrims 12 March 2014 (e)" + "DSAPrims 20 July 2014 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:57 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - DropPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + DropPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "DropPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "DropPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 12 March 2014 (i)" + "DropPlugin 20 July 2014 (i)" #else - "DropPlugin 12 March 2014 (e)" + "DropPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:57 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - FFTPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + FFTPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "FFTPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "FFTPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 12 March 2014 (i)" + "FFTPlugin 20 July 2014 (i)" #else - "FFTPlugin 12 March 2014 (e)" + "FFTPlugin 20 July 2014 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 29 April 2014 10:27:57 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:39 pm */ /* Automatically generated by FT2PluginCodeGenerator * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16 from @@ -121,9 +121,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 29 April 2014 (i)" + "FT2Plugin 20 July 2014 (i)" #else - "FT2Plugin 29 April 2014 (e)" + "FT2Plugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:58:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:39 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - FileCopyPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + FileCopyPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 12 March 2014 (i)" + "FileCopyPlugin 20 July 2014 (i)" #else - "FileCopyPlugin 12 March 2014 (e)" + "FileCopyPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:57 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - FilePlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + FilePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "FilePlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "FilePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -100,9 +100,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 12 March 2014 (i)" + "FilePlugin 20 July 2014 (i)" #else - "FilePlugin 12 March 2014 (e)" + "FilePlugin 20 July 2014 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:57 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - FloatArrayPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + FloatArrayPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 12 March 2014 (i)" + "FloatArrayPlugin 20 July 2014 (i)" #else - "FloatArrayPlugin 12 March 2014 (e)" + "FloatArrayPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:57 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - FloatMathPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + FloatMathPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 12 March 2014 (i)" + "FloatMathPlugin 20 July 2014 (i)" #else - "FloatMathPlugin 12 March 2014 (e)" + "FloatMathPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:57 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:31 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - GeniePlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + GeniePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "GeniePlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "GeniePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 12 March 2014 (i)" + "GeniePlugin v2.0 20 July 2014 (i)" #else - "GeniePlugin v2.0 12 March 2014 (e)" + "GeniePlugin v2.0 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:58:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:40 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - HostWindowPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + HostWindowPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 12 March 2014 (i)" + "HostWindowPlugin 20 July 2014 (i)" #else - "HostWindowPlugin 12 March 2014 (e)" + "HostWindowPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:57 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:31 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - JPEGReadWriter2Plugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + JPEGReadWriter2Plugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 12 March 2014 (i)" + "JPEGReadWriter2Plugin 20 July 2014 (i)" #else - "JPEGReadWriter2Plugin 12 March 2014 (e)" + "JPEGReadWriter2Plugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:58 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:31 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - JPEGReaderPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + JPEGReaderPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -136,9 +136,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 12 March 2014 (i)" + "JPEGReaderPlugin 20 July 2014 (i)" #else - "JPEGReaderPlugin 12 March 2014 (e)" + "JPEGReaderPlugin 20 July 2014 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:58 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:31 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - JoystickTabletPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + JoystickTabletPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "JoystickTabletPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 12 March 2014 (i)" + "JoystickTabletPlugin 20 July 2014 (i)" #else - "JoystickTabletPlugin 12 March 2014 (e)" + "JoystickTabletPlugin 20 July 2014 (e)" #endif ; Modified: trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c =================================================================== --- trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.5 translated as C source on 23 June 2014 6:57:27 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:41 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.347 uuid: 0e985655-74a3-4561-8daf-4a4740c19a3b + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from KedamaPlugin2 Kedama-Plugins-yo.1 uuid: 3fc7d691-0149-ba4d-a339-5d27cd44a2f8 */ @@ -123,9 +123,9 @@ static unsigned int kedamaRandomSeed; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "KedamaPlugin2 23 June 2014 (i)" + "KedamaPlugin2 20 July 2014 (i)" #else - "KedamaPlugin2 23 June 2014 (e)" + "KedamaPlugin2 20 July 2014 (e)" #endif ; static unsigned int randA; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/Klatt/Klatt.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:58 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:32 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - KlattSynthesizerPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + KlattSynthesizerPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "KlattSynthesizerPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -155,9 +155,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 12 March 2014 (i)" + "Klatt 20 July 2014 (i)" #else - "Klatt 12 March 2014 (e)" + "Klatt 20 July 2014 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2014-07-22 17:45:31 UTC (rev 3052) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2014-07-23 12:31:11 UTC (rev 3053) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.4 translated as C source on 12 March 2014 12:57:59 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:33 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae from - LargeIntegersPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a + LargeIntegersPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.344 uuid: d27f9db0-776a-4a76-aa71-2fc4aaa4885a " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; @@ -42,33 +42,32 @@ /*** Function Prototypes ***/ static sqInt anyBitOfBytesfromto(sqInt aBytesOop, sqInt start, sqInt stopArg); -static sqInt bytesLshift(sqInt aBytesOop, sqInt shiftCount); -static sqInt bytesRshiftbyteslookfirst(sqInt aBytesOop, sqInt anInteger, sqInt b, sqInt a); static sqInt bytesgrowTo(sqInt aBytesObject, sqInt newLen); static sqInt bytesOrIntgrowTo(sqInt oop, sqInt len); -static sqInt cByteOpshortlenlongleninto(sqInt opIndex, unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); -static int cBytesCopyFromtolen(unsigned char * pFrom, unsigned char * pTo, sqInt len); -static sqInt cBytesHighBitlen(unsigned char * pByte, sqInt len); -static int cBytesLshiftfromlentolen(sqInt shiftCount, unsigned char * pFrom, sqInt lenFrom, unsigned char * pTo, sqInt lenTo); -static int cBytesReplacefromtowithstartingAt(unsigned char * pTo, sqInt start, sqInt stop, unsigned char * pFrom, sqInt repStart); static sqInt cCopyIntValtoBytes(sqInt val, sqInt bytes); -static sqInt cCoreBytesRshiftCountnfbytesfromlentolen(sqInt count, sqInt n, sqInt f, sqInt b, unsigned char * pFrom, sqInt fromLen, unsigned char * pTo, sqInt toLen); -static sqInt cCoreDigitDivDivlenremlenquolen(unsigned char * pDiv, sqInt divLen, unsigned char * pRem, sqInt remLen, unsigned char * pQuo, sqInt quoLen); static unsigned char cDigitAddlenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); static sqInt cDigitComparewithlen(unsigned char * pFirst, unsigned char * pSecond, sqInt len); +static int cDigitCopyFromtolen(unsigned char * pFrom, unsigned char * pTo, sqInt len); +static sqInt cDigitDivlenremlenquolen(unsigned char * pDiv, sqInt divLen, unsigned char * pRem, sqInt remLen, unsigned char * pQuo, sqInt quoLen); +static sqInt cDigitHighBitlen(unsigned char * pByte, sqInt len); static sqInt cDigitLengthOfCSI(sqInt csi); +static sqInt cDigitLshiftfromlentolen(sqInt shiftCount, unsigned char * pFrom, sqInt lenFrom, unsigned char * pTo, sqInt lenTo); +static sqInt cDigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char * pBytesFirst, sqInt firstLen, unsigned char * pBytesSecond, sqInt secondLen, unsigned char * pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char * pBytesRes); static unsigned char cDigitMultiplylenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); static sqInt cDigitOfCSIat(sqInt csi, sqInt ix); +static sqInt cDigitOpshortlenlongleninto(sqInt opIndex, unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); +static int cDigitReplacefromtowithstartingAt(unsigned char * pTo, sqInt start, sqInt stop, unsigned char * pFrom, sqInt repStart); +static sqInt cDigitRshiftfromlentolen(sqInt shiftCount, unsigned char * pFrom, sqInt fromLen, unsigned char * pTo, sqInt toLen); static sqInt cDigitSublenwithleninto(unsigned char * pByteSmall, sqInt smallLen, unsigned char * pByteLarge, sqInt largeLen, unsigned char * pByteRes); -static sqInt cHighBit(sqInt uint); -static sqInt cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char * pBytesFirst, sqInt firstLen, unsigned char * pBytesSecond, sqInt secondLen, unsigned char * pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char * pBytesRes); +static sqInt cHighBit(unsigned int uint); static sqInt createLargeFromSmallInteger(sqInt anOop); +static sqInt digitLshift(sqInt aBytesOop, sqInt shiftCount); +static sqInt digitRshiftlookfirst(sqInt aBytesOop, sqInt shiftCount, sqInt a); static sqInt digitAddLargewith(sqInt firstInteger, sqInt secondInteger); static sqInt digitBitLogicwithopIndex(sqInt firstInteger, sqInt secondInteger, sqInt opIx); static sqInt digitCompareLargewith(sqInt firstInteger, sqInt secondInteger); static sqInt digitDivLargewithnegative(sqInt firstInteger, sqInt secondInteger, sqInt neg); static sqInt digitLength(sqInt oop); -static sqInt digitMontgomerytimesmodulomInvModB(sqInt firstLarge, sqInt secondLarge, sqInt thirdLarge, sqInt mInv); static sqInt digitMultiplyLargewithnegative(sqInt firstInteger, sqInt secondInteger, sqInt neg); static sqInt digitOfBytesat(sqInt aBytesOop, sqInt ix); static sqInt digitSubLargewith(sqInt firstInteger, sqInt secondInteger); @@ -147,7 +146,7 @@ return interpreterProxy->primitiveFail(); } magnitude = aBytesOop; - stop = ((stopArg < (cBytesHighBitlen(interpreterProxy->firstIndexableField(magnitude), interpreterProxy->slotSizeOf(magnitude)))) ? stopArg : (cBytesHighBitlen(interpreterProxy->firstIndexableField(magnitude), interpreterProxy->slotSizeOf(magnitude)))); + stop = ((stopArg < (cDigitHighBitlen(interpreterProxy->firstIndexableField(magnitude), interpreterProxy->slotSizeOf(magnitude)))) ? stopArg : (cDigitHighBitlen(interpreterProxy->firstIndexableField(magnitude), interpreterProxy->slotSizeOf(magnitude)))); if (start > stop) { return 0; } @@ -186,85 +185,6 @@ /* Attention: this method invalidates all oop's! Only newBytes is valid at return. */ /* Does not normalize. */ -static sqInt bytesLshift(sqInt aBytesOop, sqInt shiftCount) { - sqInt newLen; - sqInt oldLen; - sqInt newBytes; - sqInt highBit; - - oldLen = interpreterProxy->slotSizeOf(aBytesOop); - if (((highBit = cBytesHighBitlen(interpreterProxy->firstIndexableField(aBytesOop), oldLen))) == 0) { - return interpreterProxy->integerObjectOf(0); - } - newLen = ((sqInt) ((highBit + shiftCount) + 7) >> 3); - interpreterProxy->pushRemappableOop(aBytesOop); - newBytes = interpreterProxy->instantiateClassindexableSize(interpreterProxy->fetchClassOf(aBytesOop), newLen); - aBytesOop = interpreterProxy->popRemappableOop(); - cBytesLshiftfromlentolen(shiftCount, interpreterProxy->firstIndexableField(aBytesOop), oldLen, interpreterProxy->firstIndexableField(newBytes), newLen); - return newBytes; -} - - -/* Attention: this method invalidates all oop's! Only newBytes is valid at return. */ -/* Shift right 8*b+anInteger bits, 0<=n<8. - Discard all digits beyond a, and all zeroes at or below a. */ -/* Does not normalize. */ - -static sqInt bytesRshiftbyteslookfirst(sqInt aBytesOop, sqInt anInteger, sqInt b, sqInt a) { - sqInt i; - sqInt digit; - sqInt newBytes; - sqInt x; - sqInt f; - sqInt oldLen; - sqInt newLen; - unsigned char *pointer; - unsigned char *pointer1; - - x = 0; - f = 8 - anInteger; - i = a; - /* begin digitOfBytes:at: */ - if (i > (interpreterProxy->slotSizeOf(aBytesOop))) { - digit = 0; - goto l2; - } else { - digit = ((pointer1 = interpreterProxy->firstIndexableField(aBytesOop)))[i - 1]; - goto l2; - } -l2: /* end digitOfBytes:at: */; - while ((((((usqInt) digit) >> anInteger) | x) == 0) && (i != 1)) { - - /* Can't exceed 8 bits */ - - x = digit << f; - i -= 1; - /* begin digitOfBytes:at: */ - if (i > (interpreterProxy->slotSizeOf(aBytesOop))) { - digit = 0; - goto l1; - } else { - digit = ((pointer = interpreterProxy->firstIndexableField(aBytesOop)))[i - 1]; - goto l1; - } - l1: /* end digitOfBytes:at: */; - } - if (i <= b) { - return interpreterProxy->instantiateClassindexableSize(interpreterProxy->fetchClassOf(aBytesOop), 0); - } - oldLen = interpreterProxy->slotSizeOf(aBytesOop); - newLen = i - b; - interpreterProxy->pushRemappableOop(aBytesOop); - newBytes = interpreterProxy->instantiateClassindexableSize(interpreterProxy->fetchClassOf(aBytesOop), newLen); - aBytesOop = interpreterProxy->popRemappableOop(); - cCoreBytesRshiftCountnfbytesfromlentolen(i, anInteger, f, b, interpreterProxy->firstIndexableField(aBytesOop), oldLen, interpreterProxy->firstIndexableField(newBytes), newLen); - return newBytes; -} - - -/* Attention: this method invalidates all oop's! Only newBytes is valid at return. */ -/* Does not normalize. */ - static sqInt bytesgrowTo(sqInt aBytesObject, sqInt newLen) { sqInt oldLen; sqInt copyLen; @@ -279,7 +199,7 @@ } else { copyLen = newLen; } - cBytesCopyFromtolen(interpreterProxy->firstIndexableField(aBytesObject), interpreterProxy->firstIndexableField(newBytes), copyLen); + cDigitCopyFromtolen(interpreterProxy->firstIndexableField(aBytesObject), interpreterProxy->firstIndexableField(newBytes), copyLen); return newBytes; } @@ -306,186 +226,82 @@ return newBytes; } +static sqInt cCopyIntValtoBytes(sqInt val, sqInt bytes) { + unsigned char * pByte; + sqInt ix; + sqInt ixLimiT; -/* pByteRes len = longLen. */ - -static sqInt cByteOpshortlenlongleninto(sqInt opIndex, unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes) { - sqInt i; - sqInt limit; - - limit = shortLen - 1; - if (opIndex == andOpIndex) { - for (i = 0; i <= limit; i += 1) { - pByteRes[i] = ((pByteShort[i]) & (pByteLong[i])); - } - limit = longLen - 1; - for (i = shortLen; i <= limit; i += 1) { - pByteRes[i] = 0; - } - return 0; + pByte = interpreterProxy->firstIndexableField(bytes); + for (ix = 1, ixLimiT = (cDigitLengthOfCSI(val)); ix <= ixLimiT; ix += 1) { + pByte[ix - 1] = (cDigitOfCSIat(val, ix)); } - if (opIndex == orOpIndex) { - for (i = 0; i <= limit; i += 1) { - pByteRes[i] = ((pByteShort[i]) | (pByteLong[i])); - } - limit = longLen - 1; - for (i = shortLen; i <= limit; i += 1) { - pByteRes[i] = (pByteLong[i]); - } - return 0; - } - if (opIndex == xorOpIndex) { - for (i = 0; i <= limit; i += 1) { - pByteRes[i] = ((pByteShort[i]) ^ (pByteLong[i])); - } - limit = longLen - 1; - for (i = shortLen; i <= limit; i += 1) { - pByteRes[i] = (pByteLong[i]); - } - return 0; - } - return interpreterProxy->primitiveFail(); } -static int cBytesCopyFromtolen(unsigned char * pFrom, unsigned char * pTo, sqInt len) { - sqInt limit; - sqInt i; - ; - limit = len - 1; - for (i = 0; i <= limit; i += 1) { - pTo[i] = (pFrom[i]); - } - return 0; -} +/* pByteRes len = longLen; returns over.. */ - -/* Answer the index (in bits) of the high order bit of the receiver, or zero if the - receiver is zero. This method is allowed (and needed) for - LargeNegativeIntegers as well, since Squeak's LargeIntegers are - sign/magnitude. */ - -static sqInt cBytesHighBitlen(unsigned char * pByte, sqInt len) { - sqInt lastDigit; - sqInt realLength; - - realLength = len; - while (((lastDigit = pByte[realLength - 1])) == 0) { - if (((realLength -= 1)) == 0) { - return 0; - } - } - return (cHighBit(lastDigit)) + (8 * (realLength - 1)); -} - - -/* C indexed! */ - -static int cBytesLshiftfromlentolen(sqInt shiftCount, unsigned char * pFrom, sqInt lenFrom, unsigned char * pTo, sqInt lenTo) { - sqInt carry; - sqInt digit; - sqInt lastIx; +static unsigned char cDigitAddlenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes) { sqInt i; - sqInt bitShift; sqInt limit; - sqInt byteShift; + unsigned int accum; - byteShift = ((sqInt) shiftCount >> 3); - bitShift = shiftCount % 8; - if (bitShift == 0) { - - /* Fast version for byte-aligned shifts */ - /* C indexed! */ - - return cBytesReplacefromtowithstartingAt(pTo, byteShift, lenTo - 1, pFrom, 0); - } - carry = 0; - limit = byteShift - 1; + accum = 0; + limit = shortLen - 1; for (i = 0; i <= limit; i += 1) { - pTo[i] = 0; + accum = ((((usqInt) accum) >> 8) + (pByteShort[i])) + (pByteLong[i]); + pByteRes[i] = (accum & 255); } - limit = (lenTo - byteShift) - 2; - /* begin sqAssert: */ - /* missing DebugCode */; -l1: /* end sqAssert: */; - for (i = 0; i <= limit; i += 1) { - digit = pFrom[i]; - carry = (((usqInt) carry) >> 8) | (digit << bitShift); - pTo[i + byteShift] = (carry & 255); + limit = longLen - 1; + for (i = shortLen; i <= limit; i += 1) { + accum = (((usqInt) accum) >> 8) + (pByteLong[i]); + pByteRes[i] = (accum & 255); } - lastIx = limit + 1; - if (lastIx > (lenFrom - 1)) { - digit = 0; - } else { - digit = pFrom[lastIx]; - } - carry = (((usqInt) carry) >> 8) | (digit << bitShift); - pTo[lastIx + byteShift] = carry; - carry = ((usqInt) carry) >> 8; - /* begin sqAssert: */ - /* missing DebugCode */; -l2: /* end sqAssert: */; + return ((usqInt) accum) >> 8; } -/* C indexed! */ +/* Precondition: pFirst len = pSecond len. */ -static int cBytesReplacefromtowithstartingAt(unsigned char * pTo, sqInt start, sqInt stop, unsigned char * pFrom, sqInt repStart) { - return cBytesCopyFromtolen(pFrom + repStart, pTo + start, (stop - start) + 1); -} - -static sqInt cCopyIntValtoBytes(sqInt val, sqInt bytes) { - unsigned char * pByte; +static sqInt cDigitComparewithlen(unsigned char * pFirst, unsigned char * pSecond, sqInt len) { + unsigned int firstDigit; + unsigned int secondDigit; sqInt ix; - sqInt ixLimiT; - pByte = interpreterProxy->firstIndexableField(bytes); - for (ix = 1, ixLimiT = (cDigitLengthOfCSI(val)); ix <= ixLimiT; ix += 1) { - pByte[ix - 1] = (cDigitOfCSIat(val, ix)); + ix = len - 1; + while (ix >= 0) { + if (((secondDigit = pSecond[ix])) != ((firstDigit = pFirst[ix]))) { + if (secondDigit < firstDigit) { + return 1; + } else { + return -1; + } + } + ix -= 1; } + return 0; } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-dtl.349.mcz
by commits＠source.squeak.org 23 Jul '14

23 Jul '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.349.mcz ==================== Summary ==================== Name: VMMaker-dtl.349 Author: dtl Time: 20 July 2014, 8:03:11.294 pm UUID: b3a12120-fb0b-443c-acc5-3f027c879f1a Ancestors: VMMaker-dtl.348 VMMaker 4.13.7 Add the improved LargeIntegersPlugin implementation by Nicolas Cellier =============== Diff against VMMaker-dtl.348 =============== Item was removed: - ----- Method: LargeIntegersPlugin>>bytes:Lshift: (in category 'oop functions') ----- - bytes: aBytesOop Lshift: shiftCount - "Attention: this method invalidates all oop's!! Only newBytes is valid at return." - "Does not normalize." - | newBytes highBit newLen oldLen | - oldLen := self byteSizeOfBytes: aBytesOop. - (highBit := self cBytesHighBit: (interpreterProxy firstIndexableField: aBytesOop) - len: oldLen) = 0 ifTrue: [^ 0 asOop: SmallInteger]. - newLen := highBit + shiftCount + 7 // 8. - self remapOop: aBytesOop in: [newBytes := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesOop) - indexableSize: newLen]. - self - cBytesLshift: shiftCount - from: (interpreterProxy firstIndexableField: aBytesOop) - len: oldLen - to: (interpreterProxy firstIndexableField: newBytes) - len: newLen. - ^ newBytes! Item was removed: - ----- Method: LargeIntegersPlugin>>bytes:Rshift:bytes:lookfirst: (in category 'oop functions') ----- - bytes: aBytesOop Rshift: anInteger bytes: b lookfirst: a - "Attention: this method invalidates all oop's!! Only newBytes is valid at return." - "Shift right 8*b+anInteger bits, 0<=n<8. - Discard all digits beyond a, and all zeroes at or below a." - "Does not normalize." - | x f digit i oldLen newLen newBytes | - x := 0. - f := 8 - anInteger. - i := a. - digit := self digitOfBytes: aBytesOop at: i. - [((digit >> anInteger) - bitOr: x) - = 0 and: [i ~= 1]] - whileTrue: - [x := digit << f. - "Can't exceed 8 bits" - i := i - 1. - digit := self digitOfBytes: aBytesOop at: i]. - i <= b ifTrue: [^ interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesOop) - indexableSize: 0"Integer new: 0 neg: self negative"]. - "All bits lost" - oldLen := self byteSizeOfBytes: aBytesOop. - newLen := i - b. - self remapOop: aBytesOop in: [newBytes := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesOop) - indexableSize: newLen]. - "r := Integer new: i - b neg: self negative." - " count := i. - " - self - cCoreBytesRshiftCount: i - n: anInteger - f: f - bytes: b - from: (interpreterProxy firstIndexableField: aBytesOop) - len: oldLen - to: (interpreterProxy firstIndexableField: newBytes) - len: newLen. - ^ newBytes! Item was changed: ----- Method: LargeIntegersPlugin>>bytes:growTo: (in category 'oop util') ----- bytes: aBytesObject growTo: newLen "Attention: this method invalidates all oop's!! Only newBytes is valid at return." "Does not normalize." | newBytes oldLen copyLen | self remapOop: aBytesObject in: [newBytes := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesObject) indexableSize: newLen]. oldLen := self byteSizeOfBytes: aBytesObject. oldLen < newLen ifTrue: [copyLen := oldLen] ifFalse: [copyLen := newLen]. self + cDigitCopyFrom: (interpreterProxy firstIndexableField: aBytesObject) - cBytesCopyFrom: (interpreterProxy firstIndexableField: aBytesObject) to: (interpreterProxy firstIndexableField: newBytes) len: copyLen. ^ newBytes! Item was removed: - ----- Method: LargeIntegersPlugin>>cByteOp:short:len:long:len:into: (in category 'C core') ----- - cByteOp: opIndex short: pByteShort len: shortLen long: pByteLong len: longLen into: pByteRes - "pByteRes len = longLen." - | limit | - <var: #pByteShort type: 'unsigned char * '> - <var: #pByteLong type: 'unsigned char * '> - <var: #pByteRes type: 'unsigned char * '> - limit := shortLen - 1. - opIndex = andOpIndex - ifTrue: - [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) - bitAnd: (pByteLong at: i))]. - limit := longLen - 1. - shortLen to: limit do: [:i | pByteRes at: i put: 0]. - ^ 0]. - opIndex = orOpIndex - ifTrue: - [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) - bitOr: (pByteLong at: i))]. - limit := longLen - 1. - shortLen to: limit do: [:i | pByteRes at: i put: (pByteLong at: i)]. - ^ 0]. - opIndex = xorOpIndex - ifTrue: - [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) - bitXor: (pByteLong at: i))]. - limit := longLen - 1. - shortLen to: limit do: [:i | pByteRes at: i put: (pByteLong at: i)]. - ^ 0]. - ^ interpreterProxy primitiveFail! Item was removed: - ----- Method: LargeIntegersPlugin>>cBytesCopyFrom:to:len: (in category 'C core util') ----- - cBytesCopyFrom: pFrom to: pTo len: len - | limit | - <returnTypeC: 'int'> - <var: #pFrom type: 'unsigned char * '> - <var: #pTo type: 'unsigned char * '> - - self cCode: '' inSmalltalk: [ - (interpreterProxy isKindOf: InterpreterSimulator) ifTrue: [ - "called from InterpreterSimulator" - limit := len - 1. - 0 to: limit do: [:i | - interpreterProxy byteAt: pTo + i - put: (interpreterProxy byteAt: pFrom + i) - ]. - ^ 0 - ]. - ]. - limit := len - 1. - 0 to: limit do: [:i | pTo at: i put: (pFrom at: i)]. - ^ 0! Item was removed: - ----- Method: LargeIntegersPlugin>>cBytesHighBit:len: (in category 'C core util') ----- - cBytesHighBit: pByte len: len - "Answer the index (in bits) of the high order bit of the receiver, or zero if the - receiver is zero. This method is allowed (and needed) for - LargeNegativeIntegers as well, since Squeak's LargeIntegers are - sign/magnitude." - | realLength lastDigit | - <var: #pByte type: 'unsigned char * '> - realLength := len. - [(lastDigit := pByte at: realLength - 1) = 0] - whileTrue: [(realLength := realLength - 1) = 0 ifTrue: [^ 0]]. - ^ (self cHighBit: lastDigit) + (8 * (realLength - 1))! Item was removed: - ----- Method: LargeIntegersPlugin>>cBytesLshift:from:len:to:len: (in category 'C core') ----- - cBytesLshift: shiftCount from: pFrom len: lenFrom to: pTo len: lenTo - "C indexed!!" - | byteShift bitShift carry limit digit lastIx | - <returnTypeC: 'int'> - <var: #pTo type: 'unsigned char * '> - <var: #pFrom type: 'unsigned char * '> - byteShift := shiftCount // 8. - bitShift := shiftCount \\ 8. - bitShift = 0 ifTrue: ["Fast version for byte-aligned shifts" - "C indexed!!" - ^ self - cBytesReplace: pTo - from: byteShift - to: lenTo - 1 - with: pFrom - startingAt: 0]. - - "This implementation use at most 15 bits of carry. - bitAnd: 255 is only for simulator, useless in C" - carry := 0. - limit := byteShift - 1. - 0 to: limit do: [:i | pTo at: i put: 0]. - limit := lenTo - byteShift - 2. - self sqAssert: limit < lenFrom. - 0 to: limit do: - [:i | - digit := pFrom at: i. - carry := (carry >> 8) bitOr: (digit << bitShift). - pTo at: i + byteShift put: (carry bitAnd: 255)]. - lastIx := limit + 1. - lastIx > (lenFrom - 1) - ifTrue: [digit := 0] - ifFalse: [digit := pFrom at: lastIx]. - carry := (carry >> 8) bitOr: (digit << bitShift). - pTo at: lastIx + byteShift put: (carry "bitAnd: 255"). - carry := carry >> 8. - self sqAssert: carry = 0! Item was removed: - ----- Method: LargeIntegersPlugin>>cBytesReplace:from:to:with:startingAt: (in category 'C core util') ----- - cBytesReplace: pTo from: start to: stop with: pFrom startingAt: repStart - "C indexed!!" - <returnTypeC: 'int'> - <var: #pTo type: 'unsigned char * '> - <var: #pFrom type: 'unsigned char * '> - ^ self - cBytesCopyFrom: pFrom + repStart - to: pTo + start - len: stop - start + 1! Item was removed: - ----- Method: LargeIntegersPlugin>>cCoreBytesRshiftCount:n:f:bytes:from:len:to:len: (in category 'C core') ----- - cCoreBytesRshiftCount: count n: n f: f bytes: b from: pFrom len: fromLen to: pTo len: toLen - | x digit | - <var: #pTo type: 'unsigned char * '> - <var: #pFrom type: 'unsigned char * '> - self sqAssert: b < fromLen. - n = 0 ifTrue: ["Fast version for byte-aligned shifts" - "C indexed!!" - ^self - cBytesReplace: pTo - from: 0 - to: toLen - 1 - with: pFrom - startingAt: b]. - - "This implementation use at most 16 bits of x" - x := (pFrom at: b) << f. - self sqAssert: count - 1 < fromLen. - b + 1 to: count - 1 do: - [:j | - digit := pFrom at: j. - x := (x >> 8) bitOr: (digit << f). - pTo at: j - b - 1 put: (x bitAnd: 255)]. - count = fromLen - ifTrue: [digit := 0] - ifFalse: [digit := pFrom at: count]. - x := (x >> 8) bitOr: (digit << f). - pTo at: count - b - 1 put: (x "bitAnd: 255")! Item was removed: - ----- Method: LargeIntegersPlugin>>cCoreDigitDivDiv:len:rem:len:quo:len: (in category 'C core') ----- - cCoreDigitDivDiv: pDiv len: divLen rem: pRem len: remLen quo: pQuo len: quoLen - | dl ql dh dnh j t hi lo r3 l a cond q r1r2 mul | - <var: #pDiv type: 'unsigned char * '> - <var: #pRem type: 'unsigned char * '> - <var: #pQuo type: 'unsigned char * '> - dl := divLen - 1. - "Last actual byte of data (ST ix)" - ql := quoLen. - dh := pDiv at: dl - 1. - dl = 1 - ifTrue: [dnh := 0] - ifFalse: [dnh := pDiv at: dl - 2]. - 1 to: ql do: - [:k | - "maintain quo*arg+rem=self" - "Estimate rem/div by dividing the leading two bytes of rem by dh." - "The estimate is q = qhi*16+qlo, where qhi and qlo are nibbles." - "Nibbles are kicked off!! We use full 16 bits now, because we are in - the year 2000 ;-) [sr]" - j := remLen + 1 - k. - "r1 := rem digitAt: j." - (pRem at: j - 1) - = dh - ifTrue: [q := 255] - ifFalse: - ["Compute q = (r1,r2)//dh, t = (r1,r2)\\dh. - Note that r1,r2 are bytes, not nibbles. - Be careful not to generate intermediate results exceeding 13 - bits." - "r2 := (rem digitAt: j - 2)." - r1r2 := ((pRem at: j - 1) - bitShift: 8) - + (pRem at: j - 2). - t := r1r2 \\ dh. - q := r1r2 // dh. - "Next compute (hi,lo) := q*dnh" - mul := q * dnh. - hi := mul bitShift: -8. - lo := mul bitAnd: 255. - "Correct overestimate of q. - Max of 2 iterations through loop -- see Knuth vol. 2" - j < 3 - ifTrue: [r3 := 0] - ifFalse: [r3 := pRem at: j - 3]. - - [(t < hi - or: [t = hi and: [r3 < lo]]) - ifTrue: - ["i.e. (t,r3) < (hi,lo)" - q := q - 1. - lo := lo - dnh. - lo < 0 - ifTrue: - [hi := hi - 1. - lo := lo + 256]. - cond := hi >= dh] - ifFalse: [cond := false]. - cond] - whileTrue: [hi := hi - dh]]. - "Subtract q*div from rem" - l := j - dl. - a := 0. - 1 to: divLen do: - [:i | - hi := (pDiv at: i - 1) - * (q bitShift: -8). - lo := a + (pRem at: l - 1) - ((pDiv at: i - 1) - * (q bitAnd: 255)). - "pRem at: l - 1 put: lo - (lo // 256 * 256)." - "sign-tolerant form of (lo bitAnd: 255) -> obsolete..." - pRem at: l - 1 put: (lo bitAnd: 255). - "... is sign-tolerant!! [sr]" - a := lo // 256 - hi. - l := l + 1]. - a < 0 - ifTrue: - ["Add div back into rem, decrease q by 1" - q := q - 1. - l := j - dl. - a := 0. - 1 to: divLen do: - [:i | - a := (a bitShift: -8) - + (pRem at: l - 1) + (pDiv at: i - 1). - pRem at: l - 1 put: (a bitAnd: 255). - l := l + 1]]. - pQuo at: quoLen - k put: q]! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitAdd:len:with:len:into: (in category 'C core') ----- cDigitAdd: pByteShort len: shortLen with: pByteLong len: longLen into: pByteRes "pByteRes len = longLen; returns over.." | accum limit | <returnTypeC: 'unsigned char'> <var: #pByteShort type: 'unsigned char * '> <var: #pByteLong type: 'unsigned char * '> <var: #pByteRes type: 'unsigned char * '> + <var: #accum type: 'unsigned int'> accum := 0. limit := shortLen - 1. 0 to: limit do: [:i | + accum := (accum >> 8) - accum := (accum bitShift: -8) + (pByteShort at: i) + (pByteLong at: i). pByteRes at: i put: (accum bitAnd: 255)]. limit := longLen - 1. shortLen to: limit do: [:i | + accum := (accum >> 8) - accum := (accum bitShift: -8) + (pByteLong at: i). pByteRes at: i put: (accum bitAnd: 255)]. + ^ accum >> 8! - ^ accum bitShift: -8! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitCompare:with:len: (in category 'C core') ----- cDigitCompare: pFirst with: pSecond len: len "Precondition: pFirst len = pSecond len." | secondDigit ix firstDigit | <var: #pFirst type: 'unsigned char * '> <var: #pSecond type: 'unsigned char * '> + <var: #firstDigit type: 'unsigned int'> + <var: #secondDigit type: 'unsigned int'> ix := len - 1. [ix >= 0] whileTrue: [(secondDigit := pSecond at: ix) ~= (firstDigit := pFirst at: ix) ifTrue: [secondDigit < firstDigit ifTrue: [^ 1] ifFalse: [^ -1]]. ix := ix - 1]. ^ 0! Item was added: + ----- Method: LargeIntegersPlugin>>cDigitCopyFrom:to:len: (in category 'C core util') ----- + cDigitCopyFrom: pFrom to: pTo len: len + | limit | + <returnTypeC: 'int'> + <var: #pFrom type: 'unsigned char * '> + <var: #pTo type: 'unsigned char * '> + + self cCode: '' inSmalltalk: [ + (interpreterProxy isKindOf: InterpreterSimulator) ifTrue: [ + "called from InterpreterSimulator" + limit := len - 1. + 0 to: limit do: [:i | + interpreterProxy byteAt: pTo + i + put: (interpreterProxy byteAt: pFrom + i) + ]. + ^ 0 + ]. + ]. + limit := len - 1. + 0 to: limit do: [:i | pTo at: i put: (pFrom at: i)]. + ^ 0 + ! Item was added: + ----- Method: LargeIntegersPlugin>>cDigitDiv:len:rem:len:quo:len: (in category 'C core') ----- + cDigitDiv: pDiv len: divLen rem: pRem len: remLen quo: pQuo len: quoLen + | dl ql dh dnh j t hi lo r3 l a cond q r1r2 mul b | + <var: #pDiv type: 'unsigned char * '> + <var: #pRem type: 'unsigned char * '> + <var: #pQuo type: 'unsigned char * '> + <var: #dh type: 'unsigned int'> + <var: #dnh type: 'unsigned int'> + <var: #r3 type: 'unsigned int'> + <var: #q type: 'unsigned int'> + <var: #a type: 'unsigned int'> + <var: #b type: 'unsigned int'> + <var: #t type: 'unsigned int'> + <var: #mul type: 'unsigned int'> + <var: #hi type: 'unsigned int'> + <var: #lo type: 'unsigned int'> + <var: #r1r2 type: 'unsigned int'> + dl := divLen - 1. + "Last actual byte of data (ST ix)" + ql := quoLen. + dh := pDiv at: dl - 1. + dl = 1 + ifTrue: [dnh := 0] + ifFalse: [dnh := pDiv at: dl - 2]. + 1 to: ql do: + [:k | + "maintain quo*arg+rem=self" + "Estimate rem/div by dividing the leading two digits of rem by dh." + "The estimate is q = qhi*16r100+qlo, where qhi and qlo are unsigned char." + j := remLen + 1 - k. + "r1 := rem digitAt: j." + (pRem at: j - 1) + = dh + ifTrue: [q := 16rFF] + ifFalse: + ["Compute q = (r1,r2)//dh, t = (r1,r2)\\dh." + "r2 := (rem digitAt: j - 2)." + r1r2 := pRem at: j - 1. + r1r2 := (r1r2 << 8) + (pRem at: j - 2). + t := r1r2 \\ dh. + q := r1r2 // dh. + "Next compute (hi,lo) := q*dnh" + mul := q * dnh. + hi := mul >> 8. + lo := mul bitAnd: 16rFF. + "Correct overestimate of q. + Max of 2 iterations through loop -- see Knuth vol. 2" + j < 3 + ifTrue: [r3 := 0] + ifFalse: [r3 := pRem at: j - 3]. + + [(t < hi + or: [t = hi and: [r3 < lo]]) + ifTrue: + ["i.e. (t,r3) < (hi,lo)" + q := q - 1. + lo < dnh + ifTrue: + [hi := hi - 1. + lo := lo + 16r100 - dnh] + ifFalse: + [lo := lo - dnh]. + cond := hi >= dh] + ifFalse: [cond := false]. + cond] + whileTrue: [hi := hi - dh]]. + "Subtract q*div from rem" + l := j - dl. + a := 0. + 1 to: divLen do: + [:i | + hi := (pDiv at: i - 1) * (q >> 8). + lo := (pDiv at: i - 1) * (q bitAnd: 16rFF). + b := (pRem at: l - 1) - a - (lo bitAnd: 16rFF). + pRem at: l - 1 put: (b bitAnd: 16rFF). + "BEWARE: signed shift is implementation defined in C..." + b := b signedBitShift: -8. + "This is a possible replacement to simulate arithmetic shift (preserving sign of b)" + "b := b >> 8 bitOr: (0 - (b >> ((interpreterProxy sizeof: b)*8""CHAR_BIT""-1)) << 8)." + a := hi + (lo >> 8) - b. + l := l + 1]. + a > 0 + ifTrue: + ["Add div back into rem, decrease q by 1" + q := q - 1. + l := j - dl. + a := 0. + 1 to: divLen do: + [:i | + a := (a >> 8) + + (pRem at: l - 1) + (pDiv at: i - 1). + pRem at: l - 1 put: (a bitAnd: 16rFF). + l := l + 1]]. + pQuo at: quoLen - k put: q]. + ^0! Item was added: + ----- Method: LargeIntegersPlugin>>cDigitHighBit:len: (in category 'C core util') ----- + cDigitHighBit: pByte len: len + "Answer the index (in bits) of the high order bit of the receiver, or zero if the + receiver is zero. This method is allowed (and needed) for + LargeNegativeIntegers as well, since Squeak's LargeIntegers are + sign/magnitude." + | realLength lastDigit | + <var: #pByte type: 'unsigned char * '> + <var: #lastDigit type: 'unsigned int'> + realLength := len. + [(lastDigit := pByte at: realLength - 1) = 0] + whileTrue: [(realLength := realLength - 1) = 0 ifTrue: [^ 0]]. + ^ (self cHighBit: lastDigit) + (8 * (realLength - 1))! Item was added: + ----- Method: LargeIntegersPlugin>>cDigitLshift:from:len:to:len: (in category 'C core') ----- + cDigitLshift: shiftCount from: pFrom len: lenFrom to: pTo len: lenTo + "C indexed!!" + | digitShift bitShift carry limit digit rshift | + <var: #pTo type: 'unsigned char * '> + <var: #pFrom type: 'unsigned char * '> + <var: #carry type: 'unsigned int'> + <var: #digit type: 'unsigned int'> + digitShift := shiftCount // 8. + bitShift := shiftCount \\ 8. + + limit := digitShift - 1. + 0 to: limit do: [:i | pTo at: i put: 0]. + + bitShift = 0 ifTrue: ["Fast version for digit-aligned shifts" + "C indexed!!" + ^ self + cDigitReplace: pTo + from: digitShift + to: lenTo - 1 + with: pFrom + startingAt: 0]. + + "This implementation use at most 15 bits of carry. + bitAnd: 16rFF is only for simulator, useless in C" + rshift := 8 - bitShift. + carry := 0. + limit := lenFrom - 1. + 0 to: limit do: + [:i | + digit := pFrom at: i. + pTo at: i + digitShift put: ((carry bitOr: digit << bitShift) bitAnd: 16rFF). + carry := digit >> rshift]. + carry = 0 ifFalse: [pTo at: lenTo - 1 put: carry]. + ^0 + ! Item was added: + ----- Method: LargeIntegersPlugin>>cDigitMontgomery:len:times:len:modulo:len:mInvModB:into: (in category 'C core') ----- + cDigitMontgomery: pBytesFirst + len: firstLen + times: pBytesSecond + len: secondLen + modulo: pBytesThird + len: thirdLen + mInvModB: mInv + into: pBytesRes + + | u limit1 limit2 limit3 accum lastByte | + <var: #pBytesFirst type: 'unsigned char * '> + <var: #pBytesSecond type: 'unsigned char * '> + <var: #pBytesThird type: 'unsigned char * '> + <var: #pBytesRes type: 'unsigned char * '> + <var: #accum type: 'usqInt '> + <var: #u type: 'unsigned char '> + <var: #lastByte type: 'unsigned char '> + limit1 := firstLen - 1. + limit2 := secondLen - 1. + limit3 := thirdLen - 1. + lastByte := 0. + 0 to: limit1 do: + [:i | + accum := (pBytesRes at: 0) + ((pBytesFirst at: i)*(pBytesSecond at: 0)). + u := accum * mInv bitAnd: 255. + accum := accum + (u * (pBytesThird at: 0)). + 1 to: limit2 do: [:k | + accum := (accum >> 8) + (pBytesRes at: k) + ((pBytesFirst at: i)*(pBytesSecond at: k)) + (u * (pBytesThird at: k)). + pBytesRes at: k-1 put: (accum bitAnd: 255)]. + secondLen to: limit3 do: [:k | + accum := (accum >> 8) + (pBytesRes at: k) + (u * (pBytesThird at: k)). + pBytesRes at: k-1 put: (accum bitAnd: 255)]. + accum := (accum >> 8) + lastByte. + pBytesRes at: limit3 put: (accum bitAnd: 255). + lastByte := accum >> 8]. + firstLen to: limit3 do: + [:i | + accum := (pBytesRes at: 0). + u := accum * mInv bitAnd: 255. + accum := accum + (u * (pBytesThird at: 0)). + 1 to: limit3 do: [:k | + accum := (accum >> 8) + (pBytesRes at: k) + (u * (pBytesThird at: k)). + pBytesRes at: k-1 put: (accum bitAnd: 255)]. + accum := (accum >> 8) + lastByte. + pBytesRes at: limit3 put: (accum bitAnd: 255). + lastByte := accum >> 8]. + (lastByte = 0 and: [(self cDigitCompare: pBytesThird with: pBytesRes len: thirdLen) = 1]) ifFalse: [ + "self cDigitSub: pBytesThird len: thirdLen with: pBytesRes len: thirdLen into: pBytesRes" + accum := 0. + 0 to: limit3 do: + [:i | + accum := accum + (pBytesRes at: i) - (pBytesThird at: i). + pBytesRes at: i put: (accum bitAnd: 255). + accum := accum signedBitShift: -8]].! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitMultiply:len:with:len:into: (in category 'C core') ----- cDigitMultiply: pByteShort len: shortLen with: pByteLong len: longLen into: pByteRes | limitLong digit k carry limitShort ab | <returnTypeC: 'unsigned char'> <var: #pByteShort type: 'unsigned char * '> <var: #pByteLong type: 'unsigned char * '> <var: #pByteRes type: 'unsigned char * '> + <var: #digit type: 'unsigned int'> + <var: #carry type: 'unsigned int'> + <var: #ab type: 'unsigned int'> (shortLen = 1 and: [(pByteShort at: 0) = 0]) ifTrue: [^ 0]. (longLen = 1 and: [(pByteLong at: 0) = 0]) ifTrue: [^ 0]. "prod starts out all zero" limitShort := shortLen - 1. + limitLong := longLen - 1. 0 to: limitShort do: [:i | (digit := pByteShort at: i) ~= 0 ifTrue: [k := i. carry := 0. "Loop invariant: 0<=carry<=0377, k=i+j-1 (ST)" "-> Loop invariant: 0<=carry<=0377, k=i+j (C) (?)" - limitLong := longLen - 1. 0 to: limitLong do: [:j | + ab := (pByteLong at: j). + ab := ab * digit + carry + (pByteRes at: k). + carry := ab >> 8. + pByteRes at: k put: (ab bitAnd: 16rFF). - ab := (pByteLong at: j) - * digit + carry + (pByteRes at: k). - carry := ab bitShift: -8. - pByteRes at: k put: (ab bitAnd: 255). k := k + 1]. pByteRes at: k put: carry]]. ^ 0! Item was added: + ----- Method: LargeIntegersPlugin>>cDigitOp:short:len:long:len:into: (in category 'C core') ----- + cDigitOp: opIndex short: pByteShort len: shortLen long: pByteLong len: longLen into: pByteRes + "pByteRes len = longLen." + | limit | + <var: #pByteShort type: 'unsigned char * '> + <var: #pByteLong type: 'unsigned char * '> + <var: #pByteRes type: 'unsigned char * '> + limit := shortLen - 1. + opIndex = andOpIndex + ifTrue: + [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) + bitAnd: (pByteLong at: i))]. + limit := longLen - 1. + shortLen to: limit do: [:i | pByteRes at: i put: 0]. + ^ 0]. + opIndex = orOpIndex + ifTrue: + [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) + bitOr: (pByteLong at: i))]. + limit := longLen - 1. + shortLen to: limit do: [:i | pByteRes at: i put: (pByteLong at: i)]. + ^ 0]. + opIndex = xorOpIndex + ifTrue: + [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) + bitXor: (pByteLong at: i))]. + limit := longLen - 1. + shortLen to: limit do: [:i | pByteRes at: i put: (pByteLong at: i)]. + ^ 0]. + ^ interpreterProxy primitiveFail! Item was added: + ----- Method: LargeIntegersPlugin>>cDigitReplace:from:to:with:startingAt: (in category 'C core util') ----- + cDigitReplace: pTo from: start to: stop with: pFrom startingAt: repStart + "C indexed!!" + <returnTypeC: 'int'> + <var: #pTo type: 'unsigned char * '> + <var: #pFrom type: 'unsigned char * '> + ^ self + cDigitCopyFrom: pFrom + repStart + to: pTo + start + len: stop - start + 1! Item was added: + ----- Method: LargeIntegersPlugin>>cDigitRshift:from:len:to:len: (in category 'C core') ----- + cDigitRshift: shiftCount from: pFrom len: fromLen to: pTo len: toLen + | digit bitShift carry digitShift leftShift limit start | + <var: #pTo type: 'unsigned char * '> + <var: #pFrom type: 'unsigned char * '> + <var: #carry type: 'unsigned int '> + <var: #digit type: 'unsigned int '> + digitShift := shiftCount // 8. + bitShift := shiftCount \\ 8. + bitShift = 0 ifTrue: ["Fast version for byte-aligned shifts" + "C indexed!!" + ^self + cDigitReplace: pTo + from: 0 + to: toLen - 1 + with: pFrom + startingAt: digitShift]. + + "This implementation use at most 16 bits of x" + leftShift := 8 - bitShift. + carry := (pFrom at: digitShift) >> bitShift. + start := digitShift + 1. + limit := fromLen - 1. + start to: limit do: + [:j | + digit := pFrom at: j. + pTo at: j - start put: ((carry bitOr: digit << leftShift) bitAnd: 16rFF). + carry := digit >> bitShift]. + carry = 0 ifFalse: [pTo at: toLen - 1 put: carry]. + ^0! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitSub:len:with:len:into: (in category 'C core') ----- + cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen into: pByteRes + | z | - cDigitSub: pByteSmall - len: smallLen - with: pByteLarge - len: largeLen - into: pByteRes - | z limit | <var: #pByteSmall type: 'unsigned char * '> <var: #pByteLarge type: 'unsigned char * '> <var: #pByteRes type: 'unsigned char * '> + <var: #z type: 'unsigned int'> + z := 0. "Loop invariant is -1<=z<=0" + 0 to: smallLen - 1 do: - z := 0. - "Loop invariant is -1<=z<=1" - limit := smallLen - 1. - 0 to: limit do: [:i | z := z + (pByteLarge at: i) - (pByteSmall at: i). + pByteRes at: i put: (z bitAnd: 16rFF). + z := z signedBitShift: -8]. + smallLen to: largeLen - 1 do: - pByteRes at: i put: z - (z // 256 * 256). - "sign-tolerant form of (z bitAnd: 255)" - z := z // 256]. - limit := largeLen - 1. - smallLen to: limit do: [:i | z := z + (pByteLarge at: i) . + pByteRes at: i put: (z bitAnd: 16rFF). + z := z signedBitShift: -8]. - pByteRes at: i put: z - (z // 256 * 256). - "sign-tolerant form of (z bitAnd: 255)" - z := z // 256]. ! Item was changed: ----- Method: LargeIntegersPlugin>>cHighBit: (in category 'C core util') ----- cHighBit: uint "Answer the index of the high order bit of the argument, or zero if the argument is zero." "For 64 bit uints there could be added a 32-shift." | shifted bitNo | + <var: #uint type: 'unsigned int'> - <var: #shifted type: 'unsigned int '> shifted := uint. bitNo := 0. shifted < (1 << 16) ifFalse: [shifted := shifted bitShift: -16. bitNo := bitNo + 16]. shifted < (1 << 8) ifFalse: [shifted := shifted bitShift: -8. bitNo := bitNo + 8]. shifted < (1 << 4) ifFalse: [shifted := shifted bitShift: -4. bitNo := bitNo + 4]. shifted < (1 << 2) ifFalse: [shifted := shifted bitShift: -2. bitNo := bitNo + 2]. shifted < (1 << 1) ifFalse: [shifted := shifted bitShift: -1. bitNo := bitNo + 1]. "shifted 0 or 1 now" ^ bitNo + shifted! Item was removed: - ----- Method: LargeIntegersPlugin>>cdigitMontgomery:len:times:len:modulo:len:mInvModB:into: (in category 'C core') ----- - cdigitMontgomery: pBytesFirst - len: firstLen - times: pBytesSecond - len: secondLen - modulo: pBytesThird - len: thirdLen - mInvModB: mInv - into: pBytesRes - - | u limit1 limit2 limit3 accum lastByte | - <var: #pBytesFirst type: 'unsigned char * '> - <var: #pBytesSecond type: 'unsigned char * '> - <var: #pBytesThird type: 'unsigned char * '> - <var: #pBytesRes type: 'unsigned char * '> - <var: #accum type: 'usqInt '> - <var: #u type: 'unsigned char '> - <var: #lastByte type: 'unsigned char '> - limit1 := firstLen - 1. - limit2 := secondLen - 1. - limit3 := thirdLen - 1. - lastByte := 0. - 0 to: limit1 do: - [:i | - accum := (pBytesRes at: 0) + ((pBytesFirst at: i)*(pBytesSecond at: 0)). - u := accum * mInv bitAnd: 255. - accum := accum + (u * (pBytesThird at: 0)). - 1 to: limit2 do: [:k | - accum := (accum >> 8) + (pBytesRes at: k) + ((pBytesFirst at: i)*(pBytesSecond at: k)) + (u * (pBytesThird at: k)). - pBytesRes at: k-1 put: (accum bitAnd: 255)]. - secondLen to: limit3 do: [:k | - accum := (accum >> 8) + (pBytesRes at: k) + (u * (pBytesThird at: k)). - pBytesRes at: k-1 put: (accum bitAnd: 255)]. - accum := (accum >> 8) + lastByte. - pBytesRes at: limit3 put: (accum bitAnd: 255). - lastByte := accum >> 8]. - firstLen to: limit3 do: - [:i | - accum := (pBytesRes at: 0). - u := accum * mInv bitAnd: 255. - accum := accum + (u * (pBytesThird at: 0)). - 1 to: limit3 do: [:k | - accum := (accum >> 8) + (pBytesRes at: k) + (u * (pBytesThird at: k)). - pBytesRes at: k-1 put: (accum bitAnd: 255)]. - accum := (accum >> 8) + lastByte. - pBytesRes at: limit3 put: (accum bitAnd: 255). - lastByte := accum >> 8]. - (lastByte = 0 and: [(self cDigitCompare: pBytesThird with: pBytesRes len: thirdLen) = 1]) ifFalse: [ - "self cDigitSub: pBytesThird len: thirdLen with: pBytesRes len: thirdLen into: pBytesRes" - accum := 0. - 0 to: limit3 do: - [:i | - accum := accum + (pBytesRes at: i) - (pBytesThird at: i). - pBytesRes at: i put: accum - (accum // 256 * 256). - "sign-tolerant form of (z bitAnd: 255)" - accum := accum // 256]].! Item was added: + ----- Method: LargeIntegersPlugin>>digit:Lshift: (in category 'oop functions') ----- + digit: aBytesOop Lshift: shiftCount + "Attention: this method invalidates all oop's!! Only newBytes is valid at return." + "Does not normalize." + | newBytes highBit newLen oldLen | + oldLen := self byteSizeOfBytes: aBytesOop. + (highBit := self cDigitHighBit: (interpreterProxy firstIndexableField: aBytesOop) + len: oldLen) = 0 ifTrue: [^ 0 asOop: SmallInteger]. + newLen := highBit + shiftCount + 7 // 8. + self remapOop: aBytesOop in: [newBytes := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesOop) + indexableSize: newLen]. + self + cDigitLshift: shiftCount + from: (interpreterProxy firstIndexableField: aBytesOop) + len: oldLen + to: (interpreterProxy firstIndexableField: newBytes) + len: newLen. + ^ newBytes! Item was added: + ----- Method: LargeIntegersPlugin>>digit:Rshift:lookfirst: (in category 'oop functions') ----- + digit: aBytesOop Rshift: shiftCount lookfirst: a + "Attention: this method invalidates all oop's!! Only newBytes is valid at return." + "Shift right shiftCount bits, 0<=shiftCount. + Discard all digits beyond a, and all zeroes at or below a." + "Does not normalize." + | newByteLen newOop oldBitLen newBitLen oldDigitLen | + oldBitLen := self cDigitHighBit: (interpreterProxy firstIndexableField: aBytesOop) len: a. + oldDigitLen := oldBitLen + 7 // 8. + newBitLen := oldBitLen - shiftCount. + newBitLen <= 0 ifTrue: ["All bits lost" + ^ interpreterProxy + instantiateClass: (interpreterProxy fetchClassOf: aBytesOop) + indexableSize: 0]. + newByteLen := newBitLen + 7 // 8. + self remapOop: aBytesOop in: [newOop := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesOop) + indexableSize: newByteLen]. + self + cDigitRshift: shiftCount + from: (interpreterProxy firstIndexableField: aBytesOop) + len: oldDigitLen + to: (interpreterProxy firstIndexableField: newOop) + len: newByteLen. + ^ newOop! Item was changed: ----- Method: LargeIntegersPlugin>>digitAddLarge:with: (in category 'oop functions') ----- digitAddLarge: firstInteger with: secondInteger "Does not need to normalize!!" | over firstLen secondLen shortInt shortLen longInt longLen sum newSum resClass | <var: #over type: 'unsigned char '> firstLen := self byteSizeOfBytes: firstInteger. secondLen := self byteSizeOfBytes: secondInteger. resClass := interpreterProxy fetchClassOf: firstInteger. firstLen <= secondLen ifTrue: [shortInt := firstInteger. shortLen := firstLen. longInt := secondInteger. longLen := secondLen] ifFalse: [shortInt := secondInteger. shortLen := secondLen. longInt := firstInteger. longLen := firstLen]. " sum := Integer new: len neg: firstInteger negative." self remapOop: #(shortInt longInt ) in: [sum := interpreterProxy instantiateClass: resClass indexableSize: longLen]. over := self cDigitAdd: (interpreterProxy firstIndexableField: shortInt) len: shortLen with: (interpreterProxy firstIndexableField: longInt) len: longLen into: (interpreterProxy firstIndexableField: sum). over > 0 ifTrue: ["sum := sum growby: 1." self remapOop: sum in: [newSum := interpreterProxy instantiateClass: resClass indexableSize: longLen + 1]. self + cDigitCopyFrom: (interpreterProxy firstIndexableField: sum) - cBytesCopyFrom: (interpreterProxy firstIndexableField: sum) to: (interpreterProxy firstIndexableField: newSum) len: longLen. sum := newSum. "C index!!" (self cCoerce: (interpreterProxy firstIndexableField: sum) to: 'unsigned char *') at: longLen put: over]. ^ sum! Item was changed: ----- Method: LargeIntegersPlugin>>digitBitLogic:with:opIndex: (in category 'oop functions') ----- digitBitLogic: firstInteger with: secondInteger opIndex: opIx "Bit logic here is only implemented for positive integers or Zero; if rec or arg is negative, it fails." | firstLarge secondLarge firstLen secondLen shortLen shortLarge longLen longLarge result | (interpreterProxy isIntegerObject: firstInteger) ifTrue: [(interpreterProxy integerValueOf: firstInteger) < 0 ifTrue: [^ interpreterProxy primitiveFail]. "convert it to a not normalized LargeInteger" self remapOop: secondInteger in: [firstLarge := self createLargeFromSmallInteger: firstInteger]] ifFalse: [(interpreterProxy fetchClassOf: firstInteger) = interpreterProxy classLargeNegativeInteger ifTrue: [^ interpreterProxy primitiveFail]. firstLarge := firstInteger]. (interpreterProxy isIntegerObject: secondInteger) ifTrue: [(interpreterProxy integerValueOf: secondInteger) < 0 ifTrue: [^ interpreterProxy primitiveFail]. "convert it to a not normalized LargeInteger" self remapOop: firstLarge in: [secondLarge := self createLargeFromSmallInteger: secondInteger]] ifFalse: [(interpreterProxy fetchClassOf: secondInteger) = interpreterProxy classLargeNegativeInteger ifTrue: [^ interpreterProxy primitiveFail]. secondLarge := secondInteger]. firstLen := self byteSizeOfBytes: firstLarge. secondLen := self byteSizeOfBytes: secondLarge. firstLen < secondLen ifTrue: [shortLen := firstLen. shortLarge := firstLarge. longLen := secondLen. longLarge := secondLarge] ifFalse: [shortLen := secondLen. shortLarge := secondLarge. longLen := firstLen. longLarge := firstLarge]. self remapOop: #(shortLarge longLarge ) in: [result := interpreterProxy instantiateClass: interpreterProxy classLargePositiveInteger indexableSize: longLen]. self + cDigitOp: opIx - cByteOp: opIx short: (interpreterProxy firstIndexableField: shortLarge) len: shortLen long: (interpreterProxy firstIndexableField: longLarge) len: longLen into: (interpreterProxy firstIndexableField: result). interpreterProxy failed ifTrue: [^ 0]. ^ self normalizePositive: result! Item was changed: ----- Method: LargeIntegersPlugin>>digitDivLarge:with:negative: (in category 'oop functions') ----- digitDivLarge: firstInteger with: secondInteger negative: neg "Does not normalize." "Division by zero has to be checked in caller." | firstLen secondLen resultClass l d div rem quo result | firstLen := self byteSizeOfBytes: firstInteger. secondLen := self byteSizeOfBytes: secondInteger. neg ifTrue: [resultClass := interpreterProxy classLargeNegativeInteger] ifFalse: [resultClass := interpreterProxy classLargePositiveInteger]. l := firstLen - secondLen + 1. l <= 0 ifTrue: [self remapOop: firstInteger in: [result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2]. result stAt: 1 put: (0 asOop: SmallInteger). result stAt: 2 put: firstInteger. ^ result]. "set rem and div to copies of firstInteger and secondInteger, respectively. However, to facilitate use of Knuth's algorithm, multiply rem and div by 2 (that is, shift) until the high byte of div is >=128" d := 8 - (self cHighBit: (self unsafeByteOf: secondInteger at: secondLen)). self remapOop: firstInteger in: + [div := self digit: secondInteger Lshift: d. - [div := self bytes: secondInteger Lshift: d. div := self bytesOrInt: div growTo: (self digitLength: div) + 1]. self remapOop: div in: + [rem := self digit: firstInteger Lshift: d. - [rem := self bytes: firstInteger Lshift: d. (self digitLength: rem) = firstLen ifTrue: [rem := self bytesOrInt: rem growTo: firstLen + 1]]. self remapOop: #(div rem ) in: [quo := interpreterProxy instantiateClass: resultClass indexableSize: l]. self + cDigitDiv: (interpreterProxy firstIndexableField: div) - cCoreDigitDivDiv: (interpreterProxy firstIndexableField: div) len: (self digitLength: div) rem: (interpreterProxy firstIndexableField: rem) len: (self digitLength: rem) quo: (interpreterProxy firstIndexableField: quo) len: (self digitLength: quo). self remapOop: #(quo ) in: [rem := self + digit: rem - bytes: rem Rshift: d - bytes: 0 lookfirst: (self digitLength: div) - 1]. "^ Array with: quo with: rem" self remapOop: #(quo rem ) in: [result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2]. result stAt: 1 put: quo. result stAt: 2 put: rem. ^ result! Item was changed: ----- Method: LargeIntegersPlugin>>digitMontgomery:times:modulo:mInvModB: (in category 'oop functions') ----- digitMontgomery: firstLarge times: secondLarge modulo: thirdLarge mInvModB: mInv | firstLen secondLen thirdLen prod | - <var: #over type: 'unsigned char '> firstLen := self byteSizeOfBytes: firstLarge. secondLen := self byteSizeOfBytes: secondLarge. thirdLen := self byteSizeOfBytes: thirdLarge. firstLen <= thirdLen ifFalse: [^interpreterProxy primitiveFail]. secondLen <= thirdLen ifFalse: [^interpreterProxy primitiveFail]. (mInv >= 0 and: [mInv <= 255]) ifFalse: [^interpreterProxy primitiveFail]. self remapOop: #(firstLarge secondLarge thirdLarge) in: [prod := interpreterProxy instantiateClass: interpreterProxy classLargePositiveInteger indexableSize: thirdLen]. self + cDigitMontgomery: (interpreterProxy firstIndexableField: firstLarge) - cdigitMontgomery: (interpreterProxy firstIndexableField: firstLarge) len: firstLen times: (interpreterProxy firstIndexableField: secondLarge) len: secondLen modulo: (interpreterProxy firstIndexableField: thirdLarge) len: thirdLen mInvModB: mInv into: (interpreterProxy firstIndexableField: prod). ^self normalizePositive: prod! Item was removed: - ----- Method: LargeIntegersPlugin>>digitOf:at: (in category 'util') ----- - digitOf: oop at: ix - (interpreterProxy isIntegerObject: oop) - ifTrue: [^ self cDigitOfCSI: (interpreterProxy integerValueOf: oop) - at: ix] - ifFalse: [^ self digitOfBytes: oop at: ix]! Item was changed: ----- Method: LargeIntegersPlugin>>highBitOfBytes: (in category 'util') ----- highBitOfBytes: aBytesOop + ^ self cDigitHighBit: (interpreterProxy firstIndexableField: aBytesOop) - ^ self cBytesHighBit: (interpreterProxy firstIndexableField: aBytesOop) len: (self byteSizeOfBytes: aBytesOop)! Item was removed: - ----- Method: LargeIntegersPlugin>>negative: (in category 'util') ----- - negative: aLarge - ^ (interpreterProxy fetchClassOf: aLarge) - = interpreterProxy classLargeNegativeInteger! Item was changed: ----- Method: LargeIntegersPlugin>>primDigit:bitShift: (in category 'development primitives') ----- primDigit: anInteger bitShift: shiftCount | rShift aLarge | self debugCode: [self msg: 'primDigit: anInteger bitShift: shiftCount']. self primitive: '_primDigitBitShift' parameters: #(Integer SmallInteger ) receiver: #Oop. (interpreterProxy isIntegerObject: anInteger) ifTrue: ["convert it to a not normalized LargeInteger" aLarge := self createLargeFromSmallInteger: anInteger] ifFalse: [aLarge := anInteger]. shiftCount >= 0 + ifTrue: [^ self digit: aLarge Lshift: shiftCount] - ifTrue: [^ self bytes: aLarge Lshift: shiftCount] ifFalse: [rShift := 0 - shiftCount. ^ self normalize: (self + digit: aLarge + Rshift: rShift - bytes: aLarge - Rshift: (rShift bitAnd: 7) - bytes: (rShift bitShift: -3) lookfirst: (self byteSizeOfBytes: aLarge))]! Item was changed: ----- Method: LargeIntegersPlugin>>primDigitBitShift: (in category 'obsolete') ----- primDigitBitShift: shiftCount | rShift aLarge anInteger | self debugCode: [self msg: 'primDigitBitShift: shiftCount']. anInteger := self primitive: 'primDigitBitShift' parameters: #(SmallInteger ) receiver: #Integer. (interpreterProxy isIntegerObject: anInteger) ifTrue: ["convert it to a not normalized LargeInteger" aLarge := self createLargeFromSmallInteger: anInteger] ifFalse: [aLarge := anInteger]. shiftCount >= 0 + ifTrue: [^ self digit: aLarge Lshift: shiftCount] - ifTrue: [^ self bytes: aLarge Lshift: shiftCount] ifFalse: [rShift := 0 - shiftCount. ^ self normalize: (self + digit: aLarge + Rshift: rShift - bytes: aLarge - Rshift: (rShift bitAnd: 7) - bytes: (rShift bitShift: -3) lookfirst: (self byteSizeOfBytes: aLarge))]! Item was changed: ----- Method: LargeIntegersPlugin>>primDigitBitShiftMagnitude: (in category 'Integer primitives') ----- primDigitBitShiftMagnitude: shiftCount | rShift aLarge anInteger | self debugCode: [self msg: 'primDigitBitShiftMagnitude: shiftCount']. anInteger := self primitive: 'primDigitBitShiftMagnitude' parameters: #(#SmallInteger ) receiver: #Integer. (interpreterProxy isIntegerObject: anInteger) ifTrue: ["convert it to a not normalized LargeInteger" aLarge := self createLargeFromSmallInteger: anInteger] ifFalse: [aLarge := anInteger]. shiftCount >= 0 + ifTrue: [^ self digit: aLarge Lshift: shiftCount] - ifTrue: [^ self bytes: aLarge Lshift: shiftCount] ifFalse: [rShift := 0 - shiftCount. ^ self normalize: (self + digit: aLarge + Rshift: rShift - bytes: aLarge - Rshift: (rShift bitAnd: 7) - bytes: (rShift bitShift: -3) lookfirst: (self byteSizeOfBytes: aLarge))]! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.13.7'! - ^'4.13.6'!

1 0

Re: [Vm-dev] Status of LargeIntegersPlugin
by David T. Lewis 23 Jul '14

23 Jul '14

Moving discussion back to vm-dev, as it may be of some general interest. On Tue, Jul 22, 2014 at 09:16:23AM -0700, Eliot Miranda wrote: > On Mon, Jul 21, 2014 at 5:35 PM, David T. Lewis <lewis(a)mail.msen.com> wrote: > > > Hi Eliot, > > > > I want to check before I copy this update to the VMMaker repository - are > > you in agreement with using Nicolas' LargeIntegerPlugin? It seems fine to > > me, so I'll move it to VMM trunk if you agree. > > > > Well, it is goodness. My concern is that it requires image changes to make > image code still function, but haven't had time to check it out. The issue > is that currently, large integers are in little endian order and code in > the image accesses bytes in large integers assuming that the bytes there-in > are in little endian order. For example see digitCompare: and digitAt:. > Now digitAt: is implemented as simply primitive 60, the standard at: > primitive. So on current VMs a big-endian large integer will /not/ be > correctly accessed via digitAt:. > > Am I right? I do not have a big endian machine to check this, but my assumption is that since Squeak began on big endian machines and moved to little endian later, and since the LargeIntegersPlugin has been around for a long time, and since images migrated across big and little endian platforms without any apparent problem, then we probably do not have any endianness problems with the existing plugin. I wrote a few tests (and added them to trunk) to validate the digit access methods. These tests pass on my little endian PC with a Cog VM using the old plugin, and they also pass with Nicolas' new LargeIntegersPlugin with both the 32-bit and 64-bit image formats. Nicolas' updated plugin seems to be fully compatible with the original LargeIntegersPlugin, and it produces the expected results for all of the image formats and VMs that I am able to test. I cannot confirm this for a big endian platform, but I think that any errors on big endian box would be exposed by the unit tests. It looks good to me. Nicolas, any concerns or comments? Thanks, Dave

3 5

[commit][3052] CogVM source as per VMMaker.oscog-eem.831
by commits＠squeakvm.org 22 Jul '14

22 Jul '14

Revision: 3052 Author: eliot Date: 2014-07-22 10:45:31 -0700 (Tue, 22 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.831 Spur: Fix bug with class table management and two-way become. Because two-way become may do an in-place swap obj1 & obj2 in SpurMemoryManager>>doBecome:and:copyHash: may not be forwarded after the inner become. Hence they should not be followed if not forwarded. The bug manifested as Object's identityHash changing: superclass is the first slot in a class. Following an unforwarded subclass of object yields Object. Setting the hash bits of the followed object smashes Object's identityHash. Thanks to Stephane Rollandin for finding the bug. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2311,7 +2311,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.830"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.831"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -42466,14 +42466,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent9 & 3) == 0) - && (((longAt(referent9)) & 0x3FFFFF) == 8)) { - referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent9 & 3) == 0) + && (((longAt(referent9)) & 0x3FFFFF) == 8)) { + referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent9; } - newObj2 = referent9; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -42484,14 +42489,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -64375,7 +64385,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -64621,7 +64631,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -64677,7 +64687,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2314,7 +2314,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.830"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.831"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -42475,14 +42475,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent9 & 3) == 0) - && (((longAt(referent9)) & 0x3FFFFF) == 8)) { - referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent9 & 3) == 0) + && (((longAt(referent9)) & 0x3FFFFF) == 8)) { + referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent9; } - newObj2 = referent9; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -42493,14 +42498,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -64384,7 +64394,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -64630,7 +64640,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -64686,7 +64696,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspursrc/vm/interp.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - StackInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + StackInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2062,7 +2062,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.830"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.831"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -30999,14 +30999,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent7 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent7 & 3) == 0) - && (((longAt(referent7)) & 0x3FFFFF) == 8)) { - referent7 = longAt((referent7 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent7 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent7 & 3) == 0) + && (((longAt(referent7)) & 0x3FFFFF) == 8)) { + referent7 = longAt((referent7 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent7; } - newObj2 = referent7; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -31017,14 +31022,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - StackInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + StackInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2059,7 +2059,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.830"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.831"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -30990,14 +30990,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent7 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent7 & 3) == 0) - && (((longAt(referent7)) & 0x3FFFFF) == 8)) { - referent7 = longAt((referent7 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent7 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent7 & 3) == 0) + && (((longAt(referent7)) & 0x3FFFFF) == 8)) { + referent7 = longAt((referent7 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent7; } - newObj2 = referent7; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -31008,14 +31013,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); Modified: branches/Cog/nsspurstacksrc/vm/interp.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jul 22 06:32:10 HST 2014 + Tue Jul 22 07:44:01 HST 2014 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1116,7 +1116,7 @@ sqInt removeGCRoot(sqInt *varLoc); static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2306,7 +2306,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.830]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.831]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5494,6 +5494,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l147; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5508,7 +5509,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l147: /* end baseFrameReturn */; goto l146; } @@ -37293,14 +37294,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent9 & 3) == 0) - && (((longAt(referent9)) & 0x3FFFFF) == 8)) { - referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent9 & 3) == 0) + && (((longAt(referent9)) & 0x3FFFFF) == 8)) { + referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent9; } - newObj2 = referent9; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -37311,14 +37317,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -46455,7 +46466,7 @@ zero if no change was possible. */ -static sqInt +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -58758,7 +58769,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -58975,7 +58986,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -59000,7 +59011,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1119,7 +1119,7 @@ sqInt removeGCRoot(sqInt *varLoc); static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2309,7 +2309,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.830]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.831]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5503,6 +5503,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l147; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5517,7 +5518,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l147: /* end baseFrameReturn */; goto l146; } @@ -37302,14 +37303,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent9 & 3) == 0) - && (((longAt(referent9)) & 0x3FFFFF) == 8)) { - referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent9 & 3) == 0) + && (((longAt(referent9)) & 0x3FFFFF) == 8)) { + referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent9; } - newObj2 = referent9; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -37320,14 +37326,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -46464,7 +46475,7 @@ zero if no change was possible. */ -static sqInt +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -58767,7 +58778,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -58984,7 +58995,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -59009,7 +59020,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursistasrc/vm/interp.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursrc/vm/cointerp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2301,7 +2301,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.830]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.831]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -37089,14 +37089,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent9 & 3) == 0) - && (((longAt(referent9)) & 0x3FFFFF) == 8)) { - referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent9 & 3) == 0) + && (((longAt(referent9)) & 0x3FFFFF) == 8)) { + referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent9; } - newObj2 = referent9; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -37107,14 +37112,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -58518,7 +58528,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -58735,7 +58745,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -58760,7 +58770,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -58823,7 +58833,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -59069,7 +59079,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -59125,7 +59135,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursrc/vm/cointerp.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2304,7 +2304,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.830]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.831]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -37098,14 +37098,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent9 & 3) == 0) - && (((longAt(referent9)) & 0x3FFFFF) == 8)) { - referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent9 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent9 & 3) == 0) + && (((longAt(referent9)) & 0x3FFFFF) == 8)) { + referent9 = longAt((referent9 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent9; } - newObj2 = referent9; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -37116,14 +37121,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -58527,7 +58537,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -58744,7 +58754,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -58769,7 +58779,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -58832,7 +58842,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -59078,7 +59088,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -59134,7 +59144,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursrc/vm/interp.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spursrc/vm/vmCallback.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - StackInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + StackInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2055,7 +2055,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.830]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.831]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -26473,14 +26473,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent7 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent7 & 3) == 0) - && (((longAt(referent7)) & 0x3FFFFF) == 8)) { - referent7 = longAt((referent7 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent7 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent7 & 3) == 0) + && (((longAt(referent7)) & 0x3FFFFF) == 8)) { + referent7 = longAt((referent7 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent7; } - newObj2 = referent7; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -26491,14 +26496,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 from - StackInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + StackInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2052,7 +2052,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.830]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.831]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -26464,14 +26464,19 @@ /* o2 wasn't in the table; put it there */ - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent7 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); - while (((referent7 & 3) == 0) - && (((longAt(referent7)) & 0x3FFFFF) == 8)) { - referent7 = longAt((referent7 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent7 = longAt((obj1 + (BaseHeaderSize)) + (0 << 2)); + while (((referent7 & 3) == 0) + && (((longAt(referent7)) & 0x3FFFFF) == 8)) { + referent7 = longAt((referent7 + (BaseHeaderSize)) + (0 << 2)); + } + newObj2 = referent7; } - newObj2 = referent7; + else { + newObj2 = obj1; + } assert((rawHashBitsOf(newObj2)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); @@ -26482,14 +26487,19 @@ } else { if (o2ClassIndex != 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); - while (((referent13 & 3) == 0) - && (((longAt(referent13)) & 0x3FFFFF) == 8)) { - referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent13 = longAt((obj2 + (BaseHeaderSize)) + (0 << 2)); + while (((referent13 & 3) == 0) + && (((longAt(referent13)) & 0x3FFFFF) == 8)) { + referent13 = longAt((referent13 + (BaseHeaderSize)) + (0 << 2)); + } + newObj1 = referent13; } - newObj1 = referent13; + else { + newObj1 = obj2; + } assert((rawHashBitsOf(newObj1)) == 0); /* begin setHashBitsOf:to: */ flag("endianness"); Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spurstacksrc/vm/interp.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-07-22 16:38:54 UTC (rev 3051) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-07-22 17:45:31 UTC (rev 3052) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.831 uuid: c231d214-1763-4c79-9b58-a5bf3385b0c9 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.831.mcz
by commits＠source.squeak.org 22 Jul '14

22 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.831.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.831 Author: eem Time: 22 July 2014, 7:40:53.16 am UUID: c231d214-1763-4c79-9b58-a5bf3385b0c9 Ancestors: VMMaker.oscog-eem.830 Spur: Fix bug with class table management and two-way become. Because two-way become may do an in-place become, obj1 & obj2 in SpurMemoryManager>>doBecome:and:copyHash: may not be forwarded after the inner become. Hence they should not be followed if not forwarded. The bug manifested as Object's identityHash changing: superclass is the first slot in a class. Following an unforwarded subclass of object yields Object. Setting the hash bits of the followed object smashes Object's identityHash. Thanks to Stéphane Rollandin for finding the bug. =============== Diff against VMMaker.oscog-eem.830 =============== Item was changed: ----- Method: SpurMemoryManager>>doBecome:and:copyHash: (in category 'become implementation') ----- doBecome: obj1 and: obj2 copyHash: copyHashFlag "Inner dispatch for two-way become" | o1ClassIndex o2ClassIndex | copyHashFlag ifFalse: ["in-lined classIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] for speed." o1ClassIndex := self rawHashBitsOf: obj1. (o1ClassIndex ~= 0 and: [(self classAtIndex: o1ClassIndex) ~= obj1]) ifTrue: [o1ClassIndex := 0]. o2ClassIndex := self rawHashBitsOf: obj2. (o2ClassIndex ~= 0 and: [(self classAtIndex: o2ClassIndex) ~= obj2]) ifTrue: [o2ClassIndex := 0]]. (self numSlotsOf: obj1) = (self numSlotsOf: obj2) ifTrue: [self inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag] ifFalse: [self outOfPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag]. "if copyHashFlag then nothing changes, since hashes were also swapped." copyHashFlag ifTrue: [^self]. "if copyHash is false then the classTable entries must be updated." o1ClassIndex ~= 0 ifTrue: [o2ClassIndex ~= 0 ifTrue: "both were in the table; just swap entries" [| tmp | tmp := self classAtIndex: o1ClassIndex. self classAtIndex: o1ClassIndex put: obj2. self classAtIndex: o2ClassIndex put: tmp] ifFalse: "o2 wasn't in the table; put it there" [| newObj2 | + (self isForwarded: obj1) + ifTrue: [newObj2 := self followForwarded: obj1] + ifFalse: [newObj2 := obj1]. - newObj2 := self followForwarded: obj1. self assert: (self rawHashBitsOf: newObj2) = 0. self setHashBitsOf: newObj2 to: o1ClassIndex. self classAtIndex: o1ClassIndex put: newObj2]] ifFalse: [o2ClassIndex ~= 0 ifTrue: [| newObj1 | + (self isForwarded: obj2) + ifTrue: [newObj1 := self followForwarded: obj2] + ifFalse: [newObj1 := obj2]. - newObj1 := self followForwarded: obj2. self assert: (self rawHashBitsOf: newObj1) = 0. self setHashBitsOf: newObj1 to: o2ClassIndex. self classAtIndex: o2ClassIndex put: newObj1]]!

1 0

Re: [squeak-dev] Re: [Vm-dev] Bug in writing compressed stream when saving an mcz (was: New Cog VMs available...)
by Eliot Miranda 22 Jul '14

22 Jul '14

On Fri, Jul 18, 2014 at 12:38 PM, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > Stupid me. It's got to be the DeflateStream, and its subclasses > ZipWriteStream, GZipWriteStream and ZLibWriteStream. So my change screws > all uses of these in plugins. So what to do about fixing this? I would > like to have a go at fixing the plugins. But cheaper might be to fix > WriteStream with some property hack, storing the initialPosition somewhere > else (a class side weak dictionary of stream -> initialPosition ?? (yuck)). > > > On Fri, Jul 18, 2014 at 12:31 PM, Eliot Miranda <eliot.miranda(a)gmail.com> > wrote: > >> >> >> >> On Thu, Jul 17, 2014 at 4:02 PM, David T. Lewis <lewis(a)mail.msen.com> >> wrote: >> >>> On Fri, Jul 18, 2014 at 12:24:29AM +0200, Nicolas Cellier wrote: >>> > 2014-07-13 16:22 GMT+02:00 David T. Lewis <lewis(a)mail.msen.com>: >>> > >>> > > On Sun, Jul 13, 2014 at 09:55:41AM -0400, David T. Lewis wrote: >>> > > > On Sun, Jul 06, 2014 at 12:47:25PM -0400, David T. Lewis wrote: >>> > > > > On Sun, Jul 06, 2014 at 12:23:11PM -0400, David T. Lewis wrote: >>> > > > > > On Sun, Jul 06, 2014 at 10:34:15AM +0200, Nicolas Cellier >>> wrote: >>> > > > > > > 2014-07-04 0:47 GMT+02:00 Nicolas Cellier < >>> > > > > > > nicolas.cellier.aka.nice(a)gmail.com>: >>> > > > > > > >>> > > > > > > > >>> > > > > > > > >>> > > > > > > > >>> > > > > > > > 2014-07-04 0:09 GMT+02:00 Eliot Miranda < >>> eliot.miranda(a)gmail.com >>> > > >: >>> > > > > > > > >>> > > > > > > > >>> > > > > > > >> >>> > > > > > > >> >>> > > > > > > >> On Thu, Jul 3, 2014 at 12:33 PM, Nicolas Cellier < >>> > > > > > > >> nicolas.cellier.aka.nice(a)gmail.com> wrote: >>> > > > > > > >> >>> > > > > > > >>> The bug is repeatable, i simply have to execute this >>> snippet >>> > > with my >>> > > > > > > >>> test file: >>> > > > > > > >>> >>> > > > > > > >>> (FileStream fileNamed: 'snapshot.bin') binary >>> > > contentsOfEntireFile >>> > > > > > > >>> asString zipped. >>> > > > > > > >>> >>> > > > > > > >>> The file is too big for an attachment here - 7.3 Mbytes >>> - or >>> > > 1.7 Mbytes >>> > > > > > > >>> gzipped by external tool. >>> > > > > > > >>> If someone can suggest an upload site, or want it by >>> mail, >>> > > just ask. >>> > > > > > > >>> >>> > > > > > > >> >>> > > > > > > >> You're welcome to put it on ftp.mirandanamda.org, >>> cogftpuser, >>> > > pw cogging >>> > > > > > > >> with 0's & 1's. >>> > > > > > > >> >>> > > > > > > >> >>> > > > > > > > done, pollution of your site engaged... >>> > > > > > > > Thanks Eliot! >>> > > > > > > > >>> > > > > > > > >>> > > > > > > >> >>> > > > > > > I inquired a bit more about this bug. >>> > > > > > > An important clue is that it does not happen in Pharo3.0! >>> > > > > > > >>> > > > > > > But Pharo3.0 did not fundamentally change compression >>> > > > > > > (except some FileSystem related changes, separation of CRC >>> stuff >>> > > in another >>> > > > > > > package, some other cosmetic changes like replacing some self >>> > > assert: ... >>> > > > > > > by [...] assert and a potential bug in >>> > > > > > > DeflateStream>>nextPutAll:startingAt: introduced by >>> CamilleTeruel). >>> > > > > > > Squeak behavior is presumably not due to a Compression >>> change. >>> > > > > > > >>> > > > > > > Neither is it a VM problem, the bugs still shows up when >>> running >>> > > the Squeak >>> > > > > > > image with Pharo VM. >>> > > > > > > >>> > > > > > >>> > > > > > Yes, it is definite a problem in the Squeak trunk image. >>> > > > > > >>> > > > > > >>> > > > > > > So the difference lies somewhere else: in our beloved Stream. >>> > > > > > > I remembered a recent change of Eliot related to handling of >>> > > Stream created >>> > > > > > > with on:from:to: (Collections-eem.567). >>> > > > > > > Reverting those changes just make the snippet pass! >>> > > > > > > >>> > > > > > > Ah ah! At the time, i found the change of Eliot quite >>> minimal and >>> > > nice. >>> > > > > > > But I wish I had time to analyze this small innocent change >>> deeper. >>> > > > > > > Indeed, I remembered I previously broke my teeth on this one >>> 2 >>> > > years or so >>> > > > > > > ago, and preferred to adopt another strategy: avoid using >>> > > on:from:to: and >>> > > > > > > ReadWriteStream as much as possible. >>> > > > > > > Why? because when analyzing the usage of inst.var. in Stream >>> > > hierarchy, it >>> > > > > > > gave me headaches, some subclass are just ignoring superclass >>> > > variables, or >>> > > > > > > worse are bending the semantics of superclass variables. >>> > > > > > > I came to the conclusion that I could not decently master a >>> change >>> > > of >>> > > > > > > on:from:to: >>> > > > > > >>> > > > > > I can not confirm this. I have an image in which I can reliably >>> > > reproduce the >>> > > > > > failure in writing the MCZ to a file. I tried reverting the >>> methods >>> > > that were >>> > > > > > introduced in Collections-eem.567 and I am still getting the >>> same >>> > > failure. >>> > > > > > >>> > > > > > Dave >>> > > > > >>> > > > > Oops, I spoke too soon. Indeed the problem appears as of >>> > > Collections-eem.567, >>> > > > > and does not appear in Collections-nice.566. >>> > > > > >>> > > > > So I am confirming Nicolas' observations ... now to find the bug >>> :) >>> > > > > >>> > > > > Dave >>> > > > > >>> > > > >>> > > > This seems to be a rather tricky bug, and I don't think any of us >>> knows >>> > > the >>> > > > cause right now. In case anyone else wants to have a look at it, >>> here is >>> > > a >>> > > > recipe for reproducing the bug in a clean 4.5 image: >>> > > > >>> > > > - Start with a clean Squeak 4.5 image in and empty working >>> directory. >>> > > > ftp://ftp.squeak.org/4.5/Squeak4.5-13680.zip >>> > > > >>> > > > - Open the image, do not update it. >>> > > > >>> > > > - Open an MC browser and add the http://source.squeak.org/trunk >>> > > repository for the Help-Squeak-Project package and Collections >>> package. >>> > > > >>> > > > - Load Help-Squeak-Project-kfr.18 from trunk. >>> > > > >>> > > > - Load Collections-eem.567 from trunk. >>> > > > >>> > > > - Open a browser on class SqueakToolsDebuggerHelp, and delete the >>> class >>> > > side method #showDebuggerMenuForm. >>> > > > >>> > > > - Remove the http://source.squeak.org/trunk repository form the >>> > > Help-Squeak-Project package in the MC browser. >>> > > > >>> > > > - Highlight your package-cache repository and try to save >>> > > Help-Squeak-project to the package-cache repository. >>> > > > >>> > > > - Enter author initials 'dtl'. >>> > > > >>> > > > - For the package comment, enter 'Remove unreferenced method'. >>> > > > >>> > > > - Package save will fail part way through saving the MCZ. >>> > > > >>> > > > - To reproduce the failure in this image, do the following in a >>> > > workspace: >>> > > > >>> > > > mcv := MCVersion allInstances detect: [:e | e name = 'a >>> > > MCVersion(Help-Squeak-Project-dtl.19)']. >>> > > > [f := FileStream fileNamed: 'junk.mcz'. >>> > > > mcv fileOutOn: f] >>> > > > ensure: [f close]. >>> > > > >>> > > >>> > > In addition to the above recipe, here are some other observations: >>> > > >>> > > - Reverting from Collections-eem.567 to Collections-nice.566 makes >>> the >>> > > problem go away, but ONLY if the DeflatePlugin is active. >>> > > >>> > > - The failure appears while executing the fallback code for >>> > > #primitiveDeflateBlock >>> > > in ZipWriteStream>>deflateBlock:chainLength:goodMatch: >>> > > >>> > > - If this primitive is deactivate by commenting out the >>> > > <primitive: 'primitiveDeflateBlock' module: 'ZipPlugin'> in >>> > > ZipWriteStream>>deflateBlock:chainLength:goodMatch: then the >>> problem will >>> > > occur regardless of which version of Collections is loaded. >>> > > >>> > > - When Collections-eem.567 is loaded, the primitive will fail on the >>> 22nd >>> > > call to #deflateBlock:chainLength:goodMatch: and a debugger appears >>> > > during >>> > > execution of the fallback code. >>> > > >>> > > - When Collections-nice.566 is loaded, the primitive does not fail >>> on the >>> > > 22nd >>> > > call to #deflateBlock:chainLength:goodMatch:, the fallback code is >>> never >>> > > run, >>> > > and no error appears. >>> > > >>> > > - When Collections-nice.566 is loaded and the primitive is disabled >>> to >>> > > force >>> > > use of the fallback code, the error appears on on the 22nd call to >>> > > #deflateBlock:chainLength:goodMatch: in exactlly the same place as >>> when >>> > > Collections-eem.567 is loaded. >>> > > >>> > > - If I inspect the ZipWriteStream at the failure point (when the >>> debugger >>> > > pops >>> > > up after the problem), I see no obvious difference in the state of >>> the >>> > > stream >>> > > between the Collections-eem.567 case versus the >>> Collections-nice.566 with >>> > > primitive disabled case. >>> > > >>> > > Dave >>> > > >>> > > >>> > Very good mining work! >>> > When I hear Stream, I think fluid... >>> > But these snags make it so viscous, it's like our Stream is going to >>> freeze >>> > soon. >>> > Or is it more than frozen? The vein you're after sounds as hard as >>> diamond, >>> > we gonna need a sharp peak pickaxe. >>> > >>> >>> I keep hoping that your stream fixes will somehow make this problem go >>> away, but >>> maybe we are not so lucky. >>> >>> Whenever I get more time to play with this, I think I will try to catch >>> it with >>> gdb in the primitive. There is something strange happening that seems to >>> first >>> be detectable in the primitive failure, but only if Eliot's image fix is >>> present. >>> >>> This kind of problem is a nice way to spend the morning with a good cup >>> of coffee, >>> as some people do with the NY Times crossword puzzle ;) >>> >>> http://en.wikipedia.org/wiki/The_New_York_Times_crossword_puzzle >>> >>> Another "morning coffee" project is to figure out which version of the >>> LargeIntegersPlugin >>> should be used, which of course was the original topic that started this >>> thread. >>> >> >> So given that the change adds an instance variable to WriteStream could >> that affect some plugin that somehow accesses a stream? What plugin could >> that be? I don't see any obvious inst vars in the DeflatePlugin or >> InflatePlugin. To remind ourselves, the three changes are >> >> add inst var to WriteStream: >> >> PositionableStream subclass: #WriteStream >> instanceVariableNames: 'writeLimit initialPositionOrNil' >> classVariableNames: '' >> poolDictionaries: '' >> category: 'Collections-Streams' >> >> use it in two places: >> contents >> "Answer with a copy of my collection from the start to the current >> position." >> >> readLimit := readLimit max: position. >> ^collection copyFrom: (initialPositionOrNil ifNil: [1]) to: position >> >> on: aCollection from: firstIndex to: lastIndex >> >> | len | >> collection := aCollection. >> readLimit := >> writeLimit := lastIndex > (len := collection size) >> ifTrue: [len] >> ifFalse: [lastIndex]. >> position := firstIndex <= 1 >> ifTrue: [0] >> ifFalse: [firstIndex - 1]. >> initialPositionOrNil := position + 1 >> >> What I've just found is that if I revert all three changes to WriteStream >> the bug goes away, but if I only revert the two method changes the bug >> remains. So I think the problem is merely the adding of the inst var. >> This could break some plugin which was expecting inst vars in subclasses >> of WriteStream to be at particular offsets determined by WriteStream >> instSize = 4 now being 5. The question is which plugin(s)? >> > Doh! DeflatePlugin>>loadDeflateStreamFrom: rcvr | oop | <inline: false> ((interpreterProxy isPointers: rcvr) and: [(interpreterProxy slotSizeOf: rcvr) >= 15]) ifFalse: [^false]. oop := interpreterProxy fetchPointer: 0 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^false]. zipCollection := interpreterProxy firstIndexableField: oop. zipCollectionSize := interpreterProxy byteSizeOf: oop. zipPosition := interpreterProxy fetchInteger: 1 ofObject: rcvr. zipReadLimit := interpreterProxy fetchInteger: 2 ofObject: rcvr. "zipWriteLimit := interpreterProxy fetchInteger: 3 ofObject: rcvr." oop := interpreterProxy fetchPointer: 4 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateHashTableSize]) ifFalse: [^false]. zipHashHead := interpreterProxy firstIndexableField: oop. oop := interpreterProxy fetchPointer: 5 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateWindowSize]) ifFalse: [^false]. zipHashTail := interpreterProxy firstIndexableField: oop. zipHashValue := interpreterProxy fetchInteger: 6 ofObject: rcvr. zipBlockPos := interpreterProxy fetchInteger: 7 ofObject: rcvr. "zipBlockStart := interpreterProxy fetchInteger: 8 ofObject: rcvr." oop := interpreterProxy fetchPointer: 9 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^false]. zipLiteralSize := interpreterProxy slotSizeOf: oop. zipLiterals := interpreterProxy firstIndexableField: oop. oop := interpreterProxy fetchPointer: 10 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) >= zipLiteralSize]) ifFalse: [^false]. zipDistances := interpreterProxy firstIndexableField: oop. oop := interpreterProxy fetchPointer: 11 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateMaxLiteralCodes]) ifFalse: [^false]. zipLiteralFreq := interpreterProxy firstIndexableField: oop. oop := interpreterProxy fetchPointer: 12 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateMaxDistanceCodes]) ifFalse: [^false]. zipDistanceFreq := interpreterProxy firstIndexableField: oop. zipLiteralCount := interpreterProxy fetchInteger: 13 ofObject: rcvr. zipMatchCount := interpreterProxy fetchInteger: 14 ofObject: rcvr. ^interpreterProxy failed not I propose to add a variable that holds the inst size of the superclass of InflateStream, and to use this to correct the offsets. Objections? -- best, Eliot

6 27

[commit][3051] CogVM source as per VMMaker.oscog-eem.830
by commits＠squeakvm.org 22 Jul '14

22 Jul '14

Revision: 3051 Author: eliot Date: 2014-07-22 09:38:54 -0700 (Tue, 22 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.830 In the wake of the inlining change below, split lookupInMethodCacheSel:classTag: into it and inlineLookupInMethodCacheSel:classTag:, and use the inline version in internalFindNewMethod. Add vmParameter 52 to answer the capacity of the root table (in Spur a.k.a. the rememberedSet). Delete all the explicit initializing to nil in primitiveVMParameter since the array is instantiated normally (filled with nil). Spur: Add vm parameter 53 to answer the number of segments. Move the rememberedSet into a pinned object in oldSpace. Allow it to grow on demand, starting at 1k entries, doubling on each grow. Make sure to abort if the attempt to grow the remembered set fails. Try to grow by another 1k slots if doubling fails, then abort. Revise markAndTrace: given that markAndShouldScan: is inlined within it (see Slang changes below). Move the ephemeron processing into markAndShouldScan: out of the now unused numStringSlotsOf:ephemeronInactiveIf: circumlocution. Add activeAndDeferredScan: and numStrongSlotsOfInephemeral: in place of the double negative inactiveOrFailedToDeferScan: and hence inline numStrongSlotsOfInephemeral:. Increase the traceImmediatelySlotLimit. These changes plus the 2 repeats for compaction speed up global GC by at least x2. Change the defaultEdenBytes to 4Mb. Allow the number of compaction passes to vary, 2 on GC, 3 on GC for snapshot. Slang: Add support for inlining into the condition of ifTrue:/ifFalse: when it is marked as inline. Transform expr1 ifTrue:/ifFalse: [^expr2] by inlining ^expr2 into expr1. Transform expr ifTrue:/ifFalse: [statements] by replacing ^boolean occurrences in expr with gotos. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-07-20 16:08:57 UTC (rev 3050) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-07-22 16:38:54 UTC (rev 3051) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c from - CoInterpreter VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 + CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -850,7 +850,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -1129,7 +1129,6 @@ sqInt longStoreBytecodeForHeader(sqInt methodHeader); static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag) NoDbgRegParms; static sqInt lookupMethodInClass(sqInt class) NoDbgRegParms; -static sqInt lookupMethodInDictionary(sqInt dictionary) NoDbgRegParms; static sqInt lookupMethodNoMNUEtcInClass(sqInt class) NoDbgRegParms; sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue); static void mapInterpreterOops(void); @@ -1359,7 +1358,6 @@ _iss sqInt weakRootCount; _iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt lkupClass; _iss sqInt preemptionYields; _iss sqInt cogCompiledCodeCompactionCalledFor; _iss usqLong nextWakeupUsecs; @@ -1368,6 +1366,7 @@ _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; +_iss sqInt lkupClass; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt lowSpaceThreshold; @@ -2079,7 +2078,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.826"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.830"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4413,11 +4412,11 @@ theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << ShiftForWord)); if ((primitiveIndexOfMethodheader(theMethod, headerOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; - goto l296; + goto l297; } } unwindContextOrNilOrZero = ctxtOrNilOrZero; - l296: /* end internalFindUnwindThroughContext: */; + l297: /* end internalFindUnwindThroughContext: */; if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -4431,10 +4430,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l297; + goto l299; } ourContext = marryFrameSP(localFP, localSP); - l297: /* end ensureFrameIsMarried:SP: */; + l299: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -4455,10 +4454,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l298; + goto l296; } ourContext1 = marryFrameSP(localFP, localSP); - l298: /* end ensureFrameIsMarried:SP: */; + l296: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -4528,10 +4527,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l299; + goto l298; } ourContext2 = marryFrameSP(localFP, localSP); - l299: /* end ensureFrameIsMarried:SP: */; + l298: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -4789,27 +4788,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l301; + goto l302; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l301; + goto l302; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l301: /* end findFrameAbove:inPage: */; + l302: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l302; + goto l303; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l302: /* end newStackPage */; + l303: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -4833,7 +4832,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << ShiftForWord)), contextToReturnFrom, 1); - goto l303; + goto l301; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -4872,7 +4871,8 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l303; + null; + goto l301; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4889,8 +4889,8 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ - l303: /* end baseFrameReturn */; + null; + l301: /* end baseFrameReturn */; goto l300; } /* begin frameCallerSavedIP: */ @@ -5183,7 +5183,6 @@ CogMethod *cogMethod1; sqInt errorCode; sqInt hash; - sqInt hash1; sqInt i; sqInt localPrimIndex; sqInt methodHeader; @@ -5194,7 +5193,6 @@ sqInt object; sqInt ok; sqInt probe; - sqInt probe1; sqInt rcvr; char *savedFramePointer; char *savedStackPointer; @@ -5219,43 +5217,43 @@ } /* begin internalFindNewMethod */ VM_LABEL(0internalFindNewMethod); - /* begin lookupInMethodCacheSel:classTag: */ + /* begin inlineLookupInMethodCacheSel:classTag: */ /* shift drops two low-order zeros from addresses */ - hash1 = GIV(messageSelector) ^ lkupClassTag; + hash = GIV(messageSelector) ^ lkupClassTag; /* first probe */ - probe1 = hash1 & MethodCacheMask; - if (((GIV(methodCache)[probe1 + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe1 + MethodCacheClass]) == lkupClassTag)) { - GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); + probe = hash & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l308; + goto l307; } /* second probe */ - probe1 = (((usqInt) hash1) >> 1) & MethodCacheMask; - if (((GIV(methodCache)[probe1 + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe1 + MethodCacheClass]) == lkupClassTag)) { - GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); + probe = (((usqInt) hash) >> 1) & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l308; + goto l307; } - probe1 = (((usqInt) hash1) >> 2) & MethodCacheMask; - if (((GIV(methodCache)[probe1 + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe1 + MethodCacheClass]) == lkupClassTag)) { - GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); + probe = (((usqInt) hash) >> 2) & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l308; + goto l307; } ok = 0; - l308: /* end lookupInMethodCacheSel:classTag: */; + l307: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(0ifAppropriateCompileToNativeCodeselector); @@ -5296,7 +5294,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l309: /* end internalFindNewMethod */; + l304: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ VM_LABEL(0internalExecuteNewMethod); if (primitiveFunctionPointer != 0) { @@ -5310,31 +5308,31 @@ if (localPrimIndex >= 264) { longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << ShiftForWord))); 1; - goto l305; + goto l308; } if (localPrimIndex == 256) { 1; - goto l305; + goto l308; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l305; + goto l308; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l305; + goto l308; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l305; + goto l308; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l305: /* end internalQuickPrimitiveResponse */; - goto l304; + l308: /* end internalQuickPrimitiveResponse */; + goto l306; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -5392,7 +5390,7 @@ returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); null; - goto l304; + goto l306; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -5475,11 +5473,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); - goto l306; + goto l305; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l306: /* end getErrorObjectFromPrimFailCode */; + l305: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -5503,7 +5501,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l304: /* end internalExecuteNewMethod */; + l306: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -5611,11 +5609,11 @@ value = result; } object1 = value; - goto l7; + goto l8; } if (isWidowedContext(rcvr)) { object1 = longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord)); - goto l7; + goto l8; } /* begin frameOfMarriedContext: */ senderOop = longAt((rcvr + BaseHeaderSize) + (SenderIndex << ShiftForWord)); @@ -5661,12 +5659,12 @@ } object1 = marryFrameSP(callerFP1, theSP); l4: /* end ensureCallerContext: */; - goto l7; + goto l8; } if (byte3 == StackPointerIndex) { assert((ReceiverIndex + (stackPointerIndexForFrame(spouseFP))) < (lengthOf(rcvr))); object1 = (((stackPointerIndexForFrame(spouseFP)) << 1) | 1); - goto l7; + goto l8; } if (byte3 == InstructionPointerIndex) { if (spouseFP == localFP) { @@ -5683,18 +5681,18 @@ fp = (thePage->headFP); if (fp == spouseFP) { theFPAbove = 0; - goto l6; + goto l7; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == spouseFP) { theFPAbove = fp; - goto l6; + goto l7; } fp = callerFP; } error("did not find theFP in stack page"); theFPAbove = 0; - l6: /* end findFrameAbove:inPage: */; + l7: /* end findFrameAbove:inPage: */; theIP = (theFPAbove == 0 ? longAt((thePage->headSP)) : oopForPointer(frameCallerSavedIP(theFPAbove))); @@ -5716,11 +5714,11 @@ value = result1; } object1 = value; - goto l7; + goto l8; } error("bad index"); object1 = 0; - l7: /* end instVar:ofContext: */; + l8: /* end instVar:ofContext: */; longAtPointerput((localSP -= BytesPerOop), object1); } else { @@ -5801,7 +5799,7 @@ ensureContextIsExecutionSafeAfterAssignToStackPointer(rcvr1); } null; - goto l8; + goto l6; } /* begin frameOfMarriedContext: */ senderOop1 = longAt((rcvr1 + BaseHeaderSize) + (SenderIndex << ShiftForWord)); @@ -5826,7 +5824,7 @@ markStackPageMostRecentlyUsed(GIV(stackPage)); } null; - goto l8; + goto l6; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -5849,7 +5847,7 @@ localFP = pointerForOop(GIV(framePointer)); markStackPageMostRecentlyUsed(GIV(stackPage)); assertValidExecutionPointersimbarline(((usqInt)localIP), localFP, localSP, 1, __LINE__); - l8: /* end instVar:ofContext:put: */; + l6: /* end instVar:ofContext:put: */; } else { /* begin storePointer:ofObject:withValue: */ @@ -6519,7 +6517,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l15; + goto l18; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -6532,31 +6530,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l18; + goto l21; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l18; + goto l21; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l18: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l21: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l17: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l19; + goto l16; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l19: /* end floatValueOf: */; - l15: /* end loadFloatOrIntFrom: */; + l16: /* end floatValueOf: */; + l18: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l16; + goto l22; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -6569,27 +6567,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l21; + goto l15; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l21; + goto l15; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l21: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l15: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l20: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l22; + goto l19; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l22: /* end floatValueOf: */; - l16: /* end loadFloatOrIntFrom: */; + l19: /* end floatValueOf: */; + l22: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 + arg1)); @@ -6655,7 +6653,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l24; + goto l27; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -6668,31 +6666,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l27; + goto l30; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l27; + goto l30; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l27: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l30: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l26: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l28; + goto l25; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l28: /* end floatValueOf: */; - l24: /* end loadFloatOrIntFrom: */; + l25: /* end floatValueOf: */; + l27: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l25; + goto l31; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -6705,27 +6703,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l30; + goto l24; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l30; + goto l24; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l30: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l24: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l29: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l31; + goto l28; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l31: /* end floatValueOf: */; - l25: /* end loadFloatOrIntFrom: */; + l28: /* end floatValueOf: */; + l31: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 - arg1)); @@ -6787,7 +6785,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l33; + goto l36; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -6800,31 +6798,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l36; + goto l39; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l36; + goto l39; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l36: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l39: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l35: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l37; + goto l34; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l37: /* end floatValueOf: */; - l33: /* end loadFloatOrIntFrom: */; + l34: /* end floatValueOf: */; + l36: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l34; + goto l40; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -6837,27 +6835,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l39; + goto l33; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l39; + goto l33; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l39: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l33: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l38: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l40; + goto l37; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l40: /* end floatValueOf: */; - l34: /* end loadFloatOrIntFrom: */; + l37: /* end floatValueOf: */; + l40: /* end loadFloatOrIntFrom: */; aBool = rcvr1 < arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -6897,7 +6895,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l310; + goto l309; } if (bytecode == 172) { @@ -6907,7 +6905,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l310; + goto l309; } if (bytecode > 167) { @@ -6918,7 +6916,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l310; + goto l309; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -6926,7 +6924,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l310: /* end case */; + l309: /* end case */; break; case 179: /* bytecodePrimGreaterThan */ @@ -6966,7 +6964,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l42; + goto l45; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -6979,31 +6977,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l45; + goto l48; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l45; + goto l48; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l45: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l48: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l44: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l46; + goto l43; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l46: /* end floatValueOf: */; - l42: /* end loadFloatOrIntFrom: */; + l43: /* end floatValueOf: */; + l45: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l43; + goto l49; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7016,27 +7014,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l48; + goto l42; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l48; + goto l42; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l48: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l42: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l47: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l49; + goto l46; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l49: /* end floatValueOf: */; - l43: /* end loadFloatOrIntFrom: */; + l46: /* end floatValueOf: */; + l49: /* end loadFloatOrIntFrom: */; aBool = rcvr1 > arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7076,7 +7074,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l311; + goto l310; } if (bytecode == 172) { @@ -7087,14 +7085,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l311; + goto l310; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l311: /* end case */; + l310: /* end case */; break; case 180: /* bytecodePrimLessOrEqual */ @@ -7134,7 +7132,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l51; + goto l54; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7147,31 +7145,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l54; + goto l57; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l54; + goto l57; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l54: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l57: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l53: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l55; + goto l52; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l55: /* end floatValueOf: */; - l51: /* end loadFloatOrIntFrom: */; + l52: /* end floatValueOf: */; + l54: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l52; + goto l58; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7184,27 +7182,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l57; + goto l51; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l57; + goto l51; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l57: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l51: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l56: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l58; + goto l55; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l58: /* end floatValueOf: */; - l52: /* end loadFloatOrIntFrom: */; + l55: /* end floatValueOf: */; + l58: /* end loadFloatOrIntFrom: */; aBool = rcvr1 <= arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7260,7 +7258,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l60; + goto l63; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7273,31 +7271,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l63; + goto l66; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l63; + goto l66; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l63: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l66: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l62: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l64; + goto l61; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l64: /* end floatValueOf: */; - l60: /* end loadFloatOrIntFrom: */; + l61: /* end floatValueOf: */; + l63: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l61; + goto l67; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7310,27 +7308,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l66; + goto l60; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l66; + goto l60; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l66: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l60: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l65: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l67; + goto l64; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l67: /* end floatValueOf: */; - l61: /* end loadFloatOrIntFrom: */; + l64: /* end floatValueOf: */; + l67: /* end loadFloatOrIntFrom: */; aBool = rcvr1 >= arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7382,7 +7380,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l69; + goto l72; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7395,31 +7393,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l72; + goto l75; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l72; + goto l75; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l72: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l75: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l71: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l73; + goto l70; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l73: /* end floatValueOf: */; - l69: /* end loadFloatOrIntFrom: */; + l70: /* end floatValueOf: */; + l72: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l70; + goto l76; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7432,27 +7430,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l75; + goto l69; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l75; + goto l69; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l75: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l69: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l74: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l76; + goto l73; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l76: /* end floatValueOf: */; - l70: /* end loadFloatOrIntFrom: */; + l73: /* end floatValueOf: */; + l76: /* end loadFloatOrIntFrom: */; aBool = rcvr1 == arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7504,7 +7502,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l78; + goto l81; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7517,31 +7515,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l81; + goto l84; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l81; + goto l84; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l81: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l84: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l80: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l82; + goto l79; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l82: /* end floatValueOf: */; - l78: /* end loadFloatOrIntFrom: */; + l79: /* end floatValueOf: */; + l81: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l79; + goto l85; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7554,27 +7552,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l84; + goto l78; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l84; + goto l78; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l84: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l78: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l83: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l85; + goto l82; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l85: /* end floatValueOf: */; - l79: /* end loadFloatOrIntFrom: */; + l82: /* end floatValueOf: */; + l85: /* end loadFloatOrIntFrom: */; aBool = rcvr1 == arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7638,7 +7636,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l87; + goto l90; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7651,31 +7649,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l90; + goto l93; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l90; + goto l93; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l90: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l93: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l89: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l91; + goto l88; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l91: /* end floatValueOf: */; - l87: /* end loadFloatOrIntFrom: */; + l88: /* end floatValueOf: */; + l90: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l88; + goto l94; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7688,27 +7686,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l93; + goto l87; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l93; + goto l87; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l93: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l87: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l92: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l94; + goto l91; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l94: /* end floatValueOf: */; - l88: /* end loadFloatOrIntFrom: */; + l91: /* end floatValueOf: */; + l94: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 * arg1)); @@ -7783,7 +7781,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l96; + goto l99; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7796,31 +7794,31 @@ ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l99; + goto l102; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l99; + goto l102; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l99: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l102: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l98: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l100; + goto l97; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l100: /* end floatValueOf: */; - l96: /* end loadFloatOrIntFrom: */; + l97: /* end floatValueOf: */; + l99: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l97; + goto l103; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ @@ -7833,27 +7831,27 @@ ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l102; + goto l96; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l102; + goto l96; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l102: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l96: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l101: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l103; + goto l100; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l103: /* end floatValueOf: */; - l97: /* end loadFloatOrIntFrom: */; + l100: /* end floatValueOf: */; + l103: /* end loadFloatOrIntFrom: */; /* begin success: */ if (!(arg1 != 0.0)) { @@ -8327,7 +8325,7 @@ GIV(primFailCode) = PrimErrBadReceiver; 0; - goto l115; + goto l118; } /* begin lengthOf:baseHeader:format: */ if ((hdr & TypeMask) == HeaderTypeSizeAndClass) { @@ -8339,35 +8337,35 @@ sz1 -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz1 - BaseHeaderSize)) >> ShiftForWord; - goto l114; + goto l121; } totalLength = (fmt < 8 ? ((usqInt) (sz1 - BaseHeaderSize)) >> 2 : (sz1 - BaseHeaderSize) - (fmt & 3)); - l114: /* end lengthOf:baseHeader:format: */; + l121: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l119; + goto l113; } if (fmt < 2) { fixedFields = totalLength; - goto l119; + goto l113; } class = (((ccIndex1 = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 0x3F)) - 1; - l119: /* end fixedFieldsOf:format:length: */; + l113: /* end fixedFieldsOf:format:length: */; GIV(atCache)[atIx + AtCacheOop] = rcvr; GIV(atCache)[atIx + AtCacheFmt] = fmt; GIV(atCache)[atIx + AtCacheFixedFields] = fixedFields; GIV(atCache)[atIx + AtCacheSize] = (totalLength - fixedFields); 1; - l115: /* end install:inAtCache:at:string: */; + l118: /* end install:inAtCache:at:string: */; } else { if (primitiveFunctionPointer == primitiveStringAt) { @@ -8386,12 +8384,12 @@ sz2 -= hdr1 & Size4Bit; if (fmt1 <= 4) { totalLength1 = ((usqInt) (sz2 - BaseHeaderSize)) >> ShiftForWord; - goto l116; + goto l114; } totalLength1 = (fmt1 < 8 ? ((usqInt) (sz2 - BaseHeaderSize)) >> 2 : (sz2 - BaseHeaderSize) - (fmt1 & 3)); - l116: /* end lengthOf:baseHeader:format: */; + l114: /* end lengthOf:baseHeader:format: */; fixedFields1 = 0; /* special flag for strings */ @@ -8403,7 +8401,7 @@ GIV(atCache)[atIx + AtCacheFixedFields] = fixedFields1; GIV(atCache)[atIx + AtCacheSize] = (totalLength1 - fixedFields1); 1; - l118: /* end install:inAtCache:at:string: */; + l117: /* end install:inAtCache:at:string: */; } else { @@ Diff output truncated at 50000 characters. @@

1 0

quick update on the CMakeVMMka
by gettimothy 21 Jul '14

21 Jul '14

Hi Greg, Thank you for todays interview and presenting me with the opportunity to make my first business pitch/presentation. (: I learned an important lesson from that and will build upon that experience. I will send an update tomorrow mid-afternoon after I start putting this project together. It will be fun. Cordially, timothy murray.

1 1

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2014