Vm-dev January 2014

vm-dev@lists.squeakfoundation.org

28 participants
97 discussions

some hand holding with git and the pharovm tree please...
by Eliot Miranda 24 Jan '14

24 Jan '14

Hi All, in trying to help Clément with his Sista work on Cog I'm trying to look at the latest version of pharovm. I've been using git:// gitorious.org/cogvm/blessed. I cloned it on December 2nd, and just did a git fetch, but I see no changes to any files other than .git/FETCH_HEAD and .git/ORIG_HEAD. How do I update the files to their current state (I use svn & mercurial, have used sccs, rcs & sccs, and it's such a pain having to learn yet another f***ing sccs)? Further, I see no generated files such as gcc3x-cointerp.c or cogit.c. Why not? Do you always fire up an image and freshly generate the C source?? If not, where do I find it? All this is to answer the simple question of whether the blessed pharo vm contains primitiveInterpreterSourceVersion. How would you answer that question without running the VM? e.g. in the Cog svn repository you'd do grep primitiveInterpreterSourceVersion src/vm/*.c src/plugins/*/*.c and you'd have an answer. I tried cd mc/VMMaker-oscog.package/instance grep primitiveInterpreterSourceVersion *.st and the lack of reply makes me think it doesn't exist. Hence from !VirtualMachine methodsFor: 'accessing' stamp: 'MarcusDenker 5/8/2013 11:51'! interpreterSourceVersion "The use of this primitive not recommended. Not all VMs providing that" "Answer a string corresponding to the version of the interpreter source. This represents the version level of the Smalltalk source code (interpreter and various plugins) that is translated to C by a CCodeGenerator, as distinct from the external platform source code, typically written in C and managed separately for each platform. An optional primitive is invoked that may not be available on all virtual machines." "Smalltalk vm interpreterSourceVersion" <primitive: 'primitiveInterpreterSourceVersion'> ^ self getSystemAttribute: 1009! ! I can tell I need to look at the implementation of sourceVersionString in platforms/Cross/vm/sqSCCSVersion.h, which, despite all my best efforts, has diverged completely (and IMO unnecessarily) from http://www.squeakvm.org/svn/squeak/branches/Cog/platforms/Cross/vm/sqSCCSVe…, (which was written to be extended to satisfy us all). It reads /* * A set of definitions for C source code control systems, to provide accurate * and definitive version information to the VM. * * Currently instantiated only for Subversion. Please add definitions for * other repositories as appropriate. * * I guess a good way to manage this is to edit the below define list to select * appropriate the repository type, and then that's the extent of the fork. * * Eliot Miranda * eliot.miranda(a)gmail.com * 15 July 2011 */ #include "vmVersionInfo.h" // defines REVISION_STRING #ifndef REVISION_STRING # error "Revision information not specified" #endif static char *sourceVersionString() { return REVISION_STRING; } which is wrong. I *didn't* write this. I wrote something quite different and you should have edited it to reflect that. But alas, when I try find . -iname vmVersionInfo.h I find...nothing. hmph. stymied. frustrated. confused. hence this missive. P.S> What I'm really trying to do is get my VM simulator to say it's a Pharo VM, so I can simulate Clément's Sista image and fix the infrastructure he's trying to use for speculative inlining/adaptive optimization. So this is in aid of a (much) faster Pharo VM. Hence helpful answers only please. -- best, Eliot

2 1

[commit][2850] CogVM source as per VMMaker.oscog-eem.590.
by commits＠squeakvm.org 23 Jan '14

23 Jan '14

