Vm-dev August 2012

vm-dev@lists.squeakfoundation.org

18 participants
60 discussions

new Cog VMs
by Eliot Miranda 14 Aug '12

14 Aug '12

Hi All, please find new VMs in http://www.mirandabanda.org/files/Cog/VM/VM.r2585/. These VMs try and fix an occasional crash (try because the fix doesn't handle all cases yet), and at least turn it into an orderly exit with error message (no room on youngReferrers list/youngReferrers list overflowed) instead of a hard crash. ------------------------------------------------------------------------ Cog VM binaries as per VMMaker.oscog-eem.201/r2585. Make sure youngReferrersList has room for every method since become/cache implicit receiver can cause any method to gain a young reference. Do so by counting methods in the zone. Make overflowing the youngReferrers list a hard error (appears to happen quite often in Newspeak code). Fix assert in interpretMethodFromMachineCode. Fix bug in changeClassFrom:to: if receiver is a compact class instance with a large header. -- best, Eliot

1 0

[commit] r2585 - Cog VM source as per VMMaker.oscog-eem.201.
by commits＠squeakvm.org 14 Aug '12

14 Aug '12

Author: eliot Date: 2012-08-14 09:06:45 -0700 (Tue, 14 Aug 2012) New Revision: 2585 Modified: 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/platforms/Cross/vm/sqSCCSVersion.h 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 Log: Cog VM source as per VMMaker.oscog-eem.201. Make sure youngReferrersList has room for every method since become/cache implicit receiver can cause any method to gain a young reference. Do so by counting methods in the zone. Make overflowing the youngReferrers list a hard error (appears to happen quite often in Newspeak code). Fix assert in interpretMethodFromMachineCode. Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/nscogsrc/vm/cogit.c 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGenerator VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d from - StackToRegisterMappingCogit VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + StackToRegisterMappingCogit VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -555,6 +555,7 @@ static void freeMethod(CogMethod *cogMethod); static void freeOlderMethodsForCompaction(void); static void freePICsWithFreedTargets(void); +static usqInt freeStart(void); static sqInt genActiveContextTrampoline(void); static sqInt genAddSmallIntegerTagsTo(sqInt aRegister); static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment); @@ -810,7 +811,7 @@ static sqInt jumpLongConditionalByteSize(AbstractInstruction * self_in_jumpLongConditionalByteSize); static sqInt jumpLongTargetBeforeFollowingAddress(AbstractInstruction * self_in_jumpLongTargetBeforeFollowingAddress, sqInt mcpc); static sqInt jumpShortByteSize(AbstractInstruction * self_in_jumpShortByteSize); -static sqInt jumpTargetAddress(AbstractInstruction * self_in_jumpTargetAddress); +static AbstractInstruction * jumpTargetAddress(AbstractInstruction * self_in_jumpTargetAddress); static sqInt jumpTargetAt(AbstractInstruction * self_in_jumpTargetAt, sqInt pc); static sqInt kosherYoungReferrers(void); static AbstractInstruction * gLabel(void); @@ -824,7 +825,7 @@ static sqInt loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize); static sqInt longBranchDistance(unsigned char byteZero, unsigned char byteOne); static sqInt longForwardBranchDistance(unsigned char byteZero, unsigned char byteOne); -static sqInt longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress); +static AbstractInstruction * longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress); static AbstractInstruction * gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * gMoveCwR(sqInt wordConstant, sqInt reg); static AbstractInstruction * gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg); @@ -877,6 +878,7 @@ static sqInt numCheckFeaturesOpcodes(AbstractInstruction * self_in_numCheckFeaturesOpcodes); static sqInt numICacheFlushOpcodes(AbstractInstruction * self_in_numICacheFlushOpcodes); static sqInt numLowLevelLockOpcodes(AbstractInstruction * self_in_numLowLevelLockOpcodes); +static sqInt numMethods(void); sqInt numMethodsOfType(sqInt cogMethodType); static sqInt numSmallIntegerBits(void); static sqInt occurrencesInYoungReferrers(CogMethod *cogMethod); @@ -996,8 +998,6 @@ void voidCogCompiledCode(void); static void voidYoungReferrersPostTenureAll(void); static AbstractInstruction * gXorCwR(sqInt wordConstant, sqInt reg); -static sqInt zoneEnd(void); -static usqInt zoneLimit(void); /*** Variables ***/ @@ -1359,6 +1359,7 @@ static CogBlockMethod * maxMethodBefore; static sqInt methodAbortTrampolines[4]; static sqInt methodBytesFreedSinceLastCompaction; +static sqInt methodCount; static AbstractInstruction *methodLabel = &aMethodLabel; static sqInt methodObj; static sqInt methodOrBlockNumArgs; @@ -1668,7 +1669,6 @@ #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 @@ -1945,11 +1945,13 @@ sqInt roundedBytes; roundedBytes = (numBytes + 7) & -8; - if ((mzFreeStart + roundedBytes) > (youngReferrers - BytesPerWord)) { + if ((mzFreeStart + roundedBytes) >= (limitAddress - (methodCount * BytesPerWord))) { return 0; } allocation = mzFreeStart; mzFreeStart += roundedBytes; + methodCount += 1; + assert(roomOnYoungReferrersList()); ; return allocation; } @@ -2376,7 +2378,7 @@ innerReturn = popStack(); targetMethod = ((CogMethod *) (innerReturn - missOffset)); outerReturn = stackTop(); - assert(((outerReturn >= methodZoneBase) && (outerReturn <= (zoneLimit())))); + assert(((outerReturn >= methodZoneBase) && (outerReturn <= (freeStart())))); entryPoint = callTargetFromReturnAddress(backEnd, outerReturn); assert(((targetMethod->selector)) != (nilObject())); @@ -2800,10 +2802,7 @@ } cogMethod = methodAfter(cogMethod); } - mzFreeStart = baseAddress; - youngReferrers = limitAddress; - openPICList = null; - methodBytesFreedSinceLastCompaction = 0; + manageFromto(baseAddress, limitAddress); } @@ -2964,14 +2963,14 @@ cogMethod = methodAfter(cogMethod); } if ((((label = stringForCString("CCFree"))) == null) - || (((value = cePositive32BitIntegerFor(zoneLimit()))) == null)) { + || (((value = cePositive32BitIntegerFor(freeStart()))) == null)) { popRemappableOop(); return null; } storePointerUncheckedofObjectwithValue(count, topRemappableOop(), label); storePointerUncheckedofObjectwithValue(count + 1, topRemappableOop(), value); if ((((label = stringForCString("CCEnd"))) == null) - || (((value = cePositive32BitIntegerFor(zoneEnd()))) == null)) { + || (((value = cePositive32BitIntegerFor(limitAddress))) == null)) { popRemappableOop(); return null; } @@ -3090,7 +3089,7 @@ if ((((sqInt) ((cogMethod->objectHeader)))) >= 0) { if ((((cogMethod->methodObject)) != 0) && ((((cogMethod->methodObject)) < methodZoneBase) - || ((((cogMethod->methodObject)) > ((zoneLimit()) - openPICSize)) + || ((((cogMethod->methodObject)) > ((freeStart()) - openPICSize)) || (((((cogMethod->methodObject)) & (BytesPerWord - 1)) != 0) || (((((CogMethod *) ((cogMethod->methodObject)))->cmType)) != CMOpenPIC))))) { return 23; @@ -3303,7 +3302,7 @@ compactCompiledCode(nullHeaderForMachineCodeMethod()); assert(allMethodsHaveCorrectHeader()); assert(kosherYoungReferrers()); - flushICacheFromto(processor, methodZoneBase, zoneLimit()); + flushICacheFromto(processor, methodZoneBase, freeStart()); } static void @@ -3315,6 +3314,7 @@ source = ((CogMethod *) baseAddress); openPICList = null; + methodCount = 0; while ((source < (limitZony())) && (((source->cmType)) != CMFree)) { assert((cogMethodDoesntLookKosher(source)) == 0); @@ -3326,6 +3326,7 @@ (source->nextOpenPIC = ((usqInt)openPICList)); openPICList = source; } + methodCount += 1; source = methodAfter(source); } if (source >= (limitZony())) { @@ -3336,6 +3337,7 @@ assert((maybeFreeCogMethodDoesntLookKosher(source)) == 0); bytes = (source->blockSize); if (((source->cmType)) != CMFree) { + methodCount += 1; memmove(dest, source, bytes); (dest->objectHeader = objectHeaderValue); if (((dest->cmType)) == CMMethod) { @@ -7766,18 +7768,28 @@ freePICsWithFreedTargets(void) { CogMethod *cogMethod; + sqInt count; cogMethod = ((CogMethod *) methodZoneBase); + count = 0; while (cogMethod < (limitZony())) { if ((((cogMethod->cmType)) == CMClosedPIC) && (cPICHasFreedTargets(cogMethod))) { (cogMethod->cmType = CMFree); } cogMethod = methodAfter(cogMethod); + count += 1; } + assert(count == (numMethods())); } +static usqInt +freeStart(void) +{ + return mzFreeStart; +} + /* Short-circuit the interpreter call if a frame is already married. */ static sqInt @@ -8497,7 +8509,7 @@ headerSize = sizeof(CogMethod); (methodLabel->address = -headerSize); computeMaximumSizes(); - concretizeAt(methodLabel, allocate(0)); + concretizeAt(methodLabel, freeStart()); codeSize = generateInstructionsAt(((methodLabel->address)) + headerSize); mapSize = generateMapAtstart(0, ((methodLabel->address)) + cmNoCheckEntryOffset); totalSize = roundUpLength((headerSize + codeSize) + mapSize); @@ -13288,7 +13300,7 @@ sqInt isPCWithinMethodZone(char *address) { - return (((((usqInt)address)) >= methodZoneBase) && ((((usqInt)address)) <= (zoneLimit()))); + return (((((usqInt)address)) >= methodZoneBase) && ((((usqInt)address)) <= (freeStart()))); } static sqInt @@ -13310,7 +13322,7 @@ } target = callTargetFromReturnAddress(backEnd, retpc); return (((target >= firstSend) && (target <= lastSend))) - || (((target >= methodZoneBase) && (target <= (zoneLimit())))); + || (((target >= methodZoneBase) && (target <= (freeStart())))); } static sqInt @@ -13433,7 +13445,7 @@ /* Since it's an extraction from other methods. */ -static sqInt +static AbstractInstruction * jumpTargetAddress(AbstractInstruction * self_in_jumpTargetAddress) { AbstractInstruction *jumpTarget; @@ -13563,7 +13575,7 @@ # endif /* NewspeakVM */ - assert(((callSiteReturnAddress >= methodZoneBase) && (callSiteReturnAddress <= (zoneLimit())))); + assert(((callSiteReturnAddress >= methodZoneBase) && (callSiteReturnAddress <= (freeStart())))); inlineCacheTag = (theEntryOffset == cmNoCheckEntryOffset ? (targetMethod->selector) : inlineCacheTagForInstance(receiver)); @@ -13649,7 +13661,7 @@ sane. */ -static sqInt +static AbstractInstruction * longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress) { AbstractInstruction *jumpTarget; @@ -13715,6 +13727,7 @@ youngReferrers = (limitAddress = theLimitAddress); openPICList = null; methodBytesFreedSinceLastCompaction = 0; + methodCount = 0; } @@ -14093,7 +14106,7 @@ hasYoungObjPtr = ((sqInt)((&hasYoungObj))); codeModified = 0; pointer = youngReferrers(); - while (pointer < (zoneEnd())) { + while (pointer < limitAddress) { assert(!hasYoungObj); cogMethod = ((CogMethod *) (longAt(pointer))); if (((cogMethod->cmType)) == CMFree) { @@ -14158,6 +14171,9 @@ default: error("Case not found and no otherwise clause"); } + if (!(asserta((freeStart()) <= (youngReferrers())))) { + error("youngReferrers list overflowed"); + } } static void @@ -14195,7 +14211,7 @@ } codeModified = 0; pointer = youngReferrers(); - while (pointer < (zoneEnd())) { + while (pointer < limitAddress) { cogMethod = ((CogMethod *) (longAt(pointer))); if ((cogMethod->cmRefersToYoung)) { assert((cogMethodDoesntLookKosher(cogMethod)) == 0); @@ -15024,6 +15040,12 @@ return 14; } +static sqInt +numMethods(void) +{ + return methodCount; +} + sqInt numMethodsOfType(sqInt cogMethodType) { @@ -16161,19 +16183,33 @@ flags = primitivePropertyFlags(primIndex); if ((flags & PrimCallMayCallBack) != 0) { address = (((usqInt)cogMethod)) + (externalPrimJumpOffsets[(cogMethod->cmNumArgs)]); - extent = rewriteJumpLongAttarget(backEnd, address, ((sqInt)primFunctionPointer)); + extent = rewriteJumpLongAttarget(backEnd, address, ((usqInt)primFunctionPointer)); } else { address = (((usqInt)cogMethod)) + (externalPrimCallOffsets[(cogMethod->cmNumArgs)]); - extent = rewriteCallAttarget(backEnd, address, ((sqInt)primFunctionPointer)); + extent = rewriteCallAttarget(backEnd, address, ((usqInt)primFunctionPointer)); } flushICacheFromto(processor, address, address + extent); } + +/* The youngReferrers list holds methods that may contain a reference to a + young object and hence need to be visited during young-space garbage + collection. The + list saves walking through all of code space to do so, as in typical + circumstances there are no methods that refer to young objects.However, + events like become: + can potentially cause every method to refer to a new object (becomming + true for + example). So there needs to be room on the list for as many methods as + exist. */ + static sqInt roomOnYoungReferrersList(void) { - return (youngReferrers - BytesPerWord) >= mzFreeStart; + assert((youngReferrers <= limitAddress) + && (youngReferrers >= (limitAddress - (methodCount * BytesPerWord)))); + return (limitAddress - (methodCount * BytesPerWord)) >= mzFreeStart; } static sqInt @@ -17595,15 +17631,3 @@ { return genoperandoperand(XorCwR, wordConstant, reg); } - -static sqInt -zoneEnd(void) -{ - return limitAddress; -} - -static usqInt -zoneLimit(void) -{ - return mzFreeStart; -} Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/nscogsrc/vm/cogit.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGenerator VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGenerator VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/nscogsrc/vm/cointerp.c 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d from - CoInterpreter VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CoInterpreter VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -619,6 +619,7 @@ sqInt isMarked(sqInt oop); static sqInt isMarriedOrWidowedContext(sqInt aContext); sqInt isNonIntegerObject(sqInt objectPointer); +static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj); sqInt isOopCompiledMethod(sqInt oop); sqInt isPointers(sqInt oop); static sqInt isPrimitiveFunctionPointerAnIndex(void); @@ -1915,7 +1916,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.199"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.201"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -20973,8 +20974,10 @@ } } else { - assert(((primitiveIndexOf(GIV(newMethod))) == 0) - || ((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0)); + assert((isOopCompiledMethod(GIV(newMethod))) + && (((primitiveIndexOf(GIV(newMethod))) == 0) + || (((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0) + || (isNullExternalPrimitiveCall(GIV(newMethod)))))); } activateNewMethod(); siglongjmp(reenterInterpreter, ReturnToInterpreter); @@ -21196,6 +21199,27 @@ } +/* Answer if the method is an external primtiive call (prim 117) with a null + external primtiive. + This is just for an assert in the CoInterpreter. */ + +static sqInt +isNullExternalPrimitiveCall(sqInt aMethodObj) +{ + sqInt lit; + + if (!(((primitiveIndexOf(aMethodObj)) == 117) + && ((literalCountOfHeader(headerOf(aMethodObj))) > 0))) { + return 0; + } + lit = longAt((aMethodObj + BaseHeaderSize) + ((0 + LiteralStart) << ShiftForWord)); + return (((lit & 1) == 0) + && (((((usqInt) (longAt(lit))) >> 8) & 15) == 2)) + && (((lengthOf(lit)) == 4) + && ((longAt((lit + BaseHeaderSize) + (3 << ShiftForWord))) == ConstZero)); +} + + /* Answer whether the oop is an object of compiled method format */ sqInt Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/nscogsrc/vm/cointerp.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-08-14 16:06:45 UTC (rev 2585) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d from - CoInterpreter VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CoInterpreter VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -622,6 +622,7 @@ sqInt isMarked(sqInt oop); static sqInt isMarriedOrWidowedContext(sqInt aContext); sqInt isNonIntegerObject(sqInt objectPointer); +static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj); sqInt isOopCompiledMethod(sqInt oop); sqInt isPointers(sqInt oop); static sqInt isPrimitiveFunctionPointerAnIndex(void); @@ -1918,7 +1919,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.199"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.201"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -20977,8 +20978,10 @@ } } else { - assert(((primitiveIndexOf(GIV(newMethod))) == 0) - || ((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0)); + assert((isOopCompiledMethod(GIV(newMethod))) + && (((primitiveIndexOf(GIV(newMethod))) == 0) + || (((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0) + || (isNullExternalPrimitiveCall(GIV(newMethod)))))); } activateNewMethod(); siglongjmp(reenterInterpreter, ReturnToInterpreter); @@ -21200,6 +21203,27 @@ } +/* Answer if the method is an external primtiive call (prim 117) with a null + external primtiive. + This is just for an assert in the CoInterpreter. */ + +static sqInt +isNullExternalPrimitiveCall(sqInt aMethodObj) +{ + sqInt lit; + + if (!(((primitiveIndexOf(aMethodObj)) == 117) + && ((literalCountOfHeader(headerOf(aMethodObj))) > 0))) { + return 0; + } + lit = longAt((aMethodObj + BaseHeaderSize) + ((0 + LiteralStart) << ShiftForWord)); + return (((lit & 1) == 0) + && (((((usqInt) (longAt(lit))) >> 8) & 15) == 2)) + && (((lengthOf(lit)) == 4) + && ((longAt((lit + BaseHeaderSize) + (3 << ShiftForWord))) == ConstZero)); +} + + /* Answer whether the oop is an object of compiled method format */ sqInt Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/nscogsrc/vm/interp.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Aug 10 16:59:08 PDT 2012 + Tue Aug 14 09:01:26 PDT 2012 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/cogit.c 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGenerator VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d from - StackToRegisterMappingCogit VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + StackToRegisterMappingCogit VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -553,6 +553,7 @@ static void freeMethod(CogMethod *cogMethod); static void freeOlderMethodsForCompaction(void); static void freePICsWithFreedTargets(void); +static usqInt freeStart(void); static sqInt genActiveContextTrampoline(void); static sqInt genAddSmallIntegerTagsTo(sqInt aRegister); static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment); @@ -803,7 +804,7 @@ static sqInt jumpLongConditionalByteSize(AbstractInstruction * self_in_jumpLongConditionalByteSize); static sqInt jumpLongTargetBeforeFollowingAddress(AbstractInstruction * self_in_jumpLongTargetBeforeFollowingAddress, sqInt mcpc); static sqInt jumpShortByteSize(AbstractInstruction * self_in_jumpShortByteSize); -static sqInt jumpTargetAddress(AbstractInstruction * self_in_jumpTargetAddress); +static AbstractInstruction * jumpTargetAddress(AbstractInstruction * self_in_jumpTargetAddress); static sqInt jumpTargetAt(AbstractInstruction * self_in_jumpTargetAt, sqInt pc); static sqInt kosherYoungReferrers(void); static AbstractInstruction * gLabel(void); @@ -817,7 +818,7 @@ static sqInt loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize); static sqInt longBranchDistance(unsigned char byteZero, unsigned char byteOne); static sqInt longForwardBranchDistance(unsigned char byteZero, unsigned char byteOne); -static sqInt longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress); +static AbstractInstruction * longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress); static AbstractInstruction * gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * gMoveCwR(sqInt wordConstant, sqInt reg); static AbstractInstruction * gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg); @@ -868,6 +869,7 @@ static sqInt numCheckFeaturesOpcodes(AbstractInstruction * self_in_numCheckFeaturesOpcodes); static sqInt numICacheFlushOpcodes(AbstractInstruction * self_in_numICacheFlushOpcodes); static sqInt numLowLevelLockOpcodes(AbstractInstruction * self_in_numLowLevelLockOpcodes); +static sqInt numMethods(void); sqInt numMethodsOfType(sqInt cogMethodType); static sqInt numSmallIntegerBits(void); static sqInt occurrencesInYoungReferrers(CogMethod *cogMethod); @@ -985,8 +987,6 @@ void voidCogCompiledCode(void); static void voidYoungReferrersPostTenureAll(void); static AbstractInstruction * gXorCwR(sqInt wordConstant, sqInt reg); -static sqInt zoneEnd(void); -static usqInt zoneLimit(void); /*** Variables ***/ @@ -1342,6 +1342,7 @@ static CogBlockMethod * maxMethodBefore; static sqInt methodAbortTrampolines[4]; static sqInt methodBytesFreedSinceLastCompaction; +static sqInt methodCount; static AbstractInstruction *methodLabel = &aMethodLabel; static sqInt methodObj; static sqInt methodOrBlockNumArgs; @@ -1651,7 +1652,6 @@ #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 @@ -1928,11 +1928,13 @@ sqInt roundedBytes; roundedBytes = (numBytes + 7) & -8; - if ((mzFreeStart + roundedBytes) > (youngReferrers - BytesPerWord)) { + if ((mzFreeStart + roundedBytes) >= (limitAddress - (methodCount * BytesPerWord))) { return 0; } allocation = mzFreeStart; mzFreeStart += roundedBytes; + methodCount += 1; + assert(roomOnYoungReferrersList()); ; return allocation; } @@ -2299,7 +2301,7 @@ innerReturn = popStack(); targetMethod = ((CogMethod *) (innerReturn - missOffset)); outerReturn = stackTop(); - assert(((outerReturn >= methodZoneBase) && (outerReturn <= (zoneLimit())))); + assert(((outerReturn >= methodZoneBase) && (outerReturn <= (freeStart())))); entryPoint = callTargetFromReturnAddress(backEnd, outerReturn); assert(((targetMethod->selector)) != (nilObject())); @@ -2723,10 +2725,7 @@ } cogMethod = methodAfter(cogMethod); } - mzFreeStart = baseAddress; - youngReferrers = limitAddress; - openPICList = null; - methodBytesFreedSinceLastCompaction = 0; + manageFromto(baseAddress, limitAddress); } @@ -2887,14 +2886,14 @@ cogMethod = methodAfter(cogMethod); } if ((((label = stringForCString("CCFree"))) == null) - || (((value = cePositive32BitIntegerFor(zoneLimit()))) == null)) { + || (((value = cePositive32BitIntegerFor(freeStart()))) == null)) { popRemappableOop(); return null; } storePointerUncheckedofObjectwithValue(count, topRemappableOop(), label); storePointerUncheckedofObjectwithValue(count + 1, topRemappableOop(), value); if ((((label = stringForCString("CCEnd"))) == null) - || (((value = cePositive32BitIntegerFor(zoneEnd()))) == null)) { + || (((value = cePositive32BitIntegerFor(limitAddress))) == null)) { popRemappableOop(); return null; } @@ -3013,7 +3012,7 @@ if ((((sqInt) ((cogMethod->objectHeader)))) >= 0) { if ((((cogMethod->methodObject)) != 0) && ((((cogMethod->methodObject)) < methodZoneBase) - || ((((cogMethod->methodObject)) > ((zoneLimit()) - openPICSize)) + || ((((cogMethod->methodObject)) > ((freeStart()) - openPICSize)) || (((((cogMethod->methodObject)) & (BytesPerWord - 1)) != 0) || (((((CogMethod *) ((cogMethod->methodObject)))->cmType)) != CMOpenPIC))))) { return 23; @@ -3226,7 +3225,7 @@ compactCompiledCode(nullHeaderForMachineCodeMethod()); assert(allMethodsHaveCorrectHeader()); assert(kosherYoungReferrers()); - flushICacheFromto(processor, methodZoneBase, zoneLimit()); + flushICacheFromto(processor, methodZoneBase, freeStart()); } static void @@ -3238,6 +3237,7 @@ source = ((CogMethod *) baseAddress); openPICList = null; + methodCount = 0; while ((source < (limitZony())) && (((source->cmType)) != CMFree)) { assert((cogMethodDoesntLookKosher(source)) == 0); @@ -3249,6 +3249,7 @@ (source->nextOpenPIC = ((usqInt)openPICList)); openPICList = source; } + methodCount += 1; source = methodAfter(source); } if (source >= (limitZony())) { @@ -3259,6 +3260,7 @@ assert((maybeFreeCogMethodDoesntLookKosher(source)) == 0); bytes = (source->blockSize); if (((source->cmType)) != CMFree) { + methodCount += 1; memmove(dest, source, bytes); (dest->objectHeader = objectHeaderValue); if (((dest->cmType)) == CMMethod) { @@ -7689,18 +7691,28 @@ freePICsWithFreedTargets(void) { CogMethod *cogMethod; + sqInt count; cogMethod = ((CogMethod *) methodZoneBase); + count = 0; while (cogMethod < (limitZony())) { if ((((cogMethod->cmType)) == CMClosedPIC) && (cPICHasFreedTargets(cogMethod))) { (cogMethod->cmType = CMFree); } cogMethod = methodAfter(cogMethod); + count += 1; } + assert(count == (numMethods())); } +static usqInt +freeStart(void) +{ + return mzFreeStart; +} + /* Short-circuit the interpreter call if a frame is already married. */ static sqInt @@ -8408,7 +8420,7 @@ headerSize = sizeof(CogMethod); (methodLabel->address = -headerSize); computeMaximumSizes(); - concretizeAt(methodLabel, allocate(0)); + concretizeAt(methodLabel, freeStart()); codeSize = generateInstructionsAt(((methodLabel->address)) + headerSize); mapSize = generateMapAtstart(0, ((methodLabel->address)) + cmNoCheckEntryOffset); totalSize = roundUpLength((headerSize + codeSize) + mapSize); @@ -13076,7 +13088,7 @@ sqInt isPCWithinMethodZone(char *address) { - return (((((usqInt)address)) >= methodZoneBase) && ((((usqInt)address)) <= (zoneLimit()))); + return (((((usqInt)address)) >= methodZoneBase) && ((((usqInt)address)) <= (freeStart()))); } static sqInt @@ -13098,7 +13110,7 @@ } target = callTargetFromReturnAddress(backEnd, retpc); return (((target >= firstSend) && (target <= lastSend))) - || (((target >= methodZoneBase) && (target <= (zoneLimit())))); + || (((target >= methodZoneBase) && (target <= (freeStart())))); } static sqInt @@ -13221,7 +13233,7 @@ /* Since it's an extraction from other methods. */ -static sqInt +static AbstractInstruction * jumpTargetAddress(AbstractInstruction * self_in_jumpTargetAddress) { AbstractInstruction *jumpTarget; @@ -13351,7 +13363,7 @@ # endif /* NewspeakVM */ - assert(((callSiteReturnAddress >= methodZoneBase) && (callSiteReturnAddress <= (zoneLimit())))); + assert(((callSiteReturnAddress >= methodZoneBase) && (callSiteReturnAddress <= (freeStart())))); inlineCacheTag = (theEntryOffset == cmNoCheckEntryOffset ? (targetMethod->selector) : inlineCacheTagForInstance(receiver)); @@ -13437,7 +13449,7 @@ sane. */ -static sqInt +static AbstractInstruction * longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress) { AbstractInstruction *jumpTarget; @@ -13503,6 +13515,7 @@ youngReferrers = (limitAddress = theLimitAddress); openPICList = null; methodBytesFreedSinceLastCompaction = 0; + methodCount = 0; } @@ -13881,7 +13894,7 @@ hasYoungObjPtr = ((sqInt)((&hasYoungObj))); codeModified = 0; pointer = youngReferrers(); - while (pointer < (zoneEnd())) { + while (pointer < limitAddress) { assert(!hasYoungObj); cogMethod = ((CogMethod *) (longAt(pointer))); if (((cogMethod->cmType)) == CMFree) { @@ -13946,6 +13959,9 @@ default: error("Case not found and no otherwise clause"); } + if (!(asserta((freeStart()) <= (youngReferrers())))) { + error("youngReferrers list overflowed"); + } } static void @@ -13983,7 +13999,7 @@ } codeModified = 0; pointer = youngReferrers(); - while (pointer < (zoneEnd())) { + while (pointer < limitAddress) { cogMethod = ((CogMethod *) (longAt(pointer))); if ((cogMethod->cmRefersToYoung)) { assert((cogMethodDoesntLookKosher(cogMethod)) == 0); @@ -14639,6 +14655,12 @@ return 14; } +static sqInt +numMethods(void) +{ + return methodCount; +} + sqInt numMethodsOfType(sqInt cogMethodType) { @@ -15680,19 +15702,33 @@ flags = primitivePropertyFlags(primIndex); if ((flags & PrimCallMayCallBack) != 0) { address = (((usqInt)cogMethod)) + (externalPrimJumpOffsets[(cogMethod->cmNumArgs)]); - extent = rewriteJumpLongAttarget(backEnd, address, ((sqInt)primFunctionPointer)); + extent = rewriteJumpLongAttarget(backEnd, address, ((usqInt)primFunctionPointer)); } else { address = (((usqInt)cogMethod)) + (externalPrimCallOffsets[(cogMethod->cmNumArgs)]); - extent = rewriteCallAttarget(backEnd, address, ((sqInt)primFunctionPointer)); + extent = rewriteCallAttarget(backEnd, address, ((usqInt)primFunctionPointer)); } flushICacheFromto(processor, address, address + extent); } + +/* The youngReferrers list holds methods that may contain a reference to a + young object and hence need to be visited during young-space garbage + collection. The + list saves walking through all of code space to do so, as in typical + circumstances there are no methods that refer to young objects.However, + events like become: + can potentially cause every method to refer to a new object (becomming + true for + example). So there needs to be room on the list for as many methods as + exist. */ + static sqInt roomOnYoungReferrersList(void) { - return (youngReferrers - BytesPerWord) >= mzFreeStart; + assert((youngReferrers <= limitAddress) + && (youngReferrers >= (limitAddress - (methodCount * BytesPerWord)))); + return (limitAddress - (methodCount * BytesPerWord)) >= mzFreeStart; } static sqInt @@ -17114,15 +17150,3 @@ { return genoperandoperand(XorCwR, wordConstant, reg); } - -static sqInt -zoneEnd(void) -{ - return limitAddress; -} - -static usqInt -zoneLimit(void) -{ - return mzFreeStart; -} Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/cogit.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGenerator VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/cogmethod.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGenerator VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/cointerp.c 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d from - CoInterpreter VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CoInterpreter VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -610,6 +610,7 @@ sqInt isMarked(sqInt oop); static sqInt isMarriedOrWidowedContext(sqInt aContext); sqInt isNonIntegerObject(sqInt objectPointer); +static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj); sqInt isOopCompiledMethod(sqInt oop); sqInt isPointers(sqInt oop); static sqInt isPrimitiveFunctionPointerAnIndex(void); @@ -1905,7 +1906,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.199]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.201]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -20281,8 +20282,10 @@ } } else { - assert(((primitiveIndexOf(GIV(newMethod))) == 0) - || ((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0)); + assert((isOopCompiledMethod(GIV(newMethod))) + && (((primitiveIndexOf(GIV(newMethod))) == 0) + || (((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0) + || (isNullExternalPrimitiveCall(GIV(newMethod)))))); } activateNewMethod(); siglongjmp(reenterInterpreter, ReturnToInterpreter); @@ -20504,6 +20507,27 @@ } +/* Answer if the method is an external primtiive call (prim 117) with a null + external primtiive. + This is just for an assert in the CoInterpreter. */ + +static sqInt +isNullExternalPrimitiveCall(sqInt aMethodObj) +{ + sqInt lit; + + if (!(((primitiveIndexOf(aMethodObj)) == 117) + && ((literalCountOfHeader(headerOf(aMethodObj))) > 0))) { + return 0; + } + lit = longAt((aMethodObj + BaseHeaderSize) + ((0 + LiteralStart) << ShiftForWord)); + return (((lit & 1) == 0) + && (((((usqInt) (longAt(lit))) >> 8) & 15) == 2)) + && (((lengthOf(lit)) == 4) + && ((longAt((lit + BaseHeaderSize) + (3 << ShiftForWord))) == ConstZero)); +} + + /* Answer whether the oop is an object of compiled method format */ sqInt Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/cointerp.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/cointerpmt.c 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d from - CoInterpreterMT VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 + CoInterpreterMT VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -666,6 +666,7 @@ sqInt isMarked(sqInt oop); static sqInt isMarriedOrWidowedContext(sqInt aContext); sqInt isNonIntegerObject(sqInt objectPointer); +static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj); sqInt isOopCompiledMethod(sqInt oop); sqInt isPointers(sqInt oop); static sqInt isPrimitiveFunctionPointerAnIndex(void); @@ -2004,7 +2005,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.200]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.201]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -20987,8 +20988,10 @@ } } else { - assert(((primitiveIndexOf(GIV(newMethod))) == 0) - || ((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0)); + assert((isOopCompiledMethod(GIV(newMethod))) + && (((primitiveIndexOf(GIV(newMethod))) == 0) + || (((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0) + || (isNullExternalPrimitiveCall(GIV(newMethod)))))); } activateNewMethod(); siglongjmp(reenterInterpreter, ReturnToInterpreter); @@ -21235,6 +21238,27 @@ } +/* Answer if the method is an external primtiive call (prim 117) with a null + external primtiive. + This is just for an assert in the CoInterpreter. */ + +static sqInt +isNullExternalPrimitiveCall(sqInt aMethodObj) +{ + sqInt lit; + + if (!(((primitiveIndexOf(aMethodObj)) == 117) + && ((literalCountOfHeader(headerOf(aMethodObj))) > 0))) { + return 0; + } + lit = longAt((aMethodObj + BaseHeaderSize) + ((0 + LiteralStart) << ShiftForWord)); + return (((lit & 1) == 0) + && (((((usqInt) (longAt(lit))) >> 8) & 15) == 2)) + && (((lengthOf(lit)) == 4) + && ((longAt((lit + BaseHeaderSize) + (3 << ShiftForWord))) == ConstZero)); +} + + /* Answer whether the oop is an object of compiled method format */ sqInt Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/cointerpmt.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2012-08-14 16:06:45 UTC (rev 2585) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d from - CoInterpreter VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CoInterpreter VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -613,6 +613,7 @@ sqInt isMarked(sqInt oop); static sqInt isMarriedOrWidowedContext(sqInt aContext); sqInt isNonIntegerObject(sqInt objectPointer); +static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj); sqInt isOopCompiledMethod(sqInt oop); sqInt isPointers(sqInt oop); static sqInt isPrimitiveFunctionPointerAnIndex(void); @@ -1908,7 +1909,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.199]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.201]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -20285,8 +20286,10 @@ } } else { - assert(((primitiveIndexOf(GIV(newMethod))) == 0) - || ((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0)); + assert((isOopCompiledMethod(GIV(newMethod))) + && (((primitiveIndexOf(GIV(newMethod))) == 0) + || (((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0) + || (isNullExternalPrimitiveCall(GIV(newMethod)))))); } activateNewMethod(); siglongjmp(reenterInterpreter, ReturnToInterpreter); @@ -20508,6 +20511,27 @@ } +/* Answer if the method is an external primtiive call (prim 117) with a null + external primtiive. + This is just for an assert in the CoInterpreter. */ + +static sqInt +isNullExternalPrimitiveCall(sqInt aMethodObj) +{ + sqInt lit; + + if (!(((primitiveIndexOf(aMethodObj)) == 117) + && ((literalCountOfHeader(headerOf(aMethodObj))) > 0))) { + return 0; + } + lit = longAt((aMethodObj + BaseHeaderSize) + ((0 + LiteralStart) << ShiftForWord)); + return (((lit & 1) == 0) + && (((((usqInt) (longAt(lit))) >> 8) & 15) == 2)) + && (((lengthOf(lit)) == 4) + && ((longAt((lit + BaseHeaderSize) + (3 << ShiftForWord))) == ConstZero)); +} + + /* Answer whether the oop is an object of compiled method format */ sqInt Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-08-14 16:06:45 UTC (rev 2585) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d from - CoInterpreterMT VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 + CoInterpreterMT VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -669,6 +669,7 @@ sqInt isMarked(sqInt oop); static sqInt isMarriedOrWidowedContext(sqInt aContext); sqInt isNonIntegerObject(sqInt objectPointer); +static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj); sqInt isOopCompiledMethod(sqInt oop); sqInt isPointers(sqInt oop); static sqInt isPrimitiveFunctionPointerAnIndex(void); @@ -2007,7 +2008,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.200]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.201]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -20991,8 +20992,10 @@ } } else { - assert(((primitiveIndexOf(GIV(newMethod))) == 0) - || ((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0)); + assert((isOopCompiledMethod(GIV(newMethod))) + && (((primitiveIndexOf(GIV(newMethod))) == 0) + || (((functionPointerForinClass(primitiveIndexOf(GIV(newMethod)), nilObject())) == 0) + || (isNullExternalPrimitiveCall(GIV(newMethod)))))); } activateNewMethod(); siglongjmp(reenterInterpreter, ReturnToInterpreter); @@ -21239,6 +21242,27 @@ } +/* Answer if the method is an external primtiive call (prim 117) with a null + external primtiive. + This is just for an assert in the CoInterpreter. */ + +static sqInt +isNullExternalPrimitiveCall(sqInt aMethodObj) +{ + sqInt lit; + + if (!(((primitiveIndexOf(aMethodObj)) == 117) + && ((literalCountOfHeader(headerOf(aMethodObj))) > 0))) { + return 0; + } + lit = longAt((aMethodObj + BaseHeaderSize) + ((0 + LiteralStart) << ShiftForWord)); + return (((lit & 1) == 0) + && (((((usqInt) (longAt(lit))) >> 8) & 15) == 2)) + && (((lengthOf(lit)) == 4) + && ((longAt((lit + BaseHeaderSize) + (3 << ShiftForWord))) == ConstZero)); +} + + /* Answer whether the oop is an object of compiled method format */ sqInt Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/interp.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2012-08-10 23:59:57 UTC (rev 2584) +++ branches/Cog/src/vm/vmCallback.h 2012-08-14 16:06:45 UTC (rev 2585) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.201 uuid: 56cdd078-6771-401a-8bed-68402a0e283d */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.201.mcz
by commits＠source.squeak.org 14 Aug '12

