Vm-dev October 2014

vm-dev@lists.squeakfoundation.org

38 participants
133 discussions

[commit][3109] CogVm source as per VMMaker.oscog-eem.911
by commits＠squeakvm.org 24 Oct '14

24 Oct '14

Revision: 3109 Author: eliot Date: 2014-10-24 11:53:45 -0700 (Fri, 24 Oct 2014) Log Message: ----------- CogVm source as per VMMaker.oscog-eem.911 Avoid cogging methods containing unknown bytecodes early in scanMethod. Use a hack to avoid a test on the common path. Fix the return type of implicitReceiverCacheAddressAt:. Both of these together fix assert fails due to cogging mehtods containing unknown bytecodes. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - StackToRegisterMappingCogit VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + StackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1726,8 +1726,8 @@ { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPopStackBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genExtNopBytecode, 0, needsFrameNever, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { extABytecode, 0, needsFrameNever, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { extBBytecode, 0, needsFrameNever, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { genExtPushReceiverVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -1749,17 +1749,17 @@ { genExtUnconditionalJump, v4LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 }, { genExtJumpIfTrue, v4LongBranchDistance, 0, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 }, { genExtJumpIfFalse, v4LongBranchDistance, 0, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { callPrimitiveBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genExtPushClosureBytecode, v4BlockCodeSize, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 } + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 } }; static sqInt guardPageSize; static sqInt hasYoungReferent; @@ -12553,7 +12553,7 @@ { sqInt *address; sqInt *address1; - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt cacheTagMarked; @@ -12723,7 +12723,7 @@ static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13814,7 +13814,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14583,7 +14583,7 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - sqInt cacheAddress; + usqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); @@ -22355,6 +22355,12 @@ byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); if ((descriptor->isExtension)) { + if (((descriptor->opcode)) == Nop) { + + /* unknown bytecode tag; see Cogit class>>#generatorTableFrom: */ + + return EncounteredUnknownBytecode; + } loadSubsequentBytesForDescriptorat(descriptor, pc); ((descriptor->generator))(); } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -852,7 +852,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; @@ -1366,9 +1366,9 @@ _iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt preemptionYields; -_iss sqInt cogCompiledCodeCompactionCalledFor; _iss usqLong nextWakeupUsecs; _iss sqInt statMarkCount; +_iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt gcMode; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; @@ -2085,7 +2085,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.909"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.911"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14412,10 +14412,6 @@ } } } - else { - assert(GIV(cogCompiledCodeCompactionCalledFor) - || (!(methodShouldBeCogged(aMethodObj)))); - } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ @@ -36761,17 +36757,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36782,21 +36776,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36811,7 +36791,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36865,18 +36845,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) + next = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38751,7 +38731,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -855,7 +855,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; @@ -1369,9 +1369,9 @@ _iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt preemptionYields; -_iss sqInt cogCompiledCodeCompactionCalledFor; _iss usqLong nextWakeupUsecs; _iss sqInt statMarkCount; +_iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt gcMode; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; @@ -2088,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.909"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.911"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14421,10 +14421,6 @@ } } } - else { - assert(GIV(cogCompiledCodeCompactionCalledFor) - || (!(methodShouldBeCogged(aMethodObj)))); - } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ @@ -36770,17 +36766,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36791,21 +36785,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36820,7 +36800,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36874,18 +36854,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) + next = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38760,7 +38740,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - StackToRegisterMappingCogit VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + StackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1744,8 +1744,8 @@ { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPopStackBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genExtNopBytecode, 0, needsFrameNever, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { extABytecode, 0, needsFrameNever, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { extBBytecode, 0, needsFrameNever, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { genExtPushReceiverVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -1767,17 +1767,17 @@ { genExtUnconditionalJump, v4LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 }, { genExtJumpIfTrue, v4LongBranchDistance, 0, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 }, { genExtJumpIfFalse, v4LongBranchDistance, 0, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { callPrimitiveBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genExtPushClosureBytecode, v4BlockCodeSize, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 } + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 } }; static sqInt guardPageSize; static sqInt hasYoungReferent; @@ -12625,7 +12625,7 @@ } if (entryPoint1 == ceImplicitReceiverTrampoline) { assert(NumOopsPerIRC == 2); - cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); + cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc))); if (((class = unalignedLongAt(backEnd, cacheAddress))) != 0) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { markAndTraceLiteralinat(mixin, ((CogMethod *) cogMethod), (cacheAddress + BytesPerOop)); @@ -13801,7 +13801,7 @@ /* Examine an implicit receiver cache. */ assert(NumOopsPerIRC == 2); - cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); + cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc))); if (((oop = unalignedLongAt(backEnd, cacheAddress))) != 0) { /* First look at the classTag entry. This is an inline cache tag and so might not be an object. */ @@ -14066,7 +14066,7 @@ else { if (entryPoint == ceImplicitReceiverTrampoline) { assert(NumOopsPerIRC == 2); - cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); + cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc))); if ((isForwardedClassIndex(unalignedLongAt(backEnd, cacheAddress))) || (isForwardedClassIndex(unalignedLongAt(backEnd, cacheAddress + BytesPerOop)))) { voidImplicitReceiverCacheAt(mcpc); @@ -14614,7 +14614,7 @@ usqInt cacheAddress; assert(NumOopsPerIRC == 2); - cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); + cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc))); unalignedLongAtput(backEnd, cacheAddress, 0); unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, 0); @@ -24183,6 +24183,12 @@ byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); if ((descriptor->isExtension)) { + if (((descriptor->opcode)) == Nop) { + + /* unknown bytecode tag; see Cogit class>>#generatorTableFrom: */ + + return EncounteredUnknownBytecode; + } loadSubsequentBytesForDescriptorat(descriptor, pc); ((descriptor->generator))(); } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1582,10 +1582,10 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; _iss sqInt preemptionYields; -_iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; _iss sqInt numSegInfos; +_iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; @@ -2335,7 +2335,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 CoInterpreterPrimitives_VMMaker.oscog-eem.909"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.911"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16301,10 +16301,6 @@ } } } - else { - assert(GIV(cogCompiledCodeCompactionCalledFor) - || (!(methodShouldBeCogged(aMethodObj)))); - } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1585,10 +1585,10 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; _iss sqInt preemptionYields; -_iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; _iss sqInt numSegInfos; +_iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; @@ -2338,7 +2338,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 CoInterpreterPrimitives_VMMaker.oscog-eem.909"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.911"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16310,10 +16310,6 @@ } } } - else { - assert(GIV(cogCompiledCodeCompactionCalledFor) - || (!(methodShouldBeCogged(aMethodObj)))); - } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Oct 23 17:35:33 PDT 2014 + Fri Oct 24 11:52:39 PDT 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/sistasrc/vm/cogit.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1380,8 +1380,8 @@ { genReturnNil, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnTopFromMethod, 0, needsFrameIfInBlock, -1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnTopFromBlock, 0, needsFrameNever, -1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { extendedPushBytecode, 0, needsFrameNever, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { extendedStoreBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { extendedStoreAndPopBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -1393,7 +1393,7 @@ { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushActiveContextBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushNewArrayBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -1594,10 +1594,10 @@ { genPushConstantOneBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genExtPushPseudoVariable, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { genReturnReceiver, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnTrue, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnFalse, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, @@ -1727,13 +1727,13 @@ { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPopStackBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { extABytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { extBBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { genExtPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -1756,16 +1756,16 @@ { genExtStoreReceiverVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { genExtStoreLiteralVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { genLongStoreTemporaryVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { genCallPrimitiveBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 }, { genExtPushClosureBytecode, v4BlockCodeSize, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0 }, { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 } + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 } }; static sqInt guardPageSize; static sqInt hasYoungReferent; @@ -19348,6 +19348,12 @@ byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); if ((descriptor->isExtension)) { + if (((descriptor->opcode)) == Nop) { + + /* unknown bytecode tag; see Cogit class>>#generatorTableFrom: */ + + return EncounteredUnknownBytecode; + } loadSubsequentBytesForDescriptorat(descriptor, pc); ((descriptor->generator))(); } Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/sistasrc/vm/cogit.h 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -851,7 +851,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; @@ -1362,9 +1362,9 @@ _iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt preemptionYields; -_iss sqInt cogCompiledCodeCompactionCalledFor; _iss usqLong nextWakeupUsecs; _iss sqInt statMarkCount; +_iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt gcMode; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; @@ -2081,7 +2081,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.909]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14651,10 +14651,6 @@ } } } - else { - assert(GIV(cogCompiledCodeCompactionCalledFor) - || (!(methodShouldBeCogged(aMethodObj)))); - } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ @@ -36840,17 +36836,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36861,21 +36855,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36890,7 +36870,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36944,18 +36924,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) + next = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38830,7 +38810,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -854,7 +854,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; @@ -1365,9 +1365,9 @@ _iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt preemptionYields; -_iss sqInt cogCompiledCodeCompactionCalledFor; _iss usqLong nextWakeupUsecs; _iss sqInt statMarkCount; +_iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt gcMode; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; @@ -2084,7 +2084,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.909]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14660,10 +14660,6 @@ } } } - else { - assert(GIV(cogCompiledCodeCompactionCalledFor) - || (!(methodShouldBeCogged(aMethodObj)))); - } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ @@ -36849,17 +36845,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36870,21 +36864,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36899,7 +36879,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36953,18 +36933,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) + next = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38839,7 +38819,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-10-24 12:46:01 UTC (rev 3108) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-10-24 18:53:45 UTC (rev 3109) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.907 uuid: 1d1ad3df-9d81-4278-95fd-a11857f7a60d " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1398,8 +1398,8 @@ { genReturnNil, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnTopFromMethod, 0, needsFrameIfInBlock, -1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnTopFromBlock, 0, needsFrameNever, -1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { extendedPushBytecode, 0, needsFrameNever, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { extendedStoreBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { extendedStoreAndPopBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -1612,10 +1612,10 @@ { genPushConstantOneBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genExtPushPseudoVariable, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { genReturnReceiver, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnTrue, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnFalse, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, @@ -1745,13 +1745,13 @@ { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPopStackBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { extABytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { extBBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { genExtPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -1774,16 +1774,16 @@ { genExtStoreReceiverVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { genExtStoreLiteralVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { genLongStoreTemporaryVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 }, { genCallPrimitiveBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 }, { genExtPushClosureBytecode, v4BlockCodeSize, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0 }, { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, - { unknownBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 } + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 } }; static sqInt guardPageSize; static sqInt hasYoungReferent; @@ -20838,6 +20838,12 @@ byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); if ((descriptor->isExtension)) { @@ Diff output truncated at 50000 characters. @@

1 0

Weird rehashing problem
by Max Leske 24 Oct '14

24 Oct '14

Hi I have a rather strange problem with rehasing that occurred simultaneously multiple times on the same day but not since. Luckily I’ve saved an image with the debugger in it. The mean thing is: that doesn’t help me at all because from what I can tell either the Debugger is broken or there’s a VM problem. Note: The image is a Pharo 1.3 image. The problem occurred on two different VMs independently, an NBCog VM (Croquet Closure Cog VM [CoInterpreter VMMaker-oscog-EstebanLorenzano.166] 21.0) and a Squeak VM (Squeak3.10.2 of '5 June 2008' [latest update: #7179]). The operation during which this happened was the loading of an ImageSegment (in both instances). Here’s what happened. I got a SubscriptOutOfBounds error during rehashing of a Dictionary. When I look at the debugger it’s clear why the exception got signaled but not how that situation could ever happen. These are the top three contexts on the stack: Array(Object)>>errorSubscriptBounds: Array(Object)>>at:put: CBConfiguration(Dictionary)>>noCheckAdd: This is the #noCheckAdd: method” noCheckAdd: anObject "Must be defined separately for Dictionary because (self findElementOrNil:) expects a key, not an association. 9/7/96 tk" array at: (self findElementOrNil: anObject key) put: anObject. tally := tally + 1 and here’s #at:put: where the exception is signaled: at: index put: value <primitive: 61> index isInteger ifTrue: [self class isVariable ifTrue: [(index >= 1 and: [index <= self size]) ifTrue: [self errorImproperStore] ifFalse: [self errorSubscriptBounds: index]] <——— signaled ifFalse: [self errorNotIndexable]]. index isNumber ifTrue: [^self at: index asInteger put: value] ifFalse: [self errorNonIntegerIndex] Here’s the weird thing: according to the debugger ‘array' in #noCheckAdd: IS NOT THE SAME INSTANCE as ‘self’ in #at:put:!!!!!! ????????? When I look at the pointers to both arrays, the correct one is pointed to by the dictionary while the other is only being referenced by the exception context: Bad array: 1: SubscriptOutOfBounds: 88 2: Array(Object)>>errorSubscriptBounds: 3: Array(Object>>at:put: 4: an Inspector … Good array: 1: aCBConfiguration(size 107) I really have no clue how this could have happened. I’d appreciate any thoughts you might have… Cheers, Max

2 1

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

24 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.911.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.911 Author: eem Time: 24 October 2014, 11:44:05.762 am UUID: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd Ancestors: VMMaker.oscog-eem.910 Avoid cogging methods containing unknown bytecodes early in scanMethod. Use a hack to avoid a test on the common path. Fix the return type of implicitReceiverCacheAddressAt:. =============== Diff against VMMaker.oscog-eem.910 =============== Item was changed: ----- Method: CoInterpreter>>ceInterpretMethodFromPIC:receiver: (in category 'trampolines') ----- ceInterpretMethodFromPIC: aMethodObj receiver: rcvr <api> | pic primitiveIndex | <var: #pic type: #'CogMethod *'> self assert: (self methodHasCogMethod: aMethodObj) not. "pop off inner return and locate open PIC" pic := self cCoerceSimple: self popStack - cogit interpretOffset to: #'CogMethod *'. self assert: (pic cmType = CMOpenPIC or: [pic cmType = CMClosedPIC]). "If found from an open PIC then it must be an uncogged method and, since it's been found in the method cache, should be cogged if possible. If found from a closed PIC it should + be interpreted (since being reached by that route implies it is uncoggable, either because + there was no space, it had too many literals or it contained an illegal bytecode)." + pic cmType = CMOpenPIC ifTrue: + [(self methodShouldBeCogged: aMethodObj) ifTrue: + [cogit cog: aMethodObj selector: pic selector. + (self methodHasCogMethod: aMethodObj) ifTrue: + [self executeCogMethod: (self cogMethodOf: aMethodObj) + fromUnlinkedSendWithReceiver: rcvr]]]. - be interpreted (since being reached by that route implies it is uncoggable)." - pic cmType = CMOpenPIC - ifTrue: - [(self methodShouldBeCogged: aMethodObj) ifTrue: - [cogit cog: aMethodObj selector: pic selector. - (self methodHasCogMethod: aMethodObj) ifTrue: - [self executeCogMethod: (self cogMethodOf: aMethodObj) - fromUnlinkedSendWithReceiver: rcvr]]] - ifFalse: - [self assert: (cogCompiledCodeCompactionCalledFor - or: [(self methodShouldBeCogged: aMethodObj) not])]. messageSelector := pic selector. newMethod := aMethodObj. primitiveIndex := self primitiveIndexOf: aMethodObj. primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: objectMemory nilObject. argumentCount := pic cmNumArgs. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: Cogit class>>generatorTableFrom: (in category 'class initialization') ----- generatorTableFrom: anArray | blockCreationBytecodeSize | generatorTable := CArrayAccessor on: (Array new: 256). anArray do: [:tuple| | descriptor | (descriptor := CogBytecodeDescriptor new) numBytes: tuple first; generator: tuple fourth; isReturn: (tuple includes: #return); isMapped: (tuple includes: #isMapped); isMappedInBlock: (tuple includes: #isMappedInBlock); isBlockCreation: (tuple includes: #block); spanFunction: (((tuple includes: #block) or: [(tuple includes: #branch)]) ifTrue: [tuple detect: [:thing| thing isSymbol and: [thing numArgs = 4]]]); isBranchTrue: (tuple includes: #isBranchTrue); isBranchFalse: (tuple includes: #isBranchFalse); isExtension: (tuple includes: #extension); hasIRC: (tuple includes: #hasIRC); yourself. + "As a hack to cut down on descriptor flags, use opcode to tag unusedBytecode for + scanning. Currently descriptors are exactly 16 bytes with all 8 flag bits used. As + another hack to eliminate a test in scanMethod mark unknows as extensions." + descriptor generator == #unknownBytecode ifTrue: + [descriptor opcode: Nop; isExtension: true]. descriptor isBlockCreation ifTrue: [blockCreationBytecodeSize ifNil: [blockCreationBytecodeSize := descriptor numBytes] ifNotNil: [self assert: blockCreationBytecodeSize = descriptor numBytes]]. tuple do: [:thing| thing isSymbol ifTrue: [(thing beginsWith: #needsFrame) ifTrue: [descriptor needsFrameFunction: thing]. (CogRTLOpcodes classPool at: thing ifAbsent: []) ifNotNil: [:opcode| descriptor opcode: opcode]]]. tuple last isInteger ifTrue: [descriptor stackDelta: tuple last] ifFalse: [descriptor needsFrameFunction ifNotNil: [self error: 'frameless block bytecodes must specify a stack delta']]. tuple second to: tuple third do: [:index| generatorTable at: index put: descriptor]]. BlockCreationBytecodeSize := blockCreationBytecodeSize. ^generatorTable! Item was changed: ----- Method: Cogit>>implicitReceiverCacheAddressAt: (in category 'newspeak support') ----- implicitReceiverCacheAddressAt: mcpc "Cached push implicit receiver implementation. If objectRepresentation doesn't support pinning then caller looks like mov selector, SendNumArgsReg call ceImplicitReceiver br continue Lclass: .word Lmixin:: .word continue: If objectRepresentation supports pinning then caller looks like mov Lclass, Arg1Reg mov selector, SendNumArgsReg call ceImplicitReceiver and Lclass: .word; Lmixin: .word is somewhere on the heap." <option: #NewspeakVM> <inline: true> + <returnTypeC: #usqInt> ^objectRepresentation canPinObjects ifTrue: + [(backEnd implicitReceiveCacheAt: mcpc) asUnsignedInteger] - [backEnd implicitReceiveCacheAt: mcpc] ifFalse: [mcpc asUnsignedInteger + backEnd jumpShortByteSize]! Item was changed: ----- Method: Cogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates + - if it contans an unknown bytecode Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: + [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" + [^EncounteredUnknownBytecode]. + self loadSubsequentBytesForDescriptor: descriptor at: pc. - [self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]]. ^numBlocks! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - how many counters it needs/conditional branches it contains Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. prevBCDescriptor := nil. numCounters := 0. self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: + [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" + [^EncounteredUnknownBytecode]. + self loadSubsequentBytesForDescriptor: descriptor at: pc. - [self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC. (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [numCounters := numCounters + 1]]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: StackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. prevBCDescriptor := nil. self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: + [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" + [^EncounteredUnknownBytecode]. + self loadSubsequentBytesForDescriptor: descriptor at: pc. - [self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks!

1 0

Re: [Pharo-dev] Run Spur run!!
by Eliot Miranda 24 Oct '14

24 Oct '14

On Fri, Oct 24, 2014 at 7:34 AM, Esteban Lorenzano <estebanlm(a)gmail.com> wrote: > > On 24 Oct 2014, at 16:21, Thierry Goubier <thierry.goubier(a)gmail.com> > wrote: > > > > 2014-10-24 15:50 GMT+02:00 Clément Bera <bera.clement(a)gmail.com>: > >> The current x2 speed boost is due only to spur, not to sista. Sista will >> provide additional performance, but we have still things to do before >> production. >> >> The performance gain reported is due to (from most important to less >> important): >> - the new GC has less overhead. 30% of the execution time used to be >> spent in the GC. >> - the new object format speeds up some VM internal caches (especially >> inline caches for message sends due to an indirection for object classes >> with a class table). >> - the new object format allows some C code to be converted into machine >> code routines, including block creation, context creation, primitive >> #at:put:, which is faster because switching from jitted code to C then back >> to jitted code generate a little overhead. >> - characters are now immediate objects, which speeds up String accessing. >> - the new object format has a larger hash which speeds up big hashed >> collections such as big sets and dictionaries. >> - become is faster. >> >> > > All this is really cool :) And if I remember well, there is 64 bitness > coming as well. > > Will Spur also cover ARM ? > > > Spur is an object format, it does not have anything to do with underlying > architecture (well, at least in theory… Eliot should be able to say more on > this). > Cog, in the other side is a jitter, and it has everything to do with the > architecture so is difficult to have it running on ARM (but there is work > on that direction, so we hope it will be there eventually). > > It looks like there is a misunderstanding (probably not you, Thierry, but > since I’ve seen it time to time, I take the chance to clarify): Spur is not > a replacement for Cog, both are orthogonal (in fact, Spur runs in Stack vm > too). > Real new VM is not “Spur” vm, is "Cog+Spur" vm. > +1. Spur changes the object representation, so it has a new heap layout, a new layout for objects, and a new garbage collector. Because the object format is simpler it allows the Cog JIT to generate machine code versions of more operations, in particular basicNew, basicNew: and closure and context creation. This is the main reason for the speedups in Cog+Spur. As far as the Stack VM goes if you see speedups for Stack+Spur vs Stack+V3 that's all due to the Spur object representation & GC, because there's no JIT. Now at the moment the Cog JIT only has an x86 back-end in production. Tim Rowledge is working on finishing the ARM back end started by Lars Wassermann in the GSoC a few years ago. So soonish we should be able to have Cog+V3 or Cog+Spur on e.g. Android. As part of 64-bit Spur I will be doing a back end for x86-64. And Doug McPherson is also in the mix, having written the ARM version of the new FFI plugin, and is going to be building Stack ARM VMs and soon enough Cog ARM VMs. > cheers, > Esteban > > > Thierry > > >> >> 2014-10-24 15:20 GMT+02:00 kilon alios <kilon.alios(a)gmail.com>: >> >>> thanks max, i completely forgotten about esug videos, looks like i found >>> what to watch during the weekend :D >>> >>> On Fri, Oct 24, 2014 at 4:12 PM, Max Leske <maxleske(a)gmail.com> wrote: >>> >>>> >>>> On 24.10.2014, at 15:06, kilon alios <kilon.alios(a)gmail.com> wrote: >>>> >>>> very nice >>>> >>>> so any more information to this, how exactly this optimization works >>>> and which kind of data will benefit from this ? >>>> >>>> >>>> Clément’s byte code set talk at ESUG: >>>> http://www.youtube.com/watch?v=e9J362QHwSA&index=64&list=PLJ5nSnWzQXi_6yyRL… >>>> Clément’s Sista talk at ESUG (2 parts): >>>> >>>> http://www.youtube.com/watch?v=X4E_FoLysJg&list=PLJ5nSnWzQXi_6yyRLsMMBqG8Yl… >>>> >>>> http://www.youtube.com/watch?v=gZOk3qojoVE&list=PLJ5nSnWzQXi_6yyRLsMMBqG8Yl… >>>> >>>> Eliot’s Spur talk at ESUG (3 parts): >>>> >>>> http://www.youtube.com/watch?v=k0nBNS1aHZ4&index=49&list=PLJ5nSnWzQXi_6yyRL… >>>> >>>> http://www.youtube.com/watch?v=sn3irBZE7g4&index=48&list=PLJ5nSnWzQXi_6yyRL… >>>> >>>> http://www.youtube.com/watch?v=1Vg0iFeg_pA&list=PLJ5nSnWzQXi_6yyRLsMMBqG8Yl… >>>> >>>> >>>> On Fri, Oct 24, 2014 at 3:47 PM, Sebastian Sastre < >>>> sebastian(a)flowingconcept.com> wrote: >>>> >>>>> remarkable!!! >>>>> >>>>> congratulations for the impressive results >>>>> >>>>> thanks for sharing! >>>>> >>>>> sebastian >>>>> >>>>> o/ >>>>> >>>>> > On 23/10/2014, at 17:40, Max Leske <maxleske(a)gmail.com> wrote: >>>>> > >>>>> > For those of you who missed this on IRC: >>>>> > >>>>> > henriksp: estebanlm: Care to run a small bench Cog vs Spur for me? >>>>> > [3:32pm] henriksp: int := ZnUTF8Encoder new. >>>>> > [3:32pm] henriksp: [int decodeBytes:#[67 97 115 104 44 32 108 105 >>>>> 107 101 32 226 130 172 44 32 105 115 32 107 105 110 103 0]] bench. >>>>> > [3:32pm] henriksp: had a 16x speedup with assembly implementation vs >>>>> Cog, if it's 8x vs Spur, that's just really impressive >>>>> > [3:44pm] Craig left the chat room. (Quit: Leaving.) >>>>> > [3:53pm] Craig joined the chat room. >>>>> > [4:08pm] VitamineD joined the chat room. >>>>> > [4:20pm] estebanlm: checking >>>>> > [4:21pm] estebanlm: Cog: 167,000 per second. >>>>> > [4:22pm] estebanlm: Cog[Spur]: 289,000 per second. >>>>> > [4:23pm] estebanlm: henriksp: ping >>>>> > [4:33pm] tinchodias left the chat room. (Ping timeout: 245 seconds) >>>>> > [4:33pm] tinchodias joined the chat room. >>>>> > [4:34pm] henriksp: 70% more work done, nice! >>>>> > [5:09pm] >>>>> > >>>>> > >>>>> > Yay! :) >>>>> >>>>> >>>> >>>> >>> >> > > -- best, Eliot

2 1

Re: [Vm-dev] VM Maker: VMMaker-dtl.354.mcz
by David T. Lewis 24 Oct '14

24 Oct '14

@Eliot, This fix will not be relevant to Spur, so you may safely ignore it except as an FYI. Dave > > David T. Lewis uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker-dtl.354.mcz > > ==================== Summary ==================== > > Name: VMMaker-dtl.354 > Author: dtl > Time: 24 October 2014, 8:35:45.512 am > UUID: a38a877b-1f44-40b9-9ee8-c812a471808c > Ancestors: VMMaker-bf.353 > > VMMaker 4.13.7 > > Fix bug in primitiveChangeClass exposed in the 64 bit 68002 image format. > Corrects failure in evaluating: > > Inspector new primitiveChangeClassTo: CompiledMethodInspector new > > =============== Diff against VMMaker-bf.353 =============== > > Item was changed: > ----- Method: Interpreter>>changeClassOf:to: (in category 'object access > primitives') ----- > changeClassOf: rcvr to: argClass > "Change the class of the receiver into the class specified by the > argument given that the format of the receiver matches the format of > the argument. Fail if receiver or argument are SmallIntegers, or the > receiver is an instance of a compact class and the argument isn't, or > when the argument's class is compact and the receiver isn't, or when > the format of the receiver is different from the format of the > argument's class, or when the arguments class is fixed and the > receiver's size differs from the size that an instance of the > argument's class should have." > | classHdr sizeHiBits byteSize argFormat rcvrFormat ccIndex | > "Check what the format of the class says" > classHdr := objectMemory formatOfClass: argClass. "Low 2 bits are 0" > > "Compute the size of instances of the class (used for fixed field > classes only)" > sizeHiBits := (classHdr bitAnd: 16r60000) >> 9. > classHdr := classHdr bitAnd: 16r1FFFF. > byteSize := (classHdr bitAnd: objectMemory sizeMask) + sizeHiBits. > "size in bytes -- low 2 bits are 0" > > "Check the receiver's format against that of the class" > argFormat := (classHdr >> 8) bitAnd: 16rF. > rcvrFormat := objectMemory formatOf: rcvr. > argFormat = rcvrFormat ifFalse:[^self primitiveFail]. "no way" > > "For fixed field classes, the sizes must match. > Note: byteSize-4 because base header is included in class size." > + argFormat < 2 ifTrue:[(byteSize - 4) = (objectMemory byteSizeOf: rcvr) > ifFalse:[^self primitiveFail]]. > - argFormat < 2 ifTrue:[(byteSize - objectMemory baseHeaderSize) = > (objectMemory byteSizeOf: rcvr) ifFalse:[^self primitiveFail]]. > > (objectMemory headerType: rcvr) = HeaderTypeShort > ifTrue:[ "Compact classes. Check if the arg's class is compact and > exchange ccIndex" > ccIndex := classHdr bitAnd: CompactClassMask. > ccIndex = 0 ifTrue:[^self primitiveFail]. "class is not compact" > objectMemory longAt: rcvr put: > (((objectMemory longAt: rcvr) bitAnd: CompactClassMask bitInvert32) > bitOr: ccIndex)] > ifFalse:["Exchange the class pointer, which could make rcvr a root for > argClass" > objectMemory longAt: rcvr - objectMemory baseHeaderSize put: > (argClass bitOr: (objectMemory headerType: rcvr)). > (objectMemory oop: rcvr isLessThan: objectMemory getYoungStart) > ifTrue: [objectMemory possibleRootStoreInto: rcvr value: argClass]]! > > Item was changed: > ----- Method: VMMaker class>>versionString (in category 'version > testing') ----- > versionString > > "VMMaker versionString" > > + ^'4.13.7'! > - ^'4.13.6'! >

1 0

[commit][3108] VMMaker 4.13.7, changes from VMMaker-bf.352 and VMMaker-dtl. 354
by commits＠squeakvm.org 24 Oct '14

24 Oct '14

Revision: 3108 Author: lewis Date: 2014-10-24 05:46:01 -0700 (Fri, 24 Oct 2014) Log Message: ----------- VMMaker 4.13.7, changes from VMMaker-bf.352 and VMMaker-dtl.354 Set reclaimableContextCount to 0 in internalCannotReturn:. Fix bug in primitiveChangeClass exposed in the 64 bit 68002 image format. Corrects failure in evaluating: Inspector new primitiveChangeClassTo: CompiledMethodInspector new 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/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/ckformat.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2014-09-06T23:27:11.815+01:00--- */ +/* --- Automatically generated from class ImageFormat 2014-10-24T08:36:03.45+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-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:35:59 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - ADPCMCodecPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + ADPCMCodecPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "ADPCMCodecPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 6 September 2014 (i)" + "ADPCMCodecPlugin 24 October 2014 (i)" #else - "ADPCMCodecPlugin 6 September 2014 (e)" + "ADPCMCodecPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:11 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:03 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c 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 6 September 2014 (i)" + "AioPlugin 24 October 2014 (i)" #else - "AioPlugin 6 September 2014 (e)" + "AioPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:01 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:35:59 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - AsynchFilePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + AsynchFilePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "AsynchFilePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 6 September 2014 (i)" + "AsynchFilePlugin 24 October 2014 (i)" #else - "AsynchFilePlugin 6 September 2014 (e)" + "AsynchFilePlugin 24 October 2014 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:02 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:35:59 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - BalloonEnginePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + BalloonEnginePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "BalloonEnginePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 6 September 2014 (i)" + "B2DPlugin 24 October 2014 (i)" #else - "B2DPlugin 6 September 2014 (e)" + "B2DPlugin 24 October 2014 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:06 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:01 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - B3DAcceleratorPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + B3DAcceleratorPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "B3DAcceleratorPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 6 September 2014 (i)" + "B3DAcceleratorPlugin 24 October 2014 (i)" #else - "B3DAcceleratorPlugin 6 September 2014 (e)" + "B3DAcceleratorPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:01 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:35:59 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - BMPReadWriterPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + BMPReadWriterPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "BMPReadWriterPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 6 September 2014 (i)" + "BMPReadWriterPlugin 24 October 2014 (i)" #else - "BMPReadWriterPlugin 6 September 2014 (e)" + "BMPReadWriterPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - BitBltSimulation * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + BitBltSimulation VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "BitBltSimulation * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -256,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 6 September 2014 (i)" + "BitBltPlugin 24 October 2014 (i)" #else - "BitBltPlugin 6 September 2014 (e)" + "BitBltPlugin 24 October 2014 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:07 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:01 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - CameraPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + CameraPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "CameraPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "CameraPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 6 September 2014 (i)" + "CameraPlugin 24 October 2014 (i)" #else - "CameraPlugin 6 September 2014 (e)" + "CameraPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:07 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:01 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - ClipboardExtendedPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + ClipboardExtendedPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "ClipboardExtendedPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 6 September 2014 (i)" + "ClipboardExtendedPlugin 24 October 2014 (i)" #else - "ClipboardExtendedPlugin 6 September 2014 (e)" + "ClipboardExtendedPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - CroquetPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + CroquetPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "CroquetPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 6 September 2014 (i)" + "CroquetPlugin 24 October 2014 (i)" #else - "CroquetPlugin 6 September 2014 (e)" + "CroquetPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:07 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:01 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c 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 6 September 2014 (i)" + "DBusPlugin 24 October 2014 (i)" #else - "DBusPlugin 6 September 2014 (e)" + "DBusPlugin 24 October 2014 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - DSAPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + DSAPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "DSAPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 6 September 2014 (i)" + "DSAPrims 24 October 2014 (i)" #else - "DSAPrims 6 September 2014 (e)" + "DSAPrims 24 October 2014 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - DropPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + DropPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "DropPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 6 September 2014 (i)" + "DropPlugin 24 October 2014 (i)" #else - "DropPlugin 6 September 2014 (e)" + "DropPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - FFTPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + FFTPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "FFTPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "FFTPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 6 September 2014 (i)" + "FFTPlugin 24 October 2014 (i)" #else - "FFTPlugin 6 September 2014 (e)" + "FFTPlugin 24 October 2014 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:08 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:02 am */ /* Automatically generated by - FT2PluginCodeGenerator * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16 + FT2PluginCodeGenerator * FreeType-nice.443 uuid: d8120335-a67f-4a64-94ea-90145046f7dc from - FT2Plugin * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16 + FT2Plugin * FreeType-nice.443 uuid: d8120335-a67f-4a64-94ea-90145046f7dc */ -static char __buildInfo[] = "FT2Plugin * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16 " __DATE__ ; +static char __buildInfo[] = "FT2Plugin * FreeType-nice.443 uuid: d8120335-a67f-4a64-94ea-90145046f7dc " __DATE__ ; @@ -121,9 +121,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 6 September 2014 (i)" + "FT2Plugin 24 October 2014 (i)" #else - "FT2Plugin 6 September 2014 (e)" + "FT2Plugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:08 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:02 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - FileCopyPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + FileCopyPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "FileCopyPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 6 September 2014 (i)" + "FileCopyPlugin 24 October 2014 (i)" #else - "FileCopyPlugin 6 September 2014 (e)" + "FileCopyPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - FilePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + FilePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "FilePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -100,9 +100,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 6 September 2014 (i)" + "FilePlugin 24 October 2014 (i)" #else - "FilePlugin 6 September 2014 (e)" + "FilePlugin 24 October 2014 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - FloatArrayPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + FloatArrayPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "FloatArrayPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 6 September 2014 (i)" + "FloatArrayPlugin 24 October 2014 (i)" #else - "FloatArrayPlugin 6 September 2014 (e)" + "FloatArrayPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - FloatMathPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + FloatMathPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "FloatMathPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 6 September 2014 (i)" + "FloatMathPlugin 24 October 2014 (i)" #else - "FloatMathPlugin 6 September 2014 (e)" + "FloatMathPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - GeniePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + GeniePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "GeniePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "GeniePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 6 September 2014 (i)" + "GeniePlugin v2.0 24 October 2014 (i)" #else - "GeniePlugin v2.0 6 September 2014 (e)" + "GeniePlugin v2.0 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:09 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:02 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - HostWindowPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + HostWindowPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "HostWindowPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 6 September 2014 (i)" + "HostWindowPlugin 24 October 2014 (i)" #else - "HostWindowPlugin 6 September 2014 (e)" + "HostWindowPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - JPEGReadWriter2Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + JPEGReadWriter2Plugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "JPEGReadWriter2Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 6 September 2014 (i)" + "JPEGReadWriter2Plugin 24 October 2014 (i)" #else - "JPEGReadWriter2Plugin 6 September 2014 (e)" + "JPEGReadWriter2Plugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - JPEGReaderPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + JPEGReaderPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "JPEGReaderPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -136,9 +136,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 6 September 2014 (i)" + "JPEGReaderPlugin 24 October 2014 (i)" #else - "JPEGReaderPlugin 6 September 2014 (e)" + "JPEGReaderPlugin 24 October 2014 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - JoystickTabletPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + JoystickTabletPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "JoystickTabletPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 6 September 2014 (i)" + "JoystickTabletPlugin 24 October 2014 (i)" #else - "JoystickTabletPlugin 6 September 2014 (e)" + "JoystickTabletPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c =================================================================== --- trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:09 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:02 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c 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 6 September 2014 (i)" + "KedamaPlugin2 24 October 2014 (i)" #else - "KedamaPlugin2 6 September 2014 (e)" + "KedamaPlugin2 24 October 2014 (e)" #endif ; static unsigned int randA; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/Klatt/Klatt.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - KlattSynthesizerPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + KlattSynthesizerPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "KlattSynthesizerPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -155,9 +155,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 6 September 2014 (i)" + "Klatt 24 October 2014 (i)" #else - "Klatt 6 September 2014 (e)" + "Klatt 24 October 2014 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - LargeIntegersPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + LargeIntegersPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "LargeIntegersPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c =================================================================== --- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - LocalePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + LocalePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "LocalePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "LocalePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -71,9 +71,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LocalePlugin 6 September 2014 (i)" + "LocalePlugin 24 October 2014 (i)" #else - "LocalePlugin 6 September 2014 (e)" + "LocalePlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:09 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:02 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - MIDIPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + MIDIPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "MIDIPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin 6 September 2014 (i)" + "MIDIPlugin 24 October 2014 (i)" #else - "MIDIPlugin 6 September 2014 (e)" + "MIDIPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - Matrix2x3Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + Matrix2x3Plugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "Matrix2x3Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -74,9 +74,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin 6 September 2014 (i)" + "Matrix2x3Plugin 24 October 2014 (i)" #else - "Matrix2x3Plugin 6 September 2014 (e)" + "Matrix2x3Plugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - MiscPrimitivePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + MiscPrimitivePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "MiscPrimitivePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin 6 September 2014 (i)" + "MiscPrimitivePlugin 24 October 2014 (i)" #else - "MiscPrimitivePlugin 6 September 2014 (e)" + "MiscPrimitivePlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:10 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:02 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - Mpeg3Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + Mpeg3Plugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "Mpeg3Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "Mpeg3Plugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -101,9 +101,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin 6 September 2014 (i)" + "Mpeg3Plugin 24 October 2014 (i)" #else - "Mpeg3Plugin 6 September 2014 (e)" + "Mpeg3Plugin 24 October 2014 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; Modified: trunk/src/plugins/RePlugin/RePlugin.c =================================================================== --- trunk/src/plugins/RePlugin/RePlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/RePlugin/RePlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:01 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - RePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + RePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "RePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -79,9 +79,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin 6 September 2014 (i)" + "RePlugin 24 October 2014 (i)" #else - "RePlugin 6 September 2014 (e)" + "RePlugin 24 October 2014 (e)" #endif ; static int netMemory = 0; Modified: trunk/src/plugins/RomePlugin/RomePlugin.c =================================================================== --- trunk/src/plugins/RomePlugin/RomePlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/RomePlugin/RomePlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:10 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:02 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from RomePlugin Rome-Plugin-yo.39 uuid: 4bc7d831-189d-43ce-8b6d-7e96cf20a234 */ @@ -199,9 +199,9 @@ static sqInt maxSurfaceID; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RomePlugin yo.39 6 September 2014 (i)" + "RomePlugin yo.39 24 October 2014 (i)" #else - "RomePlugin yo.39 6 September 2014 (e)" + "RomePlugin yo.39 24 October 2014 (e)" #endif ; static fn_ioRegisterSurface registerSurfaceFn; Modified: trunk/src/plugins/ScratchPlugin/ScratchPlugin.c =================================================================== --- trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:11 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:03 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - ScratchPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + ScratchPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "ScratchPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; +static char __buildInfo[] = "ScratchPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; @@ -89,9 +89,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ScratchPlugin 6 September 2014 (i)" + "ScratchPlugin 24 October 2014 (i)" #else - "ScratchPlugin 6 September 2014 (e)" + "ScratchPlugin 24 October 2014 (e)" #endif ; Modified: trunk/src/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2014-10-24 00:37:55 UTC (rev 3107) +++ trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2014-10-24 12:46:01 UTC (rev 3108) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:01 am */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c from - SecurityPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a + SecurityPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c */ -static char __buildInfo[] = "SecurityPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-dtl.354.mcz
by commits＠source.squeak.org 24 Oct '14

24 Oct '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.354.mcz ==================== Summary ==================== Name: VMMaker-dtl.354 Author: dtl Time: 24 October 2014, 8:35:45.512 am UUID: a38a877b-1f44-40b9-9ee8-c812a471808c Ancestors: VMMaker-bf.353 VMMaker 4.13.7 Fix bug in primitiveChangeClass exposed in the 64 bit 68002 image format. Corrects failure in evaluating: Inspector new primitiveChangeClassTo: CompiledMethodInspector new =============== Diff against VMMaker-bf.353 =============== Item was changed: ----- Method: Interpreter>>changeClassOf:to: (in category 'object access primitives') ----- changeClassOf: rcvr to: argClass "Change the class of the receiver into the class specified by the argument given that the format of the receiver matches the format of the argument. Fail if receiver or argument are SmallIntegers, or the receiver is an instance of a compact class and the argument isn't, or when the argument's class is compact and the receiver isn't, or when the format of the receiver is different from the format of the argument's class, or when the arguments class is fixed and the receiver's size differs from the size that an instance of the argument's class should have." | classHdr sizeHiBits byteSize argFormat rcvrFormat ccIndex | "Check what the format of the class says" classHdr := objectMemory formatOfClass: argClass. "Low 2 bits are 0" "Compute the size of instances of the class (used for fixed field classes only)" sizeHiBits := (classHdr bitAnd: 16r60000) >> 9. classHdr := classHdr bitAnd: 16r1FFFF. byteSize := (classHdr bitAnd: objectMemory sizeMask) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Check the receiver's format against that of the class" argFormat := (classHdr >> 8) bitAnd: 16rF. rcvrFormat := objectMemory formatOf: rcvr. argFormat = rcvrFormat ifFalse:[^self primitiveFail]. "no way" "For fixed field classes, the sizes must match. Note: byteSize-4 because base header is included in class size." + argFormat < 2 ifTrue:[(byteSize - 4) = (objectMemory byteSizeOf: rcvr) ifFalse:[^self primitiveFail]]. - argFormat < 2 ifTrue:[(byteSize - objectMemory baseHeaderSize) = (objectMemory byteSizeOf: rcvr) ifFalse:[^self primitiveFail]]. (objectMemory headerType: rcvr) = HeaderTypeShort ifTrue:[ "Compact classes. Check if the arg's class is compact and exchange ccIndex" ccIndex := classHdr bitAnd: CompactClassMask. ccIndex = 0 ifTrue:[^self primitiveFail]. "class is not compact" objectMemory longAt: rcvr put: (((objectMemory longAt: rcvr) bitAnd: CompactClassMask bitInvert32) bitOr: ccIndex)] ifFalse:["Exchange the class pointer, which could make rcvr a root for argClass" objectMemory longAt: rcvr - objectMemory baseHeaderSize put: (argClass bitOr: (objectMemory headerType: rcvr)). (objectMemory oop: rcvr isLessThan: objectMemory getYoungStart) ifTrue: [objectMemory possibleRootStoreInto: rcvr value: argClass]]! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.13.7'! - ^'4.13.6'!

1 0

VM porting help: ioShowDisplay always called with empty (all 0's) buffer
by Alex Franchuk 24 Oct '14

24 Oct '14

Hey all, I'm in the process of porting Squeak to Plan9, but for some reason when ioShowDisplay is called, its buffer is all 0's, resulting in a black box to be drawn where the Squeak environment ought to be! The system is i386, and is not 100% POSIX, but has enough ANSI things to compile the VM with relatively little pain. Does anyone have advice about why this might happen, or some insight into where to look for the cause? I've tried to look at the Unix implementation where appropriate, but it seems I'm performing similar logic for most of the platform functions. Mind you, Unix and Plan9 are quite a bit different. Thanks, Alex

3 2

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

24 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.910.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.910 Author: eem Time: 23 October 2014, 5:41:36.036 pm UUID: 5b3b6e58-f2cf-46c5-9ce3-13eeae644df4 Ancestors: VMMaker.oscog-eem.909 And fix an oopsie. thanks Bob! =============== Diff against VMMaker.oscog-eem.909 =============== Item was changed: ----- Method: Spur32BitMMLECoSimulator>>return:restoringObjectsIn:savedHashes:and:savedHashes: (in category 'image segment in/out') ----- return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes self leakCheckImageSegments ifTrue: + [self halt: errCode printString]. - [self halt].. ^super return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes!

1 0

[commit][3107] CogVM source as per VMMaker.oscog-eem.909
by commits＠squeakvm.org 24 Oct '14

24 Oct '14

Revision: 3107 Author: eliot Date: 2014-10-23 17:37:55 -0700 (Thu, 23 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.909 Spur: Refactor the Spur image segment code into smaller methods. Collect the classes in a segment at the start of the seg, immediately following the root obj, to ease postponing adding cxlasses in the seg to the class table until after validation. Byte swap image segments in the load primitive if required, as is expected by the ImageSegment code. Oops, markStack pop order is LIFO. Explicitly put the roots array first in the reachable objects array that populates a segment. testImageSegmentsShouldBeWritableToaFile now succeeds & the system stays alive. All: Print slots of word objects in longPrintOop: Unix: Quote the LD_LIBRARY_PATH setting to tolerate directory names with spaces. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/unix/config/bin.squeak.sh.in branches/Cog/platforms/unix/config/squeak.sh.in branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-10-22 02:17:13 UTC (rev 3106) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-10-24 00:37:55 UTC (rev 3107) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d from - CoInterpreter VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d + CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2085,7 +2085,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.906"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.909"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46794,6 +46794,7 @@ sqInt header; sqInt header1; sqInt i; + sqInt iLimiT; sqInt index; sqInt lastIndex; sqInt len; @@ -46895,6 +46896,22 @@ return; } if (((fmt >= 6) && (fmt <= (8 - 1)))) { + for (i = 0, iLimiT = (((((((usqInt) (numBytesOf(oop))) >> 2) < 256) ? (((usqInt) (numBytesOf(oop))) >> 2) : 256)) - 1); i <= iLimiT; i += 1) { + fieldOop = long32At((oop + BaseHeaderSize) + (i << 2)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printNum(i - 1); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex(fieldOop); + /* begin space */ + /* begin printChar: */ + putchar(' '); + /* begin cr */ + printf("\n"); + } return; } startIP = (((lastPointerOf(oop)) + BytesPerOop) - BaseHeaderSize) / BytesPerOop; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-10-22 02:17:13 UTC (rev 3106) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-10-24 00:37:55 UTC (rev 3107) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-22 02:17:13 UTC (rev 3106) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-24 00:37:55 UTC (rev 3107) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d from - CoInterpreter VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d + CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2088,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.906"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.909"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46803,6 +46803,7 @@ sqInt header; sqInt header1; sqInt i; + sqInt iLimiT; sqInt index; sqInt lastIndex; sqInt len; @@ -46904,6 +46905,22 @@ return; } if (((fmt >= 6) && (fmt <= (8 - 1)))) { + for (i = 0, iLimiT = (((((((usqInt) (numBytesOf(oop))) >> 2) < 256) ? (((usqInt) (numBytesOf(oop))) >> 2) : 256)) - 1); i <= iLimiT; i += 1) { + fieldOop = long32At((oop + BaseHeaderSize) + (i << 2)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printNum(i - 1); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex(fieldOop); + /* begin space */ + /* begin printChar: */ + putchar(' '); + /* begin cr */ + printf("\n"); + } return; } startIP = (((lastPointerOf(oop)) + BytesPerOop) - BaseHeaderSize) / BytesPerOop; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-10-22 02:17:13 UTC (rev 3106) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-10-24 00:37:55 UTC (rev 3107) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d from - CoInterpreter VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d + CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.906 uuid: aaa9ffc5-3dc3-455d-b550-92988ab90a8d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1058,6 +1058,7 @@ static sqInt isonObjStack(sqInt oop, sqInt objStack) NoDbgRegParms; static sqInt keyOfEphemeron(sqInt objOop) NoDbgRegParms; static sqInt knownClassAtIndex(sqInt classIndex) NoDbgRegParms; +static sqInt lastClassIndexPun(void); sqInt lastPointerOfWhileSwizzling(sqInt objOop); sqInt lastPointerOf(sqInt objOop); sqInt leakCheckBecome(void); @@ -1070,10 +1071,11 @@ static sqInt lengthOfformat(sqInt objOop, sqInt fmt) NoDbgRegParms; sqInt literalCountOfMethodHeader(sqInt header); sqInt literalCountOf(sqInt methodPointer); -static sqInt loadImageSegmentFromoutPointers(sqInt segmentWordArrayArg, sqInt outPointerArray) NoDbgRegParms; +static sqInt loadImageSegmentFromoutPointers(sqInt segmentWordArray, sqInt outPointerArray) NoDbgRegParms; void longPrintInstancesOf(sqInt aClassOop); void longPrintInstancesWithClassIndex(sqInt classIndex); void longPrintReferencesTo(sqInt anOop); +static sqInt mapOopsFromtooutPointersoutHashes(sqInt segStart, sqInt segAddr, sqInt outPointerArray, sqInt savedOutHashes) NoDbgRegParms; static void markAndTraceClassOf(sqInt objOop) NoDbgRegParms; static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); @@ -1527,8 +1529,8 @@ _iss usqInt endOfMemory; _iss sqInt weaklingStack; _iss usqInt newSpaceStart; +_iss SpurSegmentInfo * segments; _iss sqInt needGCFlag; -_iss SpurSegmentInfo * segments; _iss sqInt trueObj; _iss sqInt falseObj; _iss sqInt remapBufferCount; @@ -1706,9 +1708,9 @@ #endif #endif static void (*primitiveFunctionPointer)(); -sqInt checkForLeaks; sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */; jmp_buf reenterInterpreter; /* private export */; +sqInt checkForLeaks; sqInt checkAllocFiller; sqInt inIOProcessEvents; sqInt desiredEdenBytes; @@ -2333,7 +2335,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 CoInterpreterPrimitives_VMMaker.oscog-eem.906"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.909"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -47136,7 +47138,8 @@ /* Copy objOop into the segment beginning at segAddr, and forward it to the copy. If it is a class in the class table, set the copy's hash to 0 for - reassignment on load. + reassignment on load, + and mark it as a class by setting its isRemembered bit. Answer the next segmentAddr if successful. Answer an appropriate error code if not */ /* Copy the object... */ @@ -47173,6 +47176,9 @@ flag("endianness"); assert(((0 >= 0) && (0 <= (identityHashHalfWordMask())))); longAtput(copy + 4, ((((longAt(copy + 4)) | 0x3FFFFF) - 0x3FFFFF)) + 0); + /* begin setIsRememberedOf:to: */ + flag("endianness"); + longAtput(copy, (longAt(copy)) | (1 << 29)); } newOop = (copy - segStart) / 8; if (newOop > 0x3FFFFF) { @@ -50763,6 +50769,19 @@ } +/* Class puns are class indices not used by any class. There is an entry + for the pun that refers to the notional class of objects with this class + index. But because the index doesn't match the class it won't show up + in allInstances, hence hiding the object with a pun as its class index. + The puns occupy indices 16 through 31. */ + +static sqInt +lastClassIndexPun(void) +{ + return 0x1F; +} + + /* Answer the byte offset of the last pointer field of the given object. Works with CompiledMethods, as well as ordinary objects. Does not examine the stack pointer of contexts to be sure to swizzle @@ -51016,33 +51035,47 @@ just fail if endinanness is wrong. */ static sqInt -loadImageSegmentFromoutPointers(sqInt segmentWordArrayArg, sqInt outPointerArray) +loadImageSegmentFromoutPointers(sqInt segmentWordArray, sqInt outPointerArray) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt addr; + sqInt addr1; sqInt classIndex; + sqInt classIndex1; + sqInt classOop; + sqInt classRef; sqInt errorCode; - sqInt firstNeedingPostProcessing; + sqInt errorCode1; sqInt hash; sqInt i; sqInt iLimiT; - sqInt newObj; - usqInt numBytes; + sqInt mappedOop; usqInt numOutPointers; usqInt numSlots; usqInt numSlots1; + usqInt numSlots11; + usqInt numSlots12; usqInt numSlots2; usqInt numSlots3; + usqInt numSlots4; + usqInt numSlots5; sqInt objOop; + sqInt objOop1; + sqInt objOop2; sqInt oldClone; sqInt oop; - sqInt outPointer; - sqInt segLimit; - sqInt segmentWordArray; - sqInt segStart; + sqInt oop1; + sqInt segmentLimit; + sqInt segmentStart; sqInt segVersion; + sqInt slotBytes; + sqInt slotBytes1; + sqInt stopAddr; + sqInt stopAddr1; sqInt topHashBit; + sqInt topHashBit1; sqInt topOopBit; - segVersion = longAt(segmentWordArrayArg + BaseHeaderSize); + segVersion = longAt(segmentWordArray + BaseHeaderSize); if (!(((segVersion & 0xFFFF) == (imageFormatVersion())) || ((!1) && ((segVersion & 0xFFFF) == ((BytesPerWord == 4 @@ -51051,239 +51084,250 @@ /* low 2 bytes */ - return PrimErrBadArgument; - } - if ((byteAt(segmentWordArrayArg + 7)) == 0xFF) { - segmentWordArray = segmentWordArrayArg; - } - else { - /* begin allocateSlots:format:classIndex: */ - if ((0xFF + 1) >= 0xFF) { - ; - newObj = GIV(freeStart) + BaseHeaderSize; - numBytes = (BaseHeaderSize + BaseHeaderSize) + (((0xFF + 1) + ((0xFF + 1) & 1)) * 4); + /* begin reverseBytesFrom:to: */ + /* begin addressAfter: */ + /* begin numSlotsOfAny: */ + numSlots11 = byteAt(segmentWordArray + 7); + numSlots3 = (numSlots11 == 0xFF + ? longAt(segmentWordArray - BaseHeaderSize) + : numSlots11); + slotBytes1 = (numSlots3 == 0 + ? 8 + : (numSlots3 + (numSlots3 & 1)) << 2); + stopAddr1 = (segmentWordArray + BaseHeaderSize) + slotBytes1; + addr1 = segmentWordArray + BaseHeaderSize; + while ((((usqInt) addr1)) < (((usqInt) stopAddr1))) { + longAtput(addr1, ((((((usqInt) (longAt(addr1)) >> 24)) & Byte0Mask) + ((((usqInt) (longAt(addr1)) >> 8)) & Byte1Mask)) + ((((usqInt) (longAt(addr1)) << 8)) & Byte2Mask)) + ((((usqInt) (longAt(addr1)) << 24)) & Byte3Mask)); + addr1 += BytesPerWord; } - else { - newObj = GIV(freeStart); - numBytes = BaseHeaderSize + (((0xFF + 1) <= 1 - ? 8 - : ((0xFF + 1) + ((0xFF + 1) & 1)) * 4)); - } - if ((GIV(freeStart) + numBytes) > GIV(scavengeThreshold)) { - if (!GIV(needGCFlag)) { - /* begin scheduleScavenge */ - GIV(needGCFlag) = 1; - forceInterruptCheck(); - } - segmentWordArray = allocateSlotsInOldSpacebytesformatclassIndex(0xFF + 1, numBytes, (((usqInt) (longAt(segmentWordArrayArg))) >> 24) & 0x1F, (longAt(segmentWordArrayArg)) & 0x3FFFFF); - goto l1; - } - if ((0xFF + 1) >= 0xFF) { + segVersion = longAt(segmentWordArray + BaseHeaderSize); + if (!(((segVersion & 0xFFFF) == (imageFormatVersion())) + || ((!1) + && ((segVersion & 0xFFFF) == ((BytesPerWord == 4 + ? 6504 + : 68002)))))) { - /* for header parsing we put a saturated slot count in the prepended overflow size word */ + /* low 2 bytes */ - flag("endianness"); - longAtput(GIV(freeStart), 0xFF + 1); - longAtput(GIV(freeStart) + 4, 0xFF << 24); - long64Atput(newObj, (((((usqLong) 0xFF)) << 56) + (((((usqInt) (longAt(segmentWordArrayArg))) >> 24) & 0x1F) << 24)) + ((longAt(segmentWordArrayArg)) & 0x3FFFFF)); + /* begin reverseBytesFrom:to: */ + /* begin addressAfter: */ + /* begin numSlotsOfAny: */ + numSlots1 = byteAt(segmentWordArray + 7); + numSlots2 = (numSlots1 == 0xFF + ? longAt(segmentWordArray - BaseHeaderSize) + : numSlots1); + slotBytes = (numSlots2 == 0 + ? 8 + : (numSlots2 + (numSlots2 & 1)) << 2); + stopAddr = (segmentWordArray + BaseHeaderSize) + slotBytes; + addr = segmentWordArray + BaseHeaderSize; + while ((((usqInt) addr)) < (((usqInt) stopAddr))) { + longAtput(addr, ((((((usqInt) (longAt(addr)) >> 24)) & Byte0Mask) + ((((usqInt) (longAt(addr)) >> 8)) & Byte1Mask)) + ((((usqInt) (longAt(addr)) << 8)) & Byte2Mask)) + ((((usqInt) (longAt(addr)) << 24)) & Byte3Mask)); + addr += BytesPerWord; + } + return PrimErrBadArgument; } - else { - long64Atput(newObj, (((((usqLong) (0xFF + 1))) << 56) + (((((usqInt) (longAt(segmentWordArrayArg))) >> 24) & 0x1F) << 24)) + ((longAt(segmentWordArrayArg)) & 0x3FFFFF)); - } - assert((numBytes % (allocationUnit())) == 0); - assert((newObj % (allocationUnit())) == 0); - GIV(freeStart) += numBytes; - segmentWordArray = newObj; - l1: /* end allocateSlots:format:classIndex: */; - if (!(segmentWordArray)) { - return PrimErrNoMemory; - } - memcpy(segmentWordArray + BaseHeaderSize, segmentWordArrayArg + BaseHeaderSize, (numSlotsOf(segmentWordArrayArg)) * BytesPerOop); } - segStart = (segmentWordArray + BaseHeaderSize) + 8; + segmentStart = (segmentWordArray + BaseHeaderSize) + 8; - /* scan through mapping oops and validating class references. - Defer entering any class objects into the class table and/or - pinning objects until a second pass. */ + /* Notionally reverse the Byte type objects if the data is from opposite endian machine. + Test top byte. $d on the Mac or $s on the PC. Rest of word is equal. If Spur is ever + ported to big-endian machines then the segment may have to be byte/word swapped, + but so far it only runs on little-endian machines, so for now just fail if endinanness is wrong. */ - segLimit = (((numSlotsOf(segmentWordArrayArg)) * BytesPerOop) + segmentWordArray) + BaseHeaderSize; + segmentLimit = (((numSlotsOf(segmentWordArray)) * BytesPerOop) + segmentWordArray) + BaseHeaderSize; + flag("endianness"); + if ((((usqInt) segVersion) >> 16) != (((usqInt) (imageSegmentVersion())) >> 16)) { + + /* Reverse the byte-type objects once */ + + return PrimErrBadArgument; + + } + /* begin mapOopsAndValidateClassRefsFrom:to:outPointers: */ /* begin numSlotsOf: */ flag("endianness"); assert((classIndexOf(outPointerArray)) > (isForwardedObjectClassIndexPun())); - numSlots1 = byteAt(outPointerArray + 7); - numOutPointers = (numSlots1 == 0xFF + numSlots4 = byteAt(outPointerArray + 7); + numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) - : numSlots1); - firstNeedingPostProcessing = 0; + : numSlots4); topHashBit = (((22 - 1) < 0) ? ((usqInt) 1 >> -(22 - 1)) : ((usqInt) 1 << (22 - 1))); topOopBit = ((((BytesPerOop * 8) - 1) < 0) ? ((usqInt) 1 >> -((BytesPerOop * 8) - 1)) : ((usqInt) 1 << ((BytesPerOop * 8) - 1))); /* begin objectStartingAt: */ - numSlots2 = byteAt(segStart + 7); - objOop = (numSlots2 == 0xFF - ? segStart + BaseHeaderSize - : segStart); - while (objOop < segLimit) { - if ((((((usqInt) (longAt(objOop))) >> 29) & 1) != 0) - || (((((usqInt) (longAt(objOop + 4))) >> 23) & 1) != 0)) { - return PrimErrInappropriate; + numSlots12 = byteAt(segmentStart + 7); + objOop1 = (numSlots12 == 0xFF + ? segmentStart + BaseHeaderSize + : segmentStart); + while (objOop1 < segmentLimit) { + if (((((usqInt) (longAt(objOop1 + 4))) >> 23) & 1) != 0) { + errorCode = PrimErrInappropriate; + goto l2; } - if ((firstNeedingPostProcessing == 0) - && ((((((usqInt) objOop)) < (((usqInt) GIV(newSpaceLimit)))) - && ((((usqInt) objOop)) >= (((usqInt) GIV(newSpaceStart))))) - && (((((usqInt) (longAt(objOop))) >> 30) & 1) != 0))) { - firstNeedingPostProcessing = objOop; - } - classIndex = (longAt(objOop)) & 0x3FFFFF; + + /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ + + classIndex = (longAt(objOop1)) & 0x3FFFFF; if (classIndex & topHashBit) { if ((classIndex - topHashBit) >= numOutPointers) { - return PrimErrBadIndex; + errorCode = PrimErrBadIndex; + goto l2; } - outPointer = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - topHashBit) << 2)); - hash = (longAt(outPointer + 4)) & 0x3FFFFF; + mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - topHashBit) << 2)); + hash = (longAt(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) - && ((classOrNilAtIndex(hash)) == outPointer))) { - return PrimErrInappropriate; + && ((classOrNilAtIndex(hash)) == mappedOop))) { + errorCode = PrimErrInappropriate; + goto l2; } - /* begin setClassIndexOf:to: */ - assert(((hash >= 0) && (hash <= (classIndexMask())))); - flag("endianness"); - longAtput(objOop, ((longAt(objOop)) & (~0x3FFFFF)) + hash); } else { /* The class is contained within the segment. */ - if (((oop = (classIndex * 8) + segStart)) >= segLimit) { - return PrimErrBadIndex; + if (((oop1 = (classIndex * 8) + segmentStart)) >= segmentLimit) { + errorCode = PrimErrBadIndex; + goto l2; } - if (((longAt(oop + 4)) & 0x3FFFFF) != 0) { - return PrimErrInappropriate; + if (((longAt(oop1 + 4)) & 0x3FFFFF) != 0) { + errorCode = PrimErrInappropriate; + goto l2; } - /* begin setIsRememberedOf:to: */ - flag("endianness"); - longAtput(objOop, (longAt(objOop)) | (1 << 29)); - if (firstNeedingPostProcessing == 0) { - firstNeedingPostProcessing = objOop; - } } - for (i = 0, iLimiT = ((numPointerSlotsOf(objOop)) - 1); i <= iLimiT; i += 1) { - oop = longAt((objOop + BaseHeaderSize) + (i << 2)); - if ((oop & 3) == 0) { - if ((oop & (8 - 1)) != 0) { - return PrimErrInappropriate; - } - if (oop & topOopBit) { - if ((oop / BytesPerOop) >= numOutPointers) { - return PrimErrBadIndex; + for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { + oop1 = longAt((objOop1 + BaseHeaderSize) + (i << 2)); + if ((oop1 & 3) == 0) { + if (oop1 & topOopBit) { + if (((oop1 = (oop1 - topOopBit) / BytesPerOop)) >= numOutPointers) { + errorCode = PrimErrBadIndex; + goto l2; } - outPointer = longAt((outPointerArray + BaseHeaderSize) + ((oop / BytesPerOop) << 2)); - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(objOop))); - longAtput((objOop + BaseHeaderSize) + (i << 2), outPointer); + mappedOop = longAt((outPointerArray + BaseHeaderSize) + (oop1 << 2)); } else { - if ((oop + segStart) >= segLimit) { - return PrimErrBadIndex; + if ((oop1 & (8 - 1)) != 0) { + errorCode = PrimErrInappropriate; + goto l2; } - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(objOop))); - longAtput((objOop + BaseHeaderSize) + (i << 2), oop + segStart); + if (((mappedOop = oop1 + segmentStart)) >= segmentLimit) { + errorCode = PrimErrBadIndex; + goto l2; + } } + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(objOop1))); + longAtput((objOop1 + BaseHeaderSize) + (i << 2), mappedOop); } } - objOop = objectAfterlimit(objOop, segLimit); + objOop1 = objectAfterlimit(objOop1, segmentLimit); } - if (firstNeedingPostProcessing != 0) { - objOop = firstNeedingPostProcessing; - assert(isRemembered(objOop)); - while (objOop < segLimit) { - if (((((usqInt) (longAt(objOop))) >> 29) & 1) != 0) { - /* begin setIsRememberedOf:to: */ + errorCode = 0; +l2: /* end mapOopsAndValidateClassRefsFrom:to:outPointers: */; + if (errorCode != 0) { + return errorCode; + } + /* begin enterClassesIntoClassTableFrom:to: */ + objOop = objectAfter(objectStartingAt(segmentStart)); + while ((objOop < segmentLimit) + && (((((usqInt) (longAt(objOop))) >> 29) & 1) != 0)) { + /* begin setIsRememberedOf:to: */ + flag("endianness"); + longAtput(objOop, (longAt(objOop)) & (~(1 << 29))); + if (((errorCode1 = enterIntoClassTable(objOop))) != 0) { + oop = objOop; + objOop = objectAfter(objectStartingAt(segmentStart)); + while (objOop < oop) { + expungeFromClassTable(objOop); + objOop = objectAfterlimit(objOop, segmentLimit); + } + errorCode = errorCode1; + goto l1; + } + objOop = objectAfterlimit(objOop, segmentLimit); + } + errorCode = 0; +l1: /* end enterClassesIntoClassTableFrom:to: */; + if (errorCode != 0) { + return errorCode; + } + /* begin assignClassIndicesAndPinFrom:to:outPointers: */ + topHashBit1 = (((22 - 1) < 0) ? ((usqInt) 1 >> -(22 - 1)) : ((usqInt) 1 << (22 - 1))); + /* begin objectStartingAt: */ + numSlots5 = byteAt(segmentStart + 7); + objOop2 = (numSlots5 == 0xFF + ? segmentStart + BaseHeaderSize + : segmentStart); + while (objOop2 < segmentLimit) { + classRef = (longAt(objOop2)) & 0x3FFFFF; + classOop = (classRef & topHashBit1 + ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - topHashBit1) << 2)) + : (classRef * 8) + segmentStart); + classIndex1 = (longAt(classOop + 4)) & 0x3FFFFF; + assert((classIndex1 > (lastClassIndexPun())) + && ((classOrNilAtIndex(classIndex1)) == classOop)); + /* begin setClassIndexOf:to: */ + assert(((classIndex1 >= 0) && (classIndex1 <= (classIndexMask())))); + flag("endianness"); + longAtput(objOop2, ((longAt(objOop2)) & (~0x3FFFFF)) + classIndex1); + if ((((((usqInt) objOop2)) < (((usqInt) GIV(newSpaceLimit)))) + && ((((usqInt) objOop2)) >= (((usqInt) GIV(newSpaceStart))))) + && (((((usqInt) (longAt(objOop2))) >> 30) & 1) != 0)) { + oldClone = cloneInOldSpaceForPinning(objOop2); + if (oldClone != 0) { + /* begin setIsPinnedOf:to: */ flag("endianness"); - longAtput(objOop, (longAt(objOop)) & (~(1 << 29))); - classIndex = (longAt(objOop)) & 0x3FFFFF; - assert(!((classIndex & topHashBit))); - oop = (classIndex * 8) + segStart; - if (((hash = (longAt(oop + 4)) & 0x3FFFFF)) == 0) { - - /* The class needs to be added to the classTable */ - - if (((errorCode = enterIntoClassTable(oop))) != 0) { - /* begin objectStartingAt: */ - numSlots = byteAt(segStart + 7); - objOop = (numSlots == 0xFF - ? segStart + BaseHeaderSize - : segStart); - while (objOop < segLimit) { - hash = (longAt(objOop + 4)) & 0x3FFFFF; - (hash > 0x1F) - && ((((classOrNilAtIndex(hash)) == objOop - ? expungeFromClassTable(objOop) - : 0), - (objOop = objectAfterlimit(objOop, segLimit)))); - } - return errorCode; - } - hash = (longAt(oop + 4)) & 0x3FFFFF; - } - /* begin setClassIndexOf:to: */ - assert(((hash >= 0) && (hash <= (classIndexMask())))); + longAtput(oldClone, (longAt(oldClone)) | (1 << 30)); + /* begin forward:to: */ + /* begin set:classIndexTo:formatTo: */ + assert(((8 >= 0) && (8 <= (classIndexMask())))); + assert(((7 >= 0) && (7 <= (formatMask())))); flag("endianness"); - longAtput(objOop, ((longAt(objOop)) & (~0x3FFFFF)) + hash); - } - if ((((((usqInt) objOop)) < (((usqInt) GIV(newSpaceLimit)))) - && ((((usqInt) objOop)) >= (((usqInt) GIV(newSpaceStart))))) - && (((((usqInt) (longAt(objOop))) >> 30) & 1) != 0)) { - oldClone = cloneInOldSpaceForPinning(objOop); - if (oldClone != 0) { - /* begin setIsPinnedOf:to: */ - flag("endianness"); - longAtput(oldClone, (longAt(oldClone)) | (1 << 30)); - /* begin forward:to: */ - /* begin set:classIndexTo:formatTo: */ - assert(((8 >= 0) && (8 <= (classIndexMask())))); - assert(((7 >= 0) && (7 <= (formatMask())))); - flag("endianness"); - longAtput(objOop, ((longAt(objOop)) & (~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); - /* begin storePointer:ofForwarder:withValue: */ - assert(isForwarded(objOop)); - assert(!(isOopForwarded(oldClone))); - if (isOldObject(objOop)) { + longAtput(objOop2, ((longAt(objOop2)) & (~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); + /* begin storePointer:ofForwarder:withValue: */ + assert(isForwarded(objOop2)); + assert(!(isOopForwarded(oldClone))); + if (isOldObject(objOop2)) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((oldClone & 3) == 0) - && ((((usqInt) oldClone)) < (((usqInt) GIV(newSpaceLimit))))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(objOop))) >> 29) & 1) != 0)) { - remember(objOop); - } + if (((oldClone & 3) == 0) + && ((((usqInt) oldClone)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(objOop2))) >> 29) & 1) != 0)) { + remember(objOop2); } } - longAtput((objOop + BaseHeaderSize) + (0 << 2), oldClone); - if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); - byteAtput(objOop + 7, 1); - } } + longAtput((objOop2 + BaseHeaderSize) + (0 << 2), oldClone); + if ((byteAt(objOop2 + 7)) == 0) { + /* begin setRawNumSlotsOf:to: */ + flag("endian"); + byteAtput(objOop2 + 7, 1); + } } - objOop = objectAfterlimit(objOop, segLimit); } + objOop2 = objectAfterlimit(objOop2, segmentLimit); } - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 0); + if ((byteAt(segmentWordArray + 7)) == 0xFF) { + /* begin setOverflowNumSlotsOf:to: */ + flag("endian"); + long32Atput(segmentWordArray - BaseHeaderSize, 0); + } + else { + /* begin setRawNumSlotsOf:to: */ + flag("endian"); + byteAtput(segmentWordArray + 7, 0); + } if ((checkForLeaks & 16) != 0) { /* begin runLeakCheckerForFullGC: */ runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(1, 0, 1); /* return self */ } /* begin objectStartingAt: */ - numSlots3 = byteAt(segStart + 7); - return (numSlots3 == 0xFF - ? segStart + BaseHeaderSize - : segStart); + numSlots = byteAt(segmentStart + 7); + return (numSlots == 0xFF + ? segmentStart + BaseHeaderSize + : segmentStart); } @@ -51586,6 +51630,185 @@ } +/* Now scan, adding out pointers to the outPointersArray; all objects in + arrayOfObjects have their hashes set to point to their copies in + segmentWordArray. Answer the outIndex + if the scan succeded, otherwise answer -1. It will fail if outPointers is + too small. */ + +static sqInt +mapOopsFromtooutPointersoutHashes(sqInt segStart, sqInt segAddr, sqInt outPointerArray, sqInt savedOutHashes) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classIndex; + sqInt classTablePage; + sqInt hash; + sqInt hash1; + sqInt i; + sqInt iLimiT; + sqInt numSlots; + usqInt numSlots1; + usqInt numSlots2; + sqInt objOop; + sqInt oop; + sqInt outIndex; + usqInt p; + sqInt topHashBit; + sqInt topOopBit; + + outIndex = 0; + /* begin fillObj:numSlots:with: */ + /* begin numSlotsOf: */ + flag("endianness"); + assert((classIndexOf(outPointerArray)) > (isForwardedObjectClassIndexPun())); + numSlots2 = byteAt(outPointerArray + 7); + numSlots = ((usqInt) ((numSlots2 == 0xFF + ? longAt(outPointerArray - BaseHeaderSize) + : numSlots2))); + assert(oopisLessThan(((outPointerArray + BaseHeaderSize) + (numSlots * (bytesPerSlot()))) - 1, addressAfter(outPointerArray))); + for (p = (((usqInt)(outPointerArray + BaseHeaderSize))); p <= (((usqInt)(((outPointerArray + BaseHeaderSize) + (numSlots * 4)) - 1))); p += 8) { + longAtput(p, GIV(nilObj)); + longAtput(p + 4, GIV(nilObj)); + } + topHashBit = (((22 - 1) < 0) ? ((usqInt) 1 >> -(22 - 1)) : ((usqInt) 1 << (22 - 1))); + topOopBit = ((((BytesPerOop * 8) - 1) < 0) ? ((usqInt) 1 >> -((BytesPerOop * 8) - 1)) : ((usqInt) 1 << ((BytesPerOop * 8) - 1))); + /* begin objectStartingAt: */ + numSlots1 = byteAt(segStart + 7); + objOop = (numSlots1 == 0xFF + ? segStart + BaseHeaderSize + : segStart); + while (objOop < segAddr) { + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(objOop)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + oop = objOop; + goto l1; + } + if (classIndex == 8) { + oop = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + oop = GIV(nilObj); + goto l2; + } + oop = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); + l2: /* end classOrNilAtIndex: */; + l1: /* end fetchClassOfNonImm: */; + if (!(((((usqInt) (longAt(oop + 4))) >> 23) & 1) != 0)) { + + /* oop is a new outPointer; allocate its oop */ + + /* begin newOutPointer:at:in:hashes:topHashBit: */ + if (outIndex >= (numSlotsOf(outPointerArray))) { + + /* no room in outPointers; fail */ + + outIndex = 0; + goto l3; + } + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(outPointerArray))); + if (isOldObject(outPointerArray)) { + + /* most stores into young objects */ + + if (((oop & 3) == 0) + && ((((usqInt) oop)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(outPointerArray))) >> 29) & 1) != 0)) { + remember(outPointerArray); + } + } + } + longAtput((outPointerArray + BaseHeaderSize) + (outIndex << 2), oop); + long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (longAt(oop + 4)) & 0x3FFFFF); + /* begin setHashBitsOf:to: */ + flag("endianness"); + assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); + longAtput(oop + 4, ((((longAt(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + setIsMarkedOfto(oop, 1); + outIndex += 1; + l3: /* end newOutPointer:at:in:hashes:topHashBit: */; + if (outIndex == 0) { + + /* no room in outPointers; fail */ + + return -1; + } + } + hash = (longAt(oop + 4)) & 0x3FFFFF; + /* begin setClassIndexOf:to: */ + assert(((hash >= 0) && (hash <= (classIndexMask())))); + flag("endianness"); + longAtput(objOop, ((longAt(objOop)) & (~0x3FFFFF)) + hash); + for (i = 0, iLimiT = ((numPointerSlotsOf(objOop)) - 1); i <= iLimiT; i += 1) { + oop = longAt((objOop + BaseHeaderSize) + (i << 2)); + if ((oop & 3) == 0) { + if (!(((((usqInt) (longAt(oop + 4))) >> 23) & 1) != 0)) { + + /* oop is a new outPointer; allocate its oop */ + + /* begin newOutPointer:at:in:hashes:topHashBit: */ + if (outIndex >= (numSlotsOf(outPointerArray))) { + + /* no room in outPointers; fail */ + + outIndex = 0; + goto l4; + } + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(outPointerArray))); + if (isOldObject(outPointerArray)) { + + /* most stores into young objects */ + + if (((oop & 3) == 0) + && ((((usqInt) oop)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(outPointerArray))) >> 29) & 1) != 0)) { + remember(outPointerArray); + } + } + } + longAtput((outPointerArray + BaseHeaderSize) + (outIndex << 2), oop); + long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (longAt(oop + 4)) & 0x3FFFFF); + /* begin setHashBitsOf:to: */ + flag("endianness"); + assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); + longAtput(oop + 4, ((((longAt(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + setIsMarkedOfto(oop, 1); + outIndex += 1; + l4: /* end newOutPointer:at:in:hashes:topHashBit: */; + if (outIndex == 0) { + + /* no room in outPointers; fail */ + + return -1; + } + } + /* begin mappedOopOf:topHashBit:topOopBit: */ + hash1 = (longAt(oop + 4)) & 0x3FFFFF; + oop = (hash1 & topHashBit + ? ((hash1 - topHashBit) * BytesPerOop) + topOopBit + : hash1 * 8); + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(objOop))); + longAtput((objOop + BaseHeaderSize) + (i << 2), oop); + } + } + objOop = objectAfterlimit(objOop, segAddr); + } + return outIndex; +} + + /* Ensure the class of the argument is marked, pushing it on the markStack if not already marked. Also set the relevant bit in the classTableBitmap so that duplicate @@ -60514,7 +60737,16 @@ assert(numSlots < (numSlotsMask())); byteAtput(objOop + 7, numSlots); } + + /* We have options. + 1. we can clone the object and forward to the clone. + 2. if the following object has a short header we can given it a large header. */ + delta = bytesBefore - (bytesInObject(objOop)); + flag("deal with it, dude"); + if (delta <= 8) { + error("shorten:toIndexableSize: attempted to shorten to allocationUnit!"); + } freeChunk = initFreeChunkWithBytesat(delta, addressAfter(objOop)); if (((((usqInt) objOop)) >= (((usqInt) GIV(oldSpaceStart)))) && ((((usqInt) objOop)) < (((usqInt) GIV(endOfMemory))))) { @@ -60688,13 +60920,16 @@ offset in the outPointer array (the first would be 4). but with the high bit set. + Since Spur has a class table the load primitive must insert classes that + have instances in the class + table. This primitive marks such classes using the isRemembered bit, which + isn't meaningful as a + remembered bit in the segment. + The primitive expects the segmentWordArray and outPointerArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly - the right size. To simplify - truncation, both incoming arrays are required to be whatever the - objectMemory considers long - objects. If either array is too small, the primitive will fail. + the right size. The primitive can fail for the following reasons with the specified failure codes: @@ -60711,19 +60946,20 @@ sqInt address1; sqInt arrayOfObjects; sqInt classIndex; - sqInt classIndex1; sqInt classTablePage; - sqInt classTablePage1; sqInt count; sqInt endSeg; sqInt fillValue; sqInt freeChunk; sqInt hash; - sqInt hash1; + sqInt here; + sqInt hereLimiT; sqInt i; sqInt i1; + sqInt i2; sqInt iLimiT; sqInt iLimiT1; + sqInt iLimiT2; sqInt limit; sqInt limit1; sqInt newObj; @@ -60735,22 +60971,21 @@ sqInt numBytes3; sqInt numSlots; sqInt numSlots1; - usqInt numSlots10; usqInt numSlots11; usqInt numSlots111; usqInt numSlots12; usqInt numSlots2; usqInt numSlots21; sqInt numSlots3; - usqInt numSlots4; - sqInt numSlots5; - sqInt numSlots6; + sqInt numSlots4; + usqInt numSlots5; + usqInt numSlots6; usqInt numSlots7; - usqInt numSlots8; - usqInt numSlots9; sqInt obj; sqInt objOop; sqInt objOop1; + sqInt objOop11; + sqInt objOop12; sqInt objOop2; sqInt objOop3; sqInt oop; @@ -60758,7 +60993,6 @@ sqInt outIndex; usqInt p; usqInt p1; - usqInt p2; sqInt prevObj; sqInt prevObj1; sqInt prevPrevObj; @@ -60771,21 +61005,9 @@ sqInt slotBytes; sqInt slotBytes1; sqInt start; - sqInt topHashBit; - sqInt topOopBit; + sqInt tempObjOop; + sqInt there; - if (!((byteAt(segmentWordArray + 7)) == 0xFF)) { - - /* Must have 128-bit header */ - - return PrimErrWritePastObject; - } - if (!((byteAt(outPointerArray + 7)) == 0xFF)) { - - /* Must have 128-bit header */ - - return PrimErrBadIndex; - } if ((checkForLeaks & 16) != 0) { /* begin runLeakCheckerForFullGC: */ runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(1, 0, 1); @@ -60794,7 +61016,20 @@ /* begin objectsReachableFromRoots: */ assert(isArray(arrayOfRoots)); assert(allObjectsUnmarked()); + /* begin markObjectsIn: */ setIsMarkedOfto(arrayOfRoots, 1); + for (i1 = 0, iLimiT1 = ((numSlotsOf(arrayOfRoots)) - 1); i1 <= iLimiT1; i1 += 1) { + /* begin followField:ofObject: */ + objOop12 = longAt((arrayOfRoots + BaseHeaderSize) + (i1 << 2)); + if (((objOop12 & 3) == 0) + && (((longAt(objOop12)) & 0x3FFFFF) == 8)) { + objOop12 = fixFollowedFieldofObjectwithInitialValue(i1, arrayOfRoots, objOop12); + } + oop1 = objOop12; + if ((oop1 & 3) == 0) { + setIsMarkedOfto(oop1, 1); + } + } markObjects(0); assert(isEmptyObjStack(GIV(markStack))); assert(isEmptyObjStack(GIV(weaklingStack))); @@ -60804,18 +61039,28 @@ /* begin addressAfter: */ /* begin numSlotsOfAny: */ numSlots12 = byteAt(freeChunk + 7); - numSlots10 = (numSlots12 == 0xFF + numSlots7 = (numSlots12 == 0xFF ? longAt(freeChunk - BaseHeaderSize) : numSlots12); - slotBytes1 = (numSlots10 == 0 + slotBytes1 = (numSlots7 == 0 ? 8 - : (numSlots10 + (numSlots10 & 1)) << 2); + : (numSlots7 + (numSlots7 & 1)) << 2); limit = (freeChunk + BaseHeaderSize) + slotBytes1; - /* First put the roots; order is important. */ + /* First put the arrayOfRoots; order is important. */ count = 0; - pushonObjStack(arrayOfRoots, GIV(markStack)); + count += 1; + if (ptr < limit) { + longAtput(ptr, arrayOfRoots); + ptr += 4; + } + for (i2 = 0, iLimiT2 = ((numSlotsOf(arrayOfRoots)) - 1); i2 <= iLimiT2; i2 += 1) { + oop = longAt((arrayOfRoots + BaseHeaderSize) + (i2 << 2)); + if ((oop & 3) == 0) { + pushonObjStack(oop, GIV(markStack)); + } + } while (!(isEmptyObjStack(GIV(markStack)))) { objOop3 = popObjStack(GIV(markStack)); count += 1; @@ -60824,39 +61069,39 @@ ptr += 4; } /* begin fetchClassOfNonImm: */ - classIndex1 = (longAt(objOop3)) & 0x3FFFFF; - if (classIndex1 <= 0x1F) { - if (classIndex1 == 0x1F) { - oop1 = objOop3; - goto l7; + classIndex = (longAt(objOop3)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + oop = objOop3; + goto l3; } - if (classIndex1 == 8) { - oop1 = GIV(nilObj); - goto l7; + if (classIndex == 8) { + oop = GIV(nilObj); + goto l3; } } - assert(classIndex1 >= (arrayClassIndexPun())); + assert(classIndex >= (arrayClassIndexPun())); /* begin classOrNilAtIndex: */ - assert((classIndex1 <= (tagMask())) - || (classIndex1 >= (arrayClassIndexPun()))); - classTablePage1 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex1) >> 10) << 2)); - if (classTablePage1 == GIV(nilObj)) { - oop1 = GIV(nilObj); - goto l8; + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + oop = GIV(nilObj); + goto l4; } - oop1 = longAt((classTablePage1 + BaseHeaderSize) + ((classIndex1 & ((1 << 10) - 1)) << 2)); - l8: /* end classOrNilAtIndex: */; - l7: /* end fetchClassOfNonImm: */; - if (!(((((usqInt) (longAt(oop1 + 4))) >> 23) & 1) != 0)) { + oop = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); + l4: /* end classOrNilAtIndex: */; + l3: /* end fetchClassOfNonImm: */; + if (!(((((usqInt) (longAt(oop + 4))) >> 23) & 1) != 0)) { setIsMarkedOfto(objOop3, 1); - pushonObjStack(oop1, GIV(markStack)); + pushonObjStack(oop, GIV(markStack)); } - for (i1 = 0, iLimiT1 = ((numPointerSlotsOf(objOop3)) - 1); i1 <= iLimiT1; i1 += 1) { - oop1 = longAt((objOop3 + BaseHeaderSize) + (i1 << 2)); - if (!(((oop1 & 3) != 0) - || (((((usqInt) (longAt(oop1 + 4))) >> 23) & 1) != 0))) { + for (i2 = 0, iLimiT2 = ((numPointerSlotsOf(objOop3)) - 1); i2 <= iLimiT2; i2 += 1) { + oop = longAt((objOop3 + BaseHeaderSize) + (i2 << 2)); + if (!(((oop & 3) != 0) + || (((((usqInt) (longAt(oop + 4))) >> 23) & 1) != 0))) { setIsMarkedOfto(objOop3, 1); - pushonObjStack(oop1, GIV(markStack)); + pushonObjStack(oop, GIV(markStack)); } } } @@ -60898,47 +61143,47 @@ /* begin objectStartingAt: */ address = ((pastSpace()).start); numSlots21 = byteAt(address + 7); - objOop1 = (numSlots21 == 0xFF + objOop11 = (numSlots21 == 0xFF ? address + BaseHeaderSize : address); limit1 = GIV(pastSpaceStart); - while ((((usqInt) objOop1)) < (((usqInt) limit1))) { - if (((((usqInt) (longAt(objOop1 + 4))) >> 23) & 1) != 0) { - if (((longAt(objOop1)) & 0x3FFFFF) > 0x1F) { - setIsMarkedOfto(objOop1, 0); + while ((((usqInt) objOop11)) < (((usqInt) limit1))) { + if (((((usqInt) (longAt(objOop11 + 4))) >> 23) & 1) != 0) { + if (((longAt(objOop11)) & 0x3FFFFF) > 0x1F) { + setIsMarkedOfto(objOop11, 0); } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); + if (!(((longAt(objOop11)) & 0x3FFFFF) == 3)) { + setIsMarkedOfto(objOop11, 0); } } } prevPrevObj1 = prevObj1; - prevObj1 = objOop1; - objOop1 = objectAfterlimit(objOop1, limit1); + prevObj1 = objOop11; + objOop11 = objectAfterlimit(objOop11, limit1); } /* begin objectStartingAt: */ address1 = ((eden()).start); numSlots111 = byteAt(address1 + 7); - objOop1 = (numSlots111 == 0xFF + objOop11 = (numSlots111 == 0xFF ? address1 + BaseHeaderSize : address1); - while ((((usqInt) objOop1)) < (((usqInt) GIV(freeStart)))) { - if (((((usqInt) (longAt(objOop1 + 4))) >> 23) & 1) != 0) { - if (((longAt(objOop1)) & 0x3FFFFF) > 0x1F) { - setIsMarkedOfto(objOop1, 0); + while ((((usqInt) objOop11)) < (((usqInt) GIV(freeStart)))) { + if (((((usqInt) (longAt(objOop11 + 4))) >> 23) & 1) != 0) { + if (((longAt(objOop11)) & 0x3FFFFF) > 0x1F) { + setIsMarkedOfto(objOop11, 0); } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); + if (!(((longAt(objOop11)) & 0x3FFFFF) == 3)) { + setIsMarkedOfto(objOop11, 0); } } } prevPrevObj1 = prevObj1; - prevObj1 = objOop1; - objOop1 = objectAfterlimit(objOop1, GIV(freeStart)); + prevObj1 = objOop11; + objOop11 = objectAfterlimit(objOop11, GIV(freeStart)); } @@ -60959,7 +61204,7 @@ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); arrayOfObjects = ((count << 1) | 1); - goto l9; + goto l5; } /* begin setFormatOf:to: */ assert(((2 >= 0) && (2 <= (formatMask())))); @@ -60981,24 +61226,25 @@ runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(0, 0, 1); /* return self */ arrayOfObjects = freeChunk; -l9: /* end objectsReachableFromRoots: */; +l5: /* end objectsReachableFromRoots: */; if (!(arrayOfObjects)) { return PrimErrNoMemory; } + assert(allObjectsUnmarked()); /* begin allocateSlots:format:classIndex: */ /* begin numSlotsForBytes: */ numBytes2 = (numSlotsOf(arrayOfObjects)) * 4; - numSlots5 = (numBytes2 + ((wordSize()) - 1)) / (wordSize()); - if (numSlots5 >= 0xFF) { + numSlots3 = (numBytes2 + ((wordSize()) - 1)) / (wordSize()); + if (numSlots3 >= 0xFF) { ; newObj = GIV(freeStart) + BaseHeaderSize; - numBytes = (BaseHeaderSize + BaseHeaderSize) + ((numSlots5 + (numSlots5 & 1)) * 4); + numBytes = (BaseHeaderSize + BaseHeaderSize) + ((numSlots3 + (numSlots3 & 1)) * 4); } else { newObj = GIV(freeStart); - numBytes = BaseHeaderSize + ((numSlots5 <= 1 + numBytes = BaseHeaderSize + ((numSlots3 <= 1 ? 8 - : (numSlots5 + (numSlots5 & 1)) * 4)); + : (numSlots3 + (numSlots3 & 1)) * 4)); } if ((GIV(freeStart) + numBytes) > GIV(scavengeThreshold)) { if (!GIV(needGCFlag)) { @@ -61006,40 +61252,40 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - savedInHashes = allocateSlotsInOldSpacebytesformatclassIndex(numSlots5, numBytes, 10, 18); - goto l3; + savedInHashes = allocateSlotsInOldSpacebytesformatclassIndex(numSlots3, numBytes, 10, 18); + goto l1; } - if (numSlots5 >= 0xFF) { + if (numSlots3 >= 0xFF) { /* for header parsing we put a saturated slot count in the prepended overflow size word */ flag("endianness"); - longAtput(GIV(freeStart), numSlots5); + longAtput(GIV(freeStart), numSlots3); longAtput(GIV(freeStart) + 4, 0xFF << 24); long64Atput(newObj, (((((usqLong) 0xFF)) << 56) + (10 << 24)) + 18); } else { - long64Atput(newObj, (((((usqLong) numSlots5)) << 56) + (10 << 24)) + 18); + long64Atput(newObj, (((((usqLong) numSlots3)) << 56) + (10 << 24)) + 18); } assert((numBytes % (allocationUnit())) == 0); assert((newObj % (allocationUnit())) == 0); GIV(freeStart) += numBytes; savedInHashes = newObj; -l3: /* end allocateSlots:format:classIndex: */; +l1: /* end allocateSlots:format:classIndex: */; /* begin allocateSlots:format:classIndex: */ /* begin numSlotsForBytes: */ numBytes3 = (numSlotsOf(outPointerArray)) * 4; - numSlots6 = (numBytes3 + ((wordSize()) - 1)) / (wordSize()); - if (numSlots6 >= 0xFF) { + numSlots4 = (numBytes3 + ((wordSize()) - 1)) / (wordSize()); + if (numSlots4 >= 0xFF) { ; newObj1 = GIV(freeStart) + BaseHeaderSize; - numBytes1 = (BaseHeaderSize + BaseHeaderSize) + ((numSlots6 + (numSlots6 & 1)) * 4); + numBytes1 = (BaseHeaderSize + BaseHeaderSize) + ((numSlots4 + (numSlots4 & 1)) * 4); } else { newObj1 = GIV(freeStart); - numBytes1 = BaseHeaderSize + ((numSlots6 <= 1 + numBytes1 = BaseHeaderSize + ((numSlots4 <= 1 ? 8 - : (numSlots6 + (numSlots6 & 1)) * 4)); + : (numSlots4 + (numSlots4 & 1)) * 4)); } if ((GIV(freeStart) + numBytes1) > GIV(scavengeThreshold)) { if (!GIV(needGCFlag)) { @@ -61047,28 +61293,29 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - savedOutHashes = allocateSlotsInOldSpacebytesformatclassIndex(numSlots6, numBytes1, 10, 18); - goto l4; + savedOutHashes = allocateSlotsInOldSpacebytesformatclassIndex(numSlots4, numBytes1, 10, 18); + goto l2; } - if (numSlots6 >= 0xFF) { + if (numSlots4 >= 0xFF) { /* for header parsing we put a saturated slot count in the prepended overflow size word */ flag("endianness"); - longAtput(GIV(freeStart), numSlots6); + longAtput(GIV(freeStart), numSlots4); longAtput(GIV(freeStart) + 4, 0xFF << 24); long64Atput(newObj1, (((((usqLong) 0xFF)) << 56) + (10 << 24)) + 18); } else { - long64Atput(newObj1, (((((usqLong) numSlots6)) << 56) + (10 << 24)) + 18); + long64Atput(newObj1, (((((usqLong) numSlots4)) << 56) + (10 << 24)) + 18); } assert((numBytes1 % (allocationUnit())) == 0); assert((newObj1 % (allocationUnit())) == 0); GIV(freeStart) += numBytes1; savedOutHashes = newObj1; -l4: /* end allocateSlots:format:classIndex: */; +l2: /* end allocateSlots:format:classIndex: */; if ((savedInHashes == null) || (savedOutHashes == null)) { + freeObject(arrayOfObjects); return PrimErrNoMemory; } fillValue = 0x3FFFFF + 1; @@ -61076,10 +61323,10 @@ /* begin numSlotsOf: */ flag("endianness"); assert((classIndexOf(savedInHashes)) > (isForwardedObjectClassIndexPun())); - numSlots7 = byteAt(savedInHashes + 7); - numSlots = ((usqInt) ((numSlots7 == 0xFF + numSlots5 = byteAt(savedInHashes + 7); + numSlots = ((usqInt) ((numSlots5 == 0xFF ? longAt(savedInHashes - BaseHeaderSize) - : numSlots7))); + : numSlots5))); assert(oopisLessThan(((savedInHashes + BaseHeaderSize) + (numSlots * (bytesPerSlot()))) - 1, addressAfter(savedInHashes))); for (p = (((usqInt)(savedInHashes + BaseHeaderSize))); p <= (((usqInt)(((savedInHashes + BaseHeaderSize) + (numSlots * 4)) - 1))); p += 8) { longAtput(p, fillValue); @@ -61089,15 +61336,45 @@ /* begin numSlotsOf: */ flag("endianness"); assert((classIndexOf(savedOutHashes)) > (isForwardedObjectClassIndexPun())); - numSlots8 = byteAt(savedOutHashes + 7); - numSlots1 = ((usqInt) ((numSlots8 == 0xFF + numSlots6 = byteAt(savedOutHashes + 7); + numSlots1 = ((usqInt) ((numSlots6 == 0xFF ? longAt(savedOutHashes - BaseHeaderSize) - : numSlots8))); + : numSlots6))); assert(oopisLessThan(((savedOutHashes + BaseHeaderSize) + (numSlots1 * (bytesPerSlot()))) - 1, addressAfter(savedOutHashes))); for (p1 = (((usqInt)(savedOutHashes + BaseHeaderSize))); p1 <= (((usqInt)(((savedOutHashes + BaseHeaderSize) + (numSlots1 * 4)) - 1))); p1 += 8) { longAtput(p1, fillValue); longAtput(p1 + 4, fillValue); } + /* begin moveClassesForwardsIn: */ + + /* if > 0, this is the index of the first non-class past the first element. */ + + there = 0; + for (here = 1, hereLimiT = ((numSlotsOf(arrayOfObjects)) - 1); here <= hereLimiT; here += 1) { + objOop1 = longAt((arrayOfObjects + BaseHeaderSize) + (here << 2)); + hash = (longAt(objOop1 + 4)) & 0x3FFFFF; + if ((hash > 0x1F) + && ((classOrNilAtIndex(hash)) == objOop1)) { + if (there > 0) { + + /* if there is zero we're in a run of classes at the start so don't move */ + + tempObjOop = longAt((arrayOfObjects + BaseHeaderSize) + (there << 2)); + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(arrayOfObjects))); + longAtput((arrayOfObjects + BaseHeaderSize) + (there << 2), objOop1); + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(arrayOfObjects))); + longAtput((arrayOfObjects + BaseHeaderSize) + (here << 2), tempObjOop); + there += 1; + } + } + else { + if (there == 0) { + there = here; + } + } + } segAddr = segmentWordArray + BaseHeaderSize; /* begin addressAfter: */ /* begin numSlotsOfAny: */ @@ -61114,8 +61391,10 @@ } long32Atput(segAddr, imageSegmentVersion()); long32Atput(segAddr + 4, imageSegmentVersion()); + + /* Copy all reachable objects to the segment. */ + segStart = (segAddr += 8); @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
...
14
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 October 2014