Revision: 2850 Author: eliot Date: 2014-01-23 11:24:54 -0800 (Thu, 23 Jan 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.590. Fix bug in Cogit>>unlinkSendsOf:isMNUSelector:, used by primitiveFlushCacheBySelector. The method could leave sends linked to freed MNU PICs. Spur: Fix valid instruction pointer asserts for instructionPointer pointing at byte before first bytecode. Fix GC of classes, piggy-backing on classTableBitmap. So rename expungeDuplicateClasses to expungeDuplicateAndUnmarkedClasses:. Add some asserts to check that entries in the classTable are classes. Revise class table become management. Don't include methods in "unforwarded zone". Hence add followObjField:ofObject: & fix bug in fixFollowedField:ofObject:withInitialValue:. Add a read barrier to fetching newMethod from a method dictionary. Add a read barrier to fetching a method dictionary from a class. Don't inline any of the methods into fullGC. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/FT2Plugin/FT2Plugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff + CCodeGenerator VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 from - StackToRegisterMappingCogit VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff + StackToRegisterMappingCogit VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -980,6 +980,7 @@ void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); void printCogYoungReferrers(void); +void printOpenPICList(void); void printTrampolineTable(void); static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex); static sqInt processorHasDoublePrecisionFloatingPointSupport(sqInt ignoredPrimIndex); @@ -1070,9 +1071,9 @@ static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); +static sqInt unlinkIfFreeOrLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector); static sqInt unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity); static sqInt unlinkIfLinkedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity); -static sqInt unlinkIfLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector); static sqInt unlinkIfLinkedSendpcto(sqInt annotation, char *mcpc, sqInt theCogMethod); void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector); void unlinkSendsToFree(void); @@ -2038,6 +2039,7 @@ #define haltmsg(msg) warning("halt: " msg) #define limitZony() ((CogMethod *)mzFreeStart) #define maybeConstant(sse) ((sse)->constant) +#define methodBytesFreedSinceLastCompaction() methodBytesFreedSinceLastCompaction #define minCallAddress() minValidCallAddress #define nextOpenPIC methodObject #define nextOpenPICHack hack hack hack i.e. the getter macro does all the work @@ -18966,6 +18968,18 @@ } void +printOpenPICList(void) +{ + CogMethod *openPIC; + + openPIC = openPICList; + while (!(openPIC == null)) { + printCogMethod(openPIC); + openPIC = ((CogMethod *) ((openPIC->nextOpenPIC))); + } +} + +void printTrampolineTable(void) { sqInt i; @@ -19251,6 +19265,11 @@ sqInt delta; delta = (cogMethod->objectHeader); + assert((((cogMethod->cmType)) == CMMethod) + || (((cogMethod->cmType)) == CMOpenPIC)); + assert((callTargetFromReturnAddress(backEnd, (((sqInt)cogMethod)) + missOffset)) == ((((cogMethod->cmType)) == CMMethod + ? methodAbortTrampolineFor((cogMethod->cmNumArgs)) + : picAbortTrampolineFor((cogMethod->cmNumArgs))))); relocateCallBeforeReturnPCby(backEnd, (((sqInt)cogMethod)) + missOffset, -delta); mapForperformUntilarg(cogMethod, relocateIfCallOrMethodReferencemcpcdelta, delta); } @@ -20686,7 +20705,7 @@ } static sqInt -unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity) +unlinkIfFreeOrLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector) { sqInt entryPoint; sqInt off; @@ -20726,18 +20745,28 @@ } targetMethod = ((CogMethod *) (entryPoint - offset)); - if (((targetMethod->cmType)) == CMFree) { + if ((((targetMethod->cmType)) == CMFree) + || (((targetMethod->selector)) == theSelector)) { unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); codeModified = 1; } } + else { + if (entryPoint == ceImplicitReceiverTrampoline) { + if ((inlineCacheTagAt(backEnd, ((sqInt)mcpc))) == theSelector) { + unalignedLongAtput(backEnd, (((sqInt)mcpc)) + (jumpShortByteSize(backEnd)), 0); + unalignedLongAtput(backEnd, ((((sqInt)mcpc)) + (jumpShortByteSize(backEnd))) + BytesPerOop, 0); + } + } + + } } return 0; } static sqInt -unlinkIfLinkedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity) +unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity) { sqInt entryPoint; sqInt off; @@ -20777,22 +20806,18 @@ } targetMethod = ((CogMethod *) (entryPoint - offset)); - unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; - rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); - } - else { - if (entryPoint == ceImplicitReceiverTrampoline) { - unalignedLongAtput(backEnd, (((sqInt)mcpc)) + (jumpShortByteSize(backEnd)), 0); - unalignedLongAtput(backEnd, ((((sqInt)mcpc)) + (jumpShortByteSize(backEnd))) + BytesPerOop, 0); + if (((targetMethod->cmType)) == CMFree) { + unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; + rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); + codeModified = 1; } - } } return 0; } static sqInt -unlinkIfLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector) +unlinkIfLinkedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity) { sqInt entryPoint; sqInt off; @@ -20832,18 +20857,13 @@ } targetMethod = ((CogMethod *) (entryPoint - offset)); - if (((targetMethod->selector)) == theSelector) { - unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; - rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); - codeModified = 1; - } + unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; + rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); } else { if (entryPoint == ceImplicitReceiverTrampoline) { - if ((inlineCacheTagAt(backEnd, ((sqInt)mcpc))) == theSelector) { - unalignedLongAtput(backEnd, (((sqInt)mcpc)) + (jumpShortByteSize(backEnd)), 0); - unalignedLongAtput(backEnd, ((((sqInt)mcpc)) + (jumpShortByteSize(backEnd))) + BytesPerOop, 0); - } + unalignedLongAtput(backEnd, (((sqInt)mcpc)) + (jumpShortByteSize(backEnd)), 0); + unalignedLongAtput(backEnd, ((((sqInt)mcpc)) + (jumpShortByteSize(backEnd))) + BytesPerOop, 0); } } @@ -20919,36 +20939,37 @@ unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector) { CogMethod *cogMethod; + sqInt freeSpace; if (methodZoneBase == null) { return; } + cogMethod = ((CogMethod *) methodZoneBase); /* First check if any method actually has the selector; if not there can't be any linked send to it. */ - cogMethod = ((CogMethod *) methodZoneBase); + freeSpace = methodBytesFreedSinceLastCompaction(); while ((cogMethod < (limitZony())) && (((cogMethod->selector)) != selector)) { + if ((((cogMethod->cmType)) != CMFree) + && ((isMNUSelector + && ((cogMethod->cpicHasMNUCase))) + || (((cogMethod->selector)) == selector))) { + freeMethod(cogMethod); + } cogMethod = methodAfter(cogMethod); } - if (cogMethod >= (limitZony())) { + if ((cogMethod >= (limitZony())) + && (freeSpace == (methodBytesFreedSinceLastCompaction()))) { return; } codeModified = 0; cogMethod = ((CogMethod *) methodZoneBase); while (cogMethod < (limitZony())) { if (((cogMethod->cmType)) == CMMethod) { - mapForperformUntilarg(cogMethod, unlinkIfLinkedSendpcof, selector); + mapForperformUntilarg(cogMethod, unlinkIfFreeOrLinkedSendpcof, selector); } - else { - if ((((cogMethod->cmType)) != CMFree) - && ((isMNUSelector - && ((cogMethod->cpicHasMNUCase))) - || (((cogMethod->selector)) == selector))) { - freeMethod(cogMethod); - } - } cogMethod = methodAfter(cogMethod); } if (codeModified) { Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff + CCodeGenerator VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ @@ -61,6 +61,7 @@ void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); void printCogYoungReferrers(void); +void printOpenPICList(void); void printTrampolineTable(void); void recordCallOffsetInof(CogMethod *cogMethod, void *callLabelArg); sqInt recordPrimTraceFunc(void); Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff + CCodeGenerator VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 from - CoInterpreter VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2029,7 +2029,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.581"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.590"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13394,6 +13394,8 @@ : primitiveTable[primitiveIndex]))); } else { + assert(!((isNonImmediate(GIV(newMethod))) + && (isForwarded(GIV(newMethod))))); primitiveFunctionPointer = primitiveInvokeObjectAsMethod; } for (p = 0; p < CacheProbeMax; p += 1) { @@ -15254,7 +15256,8 @@ || ((addressCouldBeObj(aMethodObj)) && (isOopCompiledMethod(aMethodObj)))); cPIC = ((CogMethod *) ((popStack()) - (mnuOffset()))); - assert(((cPIC->cmType)) == CMClosedPIC); + assert((((cPIC->cmType)) == CMClosedPIC) + || (((cPIC->cmType)) == CMOpenPIC)); GIV(argumentCount) = (cPIC->cmNumArgs); GIV(messageSelector) = (cPIC->selector); if (aMethodObj != 0) { @@ -23104,7 +23107,7 @@ markStackPageMostRecentlyUsed(newPage); GIV(framePointer) = (GIV(stackPage)->headFP); GIV(stackPointer) = (GIV(stackPage)->headSP); - assert(validInstructionPointerinFrame(GIV(instructionPointer), GIV(framePointer))); + assert(validInstructionPointerinFrame(GIV(instructionPointer) + 1, GIV(framePointer))); assert((!(frameHasContext(GIV(framePointer)))) || (isContext(frameContext(GIV(framePointer))))); @@ -53684,7 +53687,7 @@ GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); /* begin assertValidExecutionPointe:r:s: */ - assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); + assertValidExecutionPointersimbarline(GIV(instructionPointer) + 1, GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); } sqInt @@ -54205,7 +54208,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer; + theInstrPointer = instrPointer + 1; if ((((usqInt)(longAt(fp + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ methodField = longAt(fp + FoxMethod); @@ -54226,7 +54229,7 @@ (methodHeader = (isCogMethodReference(methodHeader1) ? ((((CogMethod *) methodHeader1))->methodHeader) : methodHeader1)), - (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BaseHeaderSize) - 1)) + (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) && ((theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + BaseHeaderSize) - 1)) && (!(((((sqInt) methodHeader)) < 0) && ((methodHeader & (65536 << SmallIntegerShift)) Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 from - CoInterpreter VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2032,7 +2032,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.581"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.590"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13403,6 +13403,8 @@ : primitiveTable[primitiveIndex]))); } else { + assert(!((isNonImmediate(GIV(newMethod))) + && (isForwarded(GIV(newMethod))))); primitiveFunctionPointer = primitiveInvokeObjectAsMethod; } for (p = 0; p < CacheProbeMax; p += 1) { @@ -15263,7 +15265,8 @@ || ((addressCouldBeObj(aMethodObj)) && (isOopCompiledMethod(aMethodObj)))); cPIC = ((CogMethod *) ((popStack()) - (mnuOffset()))); - assert(((cPIC->cmType)) == CMClosedPIC); + assert((((cPIC->cmType)) == CMClosedPIC) + || (((cPIC->cmType)) == CMOpenPIC)); GIV(argumentCount) = (cPIC->cmNumArgs); GIV(messageSelector) = (cPIC->selector); if (aMethodObj != 0) { @@ -23113,7 +23116,7 @@ markStackPageMostRecentlyUsed(newPage); GIV(framePointer) = (GIV(stackPage)->headFP); GIV(stackPointer) = (GIV(stackPage)->headSP); - assert(validInstructionPointerinFrame(GIV(instructionPointer), GIV(framePointer))); + assert(validInstructionPointerinFrame(GIV(instructionPointer) + 1, GIV(framePointer))); assert((!(frameHasContext(GIV(framePointer)))) || (isContext(frameContext(GIV(framePointer))))); @@ -53693,7 +53696,7 @@ GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); /* begin assertValidExecutionPointe:r:s: */ - assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); + assertValidExecutionPointersimbarline(GIV(instructionPointer) + 1, GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); } sqInt @@ -54214,7 +54217,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer; + theInstrPointer = instrPointer + 1; if ((((usqInt)(longAt(fp + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ methodField = longAt(fp + FoxMethod); @@ -54235,7 +54238,7 @@ (methodHeader = (isCogMethodReference(methodHeader1) ? ((((CogMethod *) methodHeader1))->methodHeader) : methodHeader1)), - (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BaseHeaderSize) - 1)) + (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) && ((theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + BaseHeaderSize) - 1)) && (!(((((sqInt) methodHeader)) < 0) && ((methodHeader & (65536 << SmallIntegerShift)) Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/nscogsrc/vm/interp.h 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jan 16 10:48:19 PST 2014 + Thu Jan 23 11:23:59 PST 2014 Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/spursrc/vm/cogit.c 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGenerator VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 from - StackToRegisterMappingCogit * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + StackToRegisterMappingCogit VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ -static char __buildInfo[] = "StackToRegisterMappingCogit * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -940,6 +940,7 @@ void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); void printCogYoungReferrers(void); +void printOpenPICList(void); void printTrampolineTable(void); static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex); static sqInt processorHasDoublePrecisionFloatingPointSupport(sqInt ignoredPrimIndex); @@ -1026,9 +1027,9 @@ static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); +static sqInt unlinkIfFreeOrLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector); static sqInt unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity); static sqInt unlinkIfLinkedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity); -static sqInt unlinkIfLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector); static sqInt unlinkIfLinkedSendpcto(sqInt annotation, char *mcpc, sqInt theCogMethod); void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector); void unlinkSendsToFree(void); @@ -1730,6 +1731,7 @@ #define haltmsg(msg) warning("halt: " msg) #define limitZony() ((CogMethod *)mzFreeStart) #define maybeConstant(sse) ((sse)->constant) +#define methodBytesFreedSinceLastCompaction() methodBytesFreedSinceLastCompaction #define minCallAddress() minValidCallAddress #define nextOpenPIC methodObject #define nextOpenPICHack hack hack hack i.e. the getter macro does all the work @@ -18619,6 +18621,18 @@ } void +printOpenPICList(void) +{ + CogMethod *openPIC; + + openPIC = openPICList; + while (!(openPIC == null)) { + printCogMethod(openPIC); + openPIC = ((CogMethod *) ((openPIC->nextOpenPIC))); + } +} + +void printTrampolineTable(void) { sqInt i; @@ -18904,6 +18918,11 @@ sqLong delta; delta = (cogMethod->objectHeader); + assert((((cogMethod->cmType)) == CMMethod) + || (((cogMethod->cmType)) == CMOpenPIC)); + assert((callTargetFromReturnAddress(backEnd, (((sqInt)cogMethod)) + missOffset)) == ((((cogMethod->cmType)) == CMMethod + ? methodAbortTrampolineFor((cogMethod->cmNumArgs)) + : picAbortTrampolineFor((cogMethod->cmNumArgs))))); relocateCallBeforeReturnPCby(backEnd, (((sqInt)cogMethod)) + missOffset, -delta); mapForperformUntilarg(cogMethod, relocateIfCallOrMethodReferencemcpcdelta, delta); } @@ -20205,7 +20224,7 @@ } static sqInt -unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity) +unlinkIfFreeOrLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector) { sqInt entryPoint; sqInt off; @@ -20234,18 +20253,22 @@ } targetMethod = ((CogMethod *) (entryPoint - offset)); - if (((targetMethod->cmType)) == CMFree) { + if ((((targetMethod->cmType)) == CMFree) + || (((targetMethod->selector)) == theSelector)) { unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); codeModified = 1; } } + else { + + } } return 0; } static sqInt -unlinkIfLinkedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity) +unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity) { sqInt entryPoint; sqInt off; @@ -20274,18 +20297,18 @@ } targetMethod = ((CogMethod *) (entryPoint - offset)); - unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; - rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); + if (((targetMethod->cmType)) == CMFree) { + unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; + rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); + codeModified = 1; + } } - else { - - } } return 0; } static sqInt -unlinkIfLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector) +unlinkIfLinkedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity) { sqInt entryPoint; sqInt off; @@ -20314,11 +20337,8 @@ } targetMethod = ((CogMethod *) (entryPoint - offset)); - if (((targetMethod->selector)) == theSelector) { - unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; - rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); - codeModified = 1; - } + unlinkedRoutine = sendTable[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))]; + rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod->selector), unlinkedRoutine); } else { @@ -20380,36 +20400,37 @@ unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector) { CogMethod *cogMethod; + sqInt freeSpace; if (methodZoneBase == null) { return; } + cogMethod = ((CogMethod *) methodZoneBase); /* First check if any method actually has the selector; if not there can't be any linked send to it. */ - cogMethod = ((CogMethod *) methodZoneBase); + freeSpace = methodBytesFreedSinceLastCompaction(); while ((cogMethod < (limitZony())) && (((cogMethod->selector)) != selector)) { + if ((((cogMethod->cmType)) != CMFree) + && ((isMNUSelector + && ((cogMethod->cpicHasMNUCase))) + || (((cogMethod->selector)) == selector))) { + freeMethod(cogMethod); + } cogMethod = methodAfter(cogMethod); } - if (cogMethod >= (limitZony())) { + if ((cogMethod >= (limitZony())) + && (freeSpace == (methodBytesFreedSinceLastCompaction()))) { return; } codeModified = 0; cogMethod = ((CogMethod *) methodZoneBase); while (cogMethod < (limitZony())) { if (((cogMethod->cmType)) == CMMethod) { - mapForperformUntilarg(cogMethod, unlinkIfLinkedSendpcof, selector); + mapForperformUntilarg(cogMethod, unlinkIfFreeOrLinkedSendpcof, selector); } - else { - if ((((cogMethod->cmType)) != CMFree) - && ((isMNUSelector - && ((cogMethod->cpicHasMNUCase))) - || (((cogMethod->selector)) == selector))) { - freeMethod(cogMethod); - } - } cogMethod = methodAfter(cogMethod); } if (codeModified) { Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/spursrc/vm/cogit.h 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGenerator VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ @@ -62,6 +62,7 @@ void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); void printCogYoungReferrers(void); +void printOpenPICList(void); void printTrampolineTable(void); void recordCallOffsetInof(CogMethod *cogMethod, void *callLabelArg); sqInt recordPrimTraceFunc(void); Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/spursrc/vm/cogmethod.h 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ typedef struct { Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-01-23 01:15:54 UTC (rev 2849) +++ branches/Cog/spursrc/vm/cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 from - CoInterpreter * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 */ -static char __buildInfo[] = "CoInterpreter * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -482,6 +482,7 @@ sqInt classExternalStructure(void); sqInt classFloat(void); sqInt classFloatCompactIndex(void); +static sqInt classForClassTag(sqInt classIndex); sqInt classIndexMask(void); sqInt classIndexOf(sqInt objOop); sqInt classLargeNegativeInteger(void); @@ -506,6 +507,7 @@ CogMethod * cogMethodOf(sqInt aMethodOop); static void collapseSegmentsPostSwizzle(void); static void commenceCogCompiledCodeCompaction(void); +static void compact(void); sqInt compactClassIndexOf(sqInt objOop); static sqInt compare31or32Bitsequal(sqInt obj1, sqInt obj2); void compilationBreakpointFor(sqInt selectorOop); @@ -558,7 +560,7 @@ static void executeCogMethodfromUnlinkedSendWithReceiver(CogMethod *cogMethod, sqInt rcvr); static sqInt executeNewMethod(void); static sqInt existInstancesInNewSpaceOf(sqInt classObj); -static void expungeDuplicateClasses(void); +static void expungeDuplicateAndUnmarkedClasses(sqInt expungeUnmarked); static void externalDivorceFrameandContext(char *theFP, sqInt ctxt); static char * externalEnsureIsBaseFrame(char *aFramePtr); static sqInt externalInstVarofContext(sqInt offset, sqInt aContext); @@ -647,6 +649,7 @@ static void freeStackPageNoAssert(StackPage *aPage); static sqInt freeStackPage(StackPage *aPage); usqInt freeStartAddress(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpace(void); static void freeUntracedStackPages(void); sqInt fullDisplayUpdate(void); usqLong fullGC(void); @@ -827,6 +830,7 @@ void markAndTrace(sqInt objOop); static void markCogMethodsAndReferentsOnPage(StackPage *thePage); static sqInt markInactiveEphemerons(void); +static void markObjects(void); static void markStackPageMostRecentlyUsed(StackPage *page); static void markStackPageNextMostRecentlyUsed(StackPage *page); static void markWeaklingsAndMarkAndFireEphemerons(void); @@ -1451,6 +1455,7 @@ _iss sqInt profileMethod; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; +_iss sqInt classTableIndex; _iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt growHeadroom; _iss sqInt highestRunnableProcessPriority; @@ -1465,7 +1470,6 @@ _iss sqInt lastUncoggableInterpretedBlockMethod; _iss usqInt lowSpaceThreshold; _iss usqLong statGCEndUsecs; -_iss sqInt classTableIndex; _iss sqInt cogCodeSize; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt flagInterpretedMethods; @@ -2164,7 +2168,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter * VMMaker.oscog-eem.584]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.590]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5778,6 +5782,8 @@ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))); if (recordSendTrace()) { /* begin recordTrace:thing:source: */ + /* begin classForClassTag: */ + assert(lkupClassTag != (isForwardedObjectClassIndexPun())); /* begin classAtIndex: */ VM_LABEL(0classAtIndex); assert((lkupClassTag <= (tagMask())) @@ -5794,7 +5800,7 @@ GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; if (printOnTrace()) { - printActivationNameForSelectorstartClass(GIV(messageSelector), classAtIndex(lkupClassTag)); + printActivationNameForSelectorstartClass(GIV(messageSelector), classForClassTag(lkupClassTag)); /* begin cr */ printf("\n"); } @@ -5937,6 +5943,8 @@ goto l152; } } + /* begin classForClassTag: */ + assert(lkupClassTag != (isForwardedObjectClassIndexPun())); /* begin classAtIndex: */ VM_LABEL(1classAtIndex); assert((lkupClassTag <= (tagMask())) @@ -10683,6 +10691,8 @@ : primitiveTable[primitiveIndex]))); } else { + assert(!((isNonImmediate(GIV(newMethod))) + && (isForwarded(GIV(newMethod))))); primitiveFunctionPointer = primitiveInvokeObjectAsMethod; } for (p = 0; p < CacheProbeMax; p += 1) { @@ -12242,7 +12252,7 @@ if (!copyHashFlag) { /* in-lined - clasIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] + classIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] for speed. */ /* begin rawHashBitsOf: */ @@ -13514,7 +13524,8 @@ || ((addressCouldBeObj(aMethodObj)) && (isOopCompiledMethod(aMethodObj)))); cPIC = ((CogMethod *) ((popStack()) - (mnuOffset()))); - assert(((cPIC->cmType)) == CMClosedPIC); + assert((((cPIC->cmType)) == CMClosedPIC) + || (((cPIC->cmType)) == CMOpenPIC)); GIV(argumentCount) = (cPIC->cmNumArgs); GIV(messageSelector) = (cPIC->selector); if (aMethodObj != 0) { @@ -13992,8 +14003,8 @@ } else { GIV(messageSelector) = selector; - if (((errSelIdx = lookupMethodNoMNUEtcInClass(classAtIndex(classTag)))) != 0) { - handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classAtIndex(classTag)); + if (((errSelIdx = lookupMethodNoMNUEtcInClass(classForClassTag(classTag)))) != 0) { + handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForClassTag(classTag)); assert(0); } } @@ -14082,8 +14093,8 @@ return ceSendFromInLineCacheMiss(cogMethodOrPIC); } GIV(messageSelector) = (cogMethodOrPIC->selector); - if (((errSelIdx = lookupMethodNoMNUEtcInClass(classAtIndex(classTag)))) != 0) { - handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classAtIndex(classTag)); + if (((errSelIdx = lookupMethodNoMNUEtcInClass(classForClassTag(classTag)))) != 0) { + handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForClassTag(classTag)); assert(0); } } @@ -14236,7 +14247,7 @@ return ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs); } GIV(messageSelector) = selector; - if (((errSelIdx = lookupMethodNoMNUEtcInClass(classAtIndex(classTag)))) != 0) { + if (((errSelIdx = lookupMethodNoMNUEtcInClass(classForClassTag(classTag)))) != 0) { if (canLinkCacheTag && ((errSelIdx == SelectorDoesNotUnderstand) && ((((usqInt)((cogMethod = cogMNUPICSelectormethodOperandnumArgs(GIV(messageSelector), mnuMethodOrNilFor(rcvr), GIV(argumentCount)))))) > (minCogMethodAddress())))) { @@ -14244,7 +14255,7 @@ ? entryOffset() : noCheckEntryOffset()), rcvr); } - handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classAtIndex(classTag)); + handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForClassTag(classTag)); assert(0); } } @@ -16387,7 +16398,8 @@ assert((classIndex <= (tagMask())) || (classIndex >= (arrayClassIndexPun()))); assert((objOop == GIV(nilObj)) - || ((rawHashBitsOf(objOop)) == classIndex)); + || (((rawHashBitsOf(objOop)) == classIndex) + && (objCouldBeClassObj(objOop)))); classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); if (classTablePage == GIV(nilObj)) { error("attempt to add class to empty page"); @@ -16477,7 +16489,23 @@ return ClassFloatCompactIndex; } +static sqInt +classForClassTag(sqInt classIndex) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classTablePage; + assert(classIndex != (isForwardedObjectClassIndexPun())); + /* begin classAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + return null; + } + return longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); +} + + /* 22-bit class mask => ~ 4M classes */ sqInt @@ -17035,6 +17063,22 @@ } } + +/* We'd like to use exact fit followed by best fit, but best-fit is complex + to implement + and potentially expensive. So just use exactFit followed, if necessary, by + first-fit. + */ + +static void +compact(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + exactFitCompact(); + if ((usedSize(&GIV(highestObjects))) > 0) { + firstFitCompact(); + } +} + sqInt compactClassIndexOf(sqInt objOop) { @@ -20411,10 +20455,13 @@ a) won't have a bit set on load (because there are no forwarders on load), b) wont match their identityHash. So expunge duplicates by eliminating unmarked entries that don't occur at - their identityHash. */ + their identityHash. + Further, any class in the table that is unmarked will also not have a bit + set so + eliminate unmarked classes using the bitmap too. */ static void -expungeDuplicateClasses(void) +expungeDuplicateAndUnmarkedClasses(sqInt expungeUnmarked) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt byte; sqInt byteIndex; @@ -20428,6 +20475,7 @@ for (i = 1; i < GIV(numClassTablePages); i += 1) { + /* Avoid expunging the puns by not scanning the 0th page. */ /* optimize scan by only scanning bitmap in regions that have pages. */ classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (i << 2)); @@ -20444,12 +20492,21 @@ classIndex = majorBitIndex + minorBitIndex; classOrNil = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); assert((classAtIndex(classIndex)) == classOrNil); + assert((classOrNil == GIV(nilObj)) + || (addressCouldBeClassObj(classOrNil))); if ((classOrNil != GIV(nilObj)) - && ((rawHashBitsOf(classOrNil)) != classIndex)) { + && ((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((rawHashBitsOf(classOrNil)) != classIndex))) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(classTablePage))); longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil); + assert((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } } } } @@ -21660,6 +21717,8 @@ return; } } + /* begin classForClassTag: */ + assert(classTag != (isForwardedObjectClassIndexPun())); /* begin classAtIndex: */ assert((classTag <= (tagMask())) || (classTag >= (arrayClassIndexPun()))); @@ -22634,8 +22693,8 @@ assert(isOopForwarded(initialValue)); /* begin followForwarded: */ - assert(isForwarded(objOop)); - referent = longAt((objOop + (BaseHeaderSize)) + (0 << 2)); + assert(isForwarded(initialValue)); + referent = longAt((initialValue + (BaseHeaderSize)) + (0 << 2)); while (((referent & 3) == 0) && (((longAt(referent)) & 0x3FFFFF) == 8)) { referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); @@ -23741,63 +23800,27 @@ } -/* Free any untraced stack pages. */ +/* Sweep all of old space, freeing unmarked objects, coalescing free chunks, + and sorting free space. + + Small free chunks are sorted in address order on each small list head. + Large free chunks + are sorted on the sortedFreeChunks list. Record as many of the highest + objects as there + is room for in highestObjects, a circular buffer, for the use of + exactFitCompact. Use + unused eden space for highestObjects. If highestObjects does not wrap, + store 0 + at highestObjects last. Record the lowest free object in firstFreeChunk. + Let the + segmentManager mark which segments contain pinned objects via notePinned:. */ static void -freeUntracedStackPages(void) +freeUnmarkedObjectsAndSortAndCoalesceFreeSpace(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt i; - StackPage *thePage; - - for (i = 0; i < GIV(numStackPages); i += 1) { - /* begin stackPageAt: */ - thePage = stackPageAtpages(i, GIV(pages)); - if ((!(isFree(thePage))) - && (((thePage->trace)) == StackPageUnreached)) { - assert(noMarkedContextsOnPage(thePage)); - freeStackPage(thePage); - } - assert(((thePage->trace = StackPageTraceInvalid)) != 0); - } -} - - -/* Repaint the entire smalltalk screen, ignoring the affected rectangle. Used - in some platform's code when the Smalltalk window is brought to the front - or uncovered. - */ - -sqInt -fullDisplayUpdate(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt displayObj; - sqInt h; - sqInt w; - - displayObj = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (TheDisplay << 2)); - if ((((displayObj & 3) == 0) - && (((((usqInt) (longAt(displayObj))) >> 24) & 0x1F) <= 5)) - && ((lengthOfformat(displayObj, (((usqInt) (longAt(displayObj))) >> 24) & 0x1F)) >= 4)) { - w = fetchIntegerofObject(1, displayObj); - h = fetchIntegerofObject(2, displayObj); - displayBitsOfLeftTopRightBottom(displayObj, 0, 0, w, h); - ioForceDisplayUpdate(); - } - return null; -} - - -/* Perform a full lazy compacting GC. Answer the size of the largest free - chunk. - */ - -usqLong -fullGC(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aLimit; usqLong bytes; sqInt bytes1; - sqInt childNode; usqInt header1NumSlots; usqInt header2NumSlots; usqInt headerNumSlots; @@ -23805,19 +23828,11 @@ sqInt highestObjectsWraps; sqInt i; sqInt i1; - sqInt i11; - sqInt i12; sqInt i2; - sqInt i21; - sqInt i3; - sqInt i4; - sqInt i5; sqInt iLimiT; sqInt iLimiT1; - sqInt iLimiT2; sqInt index; sqInt index1; - sqInt largestFree; usqInt lastHighest; sqInt lastLargeFree; sqInt limit; @@ -23829,214 +23844,16 @@ sqInt obj; sqInt obj2slots; sqInt objOop; - sqInt oop; - sqInt oop1; sqInt prev; sqInt prevObj; sqInt prevPrevObj; usqInt rawNumSlots; usqInt rawNumSlotsAfter; - sqInt sizeOfUnusedEden; sqInt sortedFreeChunks; sqInt statCoalesces = 0; sqInt sweepIndex; - StackPage *thePage; sqInt total; - sqInt traceType; - sqInt treeNode; - GIV(needGCFlag) = 0; - GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); - GIV(statMarkCount) = 0; - /* begin preGCAction: */ - if (GIV(stackPage) != 0) { - /* begin externalWriteBackHeadFramePointers */ - assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); - assert(GIV(stackPage) == (mostRecentlyUsedPage())); - /* begin setHeadFP:andSP:inPage: */ - assert(GIV(stackPointer) < GIV(framePointer)); - assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); - (GIV(stackPage)->headFP = GIV(framePointer)); - (GIV(stackPage)->headSP = GIV(stackPointer)); - assert(pageListIsWellFormed()); - } - /* begin flushMethodCache */ - for (i = 1; i <= MethodCacheSize; i += 1) { - GIV(methodCache)[i] = 0; - } - - /* this for primitiveExternalMethod */ - - GIV(lastMethodCacheProbeWrite) = 0; - /* begin flushAtCache */ - for (i1 = 1; i1 <= AtCacheTotalSize; i1 += 1) { - GIV(atCache)[i1] = 0; - } - unlinkAllSends(); - - GIV(gcMode) = GCModeFull; - if (recordEventTrace()) { - traceType = (GCModeFull == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin recordTrace:thing:source: */ - GIV(traceLog)[GIV(traceLogIndex)] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; - } - if (recordPrimTrace()) { - traceType = (GCModeFull == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin fastLogPrim: */ - GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; - primTraceLogIndex(GIV(primTraceLogIndex) + 1); - } - /* begin globalGarbageCollect */ - /* begin runLeakCheckerForFullGC: */ - runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjs(1, 0); - /* return self */ - assert(validObjStacks()); - /* begin markObjects */ - /* begin ensureAllMarkBitsAreZero */ - flag("need to implement the inc GC first..."); - assert(allObjectsUnmarked()); - ensureAdequateClassTableBitmap(); - /* begin initializeUnscannedEphemerons */ - /* begin findLargestFreeChunk */ - treeNode = GIV(freeLists)[0]; - if (treeNode == 0) { - largestFree = null; - goto l2; - } - while (1) { - assert(isValidFreeObject(treeNode)); - childNode = longAt((treeNode + (BaseHeaderSize)) + (4 << 2)); - if (!(childNode != 0)) break; - treeNode = childNode; - } - largestFree = treeNode; -l2: /* end findLargestFreeChunk */; - sizeOfUnusedEden = (((eden()).limit)) - GIV(freeStart); - if ((largestFree != null) - && ((numSlotsOfAny(largestFree)) > (sizeOfUnusedEden / (wordSize())))) { - (GIV(unscannedEphemerons).start = largestFree + (BaseHeaderSize)); - (GIV(unscannedEphemerons).limit = addressAfter(largestFree)); - } - else { - (GIV(unscannedEphemerons).start = GIV(freeStart)); - (GIV(unscannedEphemerons).limit = ((eden()).limit)); - } - (GIV(unscannedEphemerons).top = (GIV(unscannedEphemerons).start)); - /* begin initializeMarkStack */ - ensureRoomOnObjStackAt(MarkStackRootIndex); - /* begin initializeWeaklingStack */ - ensureRoomOnObjStackAt(WeaklingStackRootIndex); - /* begin markAccessibleObjects */ - assert(validClassTableRootPages()); - assert(allBridgesMarked()); - null; - - /* This must come first to enable stack page reclamation. It clears - the trace flags on stack pages and so must preceed any marking. - Otherwise it will clear the trace flags of reached pages. */ - - GIV(marking) = 1; - /* begin initStackPageGC */ - if (GIV(stackPage) != 0) { - /* begin externalWriteBackHeadFramePointers */ - assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); - assert(GIV(stackPage) == (mostRecentlyUsedPage())); - /* begin setHeadFP:andSP:inPage: */ - assert(GIV(stackPointer) < GIV(framePointer)); - assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); - (GIV(stackPage)->headFP = GIV(framePointer)); - (GIV(stackPage)->headSP = GIV(stackPointer)); - assert(pageListIsWellFormed()); - } - for (i2 = 0; i2 < GIV(numStackPages); i2 += 1) { - /* begin stackPageAt: */ - thePage = stackPageAtpages(i2, GIV(pages)); - (thePage->trace = StackPageUnreached); - } - /* begin markAndTraceHiddenRoots */ - markAndTraceObjStackandContents(GIV(markStack), 0); - markAndTraceObjStackandContents(GIV(weaklingStack), 0); - markAndTraceObjStackandContents(GIV(ephemeronQueue), 1); - setIsMarkedOfto(freeListsObj(), 1); - if (((((usqInt) (longAt(GIV(classTableFirstPage)))) >> 24) & 0x1F) == 4) { - markAndTrace(GIV(hiddenRootsObj)); - goto l1; - } - setIsMarkedOfto(GIV(hiddenRootsObj), 1); - markAndTrace(GIV(classTableFirstPage)); - for (i4 = 1; i4 < GIV(numClassTablePages); i4 += 1) { - setIsMarkedOfto(longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (i4 << 2)), 1); - } -l1: /* end markAndTraceHiddenRoots */; - /* begin markAndTraceExtraRoots */ - assert(GIV(remapBufferCount) == 0); - for (i11 = 1; i11 <= GIV(extraRootCount); i11 += 1) { - oop = (GIV(extraRoots)[i11])[0]; - if (!(((oop & 3) != 0) - || (((longAt(oop)) & 0x3FFFFF) == 0))) { - markAndTrace(oop); - } - } - assert(validClassTableRootPages()); - /* begin markAndTraceInterpreterOops: */ - markAndTraceStackPages(1); - markAndTraceTraceLog(); - markAndTracePrimTraceLog(); - markAndTrace(GIV(specialObjectsOop)); - if (!((GIV(newMethod) & 3) != 0)) { - markAndTrace(GIV(newMethod)); - } - /* begin traceProfileState */ - markAndTrace(GIV(profileProcess)); - markAndTrace(GIV(profileMethod)); - markAndTrace(GIV(profileSemaphore)); - sqLowLevelMFence(); - if ((GIV(longRunningPrimitiveCheckMethod) != null) - && (GIV(longRunningPrimitiveCheckSequenceNumber) != GIV(statCheckForEvents))) { - markAndTrace(GIV(longRunningPrimitiveCheckMethod)); - } - if (GIV(longRunningPrimitiveCheckSemaphore) != null) { - markAndTrace(GIV(longRunningPrimitiveCheckSemaphore)); - } - if (!(GIV(tempOop) == 0)) { - markAndTrace(GIV(tempOop)); - } - for (i3 = 1, iLimiT = GIV(remapBufferCount); i3 <= iLimiT; i3 += 1) { - oop1 = GIV(remapBuffer)[i3]; - if (!((oop1 & 1))) { - markAndTrace(oop1); - } - } - for (i3 = 1; i3 <= GIV(jmpDepth); i3 += 1) { - oop1 = GIV(suspendedCallbacks)[i3]; - if (!((oop1 & 1))) { - markAndTrace(oop1); - } - oop1 = GIV(suspendedMethods)[i3]; - if (!((oop1 & 1))) { - markAndTrace(oop1); - } - } - assert(validObjStacks()); - markWeaklingsAndMarkAndFireEphemerons(); - assert(validObjStacks()); - GIV(marking) = 0; - expungeDuplicateClasses(); - nilUnmarkedWeaklingSlots(); - /* begin freeUnmarkedObjectsAndSortAndCoalesceFreeSpace */ /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -24061,12 +23878,12 @@ assert(GIV(rememberedSetSize) >= 0); /* begin prepareForGlobalSweep */ sweepIndex = 0; - for (i5 = 0; i5 < GIV(numSegments); i5 += 1) { - ((GIV(segments)[i5]).containsPinned = 0); + for (i = 0; i < GIV(numSegments); i += 1) { + ((GIV(segments)[i]).containsPinned = 0); } /* begin resetFreeListHeads */ - for (i12 = 0, iLimiT2 = (32 - 1); i12 <= iLimiT2; i12 += 1) { - GIV(freeLists)[i12] = 0; + for (i1 = 0, iLimiT = (32 - 1); i1 <= iLimiT; i1 += 1) { + GIV(freeLists)[i1] = 0; } /* begin initializeStart:limit: */ aLimit = ((eden()).limit); @@ -24163,7 +23980,7 @@ if (header1NumSlots == 0xFF) { longAtput(here - (BaseHeaderSize), obj2slots + (longAt(here - (BaseHeaderSize)))); here = here; - goto l4; + goto l2; } header1NumSlots = (header1NumSlots == 0 ? 2 @@ -24176,7 +23993,7 @@ if (newNumSlots < 0xFF) { byteAtput(here + (((sqInt) 56 >> 3)), newNumSlots); @@ Diff output truncated at 50000 characters. @@