14 Aug '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.201.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.201 Author: eem Time: 13 August 2012, 6:30:31.048 pm UUID: 56cdd078-6771-401a-8bed-68402a0e283d Ancestors: VMMaker.oscog-eem.200 Make sure youngReferrersList has room for every method since become/cache implicit receiver can cause any method to gain a young reference. Do so by counting methods in the zone. Refactor type name manipulation to move extractTypeFor:fromDeclaration: from TMethod to CCodeGenerator. Rename CogMethodZone>>zoneLimit to freeStart. Fix assert in interpretMethodFromMachineCode. Fix return type of jumpTargetAddress & longJumpTargetAddress. Fix simulation of rewritePrimInvocationIn:. Nuke unused methodBytesFreedSinceLastCompaction method. =============== Diff against VMMaker.oscog-eem.200 =============== Item was added: + ----- Method: CCodeGenerator>>extractTypeFor:fromDeclaration: (in category 'utilities') ----- + extractTypeFor: aVariable fromDeclaration: aVariableDeclaration + "Eliminate inessentials from aVariableDeclaration to answer a C type without the variable, + or initializations etc" + | decl fpIndex | + decl := aVariableDeclaration. + (decl beginsWith: 'static') ifTrue: + [decl := decl allButFirst: 6]. + (decl indexOf: $= ifAbsent: []) ifNotNil: + [:index| decl := decl copyFrom: 1 to: index - 1]. + decl := decl copyReplaceAll: aVariable with: '' tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]]. + (fpIndex := decl indexOfSubCollection: '(*') > 0 ifTrue: + [decl := decl copyReplaceFrom: (decl indexOf: $( startingAt: fpIndex + 1) + to: (decl indexOf: $) startingAt: fpIndex + 1) + with: '']. + ^decl withBlanksTrimmed! Item was added: + ----- Method: CCodeGenerator>>testInliningFor:as: (in category 'utilities') ----- + testInliningFor: selector as: inlineFlagOrSymbol + "Test inlining for the method with the given selector. + Do all inlining first (cuz that's how the algorithm works. + Then try and inline into a copy of the method. This isn't + exactly what happens in the real deal but is close enough." + | meth | + meth := (self methodNamed: selector) copy. + self doBasicInlining: inlineFlagOrSymbol. + self halt. + meth tryToInlineMethodsIn: self! Item was changed: ----- Method: CCodeGenerator>>typeOfVariable: (in category 'C code generator') ----- typeOfVariable: varName "<String>" scopeStack reverseDo: [:dict| (dict includesKey: varName) ifTrue: + [^self + extractTypeFor: varName + fromDeclaration: (dict at: varName)]]. + ^self + extractTypeFor: varName + fromDeclaration: (variableDeclarations at: varName ifAbsent: [^nil])! - [^dict at: varName]]. - ^variableDeclarations at: varName ifAbsent: nil! Item was changed: ----- Method: CoInterpreter>>interpretMethodFromMachineCode (in category 'message sending') ----- interpretMethodFromMachineCode "Execute a method interpretively from machine code. We assume (require) that newMethod messageSelector, primitiveFunctionPointer and argumentCount have been set in the caller. Once evaluated either continue in the interpreter via a jongjmp or in machine code via an enilopmart (a form of longjmp - a stinking rose by any other name)." <inline: false> cogit assertCStackWellAligned. self assert: (self validInstructionPointer: instructionPointer inFrame: framePointer). primitiveFunctionPointer ~= 0 ifTrue: [primitiveFunctionPointer = #primitiveInvokeObjectAsMethod asSymbol ifTrue: [self assert: (objectMemory isOopCompiledMethod: newMethod) not] ifFalse: [self assert: ((objectMemory isOopCompiledMethod: newMethod) and: [(self primitiveIndexOf: newMethod) ~= 0])]. "Invoke an interpreter primitive (because the method is to be interpreted or has not yet been compiled). This is very similar to invoking an interpreter primitive from a compiled primitive (see e.g. SimpleStackBasedCogit>>compileInterpreterPrimitive:). Cut back the stack pointer (done above) to skip the return address and invoke the function. On return if it has succeeded simply continue otherwise restore the stackPointer, collect the pc and interpret. Note that frame building primitives such as primitiveClosureValue, primitiveEvaluateMethod et al will not return but will instead jump into either machine code or longjmp back to the interpreter." "Assign stackPage headFP so we can tell if the primitive built a frame. We can't simply save the framePointer since e.g. assignment to contexts (via primitiveInstVarAt:put:) can change the framePointer. But context assignments will change both the framePointer and stackPage headFP." stackPage headFP: framePointer. self isPrimitiveFunctionPointerAnIndex ifTrue: [self externalQuickPrimitiveResponse. primFailCode := 0] ifFalse: [self slowPrimitiveResponse]. self successful ifTrue: [self return: self popStack toExecutive: false "NOTREACHED"]] ifFalse: + [self assert: ((self isOopCompiledMethod: newMethod) + and: [(self primitiveIndexOf: newMethod) = 0 + or: [(self functionPointerFor: (self primitiveIndexOf: newMethod) inClass: objectMemory nilObject) = 0 + or: [self isNullExternalPrimitiveCall: newMethod]]])]. - [self assert: ((self primitiveIndexOf: newMethod) = 0 - or: [(self functionPointerFor: (self primitiveIndexOf: newMethod) inClass: objectMemory nilObject) = 0])]. "if not primitive, or primitive failed, activate the method and reenter the interpreter" self activateNewMethod. self siglong: reenterInterpreter jmp: ReturnToInterpreter. "NOTREACHED" ^nil! Item was changed: ----- Method: CogAbstractInstruction>>jumpTargetAddress (in category 'generate machine code') ----- jumpTargetAddress + <returnTypeC: #'AbstractInstruction *'> <inline: true> "Since it's an extraction from other methods." | jumpTarget | <var: #jumpTarget type: #'AbstractInstruction *'> jumpTarget := cogit cCoerceSimple: (operands at: 0) to: #'AbstractInstruction *'. cogit assertSaneJumpTarget: jumpTarget. (self isAnInstruction: jumpTarget) ifTrue: [jumpTarget := cogit cCoerceSimple: jumpTarget address to: #'AbstractInstruction *']. self assert: jumpTarget ~= 0. ^jumpTarget! Item was changed: ----- Method: CogAbstractInstruction>>longJumpTargetAddress (in category 'generate machine code') ----- longJumpTargetAddress + <returnTypeC: #'AbstractInstruction *'> <inline: true> "Since it's an extraction from other methods." "This needs to be digfferent from jumpTargetAddress because long jumps can be to absolute addresses and hence we can't assert that the jump target is sane." | jumpTarget | <var: #jumpTarget type: #'AbstractInstruction *'> jumpTarget := cogit cCoerceSimple: (operands at: 0) to: #'AbstractInstruction *'. (self isAnInstruction: jumpTarget) ifTrue: [jumpTarget := cogit cCoerceSimple: jumpTarget address to: #'AbstractInstruction *']. self assert: jumpTarget ~= 0. ^jumpTarget! Item was changed: CogClass subclass: #CogMethodZone + instanceVariableNames: 'youngReferrers methodCount openPICList mzFreeStart baseAddress limitAddress methodBytesFreedSinceLastCompaction coInterpreter objectRepresentation cogit objectMemory' - instanceVariableNames: 'youngReferrers openPICList mzFreeStart baseAddress limitAddress methodBytesFreedSinceLastCompaction coInterpreter objectRepresentation cogit objectMemory' classVariableNames: '' poolDictionaries: 'CogMethodConstants VMBasicConstants' category: 'VMMaker-JIT'! !CogMethodZone commentStamp: '<historical>' prior: 0! I am a simple allocator/deallocator for the native code zone. I also manage the youngReferers list, which contains methods that may refer to one or more young objects, and the openPICList which is a linked list of all open PICs in the zone.! Item was changed: ----- Method: CogMethodZone>>allocate: (in category 'allocating') ----- allocate: numBytes | roundedBytes allocation | roundedBytes := numBytes + 7 bitAnd: -8. + mzFreeStart + roundedBytes >= (limitAddress - (methodCount * BytesPerWord)) ifTrue: - mzFreeStart + roundedBytes > (youngReferrers - BytesPerWord) ifTrue: [^0]. allocation := mzFreeStart. mzFreeStart := mzFreeStart + roundedBytes. + methodCount := methodCount + 1. + self assert: self roomOnYoungReferrersList. self cCode: '' inSmalltalk: [(cogit breakPC isInteger and: [cogit breakPC between: allocation and: mzFreeStart]) ifTrue: [cogit singleStep: true]]. ^allocation! Item was changed: ----- Method: CogMethodZone>>clearCogCompiledCode (in category 'jit - api') ----- clearCogCompiledCode "Free all methods" | cogMethod | <var: #cogMethod type: #'CogMethod *'> cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. [cogMethod asUnsignedInteger < mzFreeStart] whileTrue: [cogMethod cmType = CMMethod ifTrue: [self freeMethod: cogMethod]. cogMethod := self methodAfter: cogMethod]. + self manageFrom: baseAddress to: limitAddress! - mzFreeStart := baseAddress. - youngReferrers := limitAddress. - openPICList := nil. - methodBytesFreedSinceLastCompaction := 0! Item was added: + ----- Method: CogMethodZone>>cogit (in category 'simulation only') ----- + cogit + "This is for the sizeof: CogMethod hook that allows different cogit classes to use differet CogMethod variants." + <doNotGenerate> + ^cogit! Item was changed: ----- Method: CogMethodZone>>compactCompiledCode: (in category 'compaction') ----- compactCompiledCode: objectHeaderValue | source dest bytes | <var: #source type: #'CogMethod *'> <var: #dest type: #'CogMethod *'> source := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. openPICList := nil. + methodCount := 0. [source < self limitZony and: [source cmType ~= CMFree]] whileTrue: [self assert: (cogit cogMethodDoesntLookKosher: source) = 0. source objectHeader: objectHeaderValue. source cmUsageCount > 0 ifTrue: [source cmUsageCount: source cmUsageCount // 2]. source cmType = CMOpenPIC ifTrue: [source nextOpenPIC: openPICList asUnsignedInteger. openPICList := source]. + methodCount := methodCount + 1. source := self methodAfter: source]. source >= self limitZony ifTrue: [^self halt: 'no free methods; cannot compact.']. dest := source. [source < self limitZony] whileTrue: [self assert: (cogit maybeFreeCogMethodDoesntLookKosher: source) = 0. bytes := source blockSize. source cmType ~= CMFree ifTrue: + [methodCount := methodCount + 1. + self mem: dest mo: source ve: bytes. - [self mem: dest mo: source ve: bytes. dest objectHeader: objectHeaderValue. dest cmType = CMMethod ifTrue: ["For non-Newspeak there should ne a one-to-one mapping metween bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." self assert: ((coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger or: [(cogit noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject]). "Only update the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger ifTrue: [coInterpreter rawHeaderOf: dest methodObject put: dest asInteger]] ifFalse: [dest cmType = CMOpenPIC ifTrue: [dest nextOpenPIC: openPICList asUnsignedInteger. openPICList := dest]]. dest cmUsageCount > 0 ifTrue: [dest cmUsageCount: dest cmUsageCount // 2]. dest := coInterpreter cCoerceSimple: dest asInteger + bytes to: #'CogMethod *']. source := coInterpreter cCoerceSimple: source asInteger + bytes to: #'CogMethod *']. mzFreeStart := dest asInteger. methodBytesFreedSinceLastCompaction := 0! Item was added: + ----- Method: CogMethodZone>>freeStart (in category 'accessing') ----- + freeStart + <inline: true> + <returnTypeC: #usqInt> + ^mzFreeStart! Item was added: + ----- Method: CogMethodZone>>freeStart: (in category 'accessing') ----- + freeStart: zoneLimit + <doNotGenerate> + ^mzFreeStart := zoneLimit! Item was changed: ----- Method: CogMethodZone>>manageFrom:to: (in category 'initialization') ----- manageFrom: theStartAddress to: theLimitAddress <returnTypeC: #void> mzFreeStart := baseAddress := theStartAddress. youngReferrers := limitAddress := theLimitAddress. openPICList := nil. + methodBytesFreedSinceLastCompaction := 0. + methodCount := 0! - methodBytesFreedSinceLastCompaction := 0! Item was removed: - ----- Method: CogMethodZone>>methodBytesFreedSinceLastCompaction (in category 'accessing') ----- - methodBytesFreedSinceLastCompaction - <cmacro: '() methodBytesFreedSinceLastCompaction'> "we all get a tad fatigued now and again..." - ^methodBytesFreedSinceLastCompaction! Item was added: + ----- Method: CogMethodZone>>numMethods (in category 'accessing') ----- + numMethods + ^methodCount! Item was changed: ----- Method: CogMethodZone>>roomOnYoungReferrersList (in category 'young referers') ----- roomOnYoungReferrersList + "The youngReferrers list holds methods that may contain a reference to a young + object and hence need to be visited during young-space garbage collection. The + list saves walking through all of code space to do so, as in typical circumstances + there are no methods that refer to young objects.However, events like become: + can potentially cause every method to refer to a new object (becomming true for + example). So there needs to be room on the list for as many methods as exist." + self assert: (youngReferrers <= limitAddress + and: [youngReferrers >= (limitAddress - (methodCount * BytesPerWord))]). + ^limitAddress - (methodCount * BytesPerWord) >= mzFreeStart! - ^youngReferrers - BytesPerWord >= mzFreeStart! Item was changed: ----- Method: CogMethodZone>>zoneEnd (in category 'accessing') ----- zoneEnd + <inline: true> ^limitAddress! Item was removed: - ----- Method: CogMethodZone>>zoneLimit (in category 'accessing') ----- - zoneLimit - <returnTypeC: #usqInt> - ^mzFreeStart! Item was removed: - ----- Method: CogMethodZone>>zoneLimit: (in category 'accessing') ----- - zoneLimit: zoneLimit - <doNotGenerate> - ^mzFreeStart := zoneLimit! Item was added: + ----- Method: CogVMSimulator>>commenceCogCompiledCodeCompaction (in category 'process primitive support') ----- + commenceCogCompiledCodeCompaction + self halt. + ^super commenceCogCompiledCodeCompaction! Item was changed: ----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') ----- ceSICMiss: receiver "An in-line cache check in a method has failed. The failing entry check has jumped to the ceMethodAbort abort call at the start of the method which has called this routine. If possible allocate a closed PIC for the current and existing classes. The stack looks like: receiver args sender return address sp=> ceMethodAbort call return address So we can find the method that did the failing entry check at ceMethodAbort call return address - missOffset and we can find the send site from the outer return address." <api> | pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result | <var: #pic type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> "Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method." innerReturn := coInterpreter popStack. targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'. outerReturn := coInterpreter stackTop. + self assert: (outerReturn between: methodZoneBase and: methodZone freeStart). - self assert: (outerReturn between: methodZoneBase and: methodZone zoneLimit). entryPoint := backEnd callTargetFromReturnAddress: outerReturn. self assert: targetMethod selector ~= objectMemory nilObject. self cppIf: NewspeakVM ifTrue: [self assert: (targetMethod asInteger + cmEntryOffset = entryPoint or: [targetMethod asInteger + cmDynSuperEntryOffset = entryPoint]). "Avoid the effort of implementing PICs for the relatively low dynamic frequency dynamic super send and simply rebind the send site." targetMethod asInteger + cmDynSuperEntryOffset = entryPoint ifTrue: [^coInterpreter ceDynamicSuperSend: targetMethod selector to: receiver numArgs: targetMethod cmNumArgs]]. self assert: targetMethod asInteger + cmEntryOffset = entryPoint. self lookup: targetMethod selector for: receiver methodAndErrorSelectorInto: [:method :errsel| newTargetMethodOrNil := method. errorSelectorOrNil := errsel]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. ((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]) ifTrue: [result := self patchToOpenPICFor: targetMethod selector numArgs: targetMethod cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. "See if an Open PIC is already available." pic := methodZone openPICWithSelector: targetMethod selector. pic isNil ifTrue: ["otherwise attempt to create a closed PIC for the two cases." pic := self cogPICSelector: targetMethod selector numArgs: targetMethod cmNumArgs Case0Method: targetMethod Case1Method: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. (errorSelectorOrNil notNil or: [pic asInteger between: MaxNegativeErrorCode and: -1]) ifTrue: ["If for some reason the PIC couldn't be generated, most likely a lack of code memory. Continue as if this is an unlinked send. If this is an error case continue as if this is an unlinked send to invoke the appropriate error behavior (MNU, cannot interpret et al)." pic asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]]. extent := backEnd rewriteCallAt: outerReturn target: pic asInteger + cmEntryOffset. processor flushICacheFrom: outerReturn - 1 - extent to: outerReturn - 1; flushICacheFrom: pic asInteger to: pic asInteger + closedPICSize. "Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)" coInterpreter executeCogMethodFromLinkedSend: pic withReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil! Item was changed: ----- Method: Cogit>>cogCodeConstituents (in category 'profiling primitives') ----- cogCodeConstituents "Answer the contents of the code zone as an array of pair-wise element, address in ascending address order. Answer a string for a runtime routine or abstract label (beginning, end, etc), a CompiledMethod for a CMMethod, or a selector (presumably a Symbol) for a PIC." <api> | count cogMethod constituents label value | <var: #cogMethod type: #'CogMethod *'> count := trampolineTableIndex / 2 + 3. "+ 3 for start, freeStart and end" cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [count := count + 1]. cogMethod := methodZone methodAfter: cogMethod]. constituents := coInterpreter instantiateClass: coInterpreter classArray indexableSize: count * 2. constituents isNil ifTrue: [^constituents]. coInterpreter pushRemappableOop: constituents. ((label := coInterpreter stringForCString: 'CogCode') isNil or: [(value := coInterpreter cePositive32BitIntegerFor: codeBase) isNil]) ifTrue: [^nil]. coInterpreter storePointerUnchecked: 0 ofObject: coInterpreter topRemappableOop withValue: label; storePointerUnchecked: 1 ofObject: coInterpreter topRemappableOop withValue: value. 0 to: trampolineTableIndex - 1 by: 2 do: [:i| ((label := coInterpreter stringForCString: (trampolineAddresses at: i)) isNil or: [(value := coInterpreter cePositive32BitIntegerFor: (trampolineAddresses at: i + 1) asUnsignedInteger) isNil]) ifTrue: [coInterpreter popRemappableOop. ^nil]. coInterpreter storePointerUnchecked: 2 + i ofObject: coInterpreter topRemappableOop withValue: label; storePointerUnchecked: 3 + i ofObject: coInterpreter topRemappableOop withValue: value]. count := trampolineTableIndex + 2. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [coInterpreter storePointerUnchecked: count ofObject: coInterpreter topRemappableOop withValue: (cogMethod cmType = CMMethod ifTrue: [cogMethod methodObject] ifFalse: [cogMethod selector]). (value := coInterpreter cePositive32BitIntegerFor: cogMethod asUnsignedInteger) isNil ifTrue: [coInterpreter popRemappableOop. ^nil]. coInterpreter storePointerUnchecked: count + 1 ofObject: coInterpreter topRemappableOop withValue: value. count := count + 2]. cogMethod := methodZone methodAfter: cogMethod]. ((label := coInterpreter stringForCString: 'CCFree') isNil + or: [(value := coInterpreter cePositive32BitIntegerFor: methodZone freeStart) isNil]) ifTrue: - or: [(value := coInterpreter cePositive32BitIntegerFor: methodZone zoneLimit) isNil]) ifTrue: [coInterpreter popRemappableOop. ^nil]. coInterpreter storePointerUnchecked: count ofObject: coInterpreter topRemappableOop withValue: label; storePointerUnchecked: count + 1 ofObject: coInterpreter topRemappableOop withValue: value. ((label := coInterpreter stringForCString: 'CCEnd') isNil or: [(value := coInterpreter cePositive32BitIntegerFor: methodZone zoneEnd) isNil]) ifTrue: [coInterpreter popRemappableOop. ^nil]. coInterpreter storePointerUnchecked: count + 2 ofObject: coInterpreter topRemappableOop withValue: label; storePointerUnchecked: count + 3 ofObject: coInterpreter topRemappableOop withValue: value. constituents := coInterpreter popRemappableOop. coInterpreter beRootIfOld: constituents. ^constituents! Item was changed: ----- Method: Cogit>>cogMethodDoesntLookKosher: (in category 'debugging') ----- cogMethodDoesntLookKosher: cogMethod "Check that the header fields onf a non-free method are consistent with the type. Answer 0 if it is ok, otherwise answer a code for the error." <api> <inline: false> <var: #cogMethod type: #'CogMethod *'> ((cogMethod blockSize bitAnd: BytesPerWord - 1) ~= 0 or: [cogMethod blockSize < (self sizeof: CogMethod) or: [cogMethod blockSize >= 32768]]) ifTrue: [^1]. cogMethod cmType = CMFree ifTrue: [^2]. cogMethod cmType = CMMethod ifTrue: [(objectMemory isIntegerObject: cogMethod methodHeader) ifFalse: [^11]. (objectRepresentation couldBeObject: cogMethod methodObject) ifFalse: [^12]. (cogMethod stackCheckOffset > 0 and: [cogMethod stackCheckOffset < cmNoCheckEntryOffset]) ifTrue: [^13]. ^0]. cogMethod cmType = CMOpenPIC ifTrue: [cogMethod blockSize ~= openPICSize ifTrue: [^21]. cogMethod methodHeader ~= 0 ifTrue: [^22]. "Check the nextOpenPIC link unless we're compacting" cogMethod objectHeader signedIntFromLong >= 0 ifTrue: [(cogMethod methodObject ~= 0 and: [cogMethod methodObject < methodZoneBase + or: [cogMethod methodObject > (methodZone freeStart - openPICSize) - or: [cogMethod methodObject > (methodZone zoneLimit - openPICSize) or: [(cogMethod methodObject bitAnd: BytesPerWord - 1) ~= 0 or: [(self cCoerceSimple: cogMethod methodObject to: #'CogMethod *') cmType ~= CMOpenPIC]]]]) ifTrue: [^23]]. cogMethod stackCheckOffset ~= 0 ifTrue: [^24]. ^0]. cogMethod cmType = CMClosedPIC ifTrue: [cogMethod blockSize ~= closedPICSize ifTrue: [^31]. (cogMethod cPICNumCases between: 1 and: numPICCases) ifFalse: [^32]. cogMethod methodHeader ~= 0 ifTrue: [^33]. cogMethod methodObject ~= 0 ifTrue: [^34]. ^0]. ^9! Item was changed: ----- Method: Cogit>>compactCogCompiledCode (in category 'jit - api') ----- compactCogCompiledCode <api> self assert: self noCogMethodsMaximallyMarked. coInterpreter markActiveMethodsAndReferents. methodZone freeOlderMethodsForCompaction. self freePICsWithFreedTargets. methodZone planCompaction. coInterpreter updateStackZoneReferencesToCompiledCodePreCompaction. self relocateMethodsPreCompaction. methodZone compactCompiledCode: objectMemory nullHeaderForMachineCodeMethod. self assert: self allMethodsHaveCorrectHeader. self assert: methodZone kosherYoungReferrers. + processor flushICacheFrom: methodZoneBase to: methodZone freeStart! - processor flushICacheFrom: methodZoneBase to: methodZone zoneLimit! Item was changed: ----- Method: Cogit>>freePICsWithFreedTargets (in category 'compaction') ----- freePICsWithFreedTargets + | cogMethod count | - | cogMethod | <var: #cogMethod type: #'CogMethod *'> cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. + count := 0. [cogMethod < methodZone limitZony] whileTrue: [(cogMethod cmType = CMClosedPIC and: [self cPICHasFreedTargets: cogMethod]) ifTrue: [cogMethod cmType: CMFree]. + cogMethod := methodZone methodAfter: cogMethod. + count := count + 1]. + self assert: count = methodZone numMethods! - cogMethod := methodZone methodAfter: cogMethod]! Item was changed: ----- Method: Cogit>>generateCogMethod: (in category 'generate machine code') ----- generateCogMethod: selector "We handle jump sizing simply. First we make a pass that asks each instruction to compute its maximum size. Then we make a pass that sizes jumps based on the maxmimum sizes. Then we make a pass that fixes up jumps. When fixing up a jump the jump is not allowed to choose a smaller offset but must stick to the size set in the second pass." | codeSize headerSize mapSize totalSize startAddress result method | <var: #method type: #'CogMethod *'> <var: #blockStart type: #'BlockStart *'> <var: #headerReference type: #'AbstractInstruction *'> <returnTypeC: #'CogMethod *'> headerSize := self sizeof: CogMethod. methodLabel address: headerSize negated. self computeMaximumSizes. + methodLabel concretizeAt: methodZone freeStart. - methodLabel concretizeAt: (methodZone allocate: 0). codeSize := self generateInstructionsAt: methodLabel address + headerSize. mapSize := self generateMapAt: 0 start: methodLabel address + cmNoCheckEntryOffset. totalSize := methodZone roundUpLength: headerSize + codeSize + mapSize. startAddress := methodZone allocate: totalSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. self assert: startAddress + cmEntryOffset = entry address. self assert: startAddress + cmNoCheckEntryOffset = noCheckEntry address. result := self outputInstructionsAt: startAddress + headerSize. self assert: startAddress + headerSize + codeSize = result. backEnd padIfPossibleWithNopsFrom: result to: startAddress + totalSize - mapSize. self generateMapAt: startAddress + totalSize - 1 start: startAddress + cmNoCheckEntryOffset. self fillInBlockHeadersAt: startAddress. method := self fillInMethodHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: totalSize selector: selector. postCompileHook notNil ifTrue: [self perform: postCompileHook with: method with: primInvokeLabel. postCompileHook := nil]. processor flushICacheFrom: startAddress to: startAddress + headerSize + codeSize. ^method! Item was changed: ----- Method: Cogit>>handleCallOrJumpSimulationTrap: (in category 'simulation only') ----- handleCallOrJumpSimulationTrap: aProcessorSimulationTrap <doNotGenerate> | evaluable function result savedFramePointer savedStackPointer savedArgumentCount rpc | evaluable := simulatedTrampolines at: aProcessorSimulationTrap address. function := evaluable isBlock ifTrue: ['aBlock; probably some plugin primitive'] ifFalse: [evaluable selector]. function ~~ #ceBaseFrameReturn: ifTrue: [coInterpreter assertValidExternalStackPointers]. (function beginsWith: 'ceShort') ifTrue: [^self perform: function with: aProcessorSimulationTrap]. aProcessorSimulationTrap type = #call ifTrue: [processor simulateCallOf: aProcessorSimulationTrap address nextpc: aProcessorSimulationTrap nextpc memory: coInterpreter memory. self recordInstruction: {'(simulated call of '. aProcessorSimulationTrap address. '/'. function. ')'}] ifFalse: [processor simulateJumpCallOf: aProcessorSimulationTrap address memory: coInterpreter memory. self recordInstruction: {'(simulated jump to '. aProcessorSimulationTrap address. '/'. function. ')'}]. savedFramePointer := coInterpreter framePointer. savedStackPointer := coInterpreter stackPointer. savedArgumentCount := coInterpreter argumentCount. result := ["self halt: evaluable selector." evaluable valueWithArguments: (processor postCallArgumentsNumArgs: evaluable numArgs in: coInterpreter memory)] on: ReenterMachineCode do: [:ex| ex return: ex returnValue]. coInterpreter assertValidExternalStackPointers. "Verify the stack layout assumption compileInterpreterPrimitive: makes, provided we've not called something that has built a frame, such as closure value or evaluate method, or switched frames, such as primitiveSignal, primitiveWait, primitiveResume, primitiveSuspend et al." (function beginsWith: 'primitive') ifTrue: [coInterpreter primFailCode = 0 ifTrue: [(#( primitiveClosureValue primitiveClosureValueWithArgs primitiveClosureValueNoContextSwitch primitiveSignal primitiveWait primitiveResume primitiveSuspend primitiveYield primitiveExecuteMethodArgsArray primitiveExecuteMethod primitivePerform primitivePerformWithArgs primitivePerformInSuperclass primitiveTerminateTo primitiveStoreStackp primitiveDoPrimitiveWithArgs) includes: function) ifFalse: [self assert: savedFramePointer = coInterpreter framePointer. self assert: savedStackPointer + (savedArgumentCount * BytesPerWord) = coInterpreter stackPointer]] ifFalse: [self assert: savedFramePointer = coInterpreter framePointer. self assert: savedStackPointer = coInterpreter stackPointer]]. result ~~ #continueNoReturn ifTrue: [self recordInstruction: {'(simulated return to '. processor retpcIn: coInterpreter memory. ')'}. rpc := processor retpcIn: coInterpreter memory. + self assert: (rpc >= codeBase and: [rpc < methodZone freeStart]). - self assert: (rpc >= codeBase and: [rpc < methodZone zoneLimit]). processor smashCallerSavedRegistersWithValuesFrom: 16r80000000 by: BytesPerWord; simulateReturnIn: coInterpreter memory]. self assert: (result isInteger "an oop result" or: [result == coInterpreter or: [result == objectMemory or: [#(nil continue continueNoReturn) includes: result]]]). processor cResultRegister: (result ifNil: [0] ifNotNil: [result isInteger ifTrue: [result] ifFalse: [16rF00BA222]]) "coInterpreter cr. processor sp + 32 to: processor sp - 32 by: -4 do: [:sp| sp = processor sp ifTrue: [coInterpreter print: 'sp->'; tab] ifFalse: [coInterpreter printHex: sp]. coInterpreter tab; printHex: (coInterpreter longAt: sp); cr]"! Item was changed: ----- Method: Cogit>>isPCWithinMethodZone: (in category 'disassembly') ----- isPCWithinMethodZone: address <api> <var: #address type: #'char *'> ^address asUnsignedInteger between: methodZoneBase + and: methodZone freeStart! - and: methodZone zoneLimit! Item was changed: ----- Method: Cogit>>isSendReturnPC: (in category 'jit - api') ----- isSendReturnPC: retpc <api> "Answer if the instruction preceeding retpc is a call instruction." | target | (backEnd isCallPreceedingReturnPC: retpc) ifFalse: [^false]. target := backEnd callTargetFromReturnAddress: retpc. ^(target between: firstSend and: lastSend) + or: [target between: methodZoneBase and: methodZone freeStart]! - or: [target between: methodZoneBase and: methodZone zoneLimit]! Item was changed: ----- Method: Cogit>>linkSendAt:in:to:offset:receiver: (in category 'in-line cacheing') ----- linkSendAt: callSiteReturnAddress in: sendingMethod to: targetMethod offset: theEntryOffset receiver: receiver <api> <var: #sendingMethod type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> | inlineCacheTag address extent | self cppIf: NewspeakVM ifTrue: [self assert: (theEntryOffset = cmEntryOffset or: [theEntryOffset = cmNoCheckEntryOffset or: [theEntryOffset = cmDynSuperEntryOffset]])] ifFalse: [self assert: (theEntryOffset = cmEntryOffset or: [theEntryOffset = cmNoCheckEntryOffset])]. + self assert: (callSiteReturnAddress between: methodZoneBase and: methodZone freeStart). - self assert: (callSiteReturnAddress between: methodZoneBase and: methodZone zoneLimit). inlineCacheTag := theEntryOffset = cmNoCheckEntryOffset ifTrue: [targetMethod selector "i.e. no change"] ifFalse: [objectRepresentation inlineCacheTagForInstance: receiver]. (sendingMethod cmRefersToYoung not and: [(objectRepresentation inlineCacheTagIsYoung: inlineCacheTag)]) ifTrue: [self assert: (methodZone occurrencesInYoungReferrers: sendingMethod) = 0. sendingMethod cmRefersToYoung: true. methodZone addToYoungReferrers: sendingMethod]. address := targetMethod asInteger + theEntryOffset. extent := backEnd rewriteInlineCacheAt: callSiteReturnAddress tag: inlineCacheTag target: address. processor flushICacheFrom: callSiteReturnAddress - 1 - extent to: callSiteReturnAddress - 1! Item was changed: ----- Method: Cogit>>lookupAddress: (in category 'disassembly') ----- lookupAddress: address <doNotGenerate> | cogMethod | + address < methodZone freeStart ifTrue: - address < methodZone zoneLimit ifTrue: [address >= methodZoneBase ifTrue: [(cogMethod := methodZone methodFor: address) ~= 0 ifTrue: [cogMethod := self cCoerceSimple: cogMethod to: #'CogMethod *'. ^((cogMethod selector ~= objectMemory nilObject and: [objectRepresentation couldBeObject: cogMethod selector]) ifTrue: [coInterpreter stringOf: cogMethod selector] ifFalse: [cogMethod asInteger hex]), '@', ((address - cogMethod asInteger) hex allButFirst: 3)]] ifFalse: [^address = (self codeEntryFor: address) ifTrue: [self codeEntryNameFor: address]]. ^nil]. (simulatedTrampolines includesKey: address) ifTrue: [^self labelForSimulationAccessor: (simulatedTrampolines at: address)]. (simulatedVariableGetters includesKey: address) ifTrue: [^self labelForSimulationAccessor: (simulatedVariableGetters at: address)]. ^coInterpreter lookupAddress: address! Item was changed: ----- Method: Cogit>>mapObjectReferencesInMachineCode: (in category 'jit - api') ----- mapObjectReferencesInMachineCode: gcMode <api> "Update all references to objects in machine code." gcMode caseOf: { [GCModeIncr] -> [self mapObjectReferencesInMachineCodeForIncrementalGC]. [GCModeFull] -> [self mapObjectReferencesInMachineCodeForFullGC]. + [GCModeBecome] -> [self mapObjectReferencesInMachineCodeForBecome] }. + + (self asserta: methodZone freeStart <= methodZone youngReferrers) ifFalse: + [self error: 'youngReferrers list overflowed']! - [GCModeBecome] -> [self mapObjectReferencesInMachineCodeForBecome] }! Item was changed: ----- Method: Cogit>>outputInstructionsForGeneratedRuntimeAt: (in category 'initialization') ----- outputInstructionsForGeneratedRuntimeAt: startAddress "Output instructions generated for one of the generated run-time routines, a trampoline, etc" | size endAddress | <inline: false> self computeMaximumSizes. size := self generateInstructionsAt: startAddress. endAddress := self outputInstructionsAt: startAddress. self assert: startAddress + size = endAddress. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. + self cCode: '' inSmalltalk: [methodZone freeStart: methodZoneBase]. - self cCode: '' inSmalltalk: [methodZone zoneLimit: methodZoneBase]. ^startAddress! Item was changed: ----- Method: Cogit>>simulateEnilopmart:numArgs: (in category 'simulation only') ----- simulateEnilopmart: enilopmartAddress numArgs: n <doNotGenerate> "Enter Cog code, popping the class reg and receiver from the stack and then returning to the address beneath them. In the actual VM the enilopmart is a function pointer and so senders of this method end up calling the enilopmart to enter machine code. In simulation we either need to start simulating execution (if we're in the interpreter) or return to the simulation (if we're in the run-time called from machine code. We should also smash the register state since, being an abnormal entry, no saved registers will be restored." self assert: (coInterpreter isOnRumpCStack: processor sp). + self assert: ((coInterpreter stackValue: n) between: guardPageSize and: methodZone freeStart - 1). - self assert: ((coInterpreter stackValue: n) between: guardPageSize and: methodZone zoneLimit - 1). (printInstructions or: [printRegisters]) ifTrue: [coInterpreter printExternalHeadFrame]. processor smashRegistersWithValuesFrom: 16r80000000 by: BytesPerWord; simulateLeafCallOf: enilopmartAddress nextpc: 16rBADF00D memory: coInterpreter memory. "If we're already simulating in the context of machine code then this will take us back to handleCallSimulationTrap:. Otherwise start executing machine code in the simulator." (ReenterMachineCode new returnValue: #continueNoReturn) signal. self simulateCogCodeAt: enilopmartAddress. "We should either longjmp back to the interpreter or stay in machine code so control should not reach here." self assert: false! Item was changed: ----- Method: SimpleStackBasedCogit>>rewritePrimInvocationIn:to: (in category 'external primitive support') ----- rewritePrimInvocationIn: cogMethod to: primFunctionPointer <api> <var: #cogMethod type: #'CogMethod *'> <var: #primFunctionPointer declareC: #'void (*primFunctionPointer)(void)'> | primIndex flags address extent | self assert: cogMethod cmType = CMMethod. primIndex := coInterpreter primitiveIndexOfMethodHeader: cogMethod methodHeader. flags := coInterpreter primitivePropertyFlags: primIndex. "See compileInterpreterPrimitive:" (flags bitAnd: PrimCallMayCallBack) ~= 0 ifTrue: [address := cogMethod asUnsignedInteger + + (externalPrimJumpOffsets at: cogMethod cmNumArgs). + extent := backEnd + rewriteJumpLongAt: address + target: (self cCode: [primFunctionPointer asUnsignedInteger] + inSmalltalk: [self simulatedTrampolineFor: primFunctionPointer])] - + (externalPrimJumpOffsets at: cogMethod cmNumArgs). - extent := backEnd rewriteJumpLongAt: address target: primFunctionPointer asInteger] ifFalse: [address := cogMethod asUnsignedInteger + + (externalPrimCallOffsets at: cogMethod cmNumArgs). + extent := backEnd + rewriteCallAt: address + target: (self cCode: [primFunctionPointer asUnsignedInteger] + inSmalltalk: [self simulatedTrampolineFor: primFunctionPointer])]. - + (externalPrimCallOffsets at: cogMethod cmNumArgs). - extent := backEnd rewriteCallAt: address target: primFunctionPointer asInteger]. processor flushICacheFrom: address to: address + extent! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>handleWriteSimulationTrap: (in category 'simulation only') ----- handleWriteSimulationTrap: aProcessorSimulationTrap <doNotGenerate> | address end | address := aProcessorSimulationTrap address. + (address >= methodZone freeStart - (address >= methodZone zoneLimit or: [address <= methodZoneBase]) ifTrue: [^super handleWriteSimulationTrap: aProcessorSimulationTrap]. (counterMethodCache isNil or: [address < counterMethodCache or: [counterMethodCache address + counterMethodCache blockSize < address]]) ifTrue: [counterMethodCache := methodZone methodFor: address]. end := counterMethodCache address + counterMethodCache blockSize. self assert: (address between: end - (CounterBytes * counterMethodCache numCounters) and: end). objectMemory longAt: address put: (processor perform: aProcessorSimulationTrap registerAccessor). processor pc: aProcessorSimulationTrap nextpc! Item was added: + ----- Method: StackInterpreter>>isNullExternalPrimitiveCall: (in category 'compiled methods') ----- + isNullExternalPrimitiveCall: aMethodObj + "Answer if the method is an external primtiive call (prim 117) with a null external primtiive. + This is just for an assert in the CoInterpreter." + | lit | + ((self primitiveIndexOf: aMethodObj) = 117 + and: [(self literalCountOf: aMethodObj) > 0]) ifFalse: + [^false]. + + lit := self literal: 0 ofMethod: aMethodObj. + ^(objectMemory isArray: lit) + and: [(objectMemory lengthOf: lit) = 4 + and: [(objectMemory fetchPointer: 3 ofObject: lit) = ConstZero]]! Item was removed: - ----- Method: TMethod>>extractTypeFor:fromDeclaration: (in category 'utilities') ----- - extractTypeFor: aVariable fromDeclaration: aVariableDeclaration - "Eliminate inessentials from aVariableDeclaration to answer a C type without the variable, - or initializations etc" - | decl fpIndex | - decl := aVariableDeclaration. - (decl beginsWith: 'static') ifTrue: - [decl := decl allButFirst: 6]. - (decl indexOf: $= ifAbsent: []) ifNotNil: - [:index| decl := decl copyFrom: 1 to: index - 1]. - decl := decl copyReplaceAll: aVariable with: '' tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]]. - (fpIndex := decl indexOfSubCollection: '(*') > 0 ifTrue: - [decl := decl copyReplaceFrom: (decl indexOf: $( startingAt: fpIndex + 1) - to: (decl indexOf: $) startingAt: fpIndex + 1) - with: '']. - ^decl withBlanksTrimmed! Item was changed: ----- Method: TMethod>>inlineSend:directReturn:exitVar:in: (in category 'inlining') ----- inlineSend: aSendNode directReturn: directReturn exitVar: exitVar in: aCodeGen "Answer a collection of statements to replace the given send. directReturn indicates that the send is the expression in a return statement, so returns can be left in the body of the inlined method. If exitVar is nil, the value returned by the send is not used; thus, returns need not assign to the output variable. Types are propagated to as-yet-untyped variables when inlining a send that is assigned, otherwise the assignee variable type must match the return type of the inlinee. Return types are not propagated." | sel meth exitLabel inlineStmts label exitType | sel := aSendNode selector. meth := aCodeGen methodNamed: sel. meth args size = aSendNode args size ifFalse: [^nil]. meth args with: aSendNode args do: [:formal :actual| (actual isVariable and: [(aCodeGen + variableOfType: (self typeFor: formal using: aCodeGen) - variableOfType: (self typeFor: formal) acceptsValueOfType: (self typeFor: actual name in: aCodeGen)) not]) ifTrue: [aCodeGen logger nextPutAll: 'type mismatch for formal ', formal, ' and actual ', actual name, ' when inlining ', sel, ' in ', selector, '. Use a cast.'; cr; flush]]. meth := meth copy. "Propagate the return type of an inlined method" (directReturn or:[exitVar notNil]) ifTrue:[ exitType := directReturn ifTrue:[returnType] ifFalse:[(self typeFor: exitVar in: aCodeGen) ifNil:[#sqInt]]. (exitType = #void or:[exitType = meth returnType]) ifFalse:[meth propagateReturnIn: aCodeGen]]. meth renameVarsForInliningInto: self except: #() in: aCodeGen. meth renameLabelsForInliningInto: self. self addVarsDeclarationsAndLabelsOf: meth except: #(). meth hasReturn ifTrue:[ directReturn ifFalse:[ exitLabel := self unusedLabelForInliningInto: self. (meth exitVar: exitVar label: exitLabel) "is label used?" ifTrue: [ labels add: exitLabel ] ifFalse: [ exitLabel := nil ]]]. (inlineStmts := OrderedCollection new: 100) add: (label := TLabeledCommentNode new setComment: 'begin ', sel); addAll: (self argAssignmentsFor: meth args: aSendNode args in: aCodeGen); addAll: meth statements. "method body" "Vile hacks to prevent too many labels. If the C compiler inlines functions it can duplicate labels and cause compilation to fail. The second statement prevents us creating labels in anything other than the interpreter. If we add labels to small functions that may be inlined by the C compiler then the label can be duplicated by the C compiler and cause the assembler to fail. eem 9/20/2008 12:29" (aCodeGen wantsLabels and: [meth asmLabel and: [meth mustAsmLabel or: [meth hasMoreSendsThan: 20]]]) ifTrue: [label asmLabel: sel]. (directReturn and: [meth endsWithReturn not]) ifTrue: [inlineStmts add: (TReturnNode new setExpression: (TVariableNode new setName: 'nil'))]. exitLabel ~= nil ifTrue: [inlineStmts add: (TLabeledCommentNode new setLabel: exitLabel comment: 'end ', meth selector)]. ^inlineStmts! Item was changed: ----- Method: TMethod>>propagateReturnIn: (in category 'inlining support') ----- propagateReturnIn: aCodeGen "Propagate the return type to all return nodes" | map | map := IdentityDictionary new. parseTree nodesDo:[:node| node isReturn ifTrue:[ map at: node expression put: (TSendNode new setSelector: #cCoerce:to: receiver: (TVariableNode new setName: 'self') arguments: {node expression. TConstantNode new "The following is necessary for functions returning functions, which have problematic syntax" + setValue: (aCodeGen + extractTypeFor: (aCodeGen cFunctionNameFor: self selector) - setValue: (self extractTypeFor: (aCodeGen cFunctionNameFor: self selector) fromDeclaration: returnType) })]]. + self replaceNodesIn: map! - self replaceNodesIn: map.! Item was removed: - ----- Method: TMethod>>typeFor: (in category 'utilities') ----- - typeFor: aVariable - "Answer the type for aVariable. Answer nil for variables without types. nil for - typelessness is required by the type propagation logic in inlineSend:directReturn:exitVar:in:." - ^self extractTypeFor: aVariable fromDeclaration: (declarations at: aVariable asString ifAbsent: [^nil])! Item was changed: ----- Method: TMethod>>typeFor:in: (in category 'utilities') ----- typeFor: aVariable in: aCodeGen "Answer the type for aVariable, deferring to aCodeGen (which defers to the vmClass) if no type is found and the variable is global (not an arg or a local). Expect the cCodeGen to answer nil for variables without types. nil for typelessness is required by the type propagation logic in inlineSend:directReturn:exitVar:in:." ^(declarations at: aVariable asString ifAbsent: [((locals includes: aVariable) or: [args includes: aVariable]) ifFalse: [aCodeGen typeOfVariable: aVariable]]) ifNotNil: [:decl| + aCodeGen extractTypeFor: aVariable fromDeclaration: decl]! - self extractTypeFor: aVariable fromDeclaration: decl]! Item was added: + ----- Method: TMethod>>typeFor:using: (in category 'utilities') ----- + typeFor: aVariable using: aCCodeGen + "Answer the type for aVariable. Answer nil for variables without types. nil for + typelessness is required by the type propagation logic in inlineSend:directReturn:exitVar:in:." + ^aCCodeGen extractTypeFor: aVariable fromDeclaration: (declarations at: aVariable asString ifAbsent: [^nil])! Item was added: + ----- Method: TParseNode>>detect: (in category 'enumerating') ----- + detect: aBlock + ^self detect: aBlock ifNone: [self error: 'Node is not in the tree']! Item was added: + ----- Method: TParseNode>>detect:ifNone: (in category 'enumerating') ----- + detect: aBlock ifNone: defaultBlock + self nodesDo: [:n| (aBlock value: n) ifTrue: [^n]]. + ^defaultBlock value! Item was changed: ----- Method: VMStructType class>>structTargetKindForDeclaration: (in category 'translation') ----- structTargetKindForDeclaration: decl StructTypeNameCache ifNil: [StructTypeNameCache := Set new. self allSubclassesDo: [:sc| StructTypeNameCache add: sc name; add: sc structTypeName ]]. ^(decl notNil + and: [(StructTypeNameCache includes: decl) + or: [StructTypeNameCache anySatisfy: + [:structType| + (decl beginsWith: structType) + and: [(decl indexOf: $* ifAbsent: [decl indexOf: Character space]) > structType size]]]]) ifTrue: - and: [StructTypeNameCache anySatisfy: - [:structType| - (decl beginsWith: structType) - and: [(decl indexOf: $* ifAbsent: [decl indexOf: Character space]) > structType size]]]) ifTrue: [(decl indexOf: $*) > 0 ifTrue: [#pointer] ifFalse: [#struct]]!

1 0

vm-dev@lists.squeakfoundation.org
by David T. Lewis 11 Aug '12

11 Aug '12

Message blocked due to size, forwarding trimmed version: ----- Forwarded message from vm-dev-owner(a)lists.squeakfoundation.org ----- Delivered-To: list-vm-dev(a)lists.squeakfoundation.org Date: Fri, 10 Aug 2012 14:27:56 -0700 To: vm-dev(a)lists.squeakfoundation.org From: commits(a)squeakvm.org Subject: [commit] r2582 - CogVM source as per VMMaker.oscog-eem.199. Author: eliot Date: 2012-08-10 14:27:56 -0700 (Fri, 10 Aug 2012) New Revision: 2582 Modified: 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/platforms/Cross/vm/sqSCCSVersion.h 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 Log: CogVM source as per VMMaker.oscog-eem.199. Make overflowing the youngReferrers list a hard error (appears to happen quite often in Newspeak code). Fix bug in changeClassFrom:to: if receiver is a compact class instance with a large header. Several refactorings from Lars' work & multiple bytecode sets work mean generated code is somewhat changed. Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2012-08-08 02:35:16 UTC (rev 2581) +++ branches/Cog/nscogsrc/vm/cogit.c 2012-08-10 21:27:56 UTC (rev 2582) <snip>