1 0

[commit][2849] Update the Cog 4.3 VMMaker image.
by commits＠squeakvm.org 23 Jan '14

23 Jan '14

Revision: 2849 Author: eliot Date: 2014-01-22 17:15:54 -0800 (Wed, 22 Jan 2014) Log Message: ----------- Update the Cog 4.3 VMMaker image. Modified Paths: -------------- branches/Cog/image/CogTrunk43.changes branches/Cog/image/CogTrunk43.image Added Paths: ----------- branches/Cog/image/Integer-hex8.st branches/Cog/image/Parser-initPatternreturn.st Modified: branches/Cog/image/CogTrunk43.changes =================================================================== --- branches/Cog/image/CogTrunk43.changes 2014-01-21 00:25:06 UTC (rev 2848) +++ branches/Cog/image/CogTrunk43.changes 2014-01-23 01:15:54 UTC (rev 2849) @@ -496094,4 +496094,96879 @@ ----STARTUP----{30 May 2012 . 11:32 am} as /Users/eliot/Cog/oscogvm/image/CogTrunk43.image! -----QUIT----{30 May 2012 . 11:32:50 am} CogTrunk43.image priorSource: 17864060! \ No newline at end of file @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.590.mcz
by commits＠source.squeak.org 23 Jan '14

23 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.590.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.590 Author: eem Time: 22 January 2014, 4:55:18.788 pm UUID: 8f6d2060-b948-464c-89d9-341f775e8662 Ancestors: VMMaker.oscog-eem.589 Fix CoInterpreter's validInstructionPointer =============== Diff against VMMaker.oscog-eem.589 =============== Item was changed: ----- Method: CoInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') ----- validInstructionPointer: instrPointer inMethod: aMethod framePointer: fp <var: #instrPointer type: #usqInt> <var: #aMethod type: #usqInt> <var: #fp type: #'char *'> | theInstrPointer cogMethod | <var: #theInstrPointer type: #usqInt> <var: #cogMethod type: #'CogMethod *'> instrPointer = cogit ceCannotResumePC ifTrue: [^self isMachineCodeFrame: fp]. instrPointer = cogit ceReturnToInterpreterPC ifTrue: [(self isMachineCodeFrame: fp) ifTrue: [^false]. theInstrPointer := self iframeSavedIP: fp] ifFalse: + [theInstrPointer := instrPointer + 1. - [theInstrPointer := instrPointer. self cppIf: NewspeakVM ifTrue: [(self isMachineCodeFrame: fp) ifTrue: [cogMethod := self mframeHomeMethod: fp. ^theInstrPointer >= (cogMethod asUnsignedInteger + (cogit sizeof: CogMethod)) and: [theInstrPointer < (cogMethod asUnsignedInteger + cogMethod blockSize)]]] ifFalse: [| header | header := self rawHeaderOf: aMethod. ((self isCogMethodReference: header) and: [theInstrPointer < objectMemory startOfMemory]) ifTrue: [cogMethod := self cCoerceSimple: header to: #'CogMethod *'. ^theInstrPointer >= (header + (cogit sizeof: CogMethod)) and: [theInstrPointer < (header + cogMethod blockSize)]]]]. ^super validInstructionPointer: theInstrPointer inMethod: aMethod framePointer: fp!

1 0

VM Maker: VMMaker.oscog-eem.589.mcz
by commits＠source.squeak.org 23 Jan '14

23 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.589.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.589 Author: eem Time: 22 January 2014, 4:35:18.69 pm UUID: 9cec8b08-0811-4b7b-a2fb-2b3ad91579ad Ancestors: VMMaker.oscog-eem.588 Fix snafu =============== Diff against VMMaker.oscog-eem.588 =============== Item was changed: ----- Method: NewObjectMemorySimulator class>>vmProxyMinorVersion (in category 'simulation only') ----- vmProxyMinorVersion "hack around the CoInterpreter/ObjectMemory split refactoring" + ^StackInterpreter vmProxyMinorVersion! - ^CoInterpreter vmProxyMinorVersion!

1 0

VM Maker: VMMaker.oscog-eem.588.mcz
by commits＠source.squeak.org 23 Jan '14