1 0

[Cog] It seems like there's a bug
by Igor Stasenko 11 Aug '12

11 Aug '12

Hi, all there was an outstanding issue with running a 200MB Moose image on windows, the VM was simply crashed. I took a look and found that the problem is in: #eeInstantiateSmallClass:sizeInBytes: crashing (i guess) at first few allocation once image loaded, because see the stack trace: Smalltalk stack dump: 0x1900dc I SmalltalkImage>clearExternalObjects 63367860: a(n) SmalltalkImage 0x190108 I SmalltalkImage>snapshot:andQuit: 63367860: a(n) SmalltalkImage 0x1007b820 s [] in WorldState class>saveSession 0x1007b87c s BlockClosure>ensure: so, i changed the last line in that method: - ^self eeAllocate: sizeInBytes headerSize: hdrSize h1: header1 h2: header2 h3: 0 + ^ self allocate: sizeInBytes headerSize: hdrSize h1: header1 h2: header2 h3: 0 doFill: false format: 0 and it is no longer crashes, and i were able to open and interact with that image.. The VM works fine except from strange behavior with mouse cursor (which is always hidden unless you move & click the mouse), regardless of image you opened.. So, it sounds like the dirty fix is is really dirty and incomplete (if it can be considered a fix at all). Then i recompiled again, and i don't know what is changed (should be nothing), but while VM are no longer crashes, it doesn't opens a main window .. it simply stalls somewhere with 0% CPU load.. looks like problem with undelivered events/signals etc.. or some threads are unable to initialize properly.. . Back to #eeInstantiateSmallClass:sizeInBytes: as i understand it is an optimized version of #instantiateSmallClass:sizeInBytes: so, replacing it back with that method should be ok? Except that ee-one guarantees to not trigger GC but looking at senders of this message it looks like it is not necessary to guarantee that.. But i worry that the real fix should be in completely different place, because i guess we observe only a consequence of another flaw: since that method allocates new object(s) it assumes that there's enough free space on heap.. and since there's none.. this means that some of the logic is flawed in another place. Eliot, if you can take a look, i can send you that image in private mail, because it looks like it will be hard to reproduce. Image opens and works fine on mac.. but on windows we're getting these strange issues. -- Best regards, Igor Stasenko.