23 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.588.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.588 Author: eem Time: 22 January 2014, 4:23:19.421 pm UUID: d25a3958-3120-443b-a37e-d0611d81e833 Ancestors: VMMaker.oscog-eem.587 Add missing ObjectMemory>>followObjField:ofObject:. Fix valid instruction pointer asserts for instructionPointer pointing at byte before first bytecode. Go some way to restoring in-image compilation which was broken by VMMaker.oscog-eem.344/343's revamp of simulator instantiation. =============== Diff against VMMaker.oscog-eem.587 =============== Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur class>>defaultObjectMemoryClass (in category 'accessing') ----- + defaultObjectMemoryClass + "For in-image compilation." + ^Spur32BitCoMemoryManager! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur class>>defaultObjectMemoryClass (in category 'accessing') ----- + defaultObjectMemoryClass + "For in-image compilation. Spur64BitCoMemoryManager is as yet undefined." + ^Smalltalk classNamed: #Spur64BitCoMemoryManager! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3 class>>defaultObjectMemoryClass (in category 'accessing') ----- + defaultObjectMemoryClass + "For in-image compilation." + ^NewCoObjectMemory! Item was changed: ----- Method: Cogit class>>cog:selector:options: (in category 'in-image compilation') ----- cog: aCompiledMethod selector: aSelector options: optionsDictionaryOrArray "StackToRegisterMappingCogit cog: (Integer >> #benchFib) selector: #benchFib options: #(COGMTVM false)" | coInterpreter cogit | self initializeWithOptions: (self asOptionsDictionary: optionsDictionaryOrArray). + coInterpreter := CurrentImageCoInterpreterFacade forCogit: (cogit := self new). - coInterpreter := CurrentImageCoInterpreterFacade new cogit: (cogit := self new); yourself. [cogit setInterpreter: coInterpreter; singleStep: true; initializeCodeZoneFrom: 1024 upTo: coInterpreter memory size. cogit methodZone freeStart: (cogit methodZone freeStart roundUpTo: 1024)] on: Notification do: [:ex| (ex messageText beginsWith: 'cannot find receiver for') ifTrue: [ex resume: coInterpreter]. ex pass]. ^{ coInterpreter. cogit. cogit cog: (coInterpreter oopForObject: aCompiledMethod) selector: (coInterpreter oopForObject: aSelector) }! Item was added: + ----- Method: CurrentImageCoInterpreterFacade class>>forCogit: (in category 'instance creation') ----- + forCogit: aCogit + | class | + class := self allSubclasses + detect: [:subclass| aCogit class objectMemoryClass = subclass objectRepresentationClass objectMemoryClass] + ifNone: [self error: 'cannot find subclass for the Cogit''s objectRepresentation and/or objectMemory']. + ^class new + cogit: aCogit; + yourself! Item was added: + CurrentImageCoInterpreterFacade subclass: #CurrentImageCoInterpreterFacadeForSpurObjectRepresentation + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Support'! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation class>>objectRepresentationClass (in category 'accessing') ----- + objectRepresentationClass + ^CogObjectRepresentationFor32BitSpur! Item was changed: ----- Method: ObjectMemory>>followField:ofObject: (in category 'forward compatibility') ----- followField: fieldIndex ofObject: anObject + <inline: true> ^self fetchPointer: fieldIndex ofObject: anObject! Item was added: + ----- Method: ObjectMemory>>followObjField:ofObject: (in category 'forward compatibility') ----- + followObjField: fieldIndex ofObject: anObject + <inline: true> + ^self fetchPointer: fieldIndex ofObject: anObject! Item was changed: ----- Method: StackInterpreter>>contextInstructionPointer:frame: (in category 'frame access') ----- contextInstructionPointer: theIP frame: theFP <var: #theFP type: #'char *'> + self assert: (self validInstructionPointer: theIP + 1 inFrame: theFP). - self assert: (self validInstructionPointer: theIP inFrame: theFP). ^objectMemory integerObjectOf: theIP - (self iframeMethod: theFP) - BaseHeaderSize + 2! Item was changed: ----- Method: StackInterpreter>>externalSetStackPageAndPointersForSuspendedContextOfProcess: (in category 'frame access') ----- externalSetStackPageAndPointersForSuspendedContextOfProcess: aProcess "Set stackPage, instructionPointer, framePointer and stackPointer for the suspendedContext of aProcess, marrying the context if necessary, and niling the suspendedContext slot. This is used on process switch to ensure a context has a stack frame and so can continue execution." | newContext theFrame thePage newPage | <var: #theFrame type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #newPage type: #'StackPage *'> newContext := objectMemory fetchPointer: SuspendedContextIndex ofObject: aProcess. self assert: (objectMemory isContext: newContext). (self isMarriedOrWidowedContext: newContext) ifTrue: [self assert: (self checkIsStillMarriedContext: newContext currentFP: framePointer)]. objectMemory storePointerUnchecked: SuspendedContextIndex ofObject: aProcess withValue: objectMemory nilObject. (self isStillMarriedContext: newContext) ifTrue: [theFrame := self frameOfMarriedContext: newContext. thePage := stackPages stackPageFor: theFrame. theFrame ~= thePage headFP ifTrue: ["explicit assignment of suspendedContext can cause switch to interior frame." newPage := self newStackPage. self moveFramesIn: thePage through: (self findFrameAbove: theFrame inPage: thePage) toPage: newPage. stackPages markStackPageLeastMostRecentlyUsed: newPage]. self assert: thePage headFP = theFrame] ifFalse: [thePage := self makeBaseFrameFor: newContext. theFrame := thePage baseFP]. self setStackPageAndLimit: thePage. stackPointer := thePage headSP. framePointer := thePage headFP. (self isMachineCodeFrame: framePointer) ifFalse: [self setMethod: (self iframeMethod: framePointer)]. instructionPointer := self popStack. + self assertValidExecutionPointe: instructionPointer + 1 r: framePointer s: stackPointer! - self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer! Item was changed: ----- Method: StackInterpreter>>handleStackOverflow (in category 'message sending') ----- handleStackOverflow "Check for stack overflow, moving frames to another stack if so." | newPage theFP callerFP overflowLimitAddress overflowCount | <var: #newPage type: #'StackPage *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #overflowLimitAddress type: #'char *'> "After checkForInterrupts another event check may have been forced, setting both stackLimit and stackPage stackLimit to all ones. So here we must check against the real stackLimit, not the effective stackLimit." stackPointer < stackPage realStackLimit ifFalse: [^self]. self maybeTraceStackOverflow. statStackOverflow := statStackOverflow + 1. "The stack has overflowed this page. If the system is executing some recursive algorithm, e.g. fibonacci, then the system could thrash overflowing the stack if the call soon returns back to the current page. To avoid thrashing, since overflow is quite slow, we can move more than one frame. The idea is to record which page has overflowed, and the first time it overflows move one frame, the second time two frames, and so on. We move no more frames than would leave the page half occupied." theFP := framePointer. stackPage = overflowedPage ifTrue: [overflowLimitAddress := stackPage baseAddress - stackPages overflowLimit. overflowCount := extraFramesToMoveOnOverflow := extraFramesToMoveOnOverflow + 1. [(overflowCount := overflowCount - 1) >= 0 and: [(callerFP := self frameCallerFP: theFP) < overflowLimitAddress and: [(self isBaseFrame: callerFP) not]]] whileTrue: [theFP := callerFP]] ifFalse: [overflowedPage := stackPage. extraFramesToMoveOnOverflow := 0]. self ensureCallerContext: theFP. newPage := self newStackPage. self moveFramesIn: stackPage through: theFP toPage: newPage. self setStackPageAndLimit: newPage. framePointer := stackPage headFP. stackPointer := stackPage headSP. self isCog ifFalse: "To overflow the stack this must be a new frame, but in Cog base frames are married." [self assert: (self frameHasContext: framePointer) not. + self assert: (self validInstructionPointer: instructionPointer + 1 - self assert: (self validInstructionPointer: instructionPointer inMethod: method framePointer: framePointer)] ifTrue: + [self assert: (self validInstructionPointer: instructionPointer + 1 - [self assert: (self validInstructionPointer: instructionPointer inFrame: framePointer). self assert: ((self frameHasContext: framePointer) not or: [objectMemory isContext: (self frameContext: framePointer)])]! Item was changed: ----- Method: StackInterpreter>>transferTo: (in category 'process primitive support') ----- transferTo: newProc "Record a process to be awoken on the next interpreter cycle." | activeContext sched oldProc | <inline: false> statProcessSwitch := statProcessSwitch + 1. self push: instructionPointer. self externalWriteBackHeadFramePointers. + self assertValidExecutionPointe: instructionPointer + 1 r: framePointer s: stackPointer. - self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer. sched := self schedulerPointer. oldProc := objectMemory fetchPointer: ActiveProcessIndex ofObject: sched. activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer + BytesPerWord. objectMemory storePointer: SuspendedContextIndex ofObject: oldProc withValue: activeContext. objectMemory storePointer: ActiveProcessIndex ofObject: sched withValue: newProc. objectMemory storePointerUnchecked: MyListIndex ofObject: newProc withValue: objectMemory nilObject. self externalSetStackPageAndPointersForSuspendedContextOfProcess: newProc! Item was changed: ----- Method: StackInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') ----- validInstructionPointer: theInstrPointer inMethod: aMethod framePointer: fp <var: #theInstrPointer type: #usqInt> <var: #aMethod type: #usqInt> <var: #fp type: #'char *'> ^self cppIf: MULTIPLEBYTECODESETS ifTrue: [| methodHeader | methodHeader := self noAssertHeaderOf: aMethod. "-1 for pre-increment in fetchNextBytecode" + theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop) - theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BaseHeaderSize - 1) and: [theInstrPointer < (aMethod + (objectMemory byteLengthOf: aMethod) + BaseHeaderSize - 1) and: ["If the method starts with a CallPrimitive opcode the instruction pointer should be past it." ((self headerIndicatesAlternateBytecodeSet: methodHeader) and: [(self alternateHeaderHasPrimitiveFlag: methodHeader) and: [theInstrPointer < (aMethod + BaseHeaderSize - 1 + (objectMemory lastPointerOf: aMethod) + (self sizeOfCallPrimitiveBytecode: methodHeader) - 1)]]) not]]] ifFalse: "-1 for pre-increment in fetchNextBytecode" + [theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop) - [theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod)) and: [theInstrPointer < (aMethod + (objectMemory byteLengthOf: aMethod) + objectMemory baseHeaderSize - 1)]]! Item was added: + ----- Method: VMMaker class>>generateNewspeakSpurCogVM (in category 'configurations') ----- + generateNewspeakSpurCogVM + "No primitives since we can use those for the Cog Newspeak VM" + ^VMMaker + generate: CoInterpreter + and: StackToRegisterMappingCogit + with: #( ObjectMemory Spur32BitCoMemoryManager + MULTIPLEBYTECODESETS true + NewspeakVM true) + to: (FileDirectory default pathFromURI: 'oscogvm/nsspursrc') + platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') + including:#()! Item was added: + ----- Method: VMMaker class>>generateNewspeakSpurStackVM (in category 'configurations') ----- + generateNewspeakSpurStackVM + "No primitives since we can use those for the Cog Newspeak VM" + ^VMMaker + generate: StackInterpreter + with: #( ObjectMemory Spur32BitMemoryManager + MULTIPLEBYTECODESETS true + NewspeakVM true) + to: (FileDirectory default directoryNamed: 'oscogvm/nsspurstacksrc') fullName + platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName + excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurCogVM (in category 'configurations') ----- generateSqueakSpurCogVM + "No primitives since we can use those for the Cog VM" ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( ObjectMemory Spur32BitCoMemoryManager MULTIPLEBYTECODESETS false NewspeakVM false) to: (FileDirectory default pathFromURI: 'oscogvm/spursrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#()! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurStackVM (in category 'configurations') ----- generateSqueakSpurStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter + with: #( ObjectMemory Spur32BitCoMemoryManager + MULTIPLEBYTECODESETS false + NewspeakVM false) - with: #(ObjectMemory Spur32BitMemoryManager) to: (FileDirectory default directoryNamed: 'oscogvm/spurstacksrc') fullName platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])!

1 0

Nicolas Cellier added to VMMaker developers (was: VM Maker: VMMaker-dtl.328.mcz)
by David T. Lewis 22 Jan '14

22 Jan '14

Done. Thanks Nicolas! Note, our source.squeak.org server seems to be having problems at the moment, so there is some risk that this update may be lost if the image gets restarted. I will double check tomorrow and make sure that the addition is permanent. Dave On Fri, Nov 01, 2013 at 12:44:29PM -0700, Eliot Miranda wrote: > Hi David, Nicolas, > > I'd like Nicolas to become a trusted committer. Nicolas's > contributions recently are first-class. Do you agree? If so, can you make > it so? > Nicolas, thanks. I think you're only the fourth person after myself, Lars > Wassermann and Igor Stasenko to hack the Cogit. I really appreciate it. > > > On Thu, Oct 31, 2013 at 4:55 PM, <commits(a)source.squeak.org> wrote: > > > > > David T. Lewis uploaded a new version of VMMaker to project VM Maker: > > http://source.squeak.org/VMMaker/VMMaker-dtl.328.mcz > > > > ==================== Summary ==================== > > > > Name: VMMaker-dtl.328 > > Author: dtl > > Time: 31 October 2013, 7:48:11.404 pm > > UUID: 952f8e54-a106-406f-8f0e-3c588fb14748 > > Ancestors: VMMaker-dtl.327 > > > > VMMaker 4.12.8 > > Mantis 7794: BitBltSimulation primitiveDisplayString fails to advance destX > > Fix by Nicolas Cellier: > >

3 3

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

22 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.587.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.587 Author: eem Time: 21 January 2014, 3:24:12.518 pm UUID: 3ae6428c-5746-4c6a-9125-c61345f80382 Ancestors: VMMaker.oscog-eem.586 Fix bug in Cogit>>unlinkSendsOf:isMNUSelector:, used by primitiveFlushCacheBySelector. The method could leave sends linked to freed MNU PICs. Looks like this only causes assert failures. Add abort check assert to relocateCallsAndSelfReferencesInMethod: Nuke unused method. Fix a couple of typos. =============== Diff against VMMaker.oscog-eem.586 =============== Item was changed: ----- Method: CoInterpreter>>ceMNUFromPICMNUMethod:receiver: (in category 'trampolines') ----- ceMNUFromPICMNUMethod: aMethodObj receiver: rcvr <api> | cPIC primitiveIndex | <var: #cPIC type: #'CogMethod *'> self assert: (objectMemory addressCouldBeOop: rcvr). self assert: (aMethodObj = 0 or: [(objectMemory addressCouldBeObj: aMethodObj) and: [objectMemory isOopCompiledMethod: aMethodObj]]). cPIC := self cCoerceSimple: self popStack - cogit mnuOffset to: #'CogMethod *'. + self assert: (cPIC cmType = CMClosedPIC or: [cPIC cmType = CMOpenPIC]). - self assert: cPIC cmType = CMClosedPIC. argumentCount := cPIC cmNumArgs. messageSelector := cPIC selector. aMethodObj ~= 0 ifTrue: [instructionPointer := self popStack. self createActualMessageTo: (objectMemory fetchClassOf: rcvr). (self maybeMethodHasCogMethod: aMethodObj) ifTrue: [self push: instructionPointer. self executeCogMethod: (self cogMethodOf: aMethodObj) fromUnlinkedSendWithReceiver: rcvr. "NOTREACHED" self assert: false]. newMethod := aMethodObj. primitiveIndex := self primitiveIndexOf: aMethodObj. primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: objectMemory nilObject. ^self interpretMethodFromMachineCode]. self handleMNU: SelectorDoesNotUnderstand InMachineCodeTo: rcvr classForMessage: (objectMemory fetchClassOf: rcvr). "NOTREACHED" self assert: false! Item was added: + ----- Method: CogMethodZone>>methodBytesFreedSinceLastCompaction (in category 'accessing') ----- + methodBytesFreedSinceLastCompaction + <cmacro: '() methodBytesFreedSinceLastCompaction'> + ^methodBytesFreedSinceLastCompaction! Item was added: + ----- Method: CogMethodZone>>printOpenPICList (in category 'accessing') ----- + printOpenPICList + <api> + | openPIC | + <var: #openPIC type: #'CogMethod *'> + openPIC := openPICList. + [openPIC == nil] whileFalse: + [self printCogMethod: openPIC. + openPIC := self cCoerceSimple: openPIC nextOpenPIC to: #'CogMethod *']! Item was changed: ----- Method: Cogit class>>initializeCogMethodConstants (in category 'class initialization') ----- initializeCogMethodConstants + CMOpenPIC := 1 + (CMClosedPIC := 1 + (CMBlock := 1 + (CMMethod := 1 + (CMFree := 1))))! - CMOpenPIC := 1 + (CMClosedPIC := 1 + (CMBlock := 1 +(CMMethod := 1 + (CMFree := 1))))! Item was removed: - ----- Method: Cogit>>compileProlog (in category 'compile abstract instructions') ----- - compileProlog - "The start of a CogMethod has a call to a run-time abort routine that either - handles an in-line cache failure or a stack overflow. The routine selects the - path depending on ReceiverResultReg; if zero it takes the stack overflow - path; if nonzero the in-line cache miss path. Neither of these paths returns. - The abort routine must be called; In the callee the method is located by - adding the relevant offset to the return address of the call." - stackOverflowCall := self MoveCq: 0 R: ReceiverResultReg. - sendMissCall := self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)! Item was changed: ----- Method: Cogit>>relocateCallsAndSelfReferencesInMethod: (in category 'compaction') ----- relocateCallsAndSelfReferencesInMethod: cogMethod <var: #cogMethod type: #'CogMethod *'> | delta | delta := cogMethod objectHeader. + self assert: (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]). + self assert: (backEnd callTargetFromReturnAddress: cogMethod asInteger + missOffset) + = (cogMethod cmType = CMMethod + ifTrue: [self methodAbortTrampolineFor: cogMethod cmNumArgs] + ifFalse: [self picAbortTrampolineFor: cogMethod cmNumArgs]). backEnd relocateCallBeforeReturnPC: cogMethod asInteger + missOffset by: delta negated. self mapFor: cogMethod performUntil: #relocateIfCallOrMethodReference:mcpc:delta: arg: delta! Item was added: + ----- Method: Cogit>>unlinkIfFreeOrLinkedSend:pc:of: (in category 'in-line cacheing') ----- + unlinkIfFreeOrLinkedSend: annotation pc: mcpc of: theSelector + <var: #mcpc type: #'char *'> + | entryPoint targetMethod offset sendTable unlinkedRoutine | + <var: #targetMethod type: #'CogMethod *'> + <var: #sendTable type: #'sqInt *'> + (self isSendAnnotation: annotation) ifTrue: + [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. + entryPoint > methodZoneBase + ifTrue: "It's a linked send." + [self + offsetAndSendTableFor: entryPoint + annotation: annotation + into: [:off :table| offset := off. sendTable := table]. + targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. + (targetMethod cmType = CMFree + or: [targetMethod selector = theSelector]) ifTrue: + [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). + backEnd + rewriteInlineCacheAt: mcpc asInteger + tag: targetMethod selector + target: unlinkedRoutine. + codeModified := true]] + ifFalse: + [self cppIf: NewspeakVM ifTrue: + [entryPoint = ceImplicitReceiverTrampoline ifTrue: + [(backEnd inlineCacheTagAt: mcpc asInteger) = theSelector ifTrue: + [backEnd + unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize put: 0; + unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop put: 0]]]]]. + ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkSendsOf:isMNUSelector: (in category 'jit - api') ----- unlinkSendsOf: selector isMNUSelector: isMNUSelector <api> "Unlink all sends in cog methods." + | freeSpace cogMethod | - | cogMethod | <var: #cogMethod type: #'CogMethod *'> methodZoneBase isNil ifTrue: [^self]. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. + freeSpace := methodZone methodBytesFreedSinceLastCompaction. "First check if any method actually has the selector; if not there can't be any linked send to it." [cogMethod < methodZone limitZony and: [cogMethod selector ~= selector]] whileTrue: + [(cogMethod cmType ~= CMFree + and: [(isMNUSelector and: [cogMethod cpicHasMNUCase]) + or: [cogMethod selector = selector]]) ifTrue: + [methodZone freeMethod: cogMethod]. + cogMethod := methodZone methodAfter: cogMethod]. + (cogMethod >= methodZone limitZony + and: [freeSpace = methodZone methodBytesFreedSinceLastCompaction]) ifTrue: - [cogMethod := methodZone methodAfter: cogMethod]. - cogMethod >= methodZone limitZony ifTrue: [^self]. codeModified := false. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: + [cogMethod cmType = CMMethod ifTrue: + [self mapFor: cogMethod + performUntil: #unlinkIfFreeOrLinkedSend:pc:of: + arg: selector]. - [cogMethod cmType = CMMethod - ifTrue: - [self mapFor: cogMethod - performUntil: #unlinkIfLinkedSend:pc:of: - arg: selector] - ifFalse: - [(cogMethod cmType ~= CMFree - and: [(isMNUSelector and: [cogMethod cpicHasMNUCase]) - or: [cogMethod selector = selector]]) ifTrue: - [methodZone freeMethod: cogMethod]]. cogMethod := methodZone methodAfter: cogMethod]. codeModified ifTrue: "After possibly updating inline caches we need to flush the icache." [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: VMMaker>>needsToRegenerateInterpreterFile (in category 'initialize') ----- needsToRegenerateInterpreterFile "Check the timestamp for the relevant classes and then the timestamp for the main source file (e.g. interp.c) if it already exists. Answer if the file needs regenerating." | classes tStamp | classes := self interpreterClass withAllSuperclasses copyUpTo: VMClass. self interpreterClass objectMemoryClass ifNotNil: [:objectMemoryClass| classes addAllLast: (objectMemoryClass withAllSuperclasses copyUpTo: VMClass)]. classes copy do: [:class| classes addAllLast: (class ancilliaryClasses: self options)]. tStamp := classes inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" (self coreVMDirectory entryAt: self interpreterFilename ifAbsent: [nil]) ifNotNil: [:fstat| tStamp < fstat modificationTime ifTrue: + [^self confirm: 'The ', self configurationNameIfAny, 'interpreter classes have not been modified since\ the interpreter file was last generated.\Do you still want to regenerate the source file?' withCRs]]. - [^self confirm: 'The ', self configurationNameIfAny, 'interpreter classes have not been modified since\ the interpreter file was last generated.\Do you still want to regenerate their source file?' withCRs]]. ^true !

1 0

[commit][2848] Source per VMMaker 4.12.14 (VMMaker-dtl.338)
by commits＠squeakvm.org 21 Jan '14

21 Jan '14