3 4

[commit] r2584 - CogVM source as per VMMaker.oscog-eem.200. Fix ^self slip in MT interpreter.
by commits＠squeakvm.org 11 Aug '12

11 Aug '12

Author: eliot Date: 2012-08-10 16:59:57 -0700 (Fri, 10 Aug 2012) New Revision: 2584 Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerpmt.c Log: CogVM source as per VMMaker.oscog-eem.200. Fix ^self slip in MT interpreter. Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Aug 10 14:21:21 PDT 2012 + Fri Aug 10 16:59:08 PDT 2012 Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2012-08-10 21:28:50 UTC (rev 2583) +++ branches/Cog/src/vm/cointerpmt.c 2012-08-10 23:59:57 UTC (rev 2584) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 from - CoInterpreterMT VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CoInterpreterMT VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2004,7 +2004,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.199]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.200]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -47614,7 +47614,7 @@ if (activeProc == GIV(nilObj)) { /* begin releaseVM */ setVMOwner(0); - self; + null; goto l1; } /* begin ownerIndexOfThreadId: */ Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2012-08-10 21:28:50 UTC (rev 2583) +++ branches/Cog/src/vm/cointerpmt.h 2012-08-10 23:59:57 UTC (rev 2584) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 */ Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-08-10 21:28:50 UTC (rev 2583) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-08-10 23:59:57 UTC (rev 2584) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 from - CoInterpreterMT VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 + CoInterpreterMT VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.199 uuid: 1b0cff66-2042-49a7-ae74-5fa119256732 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.200 uuid: 5a8e1270-adca-4f75-9712-0c0deda989d2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2007,7 +2007,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.199]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.200]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -47618,7 +47618,7 @@ if (activeProc == GIV(nilObj)) { /* begin releaseVM */ setVMOwner(0); - self; + null; goto l1; } /* begin ownerIndexOfThreadId: */