Revision: 2848 Author: lewis Date: 2014-01-20 16:25:06 -0800 (Mon, 20 Jan 2014) Log Message: ----------- Source per VMMaker 4.12.14 (VMMaker-dtl.338) Various code generator updates from oscog. Note - some generated code changes are related to usage of class MemoryAccess, unrelated to the oscog code generator updates (no functional impact). 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/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins/ZipPlugin/ZipPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/ckformat.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2014-01-10T17:30:29.261+01:00--- */ +/* --- Automatically generated from class ImageFormat 2014-01-20T19:15:40.803+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-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:49 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:30 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + VMPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece from - ADPCMCodecPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + ADPCMCodecPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 10 January 2014 (i)" + "ADPCMCodecPlugin 20 January 2014 (i)" #else - "ADPCMCodecPlugin 10 January 2014 (e)" + "ADPCMCodecPlugin 20 January 2014 (e)" #endif ; @@ -170,14 +170,15 @@ remaining = 16; while(1) { shift = remaining - bitPosition; - result += ((shift < 0) ? ((usqInt) currentByte >> -shift) : ((usqInt) currentByte << shift)); if (shift > 0) { + result += currentByte << shift; remaining -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result += ((usqInt) currentByte) >> (0 - shift); bitPosition -= remaining; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); predicted = result; goto l1; } @@ -191,14 +192,15 @@ remaining1 = 6; while(1) { shift1 = remaining1 - bitPosition; - result1 += ((shift1 < 0) ? ((usqInt) currentByte >> -shift1) : ((usqInt) currentByte << shift1)); if (shift1 > 0) { + result1 += currentByte << shift1; remaining1 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result1 += ((usqInt) currentByte) >> (0 - shift1); bitPosition -= remaining1; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); index = result1; goto l2; } @@ -211,14 +213,15 @@ remaining2 = bitsPerSample; while(1) { shift2 = remaining2 - bitPosition; - result2 += ((shift2 < 0) ? ((usqInt) currentByte >> -shift2) : ((usqInt) currentByte << shift2)); if (shift2 > 0) { + result2 += currentByte << shift2; remaining2 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result2 += ((usqInt) currentByte) >> (0 - shift2); bitPosition -= remaining2; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); delta = result2; goto l3; } @@ -365,14 +368,15 @@ remaining = 16; while(1) { shift = remaining - bitPosition; - result += ((shift < 0) ? ((usqInt) currentByte >> -shift) : ((usqInt) currentByte << shift)); if (shift > 0) { + result += currentByte << shift; remaining -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result += ((usqInt) currentByte) >> (0 - shift); bitPosition -= remaining; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); predictedLeft = result; goto l1; } @@ -383,14 +387,15 @@ remaining1 = 6; while(1) { shift1 = remaining1 - bitPosition; - result1 += ((shift1 < 0) ? ((usqInt) currentByte >> -shift1) : ((usqInt) currentByte << shift1)); if (shift1 > 0) { + result1 += currentByte << shift1; remaining1 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result1 += ((usqInt) currentByte) >> (0 - shift1); bitPosition -= remaining1; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); indexLeft = result1; goto l2; } @@ -401,14 +406,15 @@ remaining2 = 16; while(1) { shift2 = remaining2 - bitPosition; - result2 += ((shift2 < 0) ? ((usqInt) currentByte >> -shift2) : ((usqInt) currentByte << shift2)); if (shift2 > 0) { + result2 += currentByte << shift2; remaining2 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result2 += ((usqInt) currentByte) >> (0 - shift2); bitPosition -= remaining2; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); predictedRight = result2; goto l3; } @@ -419,14 +425,15 @@ remaining3 = 6; while(1) { shift3 = remaining3 - bitPosition; - result3 += ((shift3 < 0) ? ((usqInt) currentByte >> -shift3) : ((usqInt) currentByte << shift3)); if (shift3 > 0) { + result3 += currentByte << shift3; remaining3 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result3 += ((usqInt) currentByte) >> (0 - shift3); bitPosition -= remaining3; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); indexRight = result3; goto l4; } @@ -446,14 +453,15 @@ remaining4 = bitsPerSample; while(1) { shift4 = remaining4 - bitPosition; - result4 += ((shift4 < 0) ? ((usqInt) currentByte >> -shift4) : ((usqInt) currentByte << shift4)); if (shift4 > 0) { + result4 += currentByte << shift4; remaining4 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result4 += ((usqInt) currentByte) >> (0 - shift4); bitPosition -= remaining4; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); deltaLeft = result4; goto l5; } @@ -464,14 +472,15 @@ remaining5 = bitsPerSample; while(1) { shift5 = remaining5 - bitPosition; - result5 += ((shift5 < 0) ? ((usqInt) currentByte >> -shift5) : ((usqInt) currentByte << shift5)); if (shift5 > 0) { + result5 += currentByte << shift5; remaining5 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; } else { + result5 += ((usqInt) currentByte) >> (0 - shift5); bitPosition -= remaining5; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); deltaRight = result5; goto l6; } @@ -629,14 +638,15 @@ while(1) { bitsAvailable = 8 - bitPosition; shift = bitsAvailable - bufBits; - currentByte += ((shift < 0) ? ((usqInt) buf >> -shift) : ((usqInt) buf << shift)); if (shift < 0) { + currentByte += ((usqInt) buf) >> (0 - shift); encodedBytes[(byteIndex += 1)] = currentByte; bitPosition = 0; currentByte = 0; - buf = buf & (((((0 - shift) < 0) ? ((usqInt) 1 >> -(0 - shift)) : ((usqInt) 1 << (0 - shift)))) - 1); + buf = buf & ((1 << (0 - shift)) - 1); bufBits -= bitsAvailable; } else { + currentByte += buf << shift; bitPosition += bufBits; goto l1; } @@ -664,14 +674,15 @@ while(1) { bitsAvailable1 = 8 - bitPosition; shift1 = bitsAvailable1 - bufBits1; - currentByte += ((shift1 < 0) ? ((usqInt) buf1 >> -shift1) : ((usqInt) buf1 << shift1)); if (shift1 < 0) { + currentByte += ((usqInt) buf1) >> (0 - shift1); encodedBytes[(byteIndex += 1)] = currentByte; bitPosition = 0; currentByte = 0; - buf1 = buf1 & (((((0 - shift1) < 0) ? ((usqInt) 1 >> -(0 - shift1)) : ((usqInt) 1 << (0 - shift1)))) - 1); + buf1 = buf1 & ((1 << (0 - shift1)) - 1); bufBits1 -= bitsAvailable1; } else { + currentByte += buf1 << shift1; bitPosition += bufBits1; goto l2; } @@ -733,14 +744,15 @@ while(1) { bitsAvailable2 = 8 - bitPosition; shift2 = bitsAvailable2 - bufBits2; - currentByte += ((shift2 < 0) ? ((usqInt) buf2 >> -shift2) : ((usqInt) buf2 << shift2)); if (shift2 < 0) { + currentByte += ((usqInt) buf2) >> (0 - shift2); encodedBytes[(byteIndex += 1)] = currentByte; bitPosition = 0; currentByte = 0; - buf2 = buf2 & (((((0 - shift2) < 0) ? ((usqInt) 1 >> -(0 - shift2)) : ((usqInt) 1 << (0 - shift2)))) - 1); + buf2 = buf2 & ((1 << (0 - shift2)) - 1); bufBits2 -= bitsAvailable2; } else { + currentByte += buf2 << shift2; bitPosition += bufBits2; goto l3; } Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:26 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:40 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + VMPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece 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 10 January 2014 (i)" + "AioPlugin 20 January 2014 (i)" #else - "AioPlugin 10 January 2014 (e)" + "AioPlugin 20 January 2014 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:50 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:30 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece from - AsynchFilePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + AsynchFilePlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 10 January 2014 (i)" + "AsynchFilePlugin 20 January 2014 (i)" #else - "AsynchFilePlugin 10 January 2014 (e)" + "AsynchFilePlugin 20 January 2014 (e)" #endif ; static void * sCOAFfn; @@ -214,7 +214,7 @@ bufferSize = bufferSize * 4; } interpreterProxy->success((startIndex >= 1) && (((startIndex + count) - 1) <= bufferSize)); - bufferPtr = ((((sqMemoryBase) + buffer) + (BASE_HEADER_SIZE)) + startIndex) - 1; + bufferPtr = (((pointerForOop(buffer)) + (BASE_HEADER_SIZE)) + startIndex) - 1; if (!(interpreterProxy->failed())) { r = asyncFileReadResult(f, bufferPtr, count); } @@ -306,7 +306,7 @@ bufferSize = bufferSize * (BYTES_PER_WORD); } interpreterProxy->success((startIndex >= 1) && (((startIndex + count) - 1) <= bufferSize)); - bufferPtr = ((((sqMemoryBase) + buffer) + (BASE_HEADER_SIZE)) + startIndex) - 1; + bufferPtr = (((pointerForOop(buffer)) + (BASE_HEADER_SIZE)) + startIndex) - 1; if (!(interpreterProxy->failed())) { asyncFileWriteStart(f, fPosition, bufferPtr, count); } Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:54 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:32 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + VMPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece from - BalloonEnginePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + BalloonEnginePlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 10 January 2014 (i)" + "B2DPlugin 20 January 2014 (i)" #else - "B2DPlugin 10 January 2014 (e)" + "B2DPlugin 20 January 2014 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:12 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:36 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + VMPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece from - B3DAcceleratorPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + B3DAcceleratorPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 10 January 2014 (i)" + "B3DAcceleratorPlugin 20 January 2014 (i)" #else - "B3DAcceleratorPlugin 10 January 2014 (e)" + "B3DAcceleratorPlugin 20 January 2014 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:50 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:30 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + VMPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece from - BMPReadWriterPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + BMPReadWriterPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 10 January 2014 (i)" + "BMPReadWriterPlugin 20 January 2014 (i)" #else - "BMPReadWriterPlugin 10 January 2014 (e)" + "BMPReadWriterPlugin 20 January 2014 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:56 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:32 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece from - BitBltSimulation VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + BitBltSimulation VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece " __DATE__ ; @@ -119,6 +119,7 @@ static sqInt copyLoopPixMap(void); static unsigned int * default8To32Table(void); static sqInt destinationWordwith(sqInt sourceWord, sqInt destinationWord); +static sqInt dstLongAt(sqInt idx); static sqInt fetchIntOrFloatofObject(sqInt fieldIndex, sqInt objectPointer); static sqInt fetchIntOrFloatofObjectifNil(sqInt fieldIndex, sqInt objectPointer, sqInt defaultValue); static sqInt fixAlphawith(sqInt sourceWord, sqInt destinationWord); @@ -256,9 +257,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 10 January 2014 (i)" + "BitBltPlugin 20 January 2014 (i)" #else - "BitBltPlugin 10 January 2014 (e)" + "BitBltPlugin 20 January 2014 (e)" #endif ; static sqInt nWords; @@ -728,8 +729,8 @@ sqInt dstY; sqInt ditherIndex; sqInt addThreshold; + sqInt addThreshold1; sqInt dstValue; - sqInt addThreshold1; sqInt dstValue1; @@ -769,7 +770,7 @@ } while (((deltaX -= 1)) != 0) { ditherThreshold = ditherMatrix4x4[ditherBase + ((ditherIndex = (ditherIndex + 1) & 3))]; - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0])); + sourceWord = long32At(srcIndex); srcAlpha = ((usqInt) sourceWord) >> 24; if (srcAlpha == 255) { @@ -784,10 +785,10 @@ sourceWord = sourceWord << srcShift; } /* begin dstLongAt:put:mask: */ - dstValue = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + dstValue = long32At(dstIndex); dstValue = dstValue & dstMask; dstValue = dstValue | sourceWord; - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue)); + long32Atput(dstIndex, dstValue); } else { /* srcAlpha ~= 255 */ @@ -797,7 +798,7 @@ /* 0 < srcAlpha < 255 */ /* If we have to mix colors then just copy a single word */ - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + destWord = long32At(dstIndex); destWord = destWord & (~dstMask); /* Expand from 16 to 32 bit by adding zero bits */ @@ -820,10 +821,10 @@ sourceWord = sourceWord << srcShift; } /* begin dstLongAt:put:mask: */ - dstValue1 = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + dstValue1 = long32At(dstIndex); dstValue1 = dstValue1 & dstMask; dstValue1 = dstValue1 | sourceWord; - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue1)); + long32Atput(dstIndex, dstValue1); } } srcIndex += 4; @@ -894,17 +895,17 @@ deltaX = bbW + 1; while (((deltaX -= 1)) != 0) { - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0])); + sourceWord = long32At(srcIndex); srcAlpha = ((usqInt) sourceWord) >> 24; if (srcAlpha == 255) { - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = sourceWord)); + long32Atput(dstIndex, sourceWord); srcIndex += 4; /* Now copy as many words as possible with alpha = 255 */ dstIndex += 4; - while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]))))) >> 24) == 255)) { - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = sourceWord)); + while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = long32At(srcIndex)))) >> 24) == 255)) { + long32Atput(dstIndex, sourceWord); srcIndex += 4; dstIndex += 4; } @@ -919,7 +920,7 @@ /* Now skip as many words as possible, */ dstIndex += 4; - while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]))))) >> 24) == 0)) { + while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = long32At(srcIndex)))) >> 24) == 0)) { srcIndex += 4; dstIndex += 4; } @@ -929,9 +930,9 @@ /* 0 < srcAlpha < 255 */ /* If we have to mix colors then just copy a single word */ - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + destWord = long32At(dstIndex); destWord = alphaBlendScaledwith(sourceWord, destWord); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = destWord)); + long32Atput(dstIndex, destWord); srcIndex += 4; dstIndex += 4; } @@ -1005,7 +1006,7 @@ dstMask = mask2; while (((deltaX -= 1)) != 0) { - sourceWord = ((((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]))) & (~adjust)) + adjust; + sourceWord = ((long32At(srcIndex)) & (~adjust)) + adjust; srcAlpha = ((usqInt) sourceWord) >> 24; if (srcAlpha > 31) { @@ -1015,7 +1016,7 @@ /* Everything above 224 is opaque */ - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + destWord = long32At(dstIndex); destWord = destWord & (~dstMask); destWord = ((usqInt) destWord) >> srcShift; destWord = mappingTable[destWord]; @@ -1044,10 +1045,10 @@ sourceWord = sourceWord << srcShift; /* begin dstLongAt:put:mask: */ - dstValue = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + dstValue = long32At(dstIndex); dstValue = dstValue & dstMask; dstValue = dstValue | sourceWord; - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue)); + long32Atput(dstIndex, dstValue); } srcIndex += 4; if (destMSB) { @@ -1804,6 +1805,21 @@ sqInt i; sqInt thisWord; sqInt notSkewMask; + sqInt idx; + sqInt idx1; + sqInt idx2; + sqInt idx3; + sqInt idx4; + sqInt idx5; + sqInt idx6; + sqInt idx7; + sqInt idx8; + sqInt idx9; + sqInt idx10; + sqInt idx11; + sqInt idx12; + sqInt idx13; + sqInt idx14; mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1])); mergeFnwith; @@ -1833,7 +1849,7 @@ halftoneWord = AllOnes; halftoneHeight = 0; } else { - halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((0 % halftoneHeight) * 4)))))[0])); + halftoneWord = long32At(halftoneBase + ((0 % halftoneHeight) * 4)); } y = dy; for (i = 1; i <= bbH; i += 1) { @@ -1844,33 +1860,38 @@ /* Otherwise, its always the same */ - halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((y % halftoneHeight) * 4)))))[0])); + halftoneWord = long32At(halftoneBase + ((y % halftoneHeight) * 4)); y += vDir; } if (preload) { /* load the 64-bit shifter */ - prevWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0])); + /* begin srcLongAt: */ + idx = sourceIndex; + prevWord = long32At(idx); sourceIndex += hInc; } else { prevWord = 0; } destMask = mask1; - - /* pick up next word */ - - thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0])); + /* begin srcLongAt: */ + idx12 = sourceIndex; + thisWord = long32At(idx12); sourceIndex += hInc; /* 32-bit rotate */ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); prevWord = thisWord; - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])); + /* begin dstLongAt: */ + idx13 = destIndex; + destWord = long32At(idx13); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord)); + /* begin dstLongAt:put: */ + idx14 = destIndex; + long32Atput(idx14, destWord); /* This central horizontal loop requires no store masking */ @@ -1886,9 +1907,13 @@ /* Woeful patch: revert to older code for hDir = -1 */ for (word = 2; word <= (nWords - 1); word += 1) { - thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0])); + /* begin srcLongAt: */ + idx1 = sourceIndex; + thisWord = long32At(idx1); sourceIndex += hInc; - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = thisWord)); + /* begin dstLongAt:put: */ + idx2 = destIndex; + long32Atput(idx2, thisWord); destIndex += hInc; } } else { @@ -1896,9 +1921,13 @@ /* Note loop starts with prevWord loaded (due to preload) */ - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = prevWord)); + /* begin dstLongAt:put: */ + idx3 = destIndex; + long32Atput(idx3, prevWord); destIndex += hInc; - prevWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0])); + /* begin srcLongAt: */ + idx4 = sourceIndex; + prevWord = long32At(idx4); sourceIndex += hInc; } } @@ -1907,14 +1936,18 @@ /* Special inner loop for STORE mode -- no need to call merge */ for (word = 2; word <= (nWords - 1); word += 1) { - thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0])); + /* begin srcLongAt: */ + idx5 = sourceIndex; + thisWord = long32At(idx5); sourceIndex += hInc; /* 32-bit rotate */ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); prevWord = thisWord; - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = (skewWord & halftoneWord))); + /* begin dstLongAt:put: */ + idx6 = destIndex; + long32Atput(idx6, skewWord & halftoneWord); destIndex += hInc; } } @@ -1923,36 +1956,40 @@ /* Normal inner loop does merge: */ - - /* pick up next word */ - - thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0])); + /* begin srcLongAt: */ + idx7 = sourceIndex; + thisWord = long32At(idx7); sourceIndex += hInc; /* 32-bit rotate */ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); prevWord = thisWord; - mergeWord = mergeFnwith(skewWord & halftoneWord, ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]))); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = mergeWord)); + mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex)); + /* begin dstLongAt:put: */ + idx8 = destIndex; + long32Atput(idx8, mergeWord); destIndex += hInc; } } if (nWords > 1) { destMask = mask2; - - /* pick up next word */ - - thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0])); + /* begin srcLongAt: */ + idx9 = sourceIndex; + thisWord = long32At(idx9); sourceIndex += hInc; /* 32-bit rotate */ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])); + /* begin dstLongAt: */ + idx10 = destIndex; + destWord = long32At(idx10); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord)); + /* begin dstLongAt:put: */ + idx11 = destIndex; + long32Atput(idx11, destWord); destIndex += hInc; } sourceIndex += sourceDelta; @@ -1972,6 +2009,13 @@ sqInt word; sqInt i; sqInt idx; + sqInt idx1; + sqInt idx2; + sqInt idx3; + sqInt idx4; + sqInt idx5; + sqInt idx6; + sqInt idx7; mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1])); mergeFnwith; @@ -1984,13 +2028,17 @@ } else { /* begin halftoneAt: */ idx = (dy + i) - 1; - halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((idx % halftoneHeight) * 4)))))[0])); + halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4)); } destMask = mask1; - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])); + /* begin dstLongAt: */ + idx6 = destIndex; + destWord = long32At(idx6); mergeWord = mergeFnwith(halftoneWord, destWord); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord)); + /* begin dstLongAt:put: */ + idx7 = destIndex; + long32Atput(idx7, destWord); /* This central horizontal loop requires no store masking */ @@ -2002,7 +2050,9 @@ destWord = halftoneWord; for (word = 2; word <= (nWords - 1); word += 1) { - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord)); + /* begin dstLongAt:put: */ + idx1 = destIndex; + long32Atput(idx1, destWord); destIndex += 4; } } else { @@ -2013,18 +2063,26 @@ /* Normal inner loop does merge */ - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])); + /* begin dstLongAt: */ + idx2 = destIndex; + destWord = long32At(idx2); mergeWord = mergeFnwith(halftoneWord, destWord); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = mergeWord)); + /* begin dstLongAt:put: */ + idx3 = destIndex; + long32Atput(idx3, mergeWord); destIndex += 4; } } if (nWords > 1) { destMask = mask2; - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])); + /* begin dstLongAt: */ + idx4 = destIndex; + destWord = long32At(idx4); mergeWord = mergeFnwith(halftoneWord, destWord); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord)); + /* begin dstLongAt:put: */ + idx5 = destIndex; + long32Atput(idx5, destWord); destIndex += 4; } destIndex += destDelta; @@ -2066,6 +2124,10 @@ sqInt nPix; sqInt scrStartBits; sqInt idx; + sqInt idx1; + sqInt value; + sqInt idx2; + sqInt idx3; sqInt sourcePix; sqInt srcShift1; sqInt sourceWord; @@ -2074,9 +2136,10 @@ sqInt nPix1; sqInt destWord1; sqInt pv; + sqInt idx4; sqInt val; - sqInt idx1; - sqInt idx2; + sqInt idx11; + sqInt idx21; mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1])); mergeFnwith; @@ -2124,7 +2187,7 @@ } else { /* begin halftoneAt: */ idx = (dy + i) - 1; - halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((idx % halftoneHeight) * 4)))))[0])); + halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4)); } srcBitShift = srcShift; dstBitShift = dstShift; @@ -2139,7 +2202,9 @@ /* pick up the word */ /* begin pickSourcePixels:flags:srcMask:destMask:srcShiftInc:dstShiftInc: */ - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0])); + /* begin srcLongAt: */ + idx21 = sourceIndex; + sourceWord = long32At(idx21); destWord1 = 0; srcShift1 = srcBitShift; dstShift1 = dstBitShift; @@ -2157,8 +2222,8 @@ srcShift1 -= 32; } /* begin srcLongAt: */ - idx1 = (sourceIndex += 4); - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + idx1)))[0])); + idx4 = (sourceIndex += 4); + sourceWord = long32At(idx4); } } while(!(((nPix1 -= 1)) == 0)); } else { @@ -2191,8 +2256,8 @@ srcShift1 -= 32; } /* begin srcLongAt: */ - idx2 = (sourceIndex += 4); - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + idx2)))[0])); + idx11 = (sourceIndex += 4); + sourceWord = long32At(idx11); } } while(!(((nPix1 -= 1)) == 0)); } @@ -2203,16 +2268,23 @@ /* avoid read-modify-write */ - mergeWord = mergeFnwith(skewWord & halftoneWord, ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]))); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = (destMask & mergeWord))); + mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex)); + /* begin dstLongAt:put: */ + idx1 = destIndex; + value = destMask & mergeWord; + long32Atput(idx1, value); } else { /* General version using dest masking */ - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])); + /* begin dstLongAt: */ + idx2 = destIndex; + destWord = long32At(idx2); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord & destMask); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord)); + /* begin dstLongAt:put: */ + idx3 = destIndex; + long32Atput(idx3, destWord); } destIndex += 4; if (words == 2) { @@ -2294,7 +2366,11 @@ return destinationWord; } +static sqInt dstLongAt(sqInt idx) { + return long32At(idx); +} + /* Return the integer value of the given field of the given object. If the field contains a Float, truncate it and return its integral part. Fail if the given field does not contain a small integer or Float, or if the truncated Float is out of the range of small integers. */ static sqInt fetchIntOrFloatofObject(sqInt fieldIndex, sqInt objectPointer) { @@ -2494,17 +2570,14 @@ sqInt formPointer; sqInt formPointer1; sqInt destBitsSize; - char *ptr; sqInt sourceBitsSize; sqInt oop; sqInt cmOop; sqInt cmSize; sqInt oldStyle; sqInt halftoneBits; - char *ptr1; sqInt mapOop; sqInt mapOop1; - char *ptr2; bitBltOop = bbObj; isWarping = aBool; @@ -2597,9 +2670,7 @@ ok = 0; goto l3; } - /* begin bits_oopForPointer: */ - ptr = interpreterProxy->firstIndexableField(destBits); - destBits = ((usqInt) (ptr - (sqMemoryBase))); + destBits = oopForPointer(interpreterProxy->firstIndexableField(destBits)); } ok = 1; l3: /* end loadBitBltDestForm */; @@ -2647,9 +2718,7 @@ ok = 0; goto l4; } - /* begin bits_oopForPointer: */ - ptr1 = interpreterProxy->firstIndexableField(sourceBits); - sourceBits = ((usqInt) (ptr1 - (sqMemoryBase))); + sourceBits = oopForPointer(interpreterProxy->firstIndexableField(sourceBits)); } ok = 1; l4: /* end loadBitBltSourceForm */; @@ -2789,9 +2858,7 @@ halftoneBits = halftoneForm; halftoneHeight = interpreterProxy->slotSizeOf(halftoneBits); } - /* begin bits_oopForPointer: */ - ptr2 = interpreterProxy->firstIndexableField(halftoneBits); - halftoneBase = ((usqInt) (ptr2 - (sqMemoryBase))); + halftoneBase = oopForPointer(interpreterProxy->firstIndexableField(halftoneBits)); ok = 1; l6: /* end loadHalftoneForm */; if (!(ok)) { @@ -3322,7 +3389,7 @@ left = destX; sourcePtr = interpreterProxy->firstIndexableField(sourceString); for (charIndex = startIndex; charIndex <= stopIndex; charIndex += 1) { - ascii = ((sqInt) ((((unsigned char *) ((sourcePtr + charIndex) - 1)))[0])); + ascii = byteAtPointer((sourcePtr + charIndex) - 1); glyphIndex = interpreterProxy->fetchIntegerofObject(ascii, glyphMap); if ((glyphIndex < 0) || (glyphIndex > maxGlyph)) { return interpreterProxy->primitiveFail(); @@ -3818,14 +3885,14 @@ } while (((deltaX -= 1)) != 0) { ditherThreshold = ditherMatrix4x4[ditherBase + ((ditherIndex = (ditherIndex + 1) & 3))]; - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0])); + sourceWord = long32At(srcIndex); srcAlpha = sourceWord & 16777215; if (!(srcAlpha == 0)) { /* 0 < srcAlpha */ /* If we have to mix colors then just copy a single word */ - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + destWord = long32At(dstIndex); destWord = destWord & (~dstMask); /* Expand from 16 to 32 bit by adding zero bits */ @@ -3848,10 +3915,10 @@ sourceWord = sourceWord << srcShift; } /* begin dstLongAt:put:mask: */ - dstValue = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + dstValue = long32At(dstIndex); dstValue = dstValue & dstMask; dstValue = dstValue | sourceWord; - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue)); + long32Atput(dstIndex, dstValue); } srcIndex += 4; if (destMSB) { @@ -3921,7 +3988,7 @@ deltaX = bbW + 1; while (((deltaX -= 1)) != 0) { - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0])); + sourceWord = long32At(srcIndex); srcAlpha = sourceWord & 16777215; if (srcAlpha == 0) { srcIndex += 4; @@ -3929,7 +3996,7 @@ /* Now skip as many words as possible, */ dstIndex += 4; - while ((((deltaX -= 1)) != 0) && ((((sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0])))) & 16777215) == 0)) { + while ((((deltaX -= 1)) != 0) && ((((sourceWord = long32At(srcIndex))) & 16777215) == 0)) { srcIndex += 4; dstIndex += 4; } @@ -3939,9 +4006,9 @@ /* 0 < srcAlpha */ /* If we have to mix colors then just copy a single word */ - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + destWord = long32At(dstIndex); destWord = rgbComponentAlpha32with(sourceWord, destWord); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = destWord)); + long32Atput(dstIndex, destWord); srcIndex += 4; dstIndex += 4; } @@ -4127,7 +4194,7 @@ dstMask = mask2; while (((deltaX -= 1)) != 0) { - sourceWord = ((((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]))) & (~adjust)) + adjust; + sourceWord = ((long32At(srcIndex)) & (~adjust)) + adjust; /* set srcAlpha to the average of the 3 separate aR,Ag,AB values */ @@ -4143,7 +4210,7 @@ sourceWord = 4294967295U; } - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + destWord = long32At(dstIndex); destWord = destWord & (~dstMask); destWord = ((usqInt) destWord) >> srcShift; destWord = mappingTable[destWord]; @@ -4171,10 +4238,10 @@ sourceWord = sourceWord << srcShift; /* begin dstLongAt:put:mask: */ - dstValue = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0])); + dstValue = long32At(dstIndex); dstValue = dstValue & dstMask; dstValue = dstValue | sourceWord; - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue)); + long32Atput(dstIndex, dstValue); } srcIndex += 4; if (destMSB) { @@ -4829,7 +4896,7 @@ sqInt pAy; sqInt dstShiftInc; sqInt pBx; - usqInt sourceMapOop; + sqInt sourceMapOop; sqInt xDelta; sqInt pAx; sqInt deltaP12y; @@ -4838,7 +4905,10 @@ sqInt deltaP12x; sqInt smoothingCount; sqInt idx; - char *ptr; + sqInt idx1; + sqInt value; + sqInt idx2; + sqInt idx3; sqInt i1; sqInt words1; sqInt sourcePix; @@ -4847,12 +4917,16 @@ sqInt dstMask; sqInt destWord1; sqInt pv; - sqInt val; + sqInt xx; + sqInt yy; sqInt sourcePix1; sqInt sourceWord; sqInt srcIndex; sqInt x; sqInt y; + sqInt val; + sqInt xx1; + sqInt yy1; sqInt sourcePix2; sqInt sourceWord1; sqInt srcIndex1; @@ -4960,9 +5034,7 @@ return interpreterProxy->primitiveFail(); } - /* begin bits_oopForPointer: */ - ptr = interpreterProxy->firstIndexableField(sourceMapOop); - sourceMapOop = ((usqInt) (ptr - (sqMemoryBase))); + sourceMapOop = oopForPointer(interpreterProxy->firstIndexableField(sourceMapOop)); } } else { smoothingCount = 1; @@ -5077,7 +5149,7 @@ } else { /* begin halftoneAt: */ idx = (dy + i) - 1; - halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((idx % halftoneHeight) * 4)))))[0])); + halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4)); } destMask = mask1; @@ -5100,12 +5172,14 @@ if (mapperFlags == (ColorMapPresent | ColorMapIndexedPart)) { do { /* begin pickWarpPixelAtX:y: */ - if ((sx < 0) || ((sy < 0) || ((((x = ((usqInt) sx) >> BinaryPoint)) >= sourceWidth) || (((y = ((usqInt) sy) >> BinaryPoint)) >= sourceHeight)))) { + xx = sx; + yy = sy; + if ((xx < 0) || ((yy < 0) || ((((x = ((usqInt) xx) >> BinaryPoint)) >= sourceWidth) || (((y = ((usqInt) yy) >> BinaryPoint)) >= sourceHeight)))) { sourcePix = 0; goto l7; } srcIndex = (sourceBits + (y * sourcePitch)) + ((((usqInt) x) >> warpAlignShift) * 4); - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0])); + sourceWord = long32At(srcIndex); srcBitShift = warpBitShiftTable[x & warpAlignMask]; sourcePix1 = (((usqInt) sourceWord) >> srcBitShift) & warpSrcMask; sourcePix = sourcePix1; @@ -5119,12 +5193,14 @@ } else { do { /* begin pickWarpPixelAtX:y: */ - if ((sx < 0) || ((sy < 0) || ((((x1 = ((usqInt) sx) >> BinaryPoint)) >= sourceWidth) || (((y1 = ((usqInt) sy) >> BinaryPoint)) >= sourceHeight)))) { + xx1 = sx; + yy1 = sy; + if ((xx1 < 0) || ((yy1 < 0) || ((((x1 = ((usqInt) xx1) >> BinaryPoint)) >= sourceWidth) || (((y1 = ((usqInt) yy1) >> BinaryPoint)) >= sourceHeight)))) { sourcePix = 0; goto l8; } srcIndex1 = (sourceBits + (y1 * sourcePitch)) + ((((usqInt) x1) >> warpAlignShift) * 4); - sourceWord1 = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex1)))[0])); + sourceWord1 = long32At(srcIndex1); srcBitShift = warpBitShiftTable[x1 & warpAlignMask]; sourcePix2 = (((usqInt) sourceWord1) >> srcBitShift) & warpSrcMask; sourcePix = sourcePix2; @@ -5165,16 +5241,23 @@ /* avoid read-modify-write */ - mergeWord = mergeFnwith(skewWord & halftoneWord, ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]))); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = (destMask & mergeWord))); + mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex)); + /* begin dstLongAt:put: */ + idx1 = destIndex; + value = destMask & mergeWord; + long32Atput(idx1, value); } else { /* General version using dest masking */ - destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])); + /* begin dstLongAt: */ + idx2 = destIndex; + destWord = long32At(idx2); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord & destMask); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord)); + /* begin dstLongAt:put: */ + idx3 = destIndex; + long32Atput(idx3, destWord); } destIndex += 4; if (words == 2) { @@ -5279,7 +5362,7 @@ goto l1; } srcIndex = (sourceBits + (y1 * sourcePitch)) + ((((usqInt) x1) >> warpAlignShift) * 4); - sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0])); + sourceWord = long32At(srcIndex); srcBitShift = warpBitShiftTable[x1 & warpAlignMask]; sourcePix = (((usqInt) sourceWord) >> srcBitShift) & warpSrcMask; rgb = sourcePix; @@ -5293,7 +5376,7 @@ /* Get RGBA values from sourcemap table */ - rgb = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (sourceMap + (rgb << 2)))))[0])); + rgb = long32At(sourceMap + (rgb << 2)); } else { /* Already in RGB format */ Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:14 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:36 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + VMPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece from - CameraPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + CameraPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; +static char __buildInfo[] = "CameraPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 10 January 2014 (i)" + "CameraPlugin 20 January 2014 (i)" #else - "CameraPlugin 10 January 2014 (e)" + "CameraPlugin 20 January 2014 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:14 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.12.14 translated as C source on 20 January 2014 7:15:36 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece from - ClipboardExtendedPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 + ClipboardExtendedPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.338 uuid: 29946156-9015-45c9-83a2-c12d43f67ece " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 10 January 2014 (i)" + "ClipboardExtendedPlugin 20 January 2014 (i)" #else - "ClipboardExtendedPlugin 10 January 2014 (e)" + "ClipboardExtendedPlugin 20 January 2014 (e)" #endif ; @@ -215,8 +215,8 @@ {"ClipboardExtendedPlugin", "setInterpreter", (void*)setInterpreter}, {"ClipboardExtendedPlugin", "ioGetClipboardFormat", (void*)ioGetClipboardFormat}, {"ClipboardExtendedPlugin", "ioCreateClipboard", (void*)ioCreateClipboard}, + {"ClipboardExtendedPlugin", "ioReadClipboardData", (void*)ioReadClipboardData}, {"ClipboardExtendedPlugin", "ioAddClipboardData", (void*)ioAddClipboardData}, - {"ClipboardExtendedPlugin", "ioReadClipboardData", (void*)ioReadClipboardData}, {NULL, NULL, NULL} }; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-01-16 18:49:26 UTC (rev 2847) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-01-21 00:25:06 UTC (rev 2848) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:57 pm */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-dtl.338.mcz
by commits＠source.squeak.org 21 Jan '14

21 Jan '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.338.mcz ==================== Summary ==================== Name: VMMaker-dtl.338 Author: dtl Time: 20 January 2014, 7:13:23.86 pm UUID: 29946156-9015-45c9-83a2-c12d43f67ece Ancestors: VMMaker-dtl.337 VMMaker 4.12.14 C translation updates from oscog required for case statement code generation, e.g. shorten:toIndexableSize code generation. Add shorten:toIndexableSize from oscog, presumed working for NewObjectMemory but not verified for ClassicObjectMemory =============== Diff against VMMaker-dtl.337 =============== Item was added: + ----- Method: BlockNode>>isPotentialCCaseLabel:in: (in category '*VMMaker-C translation') ----- + isPotentialCCaseLabel: stmt in: aTMethod + (stmt isVariableNode + or: [stmt isLiteralNode + and: [stmt isConstantNumber or: [stmt literalValue isSymbol]]]) ifTrue: + [^true]. + stmt isMessageNode ifTrue: + [| selector method | + selector := stmt selector key. + (#(* + -) includes: selector) ifTrue: + [^(self isPotentialCCaseLabel: stmt receiver in: aTMethod) + and: [self isPotentialCCaseLabel: stmt arguments first in: aTMethod]]. + + (selector = #asSymbol + and: [stmt receiver isLiteralNode + and: [stmt receiver literalValue isSymbol]]) ifTrue: + [^true]. + + (stmt arguments isEmpty + and: [method := (aTMethod definingClass whichClassIncludesSelector: selector) >> selector. + (method isQuick + or: [(method literalAt: 1) isInteger + and: [method numLiterals = 3]]) + and: [(aTMethod definingClass basicNew perform: selector) isInteger]]) ifTrue: + [^true]]. + ^false! Item was added: + ----- Method: BlockNode>>isPotentialCCaseLabelIn: (in category '*VMMaker-C translation') ----- + isPotentialCCaseLabelIn: aTMethod + | stmt | + statements size ~= 1 ifTrue: [^false]. + stmt := statements first. + ^self isPotentialCCaseLabel: stmt in: aTMethod! Item was added: + ----- Method: BraceNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- + asTranslatorNodeIn: aTMethod + "make a CCodeGenerator equivalent of me" + self assert: (elements allSatisfy: + [:elem| + elem isMessageNode + and: [elem selector key = #-> + and: [elem receiver isBlockNode + and: [elem arguments first isBlockNode + and: [elem receiver isPotentialCCaseLabelIn: aTMethod]]]]]). + ^TBraceCaseNode new + caseLabels: (elements collect: [:elem| elem receiver asTranslatorNodeIn: aTMethod]); + cases: (elements collect: [:elem| elem arguments first asTranslatorNodeIn: aTMethod]); + comment: comment! Item was added: + ----- Method: CCodeGenerator>>isBuiltinSelector: (in category 'utilities') ----- + isBuiltinSelector: sel + "Answer true if the given selector is one of the builtin selectors." + + ^(self isKernelSelector: sel) or: [translationDict includesKey: sel]! Item was added: + ----- Method: CCodeGenerator>>isKernelSelector: (in category 'utilities') ----- + isKernelSelector: sel + "Answer true if the given selector is one of the kernel selectors that are implemented as macros." + + ^(#(error: + oopAt: oopAt:put: oopAtPointer: oopAtPointer:put: + byteAt: byteAt:put: byteAtPointer: byteAtPointer:put: + shortAt: shortAt:put: shortAtPointer: shortAtPointer:put: + intAt: intAt:put: intAtPointer: intAtPointer:put: + longAt: longAt:put: longAtPointer: longAtPointer:put: + longLongAt: longLongAt:put: longLongAtPointer: longLongAtPointer:put: + fetchFloatAt:into: storeFloatAt:from: + fetchFloatAtPointer:into: storeFloatAtPointer:from: + fetchSingleFloatAt:into: storeSingleFloatAt:from: + fetchSingleFloatAtPointer:into: storeSingleFloatAtPointer:from: + pointerForOop: oopForPointer: + cCoerce:to: cCoerceSimple:to:) + includes: sel)! Item was added: + ----- Method: ClassicObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- + shorten: obj toIndexableSize: nSlots + "Currently this works for pointer objects only, and is almost certainly wrong for 64 bits." + | deltaBytes desiredLength fixedFields fmt hdr totalLength | + (self isPointersNonInt: obj) ifFalse: + [^obj]. + hdr := self baseHeader: obj. + fmt := self formatOfHeader: hdr. + totalLength := self lengthOf: obj baseHeader: hdr format: fmt. + fixedFields := self fixedFieldsOf: obj format: fmt length: totalLength. + + self cCode: ' printf("fixedFields is %d\n", fixedFields); fflush(stdout) '. + self cCode: ' printf("nSlots is %d\n", nSlots); fflush(stdout) '. + + desiredLength := fixedFields + nSlots. + deltaBytes := (totalLength - desiredLength) * self bytesPerWord. + + self cCode: ' printf("desiredLength is %d\n", desiredLength); fflush(stdout) '. + self cCode: ' printf("deltaBytes is %d\n", deltaBytes); fflush(stdout) '. + + self setSizeOfFree: obj + self baseHeaderSize + (desiredLength * self bytesPerWord) + to: deltaBytes. + (self headerType: obj) caseOf: { + [HeaderTypeSizeAndClass] -> + [ + self cCode: ' printf("HeaderTypeSizeAndClass\n"); fflush(stdout) '. + + self longAt: obj put: hdr - deltaBytes]. + [HeaderTypeClass] -> + [ + self cCode: ' printf("HeaderTypeClass\n"); fflush(stdout) '. + + self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)]. + [HeaderTypeShort] -> + [ + self cCode: ' printf("HeaderTypeShort\n"); fflush(stdout) '. + + self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)] }. + ^obj! Item was added: + ----- Method: NewObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- + shorten: obj toIndexableSize: nSlots + "Currently this works for pointer objects only, and is almost certainly wrong for 64 bits." + | deltaBytes desiredLength fixedFields fmt hdr totalLength | + (self isPointersNonImm: obj) ifFalse: + [^obj]. + hdr := self baseHeader: obj. + fmt := self formatOfHeader: hdr. + totalLength := self lengthOf: obj baseHeader: hdr format: fmt. + fixedFields := self fixedFieldsOf: obj format: fmt length: totalLength. + desiredLength := fixedFields + nSlots. + deltaBytes := (totalLength - desiredLength) * self bytesPerWord. + obj + self baseHeaderSize + (totalLength * self bytesPerWord) = freeStart + ifTrue: "Shortening the last object. Need to reduce freeStart." + [self maybeFillWithAllocationCheckFillerFrom: obj + self baseHeaderSize + (desiredLength * self bytesPerWord) to: freeStart. + freeStart := obj + self baseHeaderSize + (desiredLength * self bytesPerWord)] + ifFalse: "Shortening some interior object. Need to create a free block." + [self setSizeOfFree: obj + self baseHeaderSize + (desiredLength * self bytesPerWord) + to: deltaBytes]. + (self headerType: obj) caseOf: { + [HeaderTypeSizeAndClass] -> + [self longAt: obj put: hdr - deltaBytes]. + [HeaderTypeClass] -> + [self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)]. + [HeaderTypeShort] -> + [self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)] }. + ^obj! Item was added: + ----- Method: ObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- + shorten: obj toIndexableSize: nSlots + "Shorten the length of a pointer object to nSlots, marking free memory and adjusting + end of memory as required." + + self subclassResponsibility! Item was added: + ----- Method: TAssignmentNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + variable nodesDo: aBlock parent: self. + expression nodesDo: aBlock parent: self. + aBlock value: self value: parent! Item was added: + ----- Method: TAssignmentNode>>structTargetKindIn: (in category 'testing') ----- + structTargetKindIn: aCodeGen + "Answer if the recever evaluates to a struct or struct pointer + and hence can be dereferenced using . or ->. Answer any of + #struct #pointer or nil" + ^variable structTargetKindIn: aCodeGen! Item was added: + TParseNode subclass: #TBraceCaseNode + instanceVariableNames: 'caseLabels cases' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Translation to C'! Item was added: + ----- Method: TBraceCaseNode>>bindVariableUsesIn: (in category 'transformations') ----- + bindVariableUsesIn: aDictionary + + caseLabels := caseLabels collect: [:node| node bindVariableUsesIn: aDictionary]. + cases := cases collect: [:node| node bindVariableUsesIn: aDictionary]! Item was added: + ----- Method: TBraceCaseNode>>bindVariableUsesIn:andConstantFoldIf:in: (in category 'transformations') ----- + bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen + "Answer either the receiver, if it contains no references to the given variables, or a new node with the given variables rebound." + | newCaseLabels newCases | + newCaseLabels := caseLabels collect: [:node| node bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen]. + newCases := cases collect: [:node| node bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen]. + ^(newCaseLabels = caseLabels + and: [newCases = cases]) + ifTrue: [self] + ifFalse: [self shallowCopy + caseLabels: newCaseLabels; + cases: newCases; + yourself]! Item was added: + ----- Method: TBraceCaseNode>>bindVariablesIn: (in category 'transformations') ----- + bindVariablesIn: aDictionary + + caseLabels := caseLabels collect: [:node| node bindVariablesIn: aDictionary]. + cases := cases collect: [:node| node bindVariablesIn: aDictionary]! Item was added: + ----- Method: TBraceCaseNode>>caseLabels (in category 'accessing') ----- + caseLabels + "Answer the value of caseLabels" + + ^ caseLabels! Item was added: + ----- Method: TBraceCaseNode>>caseLabels: (in category 'accessing') ----- + caseLabels: anObject + "Set the value of caseLabels" + + caseLabels := anObject! Item was added: + ----- Method: TBraceCaseNode>>cases (in category 'accessing') ----- + cases + "Answer the value of cases" + + ^ cases! Item was added: + ----- Method: TBraceCaseNode>>cases: (in category 'accessing') ----- + cases: anObject + "Set the value of cases" + + cases := anObject! Item was added: + ----- Method: TBraceCaseNode>>copyTree (in category 'copying') ----- + copyTree + + self flag: #FIXME. "adopt from oscog - get rid of copyTree, use postCopy instead" + ^self copy + ! Item was added: + ----- Method: TBraceCaseNode>>nodesDo: (in category 'enumerating') ----- + nodesDo: aBlock + "Apply aBlock to all nodes in the receiver. + N.B. This is assumed to be bottom-up, leaves first." + caseLabels do: + [:node| node nodesDo: aBlock]. + cases do: + [:node| node nodesDo: aBlock]. + aBlock value: self! Item was added: + ----- Method: TBraceCaseNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + caseLabels do: + [:node| node nodesDo: aBlock parent: self.]. + cases do: + [:node| node nodesDo: aBlock parent: self]. + aBlock value: self value: parent! Item was added: + ----- Method: TBraceCaseNode>>nodesDo:unless: (in category 'enumerating') ----- + nodesDo: aBlock unless: cautionaryBlock + + (cautionaryBlock value: self) ifTrue: [^self]. + caseLabels do: + [:node| node nodesDo: aBlock unless: cautionaryBlock]. + cases do: + [:node| node nodesDo: aBlock unless: cautionaryBlock]. + aBlock value: self! Item was added: + ----- Method: TBraceCaseNode>>replaceNodesIn: (in category 'enumerating') ----- + replaceNodesIn: aDictionary + + ^aDictionary at: self ifAbsent: [ + caseLabels := caseLabels collect: [:node| node replaceNodesIn: aDictionary]. + cases := cases collect: [:node| node replaceNodesIn: aDictionary]. + self]! Item was added: + ----- Method: TCaseStmtNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + expression nodesDo: aBlock parent: self. + cases do: [:c| c nodesDo: aBlock parent: self]. + aBlock value: self value: parent! Item was added: + ----- Method: TConstantNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + aBlock value: self value: parent! Item was added: + ----- Method: TGoToNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + aBlock value: self value: parent! Item was added: + ----- Method: TLabeledCommentNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + aBlock value: self value: parent! Item was changed: Object subclass: #TMethod + instanceVariableNames: 'selector returnType args locals declarations primitive parseTree labels possibleSideEffectsCache complete export static sharedLabel sharedCase comment definingClass globalStructureBuildMethodHasFoo canAsmLabel mustAsmLabel properties cascadeVariableNumber extraVariableNumber' - instanceVariableNames: 'selector returnType args locals declarations primitive parseTree labels possibleSideEffectsCache complete export static sharedLabel sharedCase comment definingClass globalStructureBuildMethodHasFoo canAsmLabel mustAsmLabel properties cascadeVariableNumber' classVariableNames: 'CaseStatements' poolDictionaries: '' category: 'VMMaker-Translation to C'! !TMethod commentStamp: 'dtl 9/15/2008 09:06' prior: 0! A TMethod is a translation method, representing a MethodNode that is to be translated to C source. It has a parseTree of translation nodes that mirrors the parse tree of the corresponding Smalltalk method.! Item was added: + ----- Method: TMethod>>buildSwitchStmt:parent: (in category 'transformations') ----- + buildSwitchStmt: aSendNode parent: parentNode + "Build a switch statement node for the given send of caseOf: or caseOf:otherwise:." + | switch | + switch := TSwitchStmtNode new + expression: aSendNode receiver + cases: aSendNode args first + otherwiseOrNil: (aSendNode args at: 2 ifAbsent: [nil]). + (aSendNode receiver isVariable or: [parentNode isStmtList]) ifFalse: + [switch switchVariable: (locals add: (self extraVariableName: 'switch'))]. + ^switch! Item was changed: + ----- Method: TMethod>>endsWithReturn (in category 'testing') ----- - ----- Method: TMethod>>endsWithReturn (in category 'inlining support') ----- endsWithReturn "Answer true if the last statement of this method is a return." + ^parseTree endsWithReturn! - ^ parseTree statements last isReturn! Item was added: + ----- Method: TMethod>>isStructAccessor (in category 'testing') ----- + isStructAccessor + ^[definingClass isAccessor: selector] + on: MessageNotUnderstood + do: [:ex| false]! Item was changed: ----- Method: TMethod>>prepareMethodIn: (in category 'transformations') ----- prepareMethodIn: aCodeGen "Record sends of builtin operators, map sends of the special selector dispatchOn:in: with case statement nodes, and map sends of caseOf:[otherwise:] to switch statements. - Note: Only replaces top-level sends of dispatchOn:in: et al and caseOf:[otherwise:]. - These must be top-level statements; they cannot appear in expressions. As a hack also update the types of variables introduced to implement cascades correctly. + This has to be done at the same time as this is done, so why not piggy back here?" + extraVariableNumber ifNotNil: - This has to be done at teh same time as this is done, so why not piggy back here?" - | replacements |. - cascadeVariableNumber ifNotNil: [declarations keysAndValuesDo: [:varName :decl| decl isBlock ifTrue: [self assert: ((varName beginsWith: 'cascade') and: [varName last isDigit]). locals add: varName. self declarationAt: varName put: (decl value: self value: aCodeGen), ' ', varName]]]. - replacements := IdentityDictionary new. aCodeGen pushScope: declarations + while:"N.B. nodesWithParentsDo: is bottom-up, hence replacement is destructive and conserved." + [parseTree nodesWithParentsDo: + [:node :parent| - while: - [parseTree nodesDo: - [:node| node isSend ifTrue: + [(aCodeGen isBuiltinSelector: node selector) - [(aCodeGen builtin: node selector) ifTrue: [node isBuiltinOperator: true. "If a to:by:do:'s limit has side-effects, declare the limit variable, otherwise delete it from the args" (node selector = #to:by:do: and: [node args size = 4]) ifTrue: [| limitExpr | limitExpr := node args first. (limitExpr anySatisfy: [:subNode| subNode isSend + and: [(aCodeGen isBuiltinSelector: subNode selector) not + and: [(subNode isStructSendIn: aCodeGen) not]]]) - and: [(aCodeGen builtin: subNode selector) not - and: [(subNode isStructSend: aCodeGen) not]]]) ifTrue: [ | limitVar | limitVar := node args last name. "n.b. Two loops in the same method may share the same variable for loop limit, so add the variable declaration only if not already declared by a previous loop. Assumes that the name of the loop limit variable (e.g. 'iLimiT') is unlikely to have been used as an actual instance variable elsewhere." (locals includes: limitVar) ifFalse: [locals add: limitVar]] ifFalse: [node arguments: node args allButLast]]] ifFalse: [(CaseStatements includes: node selector) ifTrue: + [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildCaseStmt: node})]. - [replacements at: node put: (self buildCaseStmt: node)]. (#(caseOf: #caseOf:otherwise:) includes: node selector) ifTrue: + [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildSwitchStmt: node parent: parent })]]]]]! - [replacements at: node put: (self buildSwitchStmt: node)]]]. - ((node isAssignment or: [node isReturn]) - and: [node expression isSwitch]) ifTrue: - [replacements at: node put: (self transformSwitchExpression: node)]]]. - replacements isEmpty ifFalse: - [parseTree := parseTree replaceNodesIn: replacements]! Item was added: + ----- Method: TParseNode>>endsWithReturn (in category 'testing') ----- + endsWithReturn + + ^false! Item was added: + ----- Method: TParseNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + self subclassResponsibility! Item was added: + ----- Method: TParseNode>>nodesWithParentsDo: (in category 'enumerating') ----- + nodesWithParentsDo: aBlock + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + self nodesDo: aBlock parent: nil! Item was added: + ----- Method: TParseNode>>structTargetKindIn: (in category 'testing') ----- + structTargetKindIn: aCodeGen + "Answer if the recever evaluates to a struct or struct pointer + and hence can be dereferenced using . or ->. Answer any of + #struct #pointer or nil" + ^nil! Item was added: + ----- Method: TReturnNode>>endsWithReturn (in category 'testing') ----- + endsWithReturn + + ^true! Item was added: + ----- Method: TReturnNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + expression nodesDo: aBlock parent: self. + aBlock value: self value: parent! Item was added: + ----- Method: TSendNode>>endsWithReturn (in category 'testing') ----- + endsWithReturn + ^self isReturningIf! Item was added: + ----- Method: TSendNode>>isStructSendIn: (in category 'testing') ----- + isStructSendIn: aCodeGen + "Answer if the recever is a send of a structure accessor. + This is tricky. We want + foo bar => foo->bar + foo bar => foo.bar + foo bar: expr => foo->bar = expr + foo bar: expr => foo.bar = expr + depending on whether foo is a struct or a pointer to a struct, + but only if both foo is a struct type and bar is a field accessor. + The tricky cases are self-sends within struct class methods. Here we need to + distinguish between self-sends of ordinary methods from self sends of accessors." + ^arguments size <= 1 + and: [(receiver structTargetKindIn: aCodeGen) notNil + and: [(aCodeGen methodNamed: selector) + ifNil: [false] + ifNotNil: [:method| method isStructAccessor]]]! Item was added: + ----- Method: TSendNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + receiver nodesDo: aBlock parent: self. + arguments do: [:arg| arg nodesDo: aBlock parent: self]. + aBlock value: self value: parent! Item was added: + ----- Method: TSendNode>>structTargetKindIn: (in category 'testing') ----- + structTargetKindIn: aCodeGen + "Answer if the recever evaluates to a struct or struct pointer + and hence can be dereferenced using . or ->. Answer any of + #struct #pointer or nil. Right now we don't need or support + structure return so this method answers either #pointer or nil." + selector == #cCoerceSimple:to: ifTrue: + [^(VMStructType isTypePointerToStruct: arguments last value) ifTrue: + [#pointer]]. + + selector == #addressOf: ifTrue: + [^#pointer]. + + selector == #at: ifTrue: + [receiver isVariable ifTrue: + [(aCodeGen typeOfVariable: receiver name) ifNotNil: + [:type| | derefType | + type last = $* ifFalse: + [^receiver structTargetKindIn: aCodeGen]. + (VMStructType isTypeStruct: (aCodeGen + extractTypeFor: receiver name + fromDeclaration: type allButLast)) ifTrue: + [^#struct]]]. + (receiver structTargetKindIn: aCodeGen) ifNotNil: + [:kind| ^kind]]. + + (aCodeGen selectorReturnsPointerToStruct: selector) ifTrue: + [^#pointer]. + + (aCodeGen selectorReturnsStruct: selector) ifTrue: + [^#struct]. + + ^nil! Item was added: + ----- Method: TStmtListNode>>endsWithReturn (in category 'testing') ----- + endsWithReturn + "Answer true if the last statement of this lock is a return." + + ^statements last isReturn or: [statements last isReturningIf]! Item was added: + ----- Method: TStmtListNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + statements do: [:s| s nodesDo: aBlock parent: self]. + aBlock value: self value: parent! Item was added: + TParseNode subclass: #TSwitchStmtNode + instanceVariableNames: 'expression cases otherwiseOrNil switchVariable' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Translation to C'! + + !TSwitchStmtNode commentStamp: '<historical>' prior: 0! + I implement a Smalltalk + foo caseOf: { [IntegerConstant | GlobalVariable] -> [expr] } + statement converting it into a C switch statement. I make some effort to discover identical right-hand-side cases.! Item was added: + ----- Method: TSwitchStmtNode>>bindVariableUsesIn: (in category 'transformations') ----- + bindVariableUsesIn: aDictionary + expression := expression bindVariableUsesIn: aDictionary. + cases := (cases collect: + [:pair| "<Array with: <Array with: ParseTreeNode> with: TStmtListNode" + { pair first collect: [:labelNode| labelNode bindVariableUsesIn: aDictionary]. + pair last bindVariableUsesIn: aDictionary }]). + otherwiseOrNil ifNotNil: + [otherwiseOrNil := otherwiseOrNil bindVariableUsesIn: aDictionary]! Item was added: + ----- Method: TSwitchStmtNode>>bindVariableUsesIn:andConstantFoldIf:in: (in category 'transformations') ----- + bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen + "Answer either the receiver, if it contains no references to the given variables, or a new node with the given variables rebound." + | newExpression newCases newOtherwise | + newExpression := expression bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen. + newCases := cases collect: + [:pair| "<Array with: <Array with: ParseTreeNode> with: TStmtListNode" + { pair first collect: [:labelNode| labelNode bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen]. + pair last bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen}]. + newOtherwise := otherwiseOrNil ifNotNil: + [otherwiseOrNil bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen]. + ^(newExpression = expression + and: [newCases = cases + and: [newOtherwise = otherwiseOrNil]]) + ifTrue: [self] + ifFalse: + [self shallowCopy + expression: newExpression; + cases: newCases; + otherwiseOrNil: newOtherwise; + yourself]! Item was added: + ----- Method: TSwitchStmtNode>>bindVariablesIn: (in category 'transformations') ----- + bindVariablesIn: aDictionary + expression := expression bindVariablesIn: aDictionary. + cases := (cases collect: + [:pair| "<Array with: <Array with: ParseTreeNode> with: TStmtListNode" + { pair first collect: [:labelNode| labelNode bindVariablesIn: aDictionary]. + pair last bindVariablesIn: aDictionary }]). + otherwiseOrNil ifNotNil: + [otherwiseOrNil := otherwiseOrNil bindVariablesIn: aDictionary]! Item was added: + ----- Method: TSwitchStmtNode>>cases (in category 'accessing') ----- + cases + "Answer the value of cases" + + ^ cases! Item was added: + ----- Method: TSwitchStmtNode>>cases: (in category 'accessing') ----- + cases: anObject + "Set the value of cases" + + cases := anObject! Item was added: + ----- Method: TSwitchStmtNode>>copyTree (in category 'copying') ----- + copyTree + + self flag: #FIXME. "adopt from oscog - get rid of copyTree, use postCopy instead" + ^self copy + ! Item was added: + ----- Method: TSwitchStmtNode>>createCasesFromBraceNode: (in category 'instance initialization') ----- + createCasesFromBraceNode: aTBraceNode + | casesToStrings stringsToLabels newCases | + casesToStrings := Dictionary new. + stringsToLabels := Dictionary new. + newCases := OrderedCollection new: aTBraceNode caseLabels size. + aTBraceNode caseLabels with: aTBraceNode cases do: + [:label :case| | printString | + printString := casesToStrings at: case put: case printString. + (stringsToLabels at: printString ifAbsentPut: [OrderedCollection new]) addLast: label]. + + aTBraceNode caseLabels with: aTBraceNode cases do: + [:label :case| | printString labels | + printString := casesToStrings at: case. + label = (labels := (stringsToLabels at: printString) asArray) first ifTrue: + [newCases addLast: { labels collect: [:ea| ea statements first]. case}]]. + + ^newCases! Item was added: + ----- Method: TSwitchStmtNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- + emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen + "Emit the receiver as an if-the-else chain." + | varName n | + self assert: (expression isVariable or: [switchVariable notNil]). + aStream nextPut: $(. + switchVariable + ifNil: [varName := String streamContents: [:s| expression emitCCodeOn: s level: 0 generator: aCodeGen]. + aStream nextPutAll: varName] + ifNotNil: + [varName := switchVariable. + aStream nextPut: $(; nextPutAll: varName; nextPutAll: ' = '. + expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. + aStream nextPut: $)]. + n := 0. + cases do: + [:tuple| + [:labels :case| + labels do: + [:label| + n > 0 ifTrue: + [aStream nextPutAll: varName]. + aStream nextPutAll: ' == '. + label emitCCodeAsArgumentOn: aStream level: level + 1 generator: aCodeGen. + aStream nextPut: $). + aStream crtab: level + n + 1. + aStream nextPutAll: '? ('. + (TStmtListNode new setArguments: #() statements: case statements) + emitCCodeAsArgumentOn: aStream + level: level + 2 + generator: aCodeGen. + aStream nextPut: $); crtab: level + n + 1; nextPutAll: ': ('. + n := n + 1]] + valueWithArguments: tuple]. + otherwiseOrNil + ifNotNil: [otherwiseOrNil emitCCodeAsArgumentOn: aStream level: level + 1 generator: aCodeGen] + ifNil: [aStream nextPutAll: 'error("Case not found and no otherwise clause"), 0']. + aStream next: n - 1 put: $)! Item was added: + ----- Method: TSwitchStmtNode>>emitCCodeOn:addToEndOfCases:level:generator: (in category 'C code generation') ----- + emitCCodeOn: aStream addToEndOfCases: aNodeOrNil level: level generator: aCodeGen + + aStream crtab: level. + aStream nextPutAll: 'switch ('. + expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. + aStream nextPutAll: ') {'. + cases do: + [:tuple| + [:labels :case| + labels do: + [:label| + aStream + crtab: level; + nextPutAll: 'case '. + label emitCCodeAsArgumentOn: aStream level: level + 1 generator: aCodeGen. + aStream nextPut: $:]. + aStream crtab: level + 1. + case emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen] + valueWithArguments: tuple. + (aNodeOrNil notNil and: [aNodeOrNil isReturn]) ifFalse: + [aStream crtab: level + 1; nextPutAll: 'break;']]. + aStream + crtab: level; + nextPutAll: 'default:'; + crtab: level + 1. + otherwiseOrNil + ifNotNil: [otherwiseOrNil emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen] + ifNil: [aStream nextPutAll: 'error("Case not found and no otherwise clause");'. + aNodeOrNil ifNotNil: + [aStream crtab: level + 1. + (aNodeOrNil copy setExpression: (TConstantNode new setValue: -1)) + emitCCodeOn: aStream level: level generator: aCodeGen. + aStream nextPut: $;]]. + aStream + crtab: level; + nextPut: $}! Item was added: + ----- Method: TSwitchStmtNode>>emitCCodeOn:level:generator: (in category 'C code generation') ----- + emitCCodeOn: aStream level: level generator: aCodeGen + + aStream crtab: level. + aStream nextPutAll: 'switch ('. + expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. + aStream nextPutAll: ') {'. + cases do: + [:tuple| + [:labels :case| + labels do: + [:label| + aStream + crtab: level; + nextPutAll: 'case '. + label emitCCodeAsArgumentOn: aStream level: level + 1 generator: aCodeGen. + aStream nextPut: $:]. + aStream crtab: level + 1. + case emitCCodeOn: aStream level: level + 1 generator: aCodeGen. + case endsWithReturn ifFalse: + [aStream tab: level + 1; nextPutAll: 'break;']] + valueWithArguments: tuple]. + aStream + crtab: level; + nextPutAll: 'default:'; + crtab: level + 1. + otherwiseOrNil + ifNotNil: + [otherwiseOrNil emitCCodeOn: aStream level: level + 1 generator: aCodeGen] + ifNil: [aStream nextPutAll: 'error("Case not found and no otherwise clause");']. + aStream + crtab: level; + nextPut: $}! Item was added: + ----- Method: TSwitchStmtNode>>expression (in category 'accessing') ----- + expression + "Answer the value of expression" + + ^ expression! Item was added: + ----- Method: TSwitchStmtNode>>expression: (in category 'accessing') ----- + expression: anObject + "Set the value of expression" + + expression := anObject! Item was added: + ----- Method: TSwitchStmtNode>>expression:cases:otherwiseOrNil: (in category 'instance initialization') ----- + expression: expr cases: aTBraceNode otherwiseOrNil: otherwiseOrNilNode + + self expression: expr. + self cases: (self createCasesFromBraceNode: aTBraceNode). + self otherwiseOrNil: otherwiseOrNilNode! Item was added: + ----- Method: TSwitchStmtNode>>isSwitch (in category 'testing') ----- + isSwitch + ^true! Item was added: + ----- Method: TSwitchStmtNode>>nodesDo: (in category 'enumerating') ----- + nodesDo: aBlock + "Apply aBlock to all nodes in the receiver. + N.B. This is assumed to be bottom-up, leaves first." + expression nodesDo: aBlock. + cases do: + [:pair| + pair first do: [:node| node nodesDo: aBlock]. + pair last nodesDo: aBlock]. + otherwiseOrNil ifNotNil: + [otherwiseOrNil nodesDo: aBlock]. + aBlock value: self! Item was added: + ----- Method: TSwitchStmtNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + expression nodesDo: aBlock parent: self.. + cases do: + [:pair| + pair first do: [:node| node nodesDo: aBlock parent: self.]. + pair last nodesDo: aBlock parent: self.]. + otherwiseOrNil ifNotNil: + [otherwiseOrNil nodesDo: aBlock parent: self]. + aBlock value: self value: parent! Item was added: + ----- Method: TSwitchStmtNode>>nodesDo:unless: (in category 'enumerating') ----- + nodesDo: aBlock unless: cautionaryBlock + + (cautionaryBlock value: self) ifTrue: [^self]. + expression nodesDo: aBlock unless: cautionaryBlock. + cases do: + [:pair| + pair first do: [:node| node nodesDo: aBlock unless: cautionaryBlock]. + pair last nodesDo: aBlock unless: cautionaryBlock]. + otherwiseOrNil ifNotNil: + [otherwiseOrNil nodesDo: aBlock unless: cautionaryBlock]! Item was added: + ----- Method: TSwitchStmtNode>>otherwiseOrNil (in category 'accessing') ----- + otherwiseOrNil + "Answer the value of otherwiseOrNil" + + ^ otherwiseOrNil! Item was added: + ----- Method: TSwitchStmtNode>>otherwiseOrNil: (in category 'accessing') ----- + otherwiseOrNil: anObject + "Set the value of otherwiseOrNil" + + otherwiseOrNil := anObject! Item was added: + ----- Method: TSwitchStmtNode>>postCopy (in category 'copying') ----- + postCopy + expression := expression copy. + cases := (cases collect: + [:pair| "<Array with: <Array with: ParseTreeNode> with: TStmtListNode" + { pair first collect: [:labelNode| labelNode copy]. + pair last copy }]). + otherwiseOrNil := otherwiseOrNil copy! Item was added: + ----- Method: TSwitchStmtNode>>printOn:level: (in category 'printing') ----- + printOn: aStream level: level + + aStream crtab: level. + aStream nextPutAll: 'switch ('. + expression printOn: aStream level: level. + aStream nextPutAll: ') {'. + cases do: + [:tuple| + [:labels :case| + labels do: + [:label| + aStream + crtab: level; + nextPutAll: 'case '. + label printOn: aStream level: level + 1. + aStream nextPut: $:]. + aStream crtab: level + 1. + case printOn: aStream level: level + 1. + aStream crtab: level + 1; nextPutAll: 'break;'] + valueWithArguments: tuple]. + otherwiseOrNil ifNotNil: + [aStream + crtab: level; + nextPutAll: 'default:'; + crtab: level + 1. + otherwiseOrNil printOn: aStream level: level + 1]. + aStream + crtab: level; + nextPut: $}! Item was added: + ----- Method: TSwitchStmtNode>>removeAssertions (in category 'transformations') ----- + removeAssertions + expression removeAssertions. + cases do: + [:pair| "<Array with: <Array with: ParseTreeNode> with: TStmtListNode" + pair first do: [:labelNode| labelNode removeAssertions]. + pair last removeAssertions]. + otherwiseOrNil ifNotNil: + [otherwiseOrNil removeAssertions]! Item was added: + ----- Method: TSwitchStmtNode>>replaceNodesIn: (in category 'transformations') ----- + replaceNodesIn: aDictionary + ^aDictionary + at: self + ifAbsent: + [expression := expression replaceNodesIn: aDictionary. + cases := (cases collect: + [:pair| "<Array with: <Array with: ParseTreeNode> with: TStmtListNode" + { pair first collect: [:labelNode| labelNode replaceNodesIn: aDictionary]. + pair last replaceNodesIn: aDictionary }]). + otherwiseOrNil ifNotNil: + [otherwiseOrNil := otherwiseOrNil replaceNodesIn: aDictionary]. + self]! Item was added: + ----- Method: TSwitchStmtNode>>switchVariable (in category 'accessing') ----- + switchVariable + "Answer the value of switchVariable" + + ^ switchVariable! Item was added: + ----- Method: TSwitchStmtNode>>switchVariable: (in category 'accessing') ----- + switchVariable: anObject + "Set the value of switchVariable" + + switchVariable := anObject! Item was added: + ----- Method: TVariableNode>>nodesDo:parent: (in category 'enumerating') ----- + nodesDo: aBlock parent: parent + "Apply aBlock to all nodes in the receiver with each node's parent. + N.B. This is assumed to be bottom-up, leaves first." + aBlock value: self value: parent! Item was added: + ----- Method: TVariableNode>>structTargetKindIn: (in category 'testing') ----- + structTargetKindIn: aCodeGen + "Answer if the recever evaluates to a struct or struct pointer + and hence can be dereferenced using . or ->. Answer any of + #struct #pointer or nil" + ^aCodeGen structTargetKindForVariableName: name! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.12.14'! - ^'4.12.13'!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2014