1 0

VM Maker: VMMaker.oscog-eem.200.mcz
by commits＠source.squeak.org 11 Aug '12

11 Aug '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.200.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.200 Author: eem Time: 10 August 2012, 4:47:24.263 pm UUID: 5a8e1270-adca-4f75-9712-0c0deda989d2 Ancestors: VMMaker.oscog-eem.199 Fix another ^self slip uncovered by VMMaker.oscog-eem.196 fix. =============== Diff against VMMaker.oscog-eem.199 =============== Item was changed: ----- Method: CoInterpreterMT>>tryToExecuteSmalltalk: (in category 'vm scheduling') ----- tryToExecuteSmalltalk: vmThread "Attempt to run the current process, if it exists, on the given vmThread." <var: #vmThread type: #'CogVMThread *'> | dvmt activeProc ownerIndex | <var: #dvmt type: #'CogVMThread *'> self assert: cogThreadManager getVMOwner = vmThread index. self assert: cogThreadManager ioGetThreadLocalThreadIndex = vmThread index. dvmt := disowningVMThread. disowningVMThread ifNil: [activeProc := self activeProcess] ifNotNil: [self preemptDisowningThread. activeProc := self wakeHighestPriority. activeProc ifNil: [activeProc := objectMemory nilObject] ifNotNil: [objectMemory storePointerUnchecked: MyListIndex ofObject: activeProc withValue: objectMemory nilObject]. objectMemory storePointer: ActiveProcessIndex ofObject: self schedulerPointer withValue: activeProc]. activeProc = objectMemory nilObject ifTrue: [cogThreadManager releaseVM. + ^nil]. - ^self]. ownerIndex := self ownerIndexOfProcess: activeProc. (ownerIndex = 0 or: [ownerIndex ~= 0 and: [ownerIndex = cogThreadManager getVMOwner]]) ifTrue: [self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject. (objectMemory fetchPointer: SuspendedContextIndex ofObject: activeProc) ~= objectMemory nilObject ifTrue: [self externalSetStackPageAndPointersForSuspendedContextOfProcess: activeProc. instructionPointer := self popStack]. self enterSmalltalkExecutive. "When we return here we should have already given up the VM and so we cannot touch any interpreter state."] ifFalse: [cogThreadManager wakeVMThreadFor: ownerIndex]!

1 0

[commit] r2583 - Add Lars' GdmArmPlugin support files.
by commits＠squeakvm.org 10 Aug '12

10 Aug '12

Author: eliot Date: 2012-08-10 14:28:50 -0700 (Fri, 10 Aug 2012) New Revision: 2583 Added: trunk/platforms/Cross/plugins/GdbARMPlugin/ trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 trunk/platforms/Cross/plugins/GdbARMPlugin/README trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c Modified: trunk/platforms/Cross/plugins/SocketPlugin/SocketPlugin.h Log: Add Lars' GdmArmPlugin support files. Add API call def to SocketPlugin.h Added: trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h (rev 0) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h 2012-08-10 21:28:50 UTC (rev 2583) @@ -0,0 +1,70 @@ +/* heavily based on BochsIA32Plugin.h */ +/* Bochs seems to use error code 1 for execution errors. + * So we use > 1 for various errors + */ +#define NoError 0 +#define ExecutionError 1 +#define BadCPUInstance 2 +#define MemoryBoundsError 3 +#define PanicError 4 +#define UnsupportedOperationError 5 +#define SomethingLoggedError 6 + +// The library is compiled with TFlag, therefore, we also need to set it. +#define MODET + +#if !defined(ulong) +typedef unsigned long ulong; +#endif + +extern ulong minReadAddress, minWriteAddress; +extern int gdb_log_printf(void* stream, const char * format, ...); + + +/* + * Answer a pointer to a new ARMulator CPU (an instance of typedef ARMul_State) + */ +extern void *newCPU(); +/* + * reset the cpu to register contents 0, protected 32-bit mode. + */ +extern int resetCPU(void *cpu); +/* + * Single-step *cpu (an ARMul_state instance) using memory as its memory. + * Answer 0 on success, or an integer error code if something went awry. + */ +extern int singleStepCPUInSizeMinAddrReadWrite(void *cpu, void *memory, + ulong byteSize, ulong minReadAddr, ulong minWriteAddr); +/* + * Run *cpu (an ARMul_state instance) using memory as its memory. + * Answer an integer error code when the processor hits some exception. + * Answer 0 when it is interrupted. + */ +extern int runCPUInSizeMinAddrReadWrite(void *cpu, void *memory, + ulong byteSize, ulong minReadAddr, ulong minWriteAddr); +/* + * Flush any icache entries from start to end + */ +extern void flushICacheFromTo(void *cpu, ulong strt, ulong nd); +/* + * force runCPUInSize to exit asap. Used by interrupts. + */ +extern void forceStopRunning(); +/* + * The previous entry in the interruptCheckChain so forceStopRunning can chain. + */ +extern void (*prevInterruptCheckChain)(); +/* + * Disassemble the instruction at address in memory, writing the output to the + * log. + */ +extern int disassembleForAtInSize(void *cpu, ulong laddr, + void *memory, ulong byteSize); +/* + * The saved error if the previous singleStepIn failed. + */ +extern int errorAcorn(); +/* + * The current log (if singleStep failed with SomethingLoggedError). + */ +extern char *getlog(long *len); Property changes on: trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h ___________________________________________________________________ Added: svn:executable + * Added: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile (rev 0) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile 2012-08-10 21:28:50 UTC (rev 2583) @@ -0,0 +1,15 @@ +CC = gcc +CFLAGS = +LDFLAGS = libsim.a $(GDBBUILDFOLDER)/opcodes/libopcodes.a -lbfd -lintl -liberty -Wl,-wrap,ARMul_OSHandleSWI +GDBBUILDFOLDER = /d/build/gdb-7.4 +SHAREDLIBRARYFLAGS = + +all: + $(CC) $(CFLAGS) armulmem.c -c -I$(GDBBUILDFOLDER)/sim/arm/ + $(CC) $(CFLAGS) sqGdbARMPlugin.c -c -fPIC -I$(GDBBUILDFOLDER)/sim/arm/ + gcc -shared $(SHAREDLIBRARYFLAGS) -o GdbARMPlugin.dll sqGdbARMPlugin.o armulmem.o $(LDFLAGS) +# mkdir ../cog/platforms/Cross/plugins/GdbARMPlugin +# mkdir ../cog/platforms/win32/plugins/GdbARMPlugin + cp sqGdbARMPlugin.c GdbARMPlugin.h armulmem.c ../cog/platforms/Cross/plugins/GdbARMPlugin/ + cp Makefile.win32 ../cog/platforms/win32/plugins/GdbARMPlugin/Makefile + cd ../cog/cygwinbuild; make Property changes on: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile ___________________________________________________________________ Added: svn:executable + * Added: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 (rev 0) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 2012-08-10 21:28:50 UTC (rev 2583) @@ -0,0 +1,14 @@ +DLLTOOLEXTRA := /d/Dateien/cog/squeakvm-armulator-plugin/libsim.a \ + /d/build/gdb-7.4/opcodes/libopcodes.a +DLLWRAPEXTRA := $(DLLTOOLEXTRA) + +LINK_WITH_GPP := yes +EXTRALIBS:= -L/d/Dateien/cog/squeakvm-armulator-plugin \ + -L/d/build/gdb-7.4/opcodes \ + -lsim -lopcodes -lbfd -lintl -liberty -Wl,-wrap,ARMul_OSHandleSWI + +include ../../Makefile.plugin + +INCLUDES:= $(INCLUDES) -I/d/build/gdb-7.4/sim/arm + + Property changes on: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 ___________________________________________________________________ Added: svn:executable + * Added: trunk/platforms/Cross/plugins/GdbARMPlugin/README =================================================================== Added: trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c (rev 0) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c 2012-08-10 21:28:50 UTC (rev 2583) @@ -0,0 +1,506 @@ +/* + This file is a compy of armvirt.c, which is part of the ARMulator distributed e.g. with gdb and skyeye. + In order to overwrite GetWord and PutWord, I had to copy the whole file. + Also changed: ReLoadInstr. +*/ +#include "GdbARMPlugin.h" + +/* armvirt.c -- ARMulator virtual memory interace: ARM6 Instruction Emulator. + Copyright (C) 1994 Advanced RISC Machines Ltd. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* This file contains a complete ARMulator memory model, modelling a +"virtual memory" system. A much simpler model can be found in armfast.c, +and that model goes faster too, but has a fixed amount of memory. This +model's memory has 64K pages, allocated on demand from a 64K entry page +table. The routines PutWord and GetWord implement this. Pages are never +freed as they might be needed again. A single area of memory may be +defined to generate aborts. */ + +#include "armopts.h" +#include "armos.h" +#include "armdefs.h" +#include "ansidecl.h" + +#ifdef VALIDATE /* for running the validate suite */ +#define TUBE 48 * 1024 * 1024 /* write a char on the screen */ +#define ABORTS 1 +#endif + +/* #define ABORTS */ + +#ifdef ABORTS /* the memory system will abort */ +/* For the old test suite Abort between 32 Kbytes and 32 Mbytes + For the new test suite Abort between 8 Mbytes and 26 Mbytes */ +/* #define LOWABORT 32 * 1024 +#define HIGHABORT 32 * 1024 * 1024 */ +#define LOWABORT 8 * 1024 * 1024 +#define HIGHABORT 26 * 1024 * 1024 + +#endif + +#define NUMPAGES 64 * 1024 +#define PAGESIZE 64 * 1024 +#define PAGEBITS 16 +#define OFFSETBITS 0xffff + +int SWI_vector_installed = FALSE; + +#include <stdio.h> + +/***************************************************************************\ +* Get a Word from Memory * +\***************************************************************************/ + +static ARMword +GetWord (ARMul_State * state, ARMword address, int check) +{ + if(address < minReadAddress || address + 4 > (state->MemSize)) + { + //raise memory access error + state->EndCondition = MemoryBoundsError; + state->Emulate = FALSE; + gdb_log_printf(NULL, "Illegal memory read at 0x%p. ", address); + return 0; + } + else + { + return *((ARMword*) (state->MemDataPtr + address)); + } +} + +/***************************************************************************\ +* Put a Word into Memory * +\***************************************************************************/ + +static void +PutWord (ARMul_State * state, ARMword address, ARMword data, int check) +{ + if(address < minWriteAddress || address + 4 > (state->MemSize)) + { + state->Emulate = FALSE; + state->EndCondition = MemoryBoundsError; + gdb_log_printf(NULL, "Illegal memory write at 0x%p. ", address); + } + else + { + *((ARMword*) (state->MemDataPtr + address)) = data; + } +} + +/***************************************************************************\ +* ReLoad Instruction * +\***************************************************************************/ + +ARMword +ARMul_ReLoadInstr (ARMul_State * state, ARMword address, ARMword isize) +{ +#ifdef ABORTS + if (address >= LOWABORT && address < HIGHABORT) + { + ARMul_PREFETCHABORT (address); + return ARMul_ABORTWORD; + } + else + { + ARMul_CLEARABORT; + } +#endif + + if (address < minReadAddress + || address >= (state->MemSize) + || (address >= minWriteAddress && minWriteAddress != 0)) + { + // Custom SWI, defined in the wrapper of ARMul_OSHandleSWI + return 0xEF000000 | 0x200000; + // ^ SWI ^ SWI number + } + + if ((isize == 2) && (address & 0x2)) + { + /* We return the next two halfwords: */ + ARMword lo = GetWord (state, address, FALSE); + ARMword hi = GetWord (state, address + 4, FALSE); + + if (state->bigendSig == HIGH) + return (lo << 16) | (hi >> 16); + else + return ((hi & 0xFFFF) << 16) | (lo >> 16); + } + + return GetWord (state, address, TRUE); +} + +/***************************************************************************\ +* Initialise the memory interface * +\***************************************************************************/ + +unsigned +ARMul_MemoryInit (ARMul_State * state, unsigned long initmemsize) +{ + ARMword **pagetable; + unsigned page; + + if (initmemsize) + state->MemSize = initmemsize; + + pagetable = (ARMword **) malloc (sizeof (ARMword *) * NUMPAGES); + + if (pagetable == NULL) + return FALSE; + + for (page = 0; page < NUMPAGES; page++) + *(pagetable + page) = NULL; + + state->MemDataPtr = (unsigned char *) pagetable; + + ARMul_ConsolePrint (state, ", 4 Gb memory"); + + return TRUE; +} + +/***************************************************************************\ +* Remove the memory interface * +\***************************************************************************/ + +void +ARMul_MemoryExit (ARMul_State * state) +{ + ARMword page; + ARMword **pagetable; + ARMword *pageptr; + + pagetable = (ARMword **) state->MemDataPtr; + for (page = 0; page < NUMPAGES; page++) + { + pageptr = *(pagetable + page); + if (pageptr != NULL) + free ((char *) pageptr); + } + free ((char *) pagetable); + return; +} + +/***************************************************************************\ +* Load Instruction, Sequential Cycle * +\***************************************************************************/ + +ARMword ARMul_LoadInstrS (ARMul_State * state, ARMword address, ARMword isize) +{ + state->NumScycles++; + +#ifdef HOURGLASS + if ((state->NumScycles & HOURGLASS_RATE) == 0) + { + HOURGLASS; + } +#endif + + return ARMul_ReLoadInstr (state, address, isize); +} + +/***************************************************************************\ +* Load Instruction, Non Sequential Cycle * +\***************************************************************************/ + +ARMword ARMul_LoadInstrN (ARMul_State * state, ARMword address, ARMword isize) +{ + state->NumNcycles++; + + return ARMul_ReLoadInstr (state, address, isize); +} + +/***************************************************************************\ +* Read Word (but don't tell anyone!) * +\***************************************************************************/ + +ARMword ARMul_ReadWord (ARMul_State * state, ARMword address) +{ +#ifdef ABORTS + if (address >= LOWABORT && address < HIGHABORT) + { + ARMul_DATAABORT (address); + return ARMul_ABORTWORD; + } + else + { + ARMul_CLEARABORT; + } +#endif + + return GetWord (state, address, TRUE); +} + +/***************************************************************************\ +* Load Word, Sequential Cycle * +\***************************************************************************/ + +ARMword ARMul_LoadWordS (ARMul_State * state, ARMword address) +{ + state->NumScycles++; + + return ARMul_ReadWord (state, address); +} + +/***************************************************************************\ +* Load Word, Non Sequential Cycle * +\***************************************************************************/ + +ARMword ARMul_LoadWordN (ARMul_State * state, ARMword address) +{ + state->NumNcycles++; + + return ARMul_ReadWord (state, address); +} + +/***************************************************************************\ +* Load Halfword, (Non Sequential Cycle) * +\***************************************************************************/ + +ARMword ARMul_LoadHalfWord (ARMul_State * state, ARMword address) +{ + ARMword temp, offset; + + state->NumNcycles++; + + temp = ARMul_ReadWord (state, address); + offset = (((ARMword) state->bigendSig * 2) ^ (address & 2)) << 3; /* bit offset into the word */ + + return (temp >> offset) & 0xffff; +} + +/***************************************************************************\ +* Read Byte (but don't tell anyone!) * +\***************************************************************************/ + +ARMword ARMul_ReadByte (ARMul_State * state, ARMword address) +{ + ARMword temp, offset; + + temp = ARMul_ReadWord (state, address); + offset = (((ARMword) state->bigendSig * 3) ^ (address & 3)) << 3; /* bit offset into the word */ + + return (temp >> offset & 0xffL); +} + +/***************************************************************************\ +* Load Byte, (Non Sequential Cycle) * +\***************************************************************************/ + +ARMword ARMul_LoadByte (ARMul_State * state, ARMword address) +{ + state->NumNcycles++; + + return ARMul_ReadByte (state, address); +} + +/***************************************************************************\ +* Write Word (but don't tell anyone!) * +\***************************************************************************/ + +void +ARMul_WriteWord (ARMul_State * state, ARMword address, ARMword data) +{ +#ifdef ABORTS + if (address >= LOWABORT && address < HIGHABORT) + { + ARMul_DATAABORT (address); + return; + } + else + { + ARMul_CLEARABORT; + } +#endif + + PutWord (state, address, data, TRUE); +} + +/***************************************************************************\ +* Store Word, Sequential Cycle * +\***************************************************************************/ + +void +ARMul_StoreWordS (ARMul_State * state, ARMword address, ARMword data) +{ + state->NumScycles++; + + ARMul_WriteWord (state, address, data); +} + +/***************************************************************************\ +* Store Word, Non Sequential Cycle * +\***************************************************************************/ + +void +ARMul_StoreWordN (ARMul_State * state, ARMword address, ARMword data) +{ + state->NumNcycles++; + + ARMul_WriteWord (state, address, data); +} + +/***************************************************************************\ +* Store HalfWord, (Non Sequential Cycle) * +\***************************************************************************/ + +void +ARMul_StoreHalfWord (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp, offset; + + state->NumNcycles++; + +#ifdef VALIDATE + if (address == TUBE) + { + if (data == 4) + state->Emulate = FALSE; + else + (void) putc ((char) data, stderr); /* Write Char */ + return; + } +#endif + + temp = ARMul_ReadWord (state, address); + offset = (((ARMword) state->bigendSig * 2) ^ (address & 2)) << 3; /* bit offset into the word */ + + PutWord (state, address, + (temp & ~(0xffffL << offset)) | ((data & 0xffffL) << offset), + TRUE); +} + +/***************************************************************************\ +* Write Byte (but don't tell anyone!) * +\***************************************************************************/ + +void +ARMul_WriteByte (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp, offset; + + temp = ARMul_ReadWord (state, address); + offset = (((ARMword) state->bigendSig * 3) ^ (address & 3)) << 3; /* bit offset into the word */ + + PutWord (state, address, + (temp & ~(0xffL << offset)) | ((data & 0xffL) << offset), + TRUE); +} + +/***************************************************************************\ +* Store Byte, (Non Sequential Cycle) * +\***************************************************************************/ + +void +ARMul_StoreByte (ARMul_State * state, ARMword address, ARMword data) +{ + state->NumNcycles++; + +#ifdef VALIDATE + if (address == TUBE) + { + if (data == 4) + state->Emulate = FALSE; + else + (void) putc ((char) data, stderr); /* Write Char */ + return; + } +#endif + + ARMul_WriteByte (state, address, data); +} + +/***************************************************************************\ +* Swap Word, (Two Non Sequential Cycles) * +\***************************************************************************/ + +ARMword ARMul_SwapWord (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp; + + state->NumNcycles++; + + temp = ARMul_ReadWord (state, address); + + state->NumNcycles++; + + PutWord (state, address, data, TRUE); + + return temp; +} + +/***************************************************************************\ +* Swap Byte, (Two Non Sequential Cycles) * +\***************************************************************************/ + +ARMword ARMul_SwapByte (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp; + + temp = ARMul_LoadByte (state, address); + ARMul_StoreByte (state, address, data); + + return temp; +} + +/***************************************************************************\ +* Count I Cycles * +\***************************************************************************/ + +void +ARMul_Icycles (ARMul_State * state, unsigned number, ARMword address ATTRIBUTE_UNUSED) +{ + state->NumIcycles += number; + ARMul_CLEARABORT; +} + +/***************************************************************************\ +* Count C Cycles * +\***************************************************************************/ + +void +ARMul_Ccycles (ARMul_State * state, unsigned number, ARMword address ATTRIBUTE_UNUSED) +{ + state->NumCcycles += number; + ARMul_CLEARABORT; +} + + +/* Read a byte. Do not check for alignment or access errors. */ + +ARMword +ARMul_SafeReadByte (ARMul_State * state, ARMword address) +{ + ARMword temp, offset; + + temp = GetWord (state, address, FALSE); + offset = (((ARMword) state->bigendSig * 3) ^ (address & 3)) << 3; + + return (temp >> offset & 0xffL); +} + +void +ARMul_SafeWriteByte (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp, offset; + + temp = GetWord (state, address, FALSE); + offset = (((ARMword) state->bigendSig * 3) ^ (address & 3)) << 3; + + PutWord (state, address, + (temp & ~(0xffL << offset)) | ((data & 0xffL) << offset), + FALSE); +} Property changes on: trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c (rev 0) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2012-08-10 21:28:50 UTC (rev 2583) @@ -0,0 +1,219 @@ +#define COG 1 +#define FOR_COG_PLUGIN 1 + +#include "GdbARMPlugin.h" + +//disassembler +#include <bfd.h> +#include <dis-asm.h> + +#include <stdarg.h> + +//emulator +#include <armdefs.h> +#include <armemu.h> + +ARMul_State* lastCPU = NULL; + + +// These two variables exist, in case there are library-functions which write to a stream. +// In that case, we would write functions which print to that stream instead of stderr or similar +#define LOGSIZE 4096 +static char gdb_log[LOGSIZE+1]; +static int gdblog_index = 0; + +ulong minReadAddress, minWriteAddress; + +// what is that for? + void (*prevInterruptCheckChain)() = 0; + +void +print_state(ARMul_State* state) +{ + printf("NextInstr: %i\ttheMemory: 0x%p\tNumInstrs: 0x%p\tPC: 0x%p\tmode: %i\tEndCondition: %i\tEmulate: %i\n", + state->NextInstr, state->MemDataPtr, + state->NumInstrs, state->Reg[15], + state->Mode, state->EndCondition, + state->Emulate); +} + +void* +newCPU() +{ + if(lastCPU == NULL) ARMul_EmulateInit(); + lastCPU = ARMul_NewState(); + return lastCPU; +} + +int +resetCPU(void* cpu) +{ + unsigned int i, j; + ARMul_State* state = (ARMul_State*) cpu; + // test whether the supplied instance is an ARMul type? + + gdblog_index = 0; + + // reset registers in all modes + for (i = 0; i < 16; i++) + { + state->Reg[i] = 0; + for (j = 0; j < 7; j++) + state->RegBank[j][i] = 0; + } + for (i = 0; i < 7; i++) + state->Spsr[i] = 0; + + ARMul_Reset(state); + return 0; +} + +int +runOnCPU(void *cpu, void *memory, + ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr, ARMword (*run)(ARMul_State*)) +{ + ARMul_State* state = (ARMul_State*) cpu; + lastCPU = state; + + // test whether the supplied instance is an ARMul type? + state->MemDataPtr = (unsigned char*) memory; + state->MemSize = byteSize; + minReadAddress = minAddr; + minWriteAddress = minWriteMaxExecAddr; + + gdblog_index = 0; + + state->EndCondition = NoError; + state->NextInstr = RESUME; + + state->Reg[15] = run(state); + + // collect the PSR from their dedicated flags to have easy access from the image. + ARMul_SetCPSR(state, ARMul_GetCPSR(state)); + + if(state->EndCondition != NoError){ + return state->EndCondition; + } + + return gdblog_index == 0 ? 0 : SomethingLoggedError; +} + +int +singleStepCPUInSizeMinAddressReadWrite(void *cpu, void *memory, + ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr) +{ + return runOnCPU(cpu, memory, byteSize, minAddr, minWriteMaxExecAddr, ARMul_DoInstr); +} + +int +runCPUInSizeMinAddressReadWrite(void *cpu, void *memory, + ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr) +{ + return runOnCPU(cpu, memory, byteSize, minAddr, minWriteMaxExecAddr, ARMul_DoProg); +} + +// next functions reason for existence is not clear +/* + * Currently a dummy for Bochs. + */ +void +flushICacheFromTo(void *cpu, ulong saddr, ulong eaddr) +{ +#if 0 +# error not yet implemented +#endif +} + +int +gdb_log_printf(void* stream, const char * format, ...) +{ + va_list arg; + int n; + va_start(arg,format); + + if(stream == NULL){ + n = vsnprintf((char*) (&gdb_log) + gdblog_index, LOGSIZE-gdblog_index, format, arg); + gdblog_index = gdblog_index + n; + } else { + vfprintf(stream, format, arg); + } + return 0; +} + +int +disassembleForAtInSize(void *cpu, ulong laddr, + void *memory, ulong byteSize) +{ + gdblog_index = 0; + // ignore the cpu + // start disassembling at laddr relative to memory + // stop disassembling at memory+byteSize + + disassemble_info* dis = (disassemble_info*) calloc(1, sizeof(disassemble_info)); + // void init_disassemble_info (struct disassemble_info *dinfo, void *stream, fprintf_ftype fprintf_func) + init_disassemble_info ( dis, NULL, gdb_log_printf); + + dis->arch = bfd_arch_arm; + dis->mach = bfd_mach_arm_unknown; + + // sets some fields in the structure dis to architecture specific values + disassemble_init_for_target( dis ); + // Given a bfd, the disassembler can find the arch by itself. + // Unfortunately, we don't have bfd-structures, so we have to choose the function by hand. + //disassemble = disassembler( c ); + disassembler_ftype disassembler = print_insn_little_arm; + //other possible functions are listed in opcodes/dissassemble.c + + dis->buffer_vma = 0; + dis->buffer = memory; + dis->buffer_length = byteSize; + + // while-loop for calling single instruction decoding: + unsigned int isize = 0; + size_t pos = laddr; + size_t max_pos = dis->buffer_vma+dis->buffer_length; + + unsigned int size = disassembler((bfd_vma) pos, dis); + + free(dis); + gdb_log[gdblog_index+1] = 0; + + return size; +} + +void +forceStopRunning() +{ + lastCPU->Emulate = STOP; +} + +int +errorAcorn(void) { return 0; } + +char * +getlog(long *len) +{ + *len = gdblog_index; + return gdb_log; +} + +// adding custom Software Interrupts to the ARMulator +unsigned __real_ARMul_OSHandleSWI(ARMul_State*, ARMword); + +unsigned +__wrap_ARMul_OSHandleSWI (ARMul_State * state, ARMword number) +{ + switch(number) + { + case 0x200000: + // This is the SWI number which is returned by our memory interface + // if there is an instruction fetch for an illegal address. + state->Emulate = STOP; + state->EndCondition = MemoryBoundsError; + + // during execution, the pc points the next fetch address, which is 8 byte after the current instruction. + gdb_log_printf(NULL, "Illegal Instruction fetch address (0x%p).", state->Reg[15]-8); + return TRUE; + } + return __real_ARMul_OSHandleSWI(state, number); +} Property changes on: trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c ___________________________________________________________________ Added: svn:executable + * Modified: trunk/platforms/Cross/plugins/SocketPlugin/SocketPlugin.h =================================================================== --- trunk/platforms/Cross/plugins/SocketPlugin/SocketPlugin.h 2012-08-10 21:27:56 UTC (rev 2582) +++ trunk/platforms/Cross/plugins/SocketPlugin/SocketPlugin.h 2012-08-10 21:28:50 UTC (rev 2583) @@ -29,6 +29,7 @@ void sqSocketConnectToPort(SocketPtr s, sqInt addr, sqInt port); void sqSocketCreateNetTypeSocketTypeRecvBytesSendBytesSemaID(SocketPtr s, sqInt netType, sqInt socketType, sqInt recvBufSize, sqInt sendBufSize, sqInt semaIndex); void sqSocketCreateNetTypeSocketTypeRecvBytesSendBytesSemaIDReadSemaIDWriteSemaID(SocketPtr s, sqInt netType, sqInt socketType, sqInt recvBufSize, sqInt sendBufSize, sqInt semaIndex, sqInt readSemaIndex, sqInt writeSemaIndex); +void sqSocketCreateRawProtoTypeRecvBytesSendBytesSemaIDReadSemaIDWriteSemaID(SocketPtr s, sqInt domain, sqInt protocol, sqInt recvBufSize, sqInt sendBufSize, sqInt semaIndex, sqInt readSemaIndex, sqInt writeSemaIndex); void sqSocketDestroy(SocketPtr s); sqInt sqSocketError(SocketPtr s); void sqSocketListenOnPort(SocketPtr s, sqInt port);

1 0

VM Maker: VMMaker.oscog-eem.199.mcz
by commits＠source.squeak.org 10 Aug '12

10 Aug '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.199.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.199 Author: eem Time: 10 August 2012, 2:09:02.546 pm UUID: 1b0cff66-2042-49a7-ae74-5fa119256732 Ancestors: VMMaker.oscog-eem.198 Rename parameter to eliminate translation-time warning. =============== Diff against VMMaker.oscog-eem.198 =============== Item was changed: ----- Method: Cogit>>linkSendAt:in:to:offset:receiver: (in category 'in-line cacheing') ----- + linkSendAt: callSiteReturnAddress in: sendingMethod to: targetMethod offset: theEntryOffset receiver: receiver - linkSendAt: callSiteReturnAddress in: sendingMethod to: targetMethod offset: entryOffset receiver: receiver <api> <var: #sendingMethod type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> | inlineCacheTag address extent | self cppIf: NewspeakVM + ifTrue: [self assert: (theEntryOffset = cmEntryOffset + or: [theEntryOffset = cmNoCheckEntryOffset + or: [theEntryOffset = cmDynSuperEntryOffset]])] + ifFalse: [self assert: (theEntryOffset = cmEntryOffset + or: [theEntryOffset = cmNoCheckEntryOffset])]. - ifTrue: [self assert: (entryOffset = cmEntryOffset - or: [entryOffset = cmNoCheckEntryOffset - or: [entryOffset = cmDynSuperEntryOffset]])] - ifFalse: [self assert: (entryOffset = cmEntryOffset - or: [entryOffset = cmNoCheckEntryOffset])]. self assert: (callSiteReturnAddress between: methodZoneBase and: methodZone zoneLimit). + inlineCacheTag := theEntryOffset = cmNoCheckEntryOffset - inlineCacheTag := entryOffset = cmNoCheckEntryOffset ifTrue: [targetMethod selector "i.e. no change"] ifFalse: [objectRepresentation inlineCacheTagForInstance: receiver]. (sendingMethod cmRefersToYoung not and: [(objectRepresentation inlineCacheTagIsYoung: inlineCacheTag)]) ifTrue: [self assert: (methodZone occurrencesInYoungReferrers: sendingMethod) = 0. sendingMethod cmRefersToYoung: true. methodZone addToYoungReferrers: sendingMethod]. + address := targetMethod asInteger + theEntryOffset. - address := targetMethod asInteger + entryOffset. extent := backEnd rewriteInlineCacheAt: callSiteReturnAddress tag: inlineCacheTag target: address. processor flushICacheFrom: callSiteReturnAddress - 1 - extent to: callSiteReturnAddress - 1!

1 0

VM Maker: VMMaker.oscog-eem.198.mcz
by commits＠source.squeak.org 10 Aug '12

10 Aug '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.198.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.198 Author: eem Time: 10 August 2012, 1:58:46.571 pm UUID: 03c8603b-bb83-42f6-8e04-a161f808aace Ancestors: VMMaker.oscog-lw.197 Make overflowing the youngReferrers list a hard error (appears to happen quite often in Newspeak code). Clarify remapNSIfObjectRef:pc:hasYoung:. =============== Diff against VMMaker.oscog-lw.197 =============== Item was changed: ----- Method: CogMethodZone>>addToYoungReferrers: (in category 'young referers') ----- addToYoungReferrers: cogMethod <var: #cogMethod type: #'CogMethod *'> self assert: youngReferrers <= limitAddress. - self assert: self roomOnYoungReferrersList. self assert: (self occurrencesInYoungReferrers: cogMethod) = 0. self assert: cogMethod cmRefersToYoung. + (self asserta: self roomOnYoungReferrersList) ifFalse: + [self error: 'no room on youngReferrers list']. youngReferrers := youngReferrers - BytesPerWord. objectMemory longAt: youngReferrers put: cogMethod asUnsignedInteger! Item was changed: ----- Method: Cogit>>remapNSIfObjectRef:pc:hasYoung: (in category 'garbage collection') ----- remapNSIfObjectRef: annotation pc: mcpc hasYoung: hasYoungPtr <option: #NewspeakVM> <var: #mcpc type: #'char *'> <var: #targetMethod type: #'CogMethod *'> annotation = IsObjectReference ifTrue: [| literal mappedLiteral | literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. (objectRepresentation couldBeObject: literal) ifTrue: [mappedLiteral := objectMemory remap: literal. literal ~= mappedLiteral ifTrue: [backEnd storeLiteral: mappedLiteral beforeFollowingAddress: mcpc asInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedLiteral]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]. (self isSendAnnotation: annotation) ifTrue: [| cacheTag mappedCacheTag entryPoint | cacheTag := backEnd inlineCacheTagAt: mcpc asInteger. (objectRepresentation couldBeObject: cacheTag) ifTrue: [mappedCacheTag := objectMemory remap: cacheTag. cacheTag ~= mappedCacheTag ifTrue: [backEnd rewriteInlineCacheTag: mappedCacheTag at: mcpc asInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedCacheTag]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. + entryPoint = ceImplicitReceiverTrampoline + ifTrue: + [| pc oop mappedOop | + pc := mcpc asInteger + backEnd jumpShortByteSize. - entryPoint = ceImplicitReceiverTrampoline ifTrue: - [| pc oop mappedOop | - pc := mcpc asInteger + backEnd jumpShortByteSize. - (oop := backEnd unalignedLongAt: pc) ~= 0 ifTrue: - [mappedOop := objectMemory remap: oop. - mappedOop ~= oop ifTrue: - [backEnd unalignedLongAt: pc put: mappedOop]. - (hasYoungPtr ~= 0 - and: [objectMemory isYoung: mappedOop]) ifTrue: - [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]. - pc := mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop. (oop := backEnd unalignedLongAt: pc) ~= 0 ifTrue: [mappedOop := objectMemory remap: oop. mappedOop ~= oop ifTrue: [backEnd unalignedLongAt: pc put: mappedOop]. + (hasYoungPtr ~= 0 + and: [objectMemory isYoung: mappedOop]) ifTrue: + [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]. + pc := mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop. + (oop := backEnd unalignedLongAt: pc) ~= 0 ifTrue: + [mappedOop := objectMemory remap: oop. + mappedOop ~= oop ifTrue: + [backEnd unalignedLongAt: pc put: mappedOop]. + (hasYoungPtr ~= 0 + and: [objectMemory isYoung: mappedOop]) ifTrue: + [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]] + ifFalse: + [hasYoungPtr ~= 0 ifTrue: + [| offset targetMethod | + "Since the unlinking routines may rewrite the cacheTag to the send's selector, and + since they don't have the cogMethod to hand and can't add it to youngReferrers, + the method must remain in youngReferrers if the targetMethod's selector is young." + entryPoint > methodZoneBase ifTrue: "It's a linked send." + [offset := (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment + ifTrue: [cmEntryOffset] + ifFalse: [cmNoCheckEntryOffset]. + targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. + (objectMemory isYoung: targetMethod selector) ifTrue: + [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]]. - (hasYoungPtr ~= 0 - and: [objectMemory isYoung: mappedOop]) ifTrue: - [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]. - hasYoungPtr ~= 0 ifTrue: - [| offset targetMethod | - "Since the unlinking routines may rewrite the cacheTag to the send's selector, and - since they don't have the cogMethod to hand and can't add it to youngReferrers, - the method must remain in youngReferrers if the targetMethod's selector is young." - entryPoint > methodZoneBase ifTrue: "It's a linked send." - [offset := (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment - ifTrue: [cmEntryOffset] - ifFalse: [cmNoCheckEntryOffset]. - targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. - (objectMemory isYoung: targetMethod selector) ifTrue: - [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]. ^0 "keep scanning"!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2012